@firestartr/cli 1.56.1-snapshot-7 → 1.56.1-snapshot-9

package/build/index.js

@@ -366279,11 +366279,15 @@ class Decanter {
     get github() {
         return this._github;
     }
+    get postRenderFunctions() {
+        return this._postRenderFunctions;
+    }
     constructor(data) {
         this.data = {};
         this.initializerInstances = [];
         this.claim = {};
         this.deps = {};
+        this._postRenderFunctions = [];
         this._github = github_0;
         this.data = data;
     }
@@ -366297,10 +366301,14 @@ class Decanter {
         return new ImportInitializer();
     }
     __patchClaim(patch) {
-        this.claim = fast_json_patch.applyPatch(this.claim, [patch]).newDocument;
+        this.claim = fast_json_patch_default().applyPatch(this.claim, [patch]).newDocument;
+    }
+    __patchCr(cr, patches) {
+        patches = Array.isArray(patches) ? patches : [patches];
+        return fast_json_patch_default().applyPatch(cr, patches).newDocument;
     }
     __validateEqual(a, b) {
-        return fast_json_patch.compare(a, b).length === 0;
+        return fast_json_patch_default().compare(a, b).length === 0;
     }
     __decantStart() { }
     __getMethods(check) {
@@ -366350,6 +366358,14 @@ class Decanter {
         catalog_common.io.writeClaim(this.claim, claimsPath);
         return yaml;
     }
+    postRender() {
+        for (const method of this.__getMethods(this)) {
+            if (method.match(/^__postRender/) &&
+                typeof this[method] === 'function') {
+                this[method]();
+            }
+        }
+    }
     async _adapt() {
         const initializers = [];
         const overrides = [];
@@ -366370,6 +366386,7 @@ class Decanter {
         }
         const adapted = {
             deps: this.getDeps(),
+            postRenderFunctions: this.postRenderFunctions,
             renderClaim: {
                 claim: this.claim,
                 initializers,
@@ -366384,6 +366401,9 @@ class Decanter {
         if (!this.deps[key])
             this.deps[key] = { cr, secret };
     }
+    setPostRenderF(f) {
+        this._postRenderFunctions.push(f);
+    }
     getDeps() {
         return this.deps;
     }
@@ -366445,7 +366465,7 @@ class GroupGithubDecanter extends GithubDecanter {
             kind: this.claimKind,
             version: this.VERSION(),
             name: this.data.groupDetails.slug,
-            description: this.data.groupDetails.description,
+            description: this.data.groupDetails.description || '',
             type: 'business-unit',
         };
     }
@@ -366500,6 +366520,15 @@ class GroupGithubDecanter extends GithubDecanter {
     async __adaptInitializerBase(_claim) {
         return await this.__loadInitializer('defaults_github_group.yaml');
     }
+    __postRenderAnnotateGithubId() {
+        this.setPostRenderF((cr) => {
+            return this.__patchCr(cr, {
+                op: 'add',
+                path: '/metadata/annotations/firestartr.dev~1github-id',
+                value: `${this.data.groupDetails.id}`,
+            });
+        });
+    }
     __validateKind(cr) {
         return true;
     }
@@ -367005,6 +367034,21 @@ async function importGithubGitopsRepository(org, skipPlan, claimsPath, resources
             previousCRs[k];
     }
     const crs = await renderCRs(data);
+    for (const key in crs) {
+        let cr = crs[key];
+        const claimName = cr.metadata?.annotations?.[catalog_common.generic.getFirestartrAnnotation('claim-ref')]?.split('/')[1];
+        const postRenderFunctions = data.postRender[`${cr.kind}-${claimName}`] || [];
+        let crModified = false;
+        for (const postRenderFunction of postRenderFunctions) {
+            cr = postRenderFunction(cr);
+            crModified = true;
+        }
+        if (crModified) {
+            const crPath = getCrPath(tmpRenderedCrsPath, cr);
+            catalog_common.io.writeYamlFile(external_path_.basename(crPath), cr, external_path_.dirname(crPath));
+            crs[key] = cr;
+        }
+    }
     await moveCRsAndClaims(crs, org, claimsPath, resourcesPath);
 }
 async function moveCRsAndClaims(crs, org, claimsPath, resourcesPath) {
@@ -367046,7 +367090,8 @@ function getClaimPathFromCR(claimsBasePath, cr) {
         FirestartrGithubRepository: 'components',
         FirestartrGithubMembership: 'users',
     };
-    return external_path_.join(claimsBasePath, `${cr.metadata.annotations[catalog_common.generic.getFirestartrAnnotation('claim-ref')]}.yaml`.toLowerCase());
+    const claimRef = `${cr.metadata.annotations['firestartr.dev/claim-ref']}.yaml`.toLowerCase();
+    return external_path_.join(claimsBasePath, mapCrsToClaims[cr.kind], claimRef.replace(/^[^/]+/, ''));
 }
 function getCrPath(crsBasePath, cr) {
     return external_path_.join(crsBasePath, `${cr.kind}.${cr.metadata.name}.yaml`);
@@ -367060,24 +367105,30 @@ async function getDataFromKinds(org, filters = []) {
     ]);
     const renderClaims = {};
     const deps = {};
+    const postRender = {};
     for (const repo of data['repos']) {
         renderClaims[`ComponentClaim-${repo.renderClaim.claim.name}`] =
             repo.renderClaim;
         deps[`FirestartrGithubRepository-${repo.renderClaim.claim.name}`] =
             repo.deps;
+        postRender[`FirestartrGithubRepository-${repo.renderClaim.claim.name}`] =
+            repo.postRenderFunctions;
     }
     for (const group of data['groups']) {
         renderClaims[`GroupClaim-${group.renderClaim.claim.name}`] =
             group.renderClaim;
         deps[`FirestartrGithubGroup-${group.renderClaim.claim.name}`] = group.deps;
+        postRender[`FirestartrGithubGroup-${group.renderClaim.claim.name}`] =
+            group.postRenderFunctions;
     }
     for (const membership of data['memberships']) {
         renderClaims[`UserClaim-${membership.renderClaim.claim.name}`] =
             membership.renderClaim;
         deps[`FirestartrGithubMembership-${membership.renderClaim.claim.name}`] =
             membership.deps;
+        postRender[`FirestartrGithubMembership-${membership.renderClaim.claim.name}`] = membership.postRenderFunctions;
     }
-    return { renderClaims, deps: deps };
+    return { renderClaims, deps: deps, postRender: postRender };
 }
 async function importGithubGroups(org, filters = []) {
     const groups = [];
@@ -367086,8 +367137,9 @@ async function importGithubGroups(org, filters = []) {
     for (const group of collection) {
         await group.gather();
         await group.decant();
-        groups.push(await group.adapt());
         group.render();
+        group.postRender();
+        groups.push(await group.adapt());
     }
     return groups;
 }
@@ -368855,6 +368907,7 @@ var WorkStatus;
 
 
 
+
 const kindsWithFinalizer = [
     'FirestartrDummyA',
     'FirestartrDummyB',
@@ -368979,6 +369032,9 @@ function enqueue(pluralKind, workItem, queue, compute, syncCtl, retryCtl) {
         writeTerraformOutputInTfResult: writeTerraformOuputInTFResult,
         writeConnectionSecret: writeConnectionSecret,
         resolveReferences: () => resolve(workItem.item, getItemByItemPath, getSecret),
+        resolveOwnOutputs: () => {
+            return resolveSecretRef(workItem.item.metadata.namespace, workItem.item, getSecret);
+        },
         deleteSecret: () => deleteSecret(workItem.item.spec.writeConnectionSecretToRef.name, workItem.item.metadata.namespace),
         itemPath: () => informer_itemPath(pluralKind, workItem.item),
         error: () => retryCtl.errorReconciling(informer_itemPath(pluralKind, workItem.item)),
@@ -369992,10 +370048,12 @@ var lib_provider = __nccwpck_require__(85791);
 ;// CONCATENATED MODULE: ../provisioner/src/entities/base/Entity.ts
 
 const EXTERNAL_NAME_ANNOTATION = 'firestartr.dev/external-name';
+const IMPORT_ID_ANNOTATION = 'firestartr.dev/github-id';
 
 class Metadata {
-    constructor(metadata) {
+    constructor(metadata, resolveOutputs) {
         this._metadata = metadata;
+        this._resolveOutputs = resolveOutputs;
     }
     get name() {
         if (EXTERNAL_NAME_ANNOTATION in this.annotations) {
@@ -370005,19 +370063,56 @@ class Metadata {
             return this._metadata.name;
         }
     }
+    get slug() {
+        // we search the slug in the outputs
+        const slug = this._resolveOutputs('slug');
+        if (slug) {
+            // is the slug in the outputs?
+            return slug;
+        }
+        else {
+            return undefined;
+        }
+    }
     get annotations() {
         return this._metadata.annotations || {};
     }
     get labels() {
         return this._metadata.labels || {};
     }
+    get id() {
+        // we search the id in the outputs
+        const id = this._resolveOutputs('id');
+        // if we are in an import process
+        // there should be an id annotation
+        // it takes always precedence
+        if (IMPORT_ID_ANNOTATION in this.annotations) {
+            return this.annotations[IMPORT_ID_ANNOTATION];
+        }
+        else if (id) {
+            // is the ID in the outputs?
+            return id;
+        }
+        else {
+            return undefined;
+        }
+    }
 }
 class Entity {
     constructor(artifact, deps) {
         this.importStack = [];
         this.kind = artifact.kind;
         this.apiVersion = artifact.apiVersion;
-        this.metadata = new Metadata(artifact.metadata);
+        this.metadata = new Metadata(artifact.metadata, (key) => {
+            if (this.deps && 'self-outputs' in this.deps) {
+                const cr = this.deps['self-outputs'].cr;
+                if (cr && typeof cr.data === 'object') {
+                    if (key in cr.data) {
+                        return Buffer.from(cr.data[key], 'base64').toString('utf-8');
+                    }
+                }
+            }
+        });
         this.spec = artifact.spec;
         if (deps) {
             this.deps = deps;
@@ -370167,14 +370262,15 @@ function provisionPermissions(scope, repo, fsGithubRepository) {
         if ('ref' in permission) {
             const tfStateKey = `_${fsGithubRepository.getTfStateKey()}-${permission.ref.kind}-${permission.ref.name}-tr`;
             if (permission.ref.kind === 'FirestartrGithubGroup') {
+                const teamSlug = fsGithubRepository.resolveRef(permission.ref, 'slug');
                 const teamId = fsGithubRepository.resolveRef(permission.ref, 'id');
                 const config = {
                     repository: repo.name,
-                    teamId,
+                    teamId: teamId,
                     permission: permission.role,
                 };
                 const teamsRepository = new team_repository/* TeamRepository */.C(scope, tfStateKey, config);
-                fsGithubRepository.addResourceToStack(`${teamId}:${fsGithubRepository.metadata.name}`, teamsRepository);
+                fsGithubRepository.addResourceToStack(`${teamSlug}:${fsGithubRepository.metadata.name}`, teamsRepository);
             }
             else if (permission.ref.kind === 'FirestartrGithubMembership') {
                 const username = fsGithubRepository.resolveRef(permission.ref);
@@ -370534,7 +370630,7 @@ function provisionGroup(scope, fsGithubGroup) {
     };
     const tfStateKey = `_${fsGithubGroup.getTfStateKey()}`;
     const group = new lib_team/* Team */.S(scope, tfStateKey, config);
-    fsGithubGroup.addResourceToStack(fsGithubGroup.metadata.name, group);
+    fsGithubGroup.addResourceToStack(fsGithubGroup.metadata.id || fsGithubGroup.metadata.name, group);
     return group;
 }
 
@@ -370546,16 +370642,17 @@ function provisionMembers(scope, team, fsGithubGroup) {
     for (const member of fsGithubGroup.spec.members) {
         provisioner_src_logger.info(`Provisioning user ${member.ref.name} for group ${fsGithubGroup.metadata.name}`);
         const tfStateKey = `_${fsGithubGroup.getTfStateKey()}-${member.ref.kind}-${member.ref.name}-tr`;
+        const teamId = team.id || fsGithubGroup.metadata.id;
         if (member.ref.kind === 'FirestartrGithubMembership') {
             const username = fsGithubGroup.resolveRef(member.ref);
             const config = {
                 dependsOn: [team],
                 username,
-                teamId: team.id,
+                teamId: teamId,
                 role: member.role,
             };
             const membership = new team_membership/* TeamMembership */.E(scope, tfStateKey, config);
-            fsGithubGroup.addResourceToStack(`${team.id}:${username}`, membership);
+            fsGithubGroup.addResourceToStack(`${teamId}:${username}`, membership);
         }
     }
 }
@@ -372436,7 +372533,10 @@ async function* doApply(item, op, handler) {
             opts['create'] = true;
         }
         const deps = await handler.resolveReferences();
-        operator_src_logger.info(`Item ${item.metadata.name} has the following dependencies: ${deps}`);
+        deps['self-outputs'] = {
+            cr: await handler.resolveOwnOutputs(),
+        };
+        operator_src_logger.info(`Item ${item.metadata.name} has the following dependencies: ${Object.keys(deps)}`);
         const annotation = 'firestartr.dev/last-state-pr';
         const statePr = item?.metadata?.annotations?.[annotation];
         const hasStatePr = typeof statePr === 'string' && statePr.trim().length > 0;
@@ -376352,7 +376452,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"1.56.1-snapshot-7"}');
+const package_namespaceObject = JSON.parse('{"i8":"1.56.1-snapshot-9"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"1.56.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

package/build/packages/importer/index.d.ts

@@ -1,6 +1,6 @@
 import { importGithubGitopsRepository } from './src/decanter';
-import { CollectionFilter } from './src/decanter/collections';
-export { CollectionFilter };
+import type { CollectionFilter } from './src/decanter/collections';
+export type { CollectionFilter };
 declare const _default: {
     importGithubGitopsRepository: typeof importGithubGitopsRepository;
 };

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

@@ -11,14 +11,17 @@ export default class Decanter {
             secret: any;
         };
     };
+    _postRenderFunctions: Function[];
     _github: any;
     set github(githubInstance: any);
     get github(): any;
+    get postRenderFunctions(): Function[];
     constructor(data: any);
     __adaptInitializerTfStateKey(): Promise<UUIDInitializer>;
     __adaptInitializerClaimRef(): Promise<InitializerClaimRef>;
     __adaptInitializerImport(): Promise<ImportInitializer>;
     __patchClaim(patch: any): void;
+    __patchCr(cr: any, patches: any): any;
     __validateEqual(a: any, b: any): boolean;
     __decantStart(): void;
     __getMethods(check: any): any[];
@@ -30,6 +33,7 @@ export default class Decanter {
                 secret: any;
             };
         };
+        postRenderFunctions: Function[];
         renderClaim: {
             claim: any;
             initializers: any[];
@@ -40,6 +44,7 @@ export default class Decanter {
     }>;
     validateCR(cr: any): boolean;
     render(): string;
+    postRender(): void;
     _adapt(): Promise<{
         deps: {
             [key: string]: {
@@ -47,6 +52,7 @@ export default class Decanter {
                 secret: any;
             };
         };
+        postRenderFunctions: Function[];
         renderClaim: {
             claim: any;
             initializers: any[];
@@ -56,6 +62,7 @@ export default class Decanter {
         };
     }>;
     setDep(key: string, cr: any, secret: any): void;
+    setPostRenderF(f: Function): void;
     getDeps(): {
         [key: string]: {
             cr: any;
@@ -70,6 +77,7 @@ export default class Decanter {
                 secret: any;
             };
         };
+        postRenderFunctions: Function[];
         renderClaim: {
             claim: any;
             initializers: any[];

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

@@ -1,5 +1,5 @@
+export type { CollectionFilter } from './filters';
 export declare function applyCollectionMixins(derivedCtor: any): void;
-export { CollectionFilter } from './filters';
 export declare class CollectionMixins {
     IS_FILTER_BY_NAME_SET(filters: any[], kind: string): boolean;
     IS_SKIP_SET(filters: any[], kind: string): boolean;

package/build/packages/importer/src/decanter/gh/github_group.d.ts

@@ -10,6 +10,7 @@ export default class GroupGithubDecanter extends GithubDecanter {
     __gatherMembers(): Promise<void>;
     __validateMembers(cr: any): Promise<boolean>;
     __adaptInitializerBase(_claim: any): Promise<InitializerDefault>;
+    __postRenderAnnotateGithubId(): void;
     __validateKind(cr: any): boolean;
     KO__validateKind(): void;
 }

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

@@ -1,5 +1,5 @@
-export { CollectionFilter } from './collections';
-import { CollectionFilter } from './collections';
+export type { CollectionFilter } from './collections';
+import type { CollectionFilter } from './collections';
 import GroupCollectionGithubDecanter from './gh/github_group_collection';
 import MemberCollectionGithubDecanter from './gh/github_member_collection';
 import RepoCollectionGithubDecanter from './gh/github_repo_collection';

package/build/packages/operator/src/informer.d.ts

@@ -42,6 +42,7 @@ export type WorkItemHandler = {
     writeTerraformOutputInTfResult: WriteTerraformOutputInTfResultFn;
     writeConnectionSecret: WriteConnectionSecretFn;
     resolveReferences: ResolveReferencesFn;
+    resolveOwnOutputs: () => Promise<any | undefined>;
     deleteSecret: DeleteSecretFn;
     itemPath: ItemPathFn;
     error: ErrorFn;

package/build/packages/provisioner/src/entities/base/Entity.d.ts

@@ -2,10 +2,13 @@ import { Construct } from 'constructs';
 import { TerraformModule, TerraformResource } from 'cdktf';
 declare class Metadata {
     _metadata: any;
-    constructor(metadata: any);
+    _resolveOutputs: Function;
+    constructor(metadata: any, resolveOutputs: Function);
     get name(): any;
+    get slug(): any;
     get annotations(): any;
     get labels(): any;
+    get id(): any;
 }
 export declare abstract class Entity {
     kind: string;

package/package.json

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