@firestartr/cli 1.55.1-snapshot-0 → 1.55.1-snapshot-2

package/build/index.js

@@ -358037,7 +358037,7 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                         },
                         owner: {
                             type: 'string',
-                            pattern: '^(user|group):[a-zA-Z0-9_-]+$',
+                            pattern: '^(user|group):[a-zA-Z0-9_&-]+$',
                         },
                     },
                     required: ['description', 'owner'],
@@ -368827,6 +368827,7 @@ var WorkStatus;
 
 
 
+
 const kindsWithFinalizer = [
     'FirestartrDummyA',
     'FirestartrDummyB',
@@ -368951,6 +368952,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)),
@@ -369964,10 +369968,13 @@ 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 {
-    constructor(metadata) {
+    constructor(metadata, resolveOutputs) {
         this._metadata = metadata;
+        this._resolveOutputs = resolveOutputs;
     }
     get name() {
         if (EXTERNAL_NAME_ANNOTATION in this.annotations) {
@@ -369977,19 +369984,56 @@ class Metadata {
             return this._metadata.name;
         }
     }
+    get slug() {
+        // buscar el slug en los outputs
+        const slug = this._resolveOutputs('slug');
+        if (IMPORT_SLUG_ANNOTATION in this.annotations) {
+            return this.annotations[IMPORT_SLUG_ANNOTATION];
+        }
+        else if (slug) {
+            // hay outputs?
+            return slug;
+        }
+        else {
+            return undefined;
+        }
+    }
     get annotations() {
         return this._metadata.annotations || {};
     }
     get labels() {
         return this._metadata.labels || {};
     }
+    get id() {
+        // buscar el id en los outputs
+        const id = this._resolveOutputs('id');
+        if (IMPORT_ID_ANNOTATION in this.annotations) {
+            return this.annotations[IMPORT_ID_ANNOTATION];
+        }
+        else if (id) {
+            // hay 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;
@@ -370139,14 +370183,14 @@ 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 teamId = fsGithubRepository.resolveRef(permission.ref, 'id');
+                const teamSlug = fsGithubRepository.resolveRef(permission.ref, 'slug');
                 const config = {
                     repository: repo.name,
-                    teamId,
+                    teamId: teamSlug,
                     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);
@@ -370506,7 +370550,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;
 }
 
@@ -370523,11 +370567,11 @@ function provisionMembers(scope, team, fsGithubGroup) {
             const config = {
                 dependsOn: [team],
                 username,
-                teamId: team.id,
+                teamId: fsGithubGroup.metadata.slug || team.id,
                 role: member.role,
             };
             const membership = new team_membership/* TeamMembership */.E(scope, tfStateKey, config);
-            fsGithubGroup.addResourceToStack(`${team.id}:${username}`, membership);
+            fsGithubGroup.addResourceToStack(`${fsGithubGroup.metadata.slug || team.id}:${username}`, membership);
         }
     }
 }
@@ -372403,7 +372447,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;
@@ -376319,7 +376366,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"1.55.1-snapshot-0"}');
+const package_namespaceObject = JSON.parse('{"i8":"1.55.1-snapshot-2"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"1.55.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

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

@@ -42,6 +42,7 @@ export type WorkItemHandler = {
     writeTerraformOutputInTfResult: WriteTerraformOutputInTfResultFn;
     writeConnectionSecret: WriteConnectionSecretFn;
     resolveReferences: ResolveReferencesFn;
+    resolveOwnOutputs: Function;
     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.55.1-snapshot-0",
+  "version": "1.55.1-snapshot-2",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",