@firestartr/cli 1.56.1-snapshot-2 → 1.56.1-snapshot-4

package/build/index.js

@@ -346571,7 +346571,6 @@ var envVars;
     envVars["githubAppInstallationIdPrefapp"] = "GITHUB_APP_INSTALLATION_ID_PREFAPP";
     envVars["githubAppPemFile"] = "GITHUB_APP_PEM_FILE";
     // ---- PREFAPP BOT VARIABLES -----------------------------------------------
-    envVars["avoidPAT"] = "AVOID_PAT";
     envVars["githubAppPatPrefapp"] = "PREFAPP_BOT_PAT";
     // ---- GENERAL CLI VARIABLES -----------------------------------------------
     envVars["firestartrImageKind"] = "FIRESTARTR_IMAGE_KIND";
@@ -353658,6 +353657,7 @@ async function checkIfInstalledForOrg(org = 'default') {
 
 
 
+const REPOS_WITH_PAT = ['prefapp/features'];
 const generateGithubAppToken = async (config) => {
     try {
         const { appId, privateKey, installationOrgId } = config;
@@ -353691,17 +353691,44 @@ async function getOctokitForOrg(org, paginated = false, genGithubAppToken = gene
     if (org === '') {
         throw 'getOctokitForOrg: "org" has to be passed';
     }
-    if (org === 'prefapp' && !process.env[catalog_common.types.envVars.avoidPAT]) {
-        github_src_logger.info("Using Prefapp's PAT token");
-        return getOctokitFromPat(catalog_common.types.envVars.githubAppPatPrefapp);
-    }
-    github_src_logger.info('Using GitHub App token');
-    const auth = await genGithubAppToken({
-        appId: catalog_common.environment.getFromEnvironment(catalog_common.types.envVars.githubAppId),
-        privateKey: catalog_common.environment.getFromEnvironment(catalog_common.types.envVars.githubAppPemFile),
-        installationOrgId: await getInstallationID(org),
-    });
-    const options = { auth: auth };
+    const createRepoSwitchAuth = (options) => {
+        // Auth strategy factory that switches between PAT and GitHub App tokens based on the repository
+        const generateTokenFromGithubApp = async () => {
+            github_src_logger.info(`Using GitHub App token for org ${org}`);
+            let auth = null;
+            auth = await genGithubAppToken({
+                appId: catalog_common.environment.getFromEnvironment(catalog_common.types.envVars.githubAppId),
+                privateKey: catalog_common.environment.getFromEnvironment(catalog_common.types.envVars.githubAppPemFile),
+                installationOrgId: await getInstallationID(org),
+            });
+            return auth;
+        };
+        return {
+            async hook(request, requestOptions) {
+                let isRepoWithPat = REPOS_WITH_PAT.find((repo) => {
+                    return requestOptions.url.includes(`repos/${repo}`);
+                }) !== undefined;
+                if (!isRepoWithPat && 'repo' in requestOptions) {
+                    const checkOrg = requestOptions['owner'] || '';
+                    // prefapp/features
+                    isRepoWithPat =
+                        REPOS_WITH_PAT.indexOf(`${checkOrg}/${requestOptions['repo']}`) !==
+                            -1;
+                }
+                github_src_logger.debug(`Requested ${JSON.stringify(requestOptions)}`);
+                requestOptions.headers = requestOptions.headers || {};
+                if (isRepoWithPat) {
+                    github_src_logger.info('Using GitHub PAT token');
+                    requestOptions.headers.authorization = `token ${process.env[catalog_common.types.envVars.githubAppPatPrefapp]}`;
+                }
+                else {
+                    requestOptions.headers.authorization = `token ${await generateTokenFromGithubApp()}`;
+                }
+                return request(requestOptions);
+            },
+        };
+    };
+    const options = { authStrategy: createRepoSwitchAuth };
     if (paginated) {
         options.plugins = [dist_bundle_paginateRest, paginateGraphQL];
     }
@@ -370020,7 +370047,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 {
@@ -370037,13 +370063,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 {
@@ -370057,13 +370080,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 {
@@ -370615,16 +370641,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);
         }
     }
 }
@@ -371162,6 +371189,7 @@ async function runCDKTF(entityPath, action, depsPath, stream) {
                 FORCE_COLOR: '0',
                 DEBUG: process.env.DEBUG,
                 DEBUG_DEPTH: '0',
+                AVOID_PAT: process.env.AVOID_PAT,
             },
         });
         let output = '';
@@ -376424,7 +376452,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"1.56.1-snapshot-2"}');
+const package_namespaceObject = JSON.parse('{"i8":"1.56.1-snapshot-4"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"1.56.0"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

package/build/packages/catalog_common/src/types/envvars.d.ts

@@ -34,7 +34,6 @@ export declare enum envVars {
     githubAppInstallationId = "GITHUB_APP_INSTALLATION_ID",
     githubAppInstallationIdPrefapp = "GITHUB_APP_INSTALLATION_ID_PREFAPP",
     githubAppPemFile = "GITHUB_APP_PEM_FILE",
-    avoidPAT = "AVOID_PAT",
     githubAppPatPrefapp = "PREFAPP_BOT_PAT",
     firestartrImageKind = "FIRESTARTR_IMAGE_KIND",
     operatorNamespace = "OPERATOR_NAMESPACE",

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-2",
+  "version": "1.56.1-snapshot-4",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",