@firestartr/cli 1.56.1-snapshot-1 → 1.56.1-snapshot-3

package/build/index.js

@@ -367007,13 +367007,21 @@ async function importGithubGitopsRepository(org, skipPlan, claimsPath, resources
             previousCRs[k];
     }
     const crs = await renderCRs(data);
-    Object.values(crs).forEach((cr) => {
-        const claimName = cr.metadata.labels?.['claim-ref'];
+    for (const key in crs) {
+        let cr = crs[key];
+        const claimName = cr.metadata?.annotations?.[catalog_common.generic.getFirestartrAnnotation('external-name')];
         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) {
@@ -370012,7 +370020,6 @@ var lib_provider = __nccwpck_require__(85791);
 ;// CONCATENATED MODULE: ../provisioner/src/entities/base/Entity.ts
 
 const EXTERNAL_NAME_ANNOTATION = 'firestartr.dev/external-name';
-const IMPORT_SLUG_ANNOTATION = 'firestartr.dev/github-slug';
 const IMPORT_ID_ANNOTATION = 'firestartr.dev/github-id';
 
 class Metadata {
@@ -370029,13 +370036,10 @@ class Metadata {
         }
     }
     get slug() {
-        // buscar el slug en los outputs
+        // we search the slug in the outputs
         const slug = this._resolveOutputs('slug');
-        if (IMPORT_SLUG_ANNOTATION in this.annotations) {
-            return this.annotations[IMPORT_SLUG_ANNOTATION];
-        }
-        else if (slug) {
-            // hay outputs?
+        if (slug) {
+            // is the slug in the outputs?
             return slug;
         }
         else {
@@ -370049,13 +370053,16 @@ class Metadata {
         return this._metadata.labels || {};
     }
     get id() {
-        // buscar el id en los outputs
+        // 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) {
-            // hay outputs?
+            // is the ID in the outputs?
             return id;
         }
         else {
@@ -370607,16 +370614,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: fsGithubGroup.metadata.slug || team.id,
+                teamId: teamId,
                 role: member.role,
             };
             const membership = new team_membership/* TeamMembership */.E(scope, tfStateKey, config);
-            fsGithubGroup.addResourceToStack(`${fsGithubGroup.metadata.slug || team.id}:${username}`, membership);
+            fsGithubGroup.addResourceToStack(`${teamId}:${username}`, membership);
         }
     }
 }
@@ -376416,7 +376424,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"1.56.1-snapshot-1"}');
+const package_namespaceObject = JSON.parse('{"i8":" v1.56.1-snapshot-3"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"1.56.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

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

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

package/package.json

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