Merge branch 'main' into update-bundle/codeql-bundle-v2.20.1

Author: dbartol

Diff for: lib/start-proxy-action.js

@@ -174,7 +174,10 @@ async function startProxy(
 
     const registry_urls = config.all_credentials
       .filter((credential) => credential.url !== undefined)
-      .map((credential) => credential.url);
+      .map((credential) => ({
+        type: credential.type,
+        url: credential.url,
+      }));
     core.setOutput("proxy_urls", JSON.stringify(registry_urls));
   } catch (error) {
     core.setFailed(`start-proxy action failed: ${util.getErrorMessage(error)}`);

Diff for: lib/start-proxy-action.js.map

@@ -24,7 +24,7 @@ outputs:
   proxy_ca_certificate:
     description: The proxy's internal CA certificate in PEM format
   proxy_urls:
-    description: The URLs of the configured registries, as a JSON array.
+    description: A stringified JSON array of objects containing the types and URLs of the configured registries.
 runs:
   using: node20
   main: "../lib/start-proxy-action.js"