@firestartr/cli 2.9.0-snapshot-org-variables-section-3 → 2.9.0-snapshot-org-variables-section-4

package/build/index.js

@@ -323504,7 +323504,7 @@ function renderFeature(featureName, version, owner, repo, featureOwner, renderPa
  * without downloading and extracting the feature
  */
 function renderFeatureFromPath(extractPath, renderedPath, featureOwner, featureArgs = {}) {
-    return features_renderer.render(extractPath, renderedPath, featureOwner, featureArgs);
+    return features_renderer.render(extractPath, renderedPath, featureOwner, {}, featureArgs);
 }
 
 // EXTERNAL MODULE: ../../node_modules/adm-zip/adm-zip.js
@@ -328824,12 +328824,20 @@ async function renderClaims(catalogScope, firestartrScope, data) {
                 ? 'FirestartrGithubOrganizationSettings'
                 : undefined;
             const previousCR = getPreviousCRfromClaim(claim, crs, expectedKind);
+            let variableSectionPreviousCR = undefined;
+            if (claim.kind === 'OrgSettingsClaim') {
+                variableSectionPreviousCR = getPreviousCRfromClaim(claim, crs, 'FirestartrGithubOrganizationVariableSection');
+            }
             const patches = await extractPatches(renderClaims[claimKey], previousCR);
+            let variableSectionPatches = undefined;
+            if (claim.kind === 'OrgSettingsClaim') {
+                variableSectionPatches = await extractPatches(renderClaims[claimKey], variableSectionPreviousCR);
+            }
             if (!previousCR) {
                 logger.debug(`No CR found for claim ${claimKey}, it will be rendered from scratch`);
             }
             const claimPath = renderClaims[claimKey].claimPath;
-            const { firestartrEntity, extraCharts, catalogEntity } = await renderClaim(catalogScope, firestartrScope, claim, patches, previousCR, claimPath);
+            const { firestartrEntity, extraCharts, catalogEntity } = await renderClaim(catalogScope, firestartrScope, claim, patches, previousCR, claimPath, variableSectionPatches);
             if (catalogEntity) {
                 result[`${catalogEntity.kind}-${catalogEntity.metadata.name}`] =
                     catalogEntity.toJson();
@@ -328858,7 +328866,7 @@ async function renderClaims(catalogScope, firestartrScope, data) {
     }
     return result;
 }
-async function renderClaim(catalogScope, firestartrScope, claim, patches, previousCR = null, claimPath) {
+async function renderClaim(catalogScope, firestartrScope, claim, patches, previousCR = null, claimPath, variableSectionPatches) {
     let catalogEntity = undefined;
     let firestartrEntity = undefined;
     const extraCharts = [];
@@ -329009,9 +329017,15 @@ async function renderClaim(catalogScope, firestartrScope, claim, patches, previo
                 const variableSectionFirestartrId = firestartrId
                     ? `${firestartrId}-variables`
                     : null;
-                const variableSectionChart = new charts.GithubOrgVariableSectionChart(firestartrScope, `github-variables-${chartId}`, variableSectionFirestartrId, claim, renderPatches);
+                const vsRenderPatches = variableSectionPatches
+                    ? variableSectionPatches.filter((patch) => !patch.isPostPatch)
+                    : renderPatches;
+                const vsPostPatches = variableSectionPatches
+                    ? variableSectionPatches.filter((patch) => patch.isPostPatch)
+                    : postPatches;
+                const variableSectionChart = new charts.GithubOrgVariableSectionChart(firestartrScope, `github-variables-${chartId}`, variableSectionFirestartrId, claim, vsRenderPatches);
                 await variableSectionChart.render();
-                const variableSectionObject = await variableSectionChart.postRenderer(postPatches);
+                const variableSectionObject = await variableSectionChart.postRenderer(vsPostPatches);
                 extraCharts.push({
                     claim: {
                         kind: claim.kind,
@@ -522610,7 +522624,7 @@ const crsStatusSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"2.9.0-snapshot-org-variables-section-3"}');
+const package_namespaceObject = JSON.parse('{"i8":"2.9.0-snapshot-org-variables-section-4"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"2.8.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

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

@@ -8,5 +8,5 @@ export declare function renderClaims(catalogScope: Construct, firestartrScope: C
     crs: any;
     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 renderClaim(catalogScope: Construct, firestartrScope: Construct, claim: any, patches: ICustomResourcePatch[], previousCR?: any | null, claimPath?: string, variableSectionPatches?: ICustomResourcePatch[]): Promise<IRenderClaimResult>;
 export declare function renameVariantCrFiles(outputDir: string, renderedMap: RenderedCrMap): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "2.9.0-snapshot-org-variables-section-3",
+  "version": "2.9.0-snapshot-org-variables-section-4",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",