fixes based on testing

Signed-off-by: Kashish Mittal <kmittal@redhat.com>

Author: 04kash

skills/rhdh-templates/scripts/dry_run.py

@@ -110,10 +110,20 @@ def main() -> int:
                 raise ValueError("--secrets file must contain a JSON object")
             secrets = {str(k): str(v) for k, v in raw.items()}
 
-        skeleton_dir = args.skeleton_dir or (template_dir / "skeleton")
         directory_contents: list[dict[str, str]] = []
-        if skeleton_dir.is_dir():
-            directory_contents = load_directory_contents(skeleton_dir)
+        content_root = args.skeleton_dir or template_dir
+        if content_root.is_dir():
+            if args.skeleton_dir:
+                prefix = content_root.relative_to(template_dir).as_posix()
+                for item in load_directory_contents(content_root):
+                    directory_contents.append(
+                        {
+                            "path": f"{prefix}/{item['path']}",
+                            "base64Content": item["base64Content"],
+                        }
+                    )
+            else:
+                directory_contents = load_directory_contents(content_root)
 
         response = dry_run(
             args.rhdh_url,

tests/integration/test_rhdh_templates_live.py

@@ -29,10 +29,14 @@ def _rhdh_url() -> str | None:
 
 
 def _rhdh_reachable(url: str) -> bool:
+    headers = {"Accept": "application/json"}
+    token = os.environ.get("RHDH_TOKEN") or os.environ.get("BACKSTAGE_TOKEN")
+    if token:
+        headers["Authorization"] = f"Bearer {token}"
     try:
         req = urllib.request.Request(
             f"{url.rstrip('/')}/api/scaffolder/v2/actions",
-            headers={"Accept": "application/json"},
+            headers=headers,
             method="GET",
         )
         with urllib.request.urlopen(req, timeout=5) as resp: