@firestartr/cli 1.52.0-snapshot-9 → 1.52.0-snapshot-11

package/build/index.js

@@ -358728,6 +358728,9 @@ async function loadClaim(claimRef, org, defaults = loadClaimDefaults(), patchCla
     try {
         const claimData = await lazyGetClaim(claimRef.split(/-/)[0], claimRef.replace(/^[^-]+-/, ''), org, cwd);
         const claim = patchClaim(catalog_common.io.fromYaml(claimData), defaults);
+        cdk8s_renderer_src_logger.silly(`Patched claim is: 
+		 ---
+			${catalog_common.io.toYaml(claim)}`);
         try {
             validateClaim(claim, base[`${claim.kind}Schema`]);
             await optionalValidation(claim);
@@ -358876,6 +358879,56 @@ async function loadVirtualClaim(kind, name, org) {
     VisitedClaims[`${kind}-${name}`] = 'virtual';
 }
 
+;// CONCATENATED MODULE: ../cdk8s_renderer/src/loader/claimsDefaulter.ts
+
+
+
+/*
+ * Default blocks are objects that cannot be merged but applied as a whole. Meaning:
+ * - If the object is defined at the claim-level it is maintained *AS IT IS* (no merge)
+ * - If the block is missed at the claim-level, the default block is applied
+ */
+const defaultBlocksPaths = ['/providers/terraform/sync'];
+function applyBlockAwareDefaults(claim, defaultClaim) {
+    // we always work with a clone of the original
+    const claimClone = JSON.parse(JSON.stringify(claim));
+    // if the block is claim-level defined we store it here
+    const defaultBlocks = new Map();
+    // we remove the blocks entirely of the claim
+    // to achieve an add copy
+    for (const defaultBlockPath of defaultBlocksPaths) {
+        if (hasDeepPath(claimClone, defaultBlockPath) !== true)
+            continue;
+        const originalValue = fast_json_patch_default().getValueByPointer(claimClone, defaultBlockPath);
+        if (originalValue) {
+            cdk8s_renderer_src_logger.silly(`${claim.kind}/${claim.name}: has an original ${defaultBlockPath}: preserving`);
+            defaultBlocks.set(defaultBlockPath, originalValue);
+            fast_json_patch_default().applyPatch(claimClone, [{ op: 'remove', path: defaultBlockPath }]);
+        }
+    }
+    // if the patch has the same path of a block
+    // and the block was defined at claim-level
+    // we interchange the value with the original value
+    // otherwise we use the default
+    const jsonPatchOps = fast_json_patch_default().compare(claimClone, defaultClaim)
+        .filter((jp) => jp.op === 'add')
+        .map((jp) => {
+        if (defaultBlocks.has(jp.path)) {
+            return {
+                ...jp,
+                value: defaultBlocks.get(jp.path),
+            };
+        }
+        else {
+            return jp;
+        }
+    });
+    return fast_json_patch_default().applyPatch(claimClone, jsonPatchOps).newDocument;
+}
+function hasDeepPath(data, deepPath) {
+    return lodash_default().has(data, deepPath.replace(/\//g, '.').replace(/^\./, ''));
+}
+
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/loader/loader.ts
 
 
@@ -359028,11 +359081,7 @@ function loadClaimDefaults() {
  */
 function loader_patchClaim(claim, defaultsClaims) {
     if (defaultsClaims[claim.kind]) {
-        const jsonPatchOps = fast_json_patch_default().compare(claim, defaultsClaims[claim.kind])
-            .filter((jp) => {
-            return jp.op === 'add';
-        });
-        claim = fast_json_patch_default().applyPatch(claim, jsonPatchOps).newDocument;
+        claim = applyBlockAwareDefaults(claim, defaultsClaims[claim.kind]);
     }
     return claim;
 }
@@ -364262,7 +364311,7 @@ class GithubOrgWebhookChart extends BaseGithubChart {
     renderSecret(secret) {
         const parts = secret.split(':');
         if (parts.length < 4) {
-            throw `GithubOrgWebhookChart: invalid secretRef: ${secret}`;
+            throw `GithubOrgWebhookChart: invalid secretRef: ${secret}. Expected format: <provider>:<namespace>:<name>:<key>`;
         }
         return {
             kind: 'Secret',
@@ -366393,12 +366442,7 @@ async function moveCRsAndClaims(crs, org, claimsPath, resourcesPath) {
     const importedResources = [];
     const failedImportedResources = [];
     for (const k of Object.keys(crs)) {
-        if (crs[k].kind === 'FirestartrGithubGroup' &&
-            crs[k].metadata.name === `${org}-all`) {
-            importer_src_logger.info(`⚡ SKIP IMPORT: CR is the all group, skipping import with kind: ${crs[k].kind} and name: ${crs[k].metadata.name}`);
-            continue;
-        }
-        else if (cdk8s_renderer.isCatalogEntity(crs[k])) {
+        if (cdk8s_renderer.isCatalogEntity(crs[k])) {
             importer_src_logger.info(`⚡ SKIP IMPORT: CR is a catalog entity, skipping import with kind: ${crs[k].kind} and name: ${crs[k].metadata.name}`);
             continue;
         }
@@ -369566,7 +369610,7 @@ async function encryptSecret(rss, secretRef, section) {
         name: secretRef.name,
         key: secretRef.key,
     });
-    const v = await github_0.encryption.encryptRepoSecret(process.env.ORG, rss.metadata.name, section, plainTextSecret);
+    const v = await github_0.encryption.encryptRepoSecret(process.env.ORG, rss.resolveRepoExternalName(), section, plainTextSecret);
     return v;
 }
 
@@ -369582,6 +369626,11 @@ class FirestartrGithubRepositorySecretsSection_FirestartrGithubRepositorySecrets
         const repo = this.resolveRef(this.spec.repositoryTarget.ref);
         await provisionRepositorySecrets(scope, this, repo);
     }
+    resolveRepoExternalName() {
+        const cr = this.deps[`${this.spec.repositoryTarget.ref.kind}-${this.spec.repositoryTarget.ref.name}`].cr;
+        const repoName = cr.metadata.annotations['firestartr.dev/external-name'];
+        return repoName;
+    }
 }
 
 ;// CONCATENATED MODULE: ../provisioner/src/entities/index.ts
@@ -369883,8 +369932,12 @@ function __calculateTFStatePath(entity) {
 
 
 async function runCDKTF(entityPath, action, depsPath, stream) {
+    const args = [action, '--log-level', 'DEBUG', '--auto-approve'];
+    if (process.env.IS_DEV_LOCAL_ENVIRONMENT) {
+        args.push('--app', 'node --loader ts-node/esm --experimental-specifier-resolution=node index.ts');
+    }
     return new Promise((ok, ko) => {
-        const cdktfProcess = (0,external_child_process_.spawn)('cdktf', [action, '--log-level', 'DEBUG', '--auto-approve'], {
+        const cdktfProcess = (0,external_child_process_.spawn)('cdktf', args, {
             stdio: ['inherit', 'pipe', 'pipe'],
             cwd: process.env.IS_DEV_LOCAL_ENVIRONMENT
                 ? '/library/packages/provisioner'

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

@@ -0,0 +1 @@
+export declare function applyBlockAwareDefaults(claim: any, defaultClaim: any): any;

package/build/packages/provisioner/src/entities/firestartrgithubrepositorysecretssection/FirestartrGithubRepositorySecretsSection.d.ts

@@ -5,4 +5,5 @@ export declare class FirestartrGithubRepositorySecretsSection extends Entity {
     loadResources(data: {
         scope: Construct;
     }): Promise<void>;
+    resolveRepoExternalName(): string;
 }

package/package.json

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