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

package/build/index.js

@@ -321336,6 +321336,9 @@ async function loadClaim(claimRef, org, defaults = loadClaimDefaults(), patchCla
                 const variantClaim = lodash_default().cloneDeep(claim);
                 variantClaim.name = variant.name;
                 variantClaim.providers.terraform = lodash_default().merge({}, claim.providers.terraform, variant.overrides);
+                if (!variant.overrides.name) {
+                    variantClaim.providers.terraform.name = variant.name;
+                }
                 if (!variantClaim.annotations) {
                     variantClaim.annotations = {};
                 }
@@ -328163,6 +328166,7 @@ class SecretsChart extends BaseSecretsChart {
 
 
 
+
 function normalizeProvidesApis(providesApis) {
     if (!providesApis)
         return [];
@@ -328416,6 +328420,21 @@ async function renderClaim(catalogScope, firestartrScope, claim, patches, previo
         ],
     };
 }
+function renameVariantCrFiles(outputDir, renderedMap) {
+    for (const cr of Object.values(renderedMap)) {
+        const crJson = cr.toJson ? cr.toJson() : cr;
+        if (crJson.metadata?.annotations?.['firestartr.dev/variant-of'] &&
+            crJson.kind &&
+            crJson.metadata?.name) {
+            const oldPath = external_path_.join(outputDir, `${crJson.kind}.${crJson.metadata.name}.yaml`);
+            const newPath = external_path_.join(outputDir, `${crJson.kind}.${crJson.metadata.name}.variant.yaml`);
+            if (external_fs_.existsSync(oldPath)) {
+                external_fs_.renameSync(oldPath, newPath);
+                logger.info(`Renamed variant CR file: ${oldPath} -> ${newPath}`);
+            }
+        }
+    }
+}
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/validations/crossReferences.ts
 
@@ -328920,6 +328939,9 @@ async function renderFromImports(rClaims, crs = {}, catalogOutputDir = '/tmp/.ca
     });
     const result = await renderClaims(catalogScope, firestartrScope, { renderClaims: rClaims, crs, renames: [] });
     firestartrScope.synth();
+    if (crOutputDir) {
+        renameVariantCrFiles(crOutputDir, result);
+    }
     return result;
 }
 async function solver(type, value, rClaims) {
@@ -328978,6 +329000,7 @@ async function addLastStateAndLastClaimAnnotations(filePath, lastStatePRLink, la
 
 
 
+
 
 
 /* harmony default export */ const cdk8s_renderer = ({
@@ -329056,8 +329079,9 @@ async function runRenderer(globalsPath, initializersPath, claimsPath, crsPath, c
         // the system takes everything defined in the claims path
         claimRefsList = await resolveClaimEntries([claimsPath]);
     }
+    let renderedMap;
     try {
-        await renderer_render(catalogApp, firestartrApp, claimRefsList);
+        renderedMap = await renderer_render(catalogApp, firestartrApp, claimRefsList);
     }
     catch (error) {
         console.log(`Rendering the system: \n ${error}`);
@@ -329065,6 +329089,7 @@ async function runRenderer(globalsPath, initializersPath, claimsPath, crsPath, c
     }
     catalogApp.synth();
     firestartrApp.synth();
+    renameVariantCrFiles(outputCrDir, renderedMap);
 }
 
 ;// CONCATENATED MODULE: ../importer/src/decanter/config.ts
@@ -521499,7 +521524,7 @@ const crsStatusSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.8.0-snapshot-2"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.8.0-snapshot-3"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"2.7.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

package/build/packages/cdk8s_renderer/src/renderer/claims-render.d.ts

@@ -9,3 +9,4 @@ export declare function renderClaims(catalogScope: Construct, firestartrScope: C
     renames?: IRenameResult[];
 }): Promise<RenderedCrMap>;
 export declare function renderClaim(catalogScope: Construct, firestartrScope: Construct, claim: any, patches: ICustomResourcePatch[], previousCR?: any | null, claimPath?: string): Promise<IRenderClaimResult>;
+export declare function renameVariantCrFiles(outputDir: string, renderedMap: RenderedCrMap): void;

package/package.json

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