@firestartr/cli 2.10.0-snapshot-org-secrets-3 → 2.10.0-snapshot-org-secrets-validation-1

package/build/index.js

@@ -332479,12 +332479,16 @@ function renameVariantCrFiles(outputDir, renderedMap) {
 
 const IS_COMPONENT_CLAIM_REF = new RegExp(/^ComponentClaim-/);
 const IS_TF_WORKSPACE = new RegExp(/^TFWorkspaceClaim-/);
+const IS_ORG_SETTINGS_CLAIM = new RegExp(/^OrgSettingsClaim-/);
+const COMPONENT_REF_PATTERN = /^component:(.+)$/;
 function validateSubReferences(renderClaims) {
     for (const ref of Object.keys(renderClaims)) {
         if (IS_COMPONENT_CLAIM_REF.test(ref))
             validateClaimsSecretsRefs(ref, renderClaims);
         else if (IS_TF_WORKSPACE.test(ref))
             validateTFClaimsSecretsRefs(ref, renderClaims);
+        else if (IS_ORG_SETTINGS_CLAIM.test(ref))
+            validateOrgSettingsComponentRefs(ref, renderClaims);
     }
 }
 function validateTFClaimsSecretsRefs(ref, renderClaims) {
@@ -332536,6 +332540,57 @@ function searchSecretKey(secretClaim, key) {
     }
     return found;
 }
+function validateOrgSettingsComponentRefs(ref, renderClaims) {
+    const claim = renderClaims[ref].claim;
+    validateOrgSecretsSelectedRepositories(claim, renderClaims);
+    validateActionsVariablesSelectedRepositories(claim, renderClaims);
+}
+function validateOrgSecretsSelectedRepositories(claim, renderClaims) {
+    const orgSecrets = claim?.providers?.github?.org_secrets;
+    if (!orgSecrets || typeof orgSecrets !== 'object')
+        return;
+    for (const section of ['actions', 'codespaces', 'dependabot']) {
+        const secrets = orgSecrets[section];
+        if (!Array.isArray(secrets))
+            continue;
+        for (const secret of secrets) {
+            if (!secret.selected_repositories)
+                continue;
+            for (const repoRef of secret.selected_repositories) {
+                const match = repoRef.match(COMPONENT_REF_PATTERN);
+                if (!match)
+                    continue;
+                const [, componentName] = match;
+                const expectedKey = `ComponentClaim-${componentName}`;
+                if (!renderClaims[expectedKey]) {
+                    throw new Error(`CrossReference error: OrgSettingsClaim/${claim.name} references a non-existent component "${componentName}" in org_secrets.${section}.${secret.name}.selected_repositories`);
+                }
+            }
+        }
+    }
+}
+function validateActionsVariablesSelectedRepositories(claim, renderClaims) {
+    const actionsVariables = claim?.providers?.github?.actions_variables;
+    if (!Array.isArray(actionsVariables))
+        return;
+    for (const variable of actionsVariables) {
+        if (variable.visibility !== 'selected')
+            continue;
+        const selectedRepos = variable.selected_repositories;
+        if (!Array.isArray(selectedRepos) || selectedRepos.length === 0)
+            continue;
+        for (const ref of selectedRepos) {
+            const match = ref.match(COMPONENT_REF_PATTERN);
+            if (!match)
+                continue;
+            const componentName = match[1];
+            const expectedKey = `ComponentClaim-${componentName}`;
+            if (!renderClaims[expectedKey]) {
+                throw new Error(`CrossReference error: OrgSettingsClaim/${claim.name} references a non-existent component "${componentName}" in actions_variables.${variable.name}.selected_repositories`);
+            }
+        }
+    }
+}
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/validations/componentPagesPath.ts
 /**
@@ -332588,7 +332643,6 @@ function validateGithubOrgSettingsSingleton(crs) {
 const GITHUB_ORG_VARIABLE_SECTION_KIND = 'FirestartrGithubOrganizationVariableSection';
 const githubOrgVariableSection_FIRESTARTR_CLAIM_REF_ANNOTATION = 'firestartr.dev/claim-ref';
 const githubOrgVariableSection_CLAIM_REF_LABEL = 'claim-ref';
-const COMPONENT_REF_PATTERN = /^component:(.+)$/;
 function githubOrgVariableSection_formatResourceRef(name, claimRef) {
     return claimRef ? `${name} (claim: ${claimRef})` : name;
 }
@@ -332644,34 +332698,6 @@ function validateActionsVariablesUniqueness(crs) {
         }
     }
 }
-function validateActionsVariablesSelectedRepositories(renderClaims) {
-    for (const claimKey of Object.keys(renderClaims)) {
-        if (!claimKey.startsWith('OrgSettingsClaim-'))
-            continue;
-        const claimData = renderClaims[claimKey];
-        const claim = claimData?.claim;
-        const actionsVariables = claim?.providers?.github?.actions_variables;
-        if (!Array.isArray(actionsVariables))
-            continue;
-        for (const variable of actionsVariables) {
-            if (variable.visibility !== 'selected')
-                continue;
-            const selectedRepos = variable.selected_repositories;
-            if (!Array.isArray(selectedRepos) || selectedRepos.length === 0)
-                continue;
-            for (const ref of selectedRepos) {
-                const match = ref.match(COMPONENT_REF_PATTERN);
-                if (!match)
-                    continue;
-                const componentName = match[1];
-                const expectedKey = `ComponentClaim-${componentName}`;
-                if (!renderClaims[expectedKey]) {
-                    throw new Error(`CrossReference error: OrgSettingsClaim/${claim.name} references a non-existent component "${componentName}" in actions_variables.${variable.name}.selected_repositories`);
-                }
-            }
-        }
-    }
-}
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/validations/githubOrgSecretSection.ts
 const GITHUB_ORG_SECRET_SECTION_KIND = 'FirestartrGithubOrganizationSecretSection';
@@ -332816,7 +332842,6 @@ async function renderer_render(catalogScope, firestartrScope, claimList) {
     try {
         validateSubReferences(data.renderClaims);
         validateComponentPagesPath(data.renderClaims);
-        validateActionsVariablesSelectedRepositories(data.renderClaims);
         validateOrgSecretsCrossReferences(data.renderClaims);
         validateTfStateKeyUniqueness(result);
         validateGithubOrgSettingsSingleton(fullCrSet);
@@ -526235,7 +526260,7 @@ const crsStatusSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.10.0-snapshot-org-secrets-3"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.10.0-snapshot-org-secrets-validation-1"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"2.9.0"};
 // EXTERNAL MODULE: ../../node_modules/semver/index.js

package/build/packages/cdk8s_renderer/src/validations/githubOrgVariableSection.d.ts

@@ -1,4 +1,3 @@
-import { RenderClaims, RenderedCrMap } from '../renderer/types';
+import { RenderedCrMap } from '../renderer/types';
 export declare function validateGithubOrgVariableSectionSingleton(crs: RenderedCrMap): void;
 export declare function validateActionsVariablesUniqueness(crs: RenderedCrMap): void;
-export declare function validateActionsVariablesSelectedRepositories(renderClaims: RenderClaims): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "2.10.0-snapshot-org-secrets-3",
+  "version": "2.10.0-snapshot-org-secrets-validation-1",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",