@firestartr/cli 2.8.0-snapshot-variant-cloning-1 → 2.8.0-snapshot-variant-cloning-3

package/build/index.js

@@ -281913,6 +281913,16 @@ async function getRepoInfo(owner, name) {
     const res = await octokit.repos.get({ owner: owner, repo: name });
     return res['data'];
 }
+async function getRepoSecret(owner, repo, secretName) {
+    logger.info(`Getting repo secret ${owner}/${repo}/${secretName}`);
+    const octokit = await getOctokitForOrg(owner);
+    const response = await octokit.rest.actions.getRepoSecret({
+        owner,
+        repo,
+        secret_name: secretName,
+    });
+    return response.data;
+}
 async function repoExists(owner, name) {
     logger.info(`Checking if repo exists: ${owner}/${name}`);
     try {
@@ -282089,6 +282099,7 @@ async function isEmptyRepo(owner, name) {
     uploadFile,
     deleteFile,
     getRepoInfo,
+    getRepoSecret,
     repoExists,
     getPages,
     getBranchProtection,
@@ -283365,6 +283376,15 @@ function createFacade(profileName) {
                 const response = await octokit.rest.repos.get({ owner, repo: name });
                 return response.data;
             },
+            getRepoSecret: async (owner, repo, secretName) => {
+                const octokit = await getOctokitForOrg(owner);
+                const response = await octokit.rest.actions.getRepoSecret({
+                    owner,
+                    repo,
+                    secret_name: secretName,
+                });
+                return response.data;
+            },
             repoExists: async (owner, name) => {
                 try {
                     const octokit = await getOctokitForOrg(owner);
@@ -317375,10 +317395,12 @@ class InitializerClaimRef extends InitializerPatches {
                 apply(cr) {
                     cr.metadata = cr.metadata ?? {};
                     cr.metadata.labels = cr.metadata.labels ?? {};
-                    cr.metadata.labels['claim-ref'] = catalog_common/* default.generic.normalizeLabel */.Z.generic.normalizeLabel(claim.name);
+                    const claimName = claim._parentClaimName || claim.name;
+                    cr.metadata.labels['claim-ref'] =
+                        catalog_common/* default.generic.normalizeLabel */.Z.generic.normalizeLabel(claimName);
                     cr.metadata.annotations = {
                         ...(cr.metadata.annotations || {}),
-                        [catalog_common/* default.generic.getFirestartrAnnotation */.Z.generic.getFirestartrAnnotation('claim-ref')]: `${claim.kind}/${claim.name}`,
+                        [catalog_common/* default.generic.getFirestartrAnnotation */.Z.generic.getFirestartrAnnotation('claim-ref')]: `${claim.kind}/${claimName}`,
                     };
                     return cr;
                 },
@@ -321324,7 +321346,7 @@ async function loadClaim(claimRef, org, defaults = loadClaimDefaults(), patchCla
                 if (!variant.name || !variant.overrides) {
                     throw new Error(`Variant in claim ${claimRef} is missing required field 'name' or 'overrides'`);
                 }
-                const prohibitedOverrideFields = ['source', 'module'];
+                const prohibitedOverrideFields = ['source', 'module', 'name'];
                 for (const field of prohibitedOverrideFields) {
                     if (field in variant.overrides) {
                         throw new Error(`Variant '${variant.name}' in claim ${claimRef} cannot override '${field}'`);
@@ -321332,6 +321354,7 @@ async function loadClaim(claimRef, org, defaults = loadClaimDefaults(), patchCla
                 }
                 const composedName = claim.providers.terraform.name + '-' + variant.name;
                 const variantClaim = lodash_default().cloneDeep(claim);
+                variantClaim._parentClaimName = claim.name;
                 variantClaim.name = composedName;
                 variantClaim.providers.terraform = lodash_default().merge({}, claim.providers.terraform, variant.overrides);
                 variantClaim.providers.terraform.name = composedName;
@@ -323639,18 +323662,41 @@ const CLAIM_REF_ANNOTATION = 'firestartr.dev/claim-ref';
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/renderer/previous-crs-extractor.ts
 
 
+const VARIANT_OF_ANNOTATION = 'firestartr.dev/variant-of';
+function isVariantCR(cr) {
+    return cr.metadata?.annotations?.[VARIANT_OF_ANNOTATION] !== undefined;
+}
 function getPreviousCRfromClaim(claim, previousCRs) {
     const previousCRsKeys = Object.keys(previousCRs);
+    const isVariantClaim = !!claim._parentClaimName;
     for (const previousCRKey of previousCRsKeys) {
         const previousCR = previousCRs[previousCRKey];
         if (isCatalogEntity(previousCR))
             continue;
         if (isExcludedFromPreviousCR(previousCR.kind))
             continue;
-        if (previousCR.metadata.annotations[CLAIM_REF_ANNOTATION] ===
-            `${claim.kind}/${claim.name}`) {
+        const crVariant = isVariantCR(previousCR);
+        if (isVariantClaim && !crVariant)
+            continue;
+        if (!isVariantClaim && crVariant)
+            continue;
+        const crClaimRef = previousCR.metadata.annotations[CLAIM_REF_ANNOTATION];
+        if (crClaimRef === `${claim.kind}/${claim.name}`) {
             return previousCR;
         }
+        // For variant claims, the claim-ref annotation uses the parent claim name
+        // (via _parentClaimName), but claim.name is the composed name.
+        // Match on parent claim-ref plus composed provider name as CR name prefix.
+        if (isVariantClaim &&
+            crClaimRef === `${claim.kind}/${claim._parentClaimName}`) {
+            for (const provider of Object.keys(claim.providers || {})) {
+                const providerName = claim.providers[provider]?.name;
+                if (providerName &&
+                    previousCR.metadata.name.startsWith(providerName + '-')) {
+                    return previousCR;
+                }
+            }
+        }
     }
     return false;
 }
@@ -521916,7 +521962,7 @@ const crsStatusSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.8.0-snapshot-variant-cloning-1"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.8.0-snapshot-variant-cloning-3"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"2.7.1"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

package/build/packages/github/index.d.ts

@@ -26,6 +26,7 @@ declare const _default: {
         uploadFile: typeof import("./src/repository").uploadFile;
         deleteFile: typeof import("./src/repository").deleteFile;
         getRepoInfo: typeof import("./src/repository").getRepoInfo;
+        getRepoSecret: typeof import("./src/repository").getRepoSecret;
         repoExists: typeof import("./src/repository").repoExists;
         getPages: typeof import("./src/repository").getPages;
         getBranchProtection: typeof import("./src/repository").getBranchProtection;

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

@@ -800,6 +800,11 @@ export declare function getRepoInfo(owner: string, name: string): Promise<{
         [key: string]: unknown;
     };
 }>;
+export declare function getRepoSecret(owner: string, repo: string, secretName: string): Promise<{
+    name: string;
+    created_at: string;
+    updated_at: string;
+}>;
 export declare function repoExists(owner: string, name: string): Promise<boolean>;
 export declare function getPages(owner: string, name: string): Promise<{
     url: string;
@@ -1336,6 +1341,7 @@ declare const _default: {
     uploadFile: typeof uploadFile;
     deleteFile: typeof deleteFile;
     getRepoInfo: typeof getRepoInfo;
+    getRepoSecret: typeof getRepoSecret;
     repoExists: typeof repoExists;
     getPages: typeof getPages;
     getBranchProtection: typeof getBranchProtection;

package/build/packages/github/src/with_profile.d.ts

@@ -824,6 +824,11 @@ export declare function withProfile(profileName: string): {
                 [key: string]: unknown;
             };
         }>;
+        getRepoSecret: (owner: string, repo: string, secretName: string) => Promise<{
+            name: string;
+            created_at: string;
+            updated_at: string;
+        }>;
         repoExists: (owner: string, name: string) => Promise<boolean>;
     };
     team: {

package/package.json

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