@firestartr/cli 1.39.6 → 1.40.1

package/build/index.js

@@ -277886,6 +277886,8 @@ var envVars;
     envVars["githubAppInstallationId"] = "GITHUB_APP_INSTALLATION_ID";
     envVars["githubAppInstallationIdPrefapp"] = "GITHUB_APP_INSTALLATION_ID_PREFAPP";
     envVars["githubAppPemFile"] = "GITHUB_APP_PEM_FILE";
+    // ---- PREFAPP BOT VARIABLES -----------------------------------------------
+    envVars["githubAppPatPrefapp"] = "PREFAPP_BOT_PAT";
     // ---- GENERAL CLI VARIABLES -----------------------------------------------
     envVars["firestartrImageKind"] = "FIRESTARTR_IMAGE_KIND";
     // ---- OPERATOR VARIABLES -----------------------------------------------
@@ -283245,9 +283247,9 @@ async function getGithubAppToken(org = 'default', genGithubAppToken = generateGi
     return token;
 }
 async function getOctokitForOrg(org = 'default', paginated = false, genGithubAppToken = generateGithubAppToken) {
-    const installationOrgId = catalog_common.environment.getFromEnvironmentWithDefault(org === 'prefapp'
-        ? catalog_common.types.envVars.githubAppInstallationIdPrefapp
-        : catalog_common.types.envVars.githubAppInstallationId);
+    if (org === 'prefapp')
+        return getOctokitFromPat(catalog_common.types.envVars.githubAppPatPrefapp);
+    const installationOrgId = catalog_common.environment.getFromEnvironment(catalog_common.types.envVars.githubAppInstallationId);
     const auth = await genGithubAppToken({
         appId: catalog_common.environment.getFromEnvironment(catalog_common.types.envVars.githubAppId),
         privateKey: catalog_common.environment.getFromEnvironment(catalog_common.types.envVars.githubAppPemFile),
@@ -283259,6 +283261,11 @@ async function getOctokitForOrg(org = 'default', paginated = false, genGithubApp
     }
     return new dist_src_Octokit(options);
 }
+async function getOctokitFromPat(envVar) {
+    return new dist_src_Octokit({
+        auth: process.env[envVar],
+    });
+}
 /* harmony default export */ const src_auth = ({ getOctokitForOrg });
 
 ;// CONCATENATED MODULE: ../github/src/organization.ts
@@ -283871,6 +283878,7 @@ async function createOrphanBranch(repo, branch, owner = 'prefapp') {
     team: team,
     user: user,
     getOctokitForOrg: getOctokitForOrg,
+    getOctokitFromPat: getOctokitFromPat,
     generateGithubAppToken: generateGithubAppToken,
     getGithubAppToken: getGithubAppToken,
     auth: src_auth,
@@ -288871,7 +288879,10 @@ async function downloadFeatureTarball(repo, featureName, version, owner = 'prefa
         if (!release)
             throw new Error(`Release ${featureName}-v${version} not found`);
         const ref = release['tag_name'];
-        const octokit = await github_0.getOctokitForOrg(owner);
+        // Only use pat if the owner is prefapp
+        const octokit = owner === 'prefapp'
+            ? await github_0.getOctokitFromPat('PREFAPP_BOT_PAT')
+            : await github_0.getOctokitForOrg(owner);
         const response = await octokit.request(`GET /repos/${owner}/${repo}/tarball/${ref}`, { owner, repo, ref });
         const tarballExtractPath = catalog_common.features.tarballs.getFeaturesExtractPath(featureName, version, { createIfNotExists: true });
         const tarballPath = catalog_common.features.tarballs.getFeatureTarballDownloadPath(featureName, version);

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

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

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

@@ -1,4 +1,4 @@
-import { getOctokitForOrg, getGithubAppToken } from './src/auth';
+import { getOctokitForOrg, getGithubAppToken, getOctokitFromPat } from './src/auth';
 declare const _default: {
     org: {
         getRepositoryList: typeof import("./src/organization").getRepositoryList;
@@ -37,6 +37,7 @@ declare const _default: {
         getUserInfo: typeof import("./src/user").getUserInfo;
     };
     getOctokitForOrg: typeof getOctokitForOrg;
+    getOctokitFromPat: typeof getOctokitFromPat;
     generateGithubAppToken: (config: any) => Promise<string>;
     getGithubAppToken: typeof getGithubAppToken;
     auth: {

package/build/packages/github/src/auth.d.ts

@@ -2,6 +2,7 @@ import { Octokit } from '@octokit/rest';
 export declare const generateGithubAppToken: (config: any) => Promise<string>;
 export declare function getGithubAppToken(org?: string, genGithubAppToken?: any): Promise<string>;
 export declare function getOctokitForOrg(org?: string, paginated?: boolean, genGithubAppToken?: any): Promise<Octokit>;
+export declare function getOctokitFromPat(envVar: string): Promise<Octokit>;
 declare const _default: {
     getOctokitForOrg: typeof getOctokitForOrg;
 };

package/build/packages/github/src/branches.d.ts

@@ -428,7 +428,7 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
                 verified_at: string;
             };
         };
-        author: Record<string, never> | {
+        author: {
             name?: string;
             email?: string;
             login: string;
@@ -451,8 +451,8 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
             site_admin: boolean;
             starred_at?: string;
             user_view_type?: string;
-        };
-        committer: Record<string, never> | {
+        } | Record<string, never>;
+        committer: {
             name?: string;
             email?: string;
             login: string;
@@ -475,7 +475,7 @@ export declare function getBranch(repo: string, branch: string, owner?: string):
             site_admin: boolean;
             starred_at?: string;
             user_view_type?: string;
-        };
+        } | Record<string, never>;
         parents: {
             sha: string;
             url: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "1.39.6",
+  "version": "1.40.1",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",