@firestartr/cli 1.59.0-snapshot-11 → 1.59.0-snapshot-12

package/build/index.js

@@ -355410,11 +355410,11 @@ class NameNormalizer extends Normalizer {
                     const provider = helperCTX(this).provider;
                     const annotation = catalog_common.generic.getFirestartrAnnotation('external-name');
                     const providerName = claim.providers[provider].name;
-                    if (previousCR && !lodash.isEmpty(previousCR)) {
+                    if (previousCR && !lodash_default().isEmpty(previousCR)) {
                         cr.metadata.annotations[annotation] = providerName;
                         cr.metadata.name = previousCR.metadata.name;
                         if (previousCR.writeConnectionSecretToRef &&
-                            !lodash.isEmpty(previousCR.writeConnectionSecretToRef)) {
+                            !lodash_default().isEmpty(previousCR.writeConnectionSecretToRef)) {
                             cr.writeConnectionSecretToRef.name =
                                 previousCR.writeConnectionSecretToRef.name;
                         }
@@ -366091,9 +366091,93 @@ async function renderTfWorkspace(claim, firestartrId, resolveRef, namespace) {
     return jsonObject;
 }
 
+;// CONCATENATED MODULE: ../cdk8s_renderer/src/renderer/imported-refs.ts
+// takes a cr and walks to find
+// any '<type>-imported-ref' being type: user|group
+
+
+// ref must match type-imported-ref where type can be group|user and:<value>
+// example: user-importer-ref:My Group
+const REGEX_IMPORTED_REF = /(?<type>user|group)-imported-ref:(?<value>.+)/;
+function importedsRefsWalker(renderClaim) {
+    // cr is an object, we want to walk through all its properties recursively
+    // the property can be another object, an array, or a primitive value
+    // has a function to resolve
+    // has to be an array of functions with
+    // the following signature: (solver: Function) => Promise<void>
+    const symbolsToResolve = [];
+    walk(renderClaim.claim, symbolsToResolve, renderClaim);
+    return symbolsToResolve;
+}
+function walk(element, symbolsToResolve, renderClaim) {
+    if (typeof element === 'string' || typeof element === 'number') {
+        return element;
+    }
+    else if (Array.isArray(element)) {
+        return walkArray(element, symbolsToResolve, renderClaim);
+    }
+    else if (typeof element === 'object' && element !== null) {
+        return walkObject(element, symbolsToResolve, renderClaim);
+    }
+    else {
+        return element;
+    }
+}
+function walkObject(obj, symbolsToResolve, renderClaim) {
+    for (const key in obj) {
+        const value = obj[key];
+        if (typeof value === 'string') {
+            const match = value.match(REGEX_IMPORTED_REF);
+            if (!match) {
+                continue;
+            }
+            const type = match.groups?.type;
+            const catchedKey = key;
+            if (type) {
+                cdk8s_renderer_src_logger.info(`Found an imported-ref in the claim with key ${key} and value ${value}. This will be resolved later.`);
+                symbolsToResolve.push(async (solver) => {
+                    const resolvedValue = await solver(type, match.groups?.value);
+                    cdk8s_renderer_src_logger.info(`Resolved imported-ref with key ${key} and value ${value} to ${resolvedValue} in path ${renderClaim.claimPath}`);
+                    obj[catchedKey] = resolvedValue;
+                    await catalog_common.io.writeClaim(renderClaim.claim, renderClaim.claimPath || '');
+                });
+            }
+        }
+        else {
+            walk(value, symbolsToResolve, renderClaim);
+        }
+    }
+}
+function walkArray(arr, symbolsToResolve, renderClaim) {
+    for (let i = 0; i < arr.length; i++) {
+        const value = arr[i];
+        if (typeof value === 'string') {
+            const match = value.match(REGEX_IMPORTED_REF);
+            if (!match) {
+                continue;
+            }
+            cdk8s_renderer_src_logger.info(`Found an imported-ref in the claim with value ${value}. This will be resolved later.`);
+            const type = match.groups?.type;
+            if (type) {
+                const catchedIndex = i;
+                symbolsToResolve.push(async (solver) => {
+                    const resolvedValue = await solver(type, match.groups?.value);
+                    cdk8s_renderer_src_logger.info(`Resolved imported-ref with value ${value} to ${resolvedValue} in path ${renderClaim.claimPath}`);
+                    arr[catchedIndex] = resolvedValue;
+                    await catalog_common.io.writeClaim(renderClaim.claim, renderClaim.claimPath || '');
+                });
+            }
+        }
+        else {
+            walk(value, symbolsToResolve, renderClaim);
+        }
+    }
+}
+
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/renderer/import-renderer.ts
 
 
+
 /*
  * Function called when rendering from the importer class.
  *
@@ -366107,6 +366191,16 @@ async function renderTfWorkspace(claim, firestartrId, resolveRef, namespace) {
  *
  */
 async function renderFromImports(rClaims, crs = {}, catalogOutputDir = '/tmp/.catalog', crOutputDir = '/tmp/.resources') {
+    // type: is the kind of the claim
+    // value: is the imported-ref (the name in Github, can be with special characters, spaces, etc)
+    const fSolver = (type, value) => {
+        return solver(type, value, rClaims);
+    };
+    // we need to expand the imported-refs
+    for (const renderClaim of Object.values(rClaims)) {
+        const symbolsToResolve = importedsRefsWalker(renderClaim);
+        await Promise.all(symbolsToResolve.map((s) => s(fSolver)));
+    }
     const catalogScope = new lib.App({
         outdir: catalogOutputDir,
         outputFileExtension: '.yaml',
@@ -366121,6 +366215,19 @@ async function renderFromImports(rClaims, crs = {}, catalogOutputDir = '/tmp/.ca
     firestartrScope.synth();
     return result;
 }
+async function solver(type, value, rClaims) {
+    // TODO: we need to receive the claims directory as a parameter, and read all the claims to find the one that matches the imported-ref
+    const claimKind = type === 'user' ? 'UserClaim' : 'GroupClaim';
+    for (const key in rClaims) {
+        if (key.startsWith(claimKind)) {
+            const claimData = rClaims[key];
+            if (claimData.claim.providers?.github?.name === value) {
+                return `${type}:${claimData.claim.name}`;
+            }
+        }
+    }
+    throw new Error(`Could not resolve imported-ref of type ${type} with value ${value}`);
+}
 
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/renderer/last-state-pr.ts
 
@@ -366418,6 +366525,7 @@ class Decanter {
             postRenderFunctions: this.postRenderFunctions,
             renderClaim: {
                 claim: this.claim,
+                claimPath: getClaimsPath(),
                 initializers,
                 globals: [],
                 overrides,
@@ -366514,7 +366622,7 @@ class GroupGithubDecanter extends GithubDecanter {
         else {
             this.__patchClaim({
                 op: 'add',
-                value: this.data.members.map((member) => `user:${member.name}`),
+                value: this.data.members.map((member) => `user-imported-ref:${member.name}`),
                 path: '/members',
             });
         }
@@ -366532,7 +366640,7 @@ class GroupGithubDecanter extends GithubDecanter {
         if (this.data.groupDetails.parent) {
             this.__patchClaim({
                 op: 'add',
-                value: `group:${this.data.groupDetails.parent.slug}`,
+                value: `group-imported-ref:${this.data.groupDetails.parent.name}`,
                 path: '/parent',
             });
         }
@@ -366796,7 +366904,7 @@ class RepoGithubDecanter extends GithubDecanter {
         const directMaintainers = this.data.teamsAndMembers.directMembers
             .filter((member) => member.role === 'maintain')
             .map((member) => {
-            return `user:${member.name}`;
+            return `user-imported-ref:${member.name}`;
         });
         const outsideMaintainers = this.data.teamsAndMembers.outsideMembers
             .filter((member) => member.role === 'maintain')
@@ -366806,7 +366914,7 @@ class RepoGithubDecanter extends GithubDecanter {
         const teamMaintainers = this.data.teamsAndMembers.teams
             .filter((team) => team.role === 'maintain')
             .map((team) => {
-            return `group:${team.slug}`;
+            return `group-imported-ref:${team.name}`;
         });
         const maintainers = directMaintainers
             .concat(outsideMaintainers)
@@ -366821,7 +366929,7 @@ class RepoGithubDecanter extends GithubDecanter {
         const directAdmins = this.data.teamsAndMembers.directMembers
             .filter((member) => member.role === 'admin')
             .map((member) => {
-            return `user:${member.name}`;
+            return `user-imported-ref:${member.name}`;
         });
         const outsideAdmins = this.data.teamsAndMembers.outsideMembers
             .filter((member) => member.role === 'admin')
@@ -366831,7 +366939,7 @@ class RepoGithubDecanter extends GithubDecanter {
         const teamAdmins = this.data.teamsAndMembers.teams
             .filter((team) => team.role === 'admin')
             .map((team) => {
-            return `group:${team.slug}`;
+            return `group-imported-ref:${team.name}`;
         });
         const admins = directAdmins.concat(outsideAdmins).concat(teamAdmins);
         const overrides = {};
@@ -366856,7 +366964,7 @@ class RepoGithubDecanter extends GithubDecanter {
         const directWriters = this.data.teamsAndMembers.directMembers
             .filter((member) => member.role === 'push')
             .map((member) => {
-            return `user:${member.name}`;
+            return `user-imported-ref:${member.name}`;
         });
         const outsideWriters = this.data.teamsAndMembers.outsideMembers
             .filter((member) => member.role === 'push')
@@ -366866,7 +366974,7 @@ class RepoGithubDecanter extends GithubDecanter {
         const teamWriters = this.data.teamsAndMembers.teams
             .filter((team) => ['push', 'write'].includes(team.role))
             .map((team) => {
-            return `group:${team.slug}`;
+            return `group-imported-ref:${team.name}`;
         });
         const writers = directWriters.concat(outsideWriters).concat(teamWriters);
         if (writers && writers.length > 0) {
@@ -366880,7 +366988,7 @@ class RepoGithubDecanter extends GithubDecanter {
         const directReaders = this.data.teamsAndMembers.directMembers
             .filter((member) => member.role === 'pull')
             .map((member) => {
-            return `user:${member.name}`;
+            return `user-imported-ref:${member.name}`;
         });
         const outsideReaders = this.data.teamsAndMembers.outsideMembers
             .filter((member) => member.role === 'pull')
@@ -366890,7 +366998,7 @@ class RepoGithubDecanter extends GithubDecanter {
         const teamReaders = this.data.teamsAndMembers.teams
             .filter((team) => ['pull', 'read'].includes(team.role))
             .map((team) => {
-            return `group:${team.slug}`;
+            return `group-imported-ref:${team.name}`;
         });
         const readers = directReaders.concat(outsideReaders).concat(teamReaders);
         if (readers && readers.length > 0) {
@@ -368802,7 +368910,7 @@ class ResolverError extends Error {
 async function resolve(cr, getItemByItemPath, getSecret, namespace = 'default') {
     const deps = {};
     namespace = cr['metadata']['namespace'] || namespace;
-    const references = [...walk(cr)];
+    const references = [...resolver_walk(cr)];
     operator_src_logger.silly(`${cr.kind}/${cr.metadata?.name}: references ${JSON.stringify(references, null, 2)}`);
     // ⚠️ The references array is mutated by resolveDep, adding new references if nested dependencies are found
     for (const resolve of references) {
@@ -368836,7 +368944,7 @@ async function resolveDep(namespace, resolve, deps, references, getItemByItemPat
         throw new ResolverError(kr);
     // We may have nested refs but they should not be circular
     // ⚠️ This mutates the references array, but it's ok because we don't need to resolve the same ref twice
-    for (const nestedRef of walk(ref)) {
+    for (const nestedRef of resolver_walk(ref)) {
         references.push(nestedRef);
     }
     const secret = resolve.apiGroup === catalog_common.types.controller.FirestartrApiGroup ||
@@ -368848,7 +368956,7 @@ async function resolveDep(namespace, resolve, deps, references, getItemByItemPat
         secret: secret,
     };
 }
-function* walk(item) {
+function* resolver_walk(item) {
     const toResolve = walkItem(item);
     for (const resolve of toResolve) {
         yield resolve;
@@ -368856,20 +368964,20 @@ function* walk(item) {
 }
 function walkItem(item) {
     if (Array.isArray(item))
-        return walkArray(item);
+        return resolver_walkArray(item);
     else if (item.constructor === Object)
-        return walkObject(item);
+        return resolver_walkObject(item);
     else
         return [];
 }
-function walkArray(items) {
+function resolver_walkArray(items) {
     const toResolve = [];
     for (const itemN of items) {
         toResolve.push(walkItem(itemN));
     }
     return toResolve.flat(Infinity);
 }
-function walkObject(item) {
+function resolver_walkObject(item) {
     const toResolve = [];
     // For now we only support refs to secrets.
     // We cannot make it generic because of WriteSecretConnectionToRef in our CRDs
@@ -376631,7 +376739,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"1.59.0-snapshot-11"}');
+const package_namespaceObject = JSON.parse('{"i8":"1.59.0-snapshot-12"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"1.58.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

package/build/packages/cdk8s_renderer/src/renderer/imported-refs.d.ts

@@ -0,0 +1,4 @@
+import { RenderClaimData } from './types';
+type SymbolResolver = (Function: any) => Promise<any>;
+export declare function importedsRefsWalker(renderClaim: RenderClaimData): SymbolResolver[];
+export {};

package/build/packages/importer/src/decanter/base.d.ts

@@ -36,6 +36,7 @@ export default class Decanter {
         postRenderFunctions: Function[];
         renderClaim: {
             claim: any;
+            claimPath: string;
             initializers: any[];
             globals: any[];
             overrides: any[];
@@ -55,6 +56,7 @@ export default class Decanter {
         postRenderFunctions: Function[];
         renderClaim: {
             claim: any;
+            claimPath: string;
             initializers: any[];
             globals: any[];
             overrides: any[];
@@ -80,6 +82,7 @@ export default class Decanter {
         postRenderFunctions: Function[];
         renderClaim: {
             claim: any;
+            claimPath: string;
             initializers: any[];
             globals: any[];
             overrides: any[];

package/package.json

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