@firestartr/cli 1.54.0-snapshot-2 → 1.54.0-snapshot-3

package/build/index.js

@@ -358075,6 +358075,14 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                         secrets: {
                             $ref: 'firestartr.dev://github/GithubComponentClaimSecrets',
                         },
+                        topics: {
+                            type: 'array',
+                            items: {
+                                type: 'string',
+                                maxLength: 50,
+                                pattern: '^[a-z0-9][a-z0-9-]*$',
+                            },
+                        },
                     },
                     required: ['visibility', 'org'],
                 },
@@ -358548,7 +358556,11 @@ const ArgoCDSchemas = [argocd_schema];
                         additionalProperties: false,
                         type: 'object',
                         properties: {
-                            secretName: { type: 'string' },
+                            secretName: {
+                                type: 'string',
+                                description: 'Validation for Kubernetes Secret keys, allowing only alphanumeric characters, hyphens, underscores, and dots.',
+                                pattern: '^([a-zA-Z0-9._-]+)$',
+                            },
                             remoteRef: { type: 'string' },
                         },
                         required: ['secretName'],
@@ -358611,29 +358623,24 @@ const ArgoCDSchemas = [argocd_schema];
             allOf: [
                 { $ref: 'firestartr.dev://common/ClaimProviderEnvelope' },
                 {
-                    anyOf: [
-                        {
-                            properties: {
-                                externalSecrets: {
-                                    $ref: 'firestartr.dev://secrets/ExternalSecretsSection',
-                                },
-                                secretStore: {
-                                    $ref: 'firestartr.dev://secrets/SecretStore',
-                                },
-                            },
-                            required: ['secretStore', 'externalSecrets'],
+                    type: 'object',
+                    properties: {
+                        externalSecrets: {
+                            $ref: 'firestartr.dev://secrets/ExternalSecretsSection',
                         },
-                        {
-                            properties: {
-                                pushSecrets: {
-                                    $ref: 'firestartr.dev://secrets/PushSecretsSection',
-                                },
-                                secretStore: {
-                                    $ref: 'firestartr.dev://secrets/SecretStore',
-                                },
-                            },
-                            required: ['secretStore', 'pushSecrets'],
+                        secretStore: {
+                            $ref: 'firestartr.dev://secrets/SecretStore',
+                        },
+                        pushSecrets: {
+                            $ref: 'firestartr.dev://secrets/PushSecretsSection',
                         },
+                    },
+                    // 1. MANDATORY RULE (ALWAYS): secretStore
+                    required: ['secretStore'],
+                    // 2. CONDITIONAL RULE (AT LEAST ONE): externalSecrets OR pushSecrets
+                    anyOf: [
+                        { required: ['externalSecrets'] },
+                        { required: ['pushSecrets'] },
                     ],
                 },
             ],
@@ -358861,7 +358868,7 @@ function checkGrep() {
         });
     });
 }
