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

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];
     }
@@ -367009,7 +367036,7 @@ async function importGithubGitopsRepository(org, skipPlan, claimsPath, resources
     const crs = await renderCRs(data);
     for (const key in crs) {
         let cr = crs[key];
-        const claimName = cr.metadata?.annotations?.[catalog_common.generic.getFirestartrAnnotation('external-name')];
+        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) {
@@ -367109,9 +367136,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;
 }
@@ -376424,7 +376451,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":" v1.56.1-snapshot-3"}');
+const package_namespaceObject = JSON.parse('{"i8":"1.56.1-snapshot-5"}');
 ;// 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/importer/index.d.ts

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

package/package.json

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