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

package/build/index.js

@@ -317375,10 +317375,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 +321326,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 +321334,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;
@@ -521916,7 +521919,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-2"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"2.7.1"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

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-2",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",