-async function loadClaim(claimRef, org, defaults = loadClaimDefaults(), patchClaim = loader_patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, existingRefs = {}) {
+async function loadClaim(claimRef, org, defaults = loadClaimDefaults(), patchClaim = loader_patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, existingRefs = {}, postValidations = new Map()) {
     await checkGrep();
     let result = existingRefs;
     cdk8s_renderer_src_logger.info(`Load reference ${claimRef}`);
@@ -358899,7 +358906,7 @@ async function loadClaim(claimRef, org, defaults = loadClaimDefaults(), patchCla
         const references = extractAllRefs(catalog_common.io.toYaml(claim));
         for (const ref of references) {
             if (!result[ref]) {
-                const resolvedReferences = await loadClaim(ref, org, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, result);
+                const [resolvedReferences] = await loadClaim(ref, org, defaults, patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, cwd, result, postValidations);
                 result = lodash_default().merge(result, resolvedReferences);
             }
         }
@@ -358907,7 +358914,7 @@ async function loadClaim(claimRef, org, defaults = loadClaimDefaults(), patchCla
     catch (err) {
         throw `Lazy Loading: ${err}`;
     }
-    return result;
+    return [result, postValidations];
 }
 let LoadedClaims = {};
 let VisitedClaims = {};
@@ -359309,7 +359316,7 @@ async function loadClaimsList(claimRefList, claimsPath = config_getPath('claims'
     };
     const defaults = loadClaimDefaults();
     for await (const claimRef of claimRefList) {
-        const renderedClaimData = await loadClaim(claimRef, getOrg(), defaults, loader_patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, claimsPath);
+        const [renderedClaimData] = await loadClaim(claimRef, getOrg(), defaults, loader_patchClaim, loadInitializers, loadGlobals, loadOverrides, loadNormalizers, claimsPath);
         data.renderClaims = lodash_default().merge(data.renderClaims, renderedClaimData);
     }
     const crClaimReferences = [];
@@ -362202,6 +362209,7 @@ function toJson_FirestartrGithubRepositorySpecRepo(obj) {
         'hasIssues': obj.hasIssues,
         'hasWiki': obj.hasWiki,
         'pages': obj.pages,
+        'topics': obj.topics?.map(y => y),
         'visibility': obj.visibility,
         'defaultBranch': obj.defaultBranch,
         'additionalBranches': obj.additionalBranches?.map(y => toJson_FirestartrGithubRepositorySpecRepoAdditionalBranches(y)),
@@ -364327,6 +364335,7 @@ class GithubRepositoryChart extends BaseGithubChart {
                     defaultBranch: claim.providers.github?.branchStrategy?.defaultBranch,
                     codeowners: createCodeOwnersData(claim),
                     additionalBranches: claim.providers.github.additionalBranches || [],
+                    topics: claim.providers.github.topics || [],
                 },
                 actions,
                 permissions: this.createPermissions(claim),
@@ -365398,11 +365407,27 @@ async function renderClaim(catalogScope, firestartrScope, claim, patches, previo
 }
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/validations/crossReferences.ts
+
 const IS_COMPONENT_CLAIM_REF = new RegExp(/^ComponentClaim-/);
+const IS_TF_WORKSPACE = new RegExp(/^TFWorkspaceClaim-/);
 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);
+    }
+}
+function validateTFClaimsSecretsRefs(ref, renderClaims) {
+    const claim = renderClaims[ref].claim;
+    const values = claim.providers?.terraform?.values;
+    const secretRefs = Object.values(values).filter((v) => isRepoSecretRef(v));
+    for (const secret of secretRefs) {
+        const [secretName, key] = secret.split(':').slice(2);
+        const keyFound = searchSecretKey(renderClaims[`SecretsClaim-${secretName}`].claim, key);
+        if (!keyFound) {
+            throw new Error(`CrossReference error: TFWorkspaceClaim/${claim.name} references a non-existent secret key: '${secretName}:${key}'`);
+        }
     }
 }
 function validateClaimsSecretsRefs(ref, renderClaims) {
@@ -373360,7 +373385,6 @@ function resolveReferences(item, deps) {
     try {
         const references = {};
         const itemReferences = item.spec.references;
-        console.dir(itemReferences);
         // if(!process.env.TONISILLO) process.exit(1)
         for (const iRef of itemReferences) {
             const ref = deps[`${iRef.ref.kind}-${iRef.ref.name}`];

package/build/packages/cdk8s_renderer/imports/firestartr.dev.d.ts

@@ -1014,6 +1014,10 @@ export interface FirestartrGithubRepositorySpecRepo {
      * @schema FirestartrGithubRepositorySpecRepo#pages
      */
     readonly pages?: any;
+    /**
+     * @schema FirestartrGithubRepositorySpecRepo#topics
+     */
+    readonly topics?: string[];
     /**
      * @schema FirestartrGithubRepositorySpecRepo#visibility
      */

package/build/packages/cdk8s_renderer/src/claims/base/schemas/index.d.ts

@@ -505,6 +505,14 @@ declare const schemas: {
                         secrets: {
                             $ref: string;
                         };
+                        topics: {
+                            type: string;
+                            items: {
+                                type: string;
+                                maxLength: number;
+                                pattern: string;
+                            };
+                        };
                     };
                     required: string[];
                     $ref?: undefined;
@@ -887,6 +895,8 @@ declare const schemas: {
                             properties: {
                                 secretName: {
                                     type: string;
+                                    description: string;
+                                    pattern: string;
                                 };
                                 remoteRef: {
                                     type: string;
@@ -947,31 +957,27 @@ declare const schemas: {
                 description: string;
                 allOf: ({
                     $ref: string;
+                    type?: undefined;
+                    properties?: undefined;
+                    required?: undefined;
                     anyOf?: undefined;
                 } | {
-                    anyOf: ({
-                        properties: {
-                            externalSecrets: {
-                                $ref: string;
-                            };
-                            secretStore: {
-                                $ref: string;
-                            };
-                            pushSecrets?: undefined;
+                    type: string;
+                    properties: {
+                        externalSecrets: {
+                            $ref: string;
                         };
-                        required: string[];
-                    } | {
-                        properties: {
-                            pushSecrets: {
-                                $ref: string;
-                            };
-                            secretStore: {
-                                $ref: string;
-                            };
-                            externalSecrets?: undefined;
+                        secretStore: {
+                            $ref: string;
                         };
+                        pushSecrets: {
+                            $ref: string;
+                        };
+                    };
+                    required: string[];
+                    anyOf: {
                         required: string[];
-                    })[];
+                    }[];
                     $ref?: undefined;
                 })[];
             };

package/build/packages/cdk8s_renderer/src/claims/external-secrets/external-secrets.schema.d.ts

@@ -31,6 +31,8 @@ declare const _default: {
                         properties: {
                             secretName: {
                                 type: string;
+                                description: string;
+                                pattern: string;
                             };
                             remoteRef: {
                                 type: string;
@@ -91,31 +93,27 @@ declare const _default: {
             description: string;
             allOf: ({
                 $ref: string;
+                type?: undefined;
+                properties?: undefined;
+                required?: undefined;
                 anyOf?: undefined;
             } | {
-                anyOf: ({
-                    properties: {
-                        externalSecrets: {
-                            $ref: string;
-                        };
-                        secretStore: {
-                            $ref: string;
-                        };
-                        pushSecrets?: undefined;
+                type: string;
+                properties: {
+                    externalSecrets: {
+                        $ref: string;
                     };
-                    required: string[];
-                } | {
-                    properties: {
-                        pushSecrets: {
-                            $ref: string;
-                        };
-                        secretStore: {
-                            $ref: string;
-                        };
-                        externalSecrets?: undefined;
+                    secretStore: {
+                        $ref: string;
+                    };
+                    pushSecrets: {
+                        $ref: string;
                     };
+                };
+                required: string[];
+                anyOf: {
                     required: string[];
-                })[];
+                }[];
                 $ref?: undefined;
             })[];
         };

package/build/packages/cdk8s_renderer/src/claims/external-secrets/index.d.ts

@@ -31,6 +31,8 @@ export declare const SecretsSchemas: {
                         properties: {
                             secretName: {
                                 type: string;
+                                description: string;
+                                pattern: string;
                             };
                             remoteRef: {
                                 type: string;
@@ -91,31 +93,27 @@ export declare const SecretsSchemas: {
             description: string;
             allOf: ({
                 $ref: string;
+                type?: undefined;
+                properties?: undefined;
+                required?: undefined;
                 anyOf?: undefined;
             } | {
-                anyOf: ({
-                    properties: {
-                        externalSecrets: {
-                            $ref: string;
-                        };
-                        secretStore: {
-                            $ref: string;
-                        };
-                        pushSecrets?: undefined;
+                type: string;
+                properties: {
+                    externalSecrets: {
+                        $ref: string;
                     };
-                    required: string[];
-                } | {
-                    properties: {
-                        pushSecrets: {
-                            $ref: string;
-                        };
-                        secretStore: {
-                            $ref: string;
-                        };
-                        externalSecrets?: undefined;
+                    secretStore: {
+                        $ref: string;
+                    };
+                    pushSecrets: {
+                        $ref: string;
                     };
+                };
+                required: string[];
+                anyOf: {
                     required: string[];
-                })[];
+                }[];
                 $ref?: undefined;
             })[];
         };

package/build/packages/cdk8s_renderer/src/claims/github/component.schema.d.ts

@@ -35,6 +35,14 @@ declare const _default: {
                     secrets: {
                         $ref: string;
                     };
+                    topics: {
+                        type: string;
+                        items: {
+                            type: string;
+                            maxLength: number;
+                            pattern: string;
+                        };
+                    };
                 };
                 required: string[];
                 $ref?: undefined;

package/build/packages/cdk8s_renderer/src/claims/github/index.d.ts

@@ -140,6 +140,14 @@ export declare const GithubSchemas: ({
                     secrets: {
                         $ref: string;
                     };
+                    topics: {
+                        type: string;
+                        items: {
+                            type: string;
+                            maxLength: number;
+                            pattern: string;
+                        };
+                    };
                 };
                 required: string[];
                 $ref?: undefined;

package/build/packages/cdk8s_renderer/src/claims/github/repository.d.ts

@@ -28,6 +28,7 @@ export interface IGithubRepositoryClaim extends IComponentClaim {
                 name: string;
                 orphan: boolean;
             }[];
+            topics?: string[];
         };
     };
 }

package/build/packages/cdk8s_renderer/src/loader/lazy_loader.d.ts

@@ -2,5 +2,5 @@ import { InitializerPatches } from '../initializers/base';
 import { GlobalSection } from '../globals/base';
 import { OverriderPatches } from '../overriders/base';
 import { Normalizer } from '../normalizers/base';
-export declare function loadClaim(claimRef: string, org: string, defaults: any, patchClaim: (claim: any, defaults: any) => any, loadInitializers: (claim: any) => Promise<InitializerPatches[]>, loadGlobals: (claim: any) => Promise<GlobalSection[]>, loadOverrides: (claim: any) => OverriderPatches[], loadNormalizers: (claim: any, path: string) => Promise<Normalizer[]>, cwd?: string, existingRefs?: any): Promise<any>;
+export declare function loadClaim(claimRef: string, org: string, defaults: any, patchClaim: (claim: any, defaults: any) => any, loadInitializers: (claim: any) => Promise<InitializerPatches[]>, loadGlobals: (claim: any) => Promise<GlobalSection[]>, loadOverrides: (claim: any) => OverriderPatches[], loadNormalizers: (claim: any, path: string) => Promise<Normalizer[]>, cwd?: string, existingRefs?: any, postValidations?: Map<string, Function[]>): Promise<any[]>;
 export declare function resetLazyLoader(): void;

package/package.json

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