@firestartr/cli 1.50.1-snapshot-40 → 1.50.1-snapshot-42

package/build/index.js

@@ -298282,17 +298282,19 @@ async function getOctokitForOrg(org, paginated = false, genGithubAppToken = gene
         installationOrgId: await getInstallationID(org),
     });
     const options = { auth: auth };
-    const test = new dist_src_Octokit({ auth: auth });
-    console.dir(test, { depth: null });
     if (paginated) {
         options.plugins = [dist_bundle_paginateRest, paginateGraphQL];
     }
-    const octokit = new dist_src_Octokit(options);
-    return octokit;
+    const OctokitWithGraphQL = dist_src_Octokit.plugin(paginateGraphQL);
+    return new OctokitWithGraphQL(options);
 }
 async function getOctokitFromPat(envVar) {
-    const options = { auth: process.env[envVar], plugins: [dist_bundle_paginateRest, paginateGraphQL] };
-    return new dist_src_Octokit(options);
+    const options = {
+        auth: process.env[envVar],
+        plugins: [dist_bundle_paginateRest, paginateGraphQL],
+    };
+    const OctokitWithGraphQL = dist_src_Octokit.plugin(paginateGraphQL);
+    return new OctokitWithGraphQL(options);
 }
 /* harmony default export */ const src_auth = ({ getOctokitForOrg });
 
@@ -298355,9 +298357,8 @@ async function getOrgInfo(org) {
 async function getOrgTeamsDirectAccess(org) {
     github_src_logger.info(`Getting teams for org ${org}`);
     const octokit = await getOctokitForOrg(org);
-    const response = await octokit.graphql.paginate(`
-    query paginate($cursor: String,  $org: String!) {
-      organization(login: \$org) {
+    const response = await octokit.graphql.paginate(`query paginate($cursor: String,  $org: String!) {
+      organization(login: $org) {
         teams(first: 100, after: $cursor) {
           nodes {
             id
@@ -303533,7 +303534,14 @@ async function loadInitializers(claim, initializersPath = config_getPath('initia
     return loadedInitializers;
 }
 function loadClaimDefaults() {
-    return catalog_common.io.fromYaml(external_fs_.readFileSync(`${config_getPath('claimsDefaults')}/claims_defaults.yaml`, 'utf-8'));
+    try {
+        return catalog_common.io.fromYaml(external_fs_.readFileSync(`${config_getPath('claimsDefaults')}/claims_defaults.yaml`, 'utf-8'));
+    }
+    catch (error) {
+        const errMsg = `Could not read claims defaults file in path ${config_getPath('claimsDefaults')}/claims_defaults.yaml: ${error}`;
+        cdk8s_renderer_src_logger.error(errMsg);
+        throw new Error(`${errMsg}`);
+    }
 }
 /*
  * Using fast-json-patch, compares a claim to its kind's defaults, then patches it.
@@ -310743,7 +310751,7 @@ function getClaimPathFromCR(claimsBasePath, cr) {
         FirestartrGithubRepository: 'components',
         FirestartrGithubMembership: 'users',
     };
-    return external_path_.join(claimsBasePath, mapCrsToClaims[cr.kind], `${cr.metadata.labels['claim-ref']}.yaml`.toLowerCase());
+    return external_path_.join(claimsBasePath, mapCrsToClaims[cr.kind], `${cr.metadata.annotations[catalog_common.generic.getFirestartrAnnotation('external-name')]}.yaml`.toLowerCase());
 }
 function getCrPath(crsBasePath, cr) {
     return external_path_.join(crsBasePath, `${cr.kind}.${cr.metadata.name}.yaml`);
@@ -310864,16 +310872,12 @@ function compileReg(value) {
 //    gh-group: 'FirestartrGithubGroup',
 //    gh-repo: 'FirestartrGithubRepository',
 //  }
-async function runImporter(force, generateDefaults, skipPlan, claimsPath, crsPath, configPath, claimsDefaultsPath, org, filters, provider = AllowedProviders.all) {
+async function runImporter(force, skipPlan, claimsPath, crsPath, configPath, claimsDefaultsPath, org, filters, provider = AllowedProviders.all) {
     configureProvider(provider);
     let generatedFilters = [];
     //gh-repo,REGEXP=.*vite.*
     cdk8s_renderer.setPath('claimsDefaults', claimsDefaultsPath);
     generatedFilters = buildFilters(filters, force, crsPath, generatedFilters);
-    if (generateDefaults) {
-        generateClaimsDefaults(org, claimsDefaultsPath);
-        generateDefaultsFn(org, configPath);
-    }
     await importGithubGitopsRepository(org, skipPlan, claimsPath, crsPath, configPath, generatedFilters);
 }
 function buildFilters(filters, force, crsPath, generatedFilters) {
@@ -310909,11 +310913,6 @@ function createSkipFilters(filters) {
     }
     return filters;
 }
-function generateDefaultsFn(org, defaultsPath) {
-    generateDefaultsForGithubGroups(org, defaultsPath);
-    generateDefaultsForGithubRepos(org, defaultsPath);
-    generateDefaultsForGithubRepos(org, defaultsPath);
-}
 function generateDefaultsForGithubGroups(org, defaultsPath) {
     const defaultGroups = {
         name: 'group_base',
@@ -310923,7 +310922,7 @@ function generateDefaultsForGithubGroups(org, defaultsPath) {
             org: org,
         },
     };
-    catalog_common.io.writeYamlFile('defaults_github_group', defaultGroups, defaultsPath);
+    common.io.writeYamlFile('defaults_github_group', defaultGroups, defaultsPath);
 }
 function generateDefaultsForGithubRepos(org, defaultsPath) {
     const defaultRepos = {
@@ -310951,54 +310950,7 @@ function generateDefaultsForGithubRepos(org, defaultsPath) {
             },
         },
     };
-    catalog_common.io.writeYamlFile('defaults_github_repository', defaultRepos, defaultsPath);
-}
-function generateClaimsDefaults(org, defaultsPath) {
-    const defaultClaims = {
-        ComponentClaim: {
-            version: '1.0',
-            type: 'service',
-            lifecycle: 'production',
-            system: 'system:firestartr-test-system',
-            maintainedBy: [],
-            platformOwner: `group:${org}-all`,
-            providers: {
-                github: {
-                    org: org,
-                    branchStrategy: {
-                        name: 'trunkBasedDevelopment',
-                        defaultBranch: 'main',
-                    },
-                    orgPermissions: 'none',
-                    visibility: 'private',
-                    technology: {
-                        stack: 'none',
-                        version: 'none',
-                    },
-                    features: [],
-                },
-            },
-        },
-        GroupClaim: {
-            providers: {
-                github: {
-                    org: org,
-                    privacy: 'closed',
-                },
-            },
-        },
-        SystemClaim: {
-            providers: {
-                catalog: null,
-            },
-        },
-        DomainClaim: {
-            providers: {
-                catalog: null,
-            },
-        },
-    };
-    catalog_common.io.writeYamlFile('claims_defaults', defaultClaims, defaultsPath);
+    common.io.writeYamlFile('defaults_github_repository', defaultRepos, defaultsPath);
 }
 
 ;// CONCATENATED MODULE: ./src/subcommands/importer-subcommands.ts
@@ -311008,7 +310960,6 @@ const importSubcommand = {
     requiredEnv: [],
     subparameters: [
         { name: 'force', type: Boolean },
-        { name: 'generateDefaults', type: Boolean },
         { name: 'skipPlan', type: Boolean },
         { name: 'claims', type: String },
         { name: 'crs', type: String },
@@ -311019,7 +310970,7 @@ const importSubcommand = {
     ],
     run: async (options) => {
         console.table(options);
-        await runImporter(options.force, options.generateDefaults, options.skipPlan, options.claims, options.crs, options.config, options.claimsDefaults, options.org, options.filters);
+        await runImporter(options.force, options.skipPlan, options.claims, options.crs, options.config, options.claimsDefaults, options.org, options.filters);
     },
 };
 

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

@@ -1,7 +1,7 @@
 import { Octokit } from '@octokit/rest';
 import type { Api } from '@octokit/plugin-rest-endpoint-methods/dist-types/types';
 import type { PaginateInterface } from '@octokit/plugin-paginate-rest/dist-types/types';
-import type { paginateGraphQLInterface } from "@octokit/plugin-paginate-graphql/dist-types/index.js";
+import type { paginateGraphQLInterface } from '@octokit/plugin-paginate-graphql/dist-types/index.js';
 export declare const generateGithubAppToken: (config: any) => Promise<string>;
 export declare function getGithubAppToken(org: string, genGithubAppToken?: any): Promise<string>;
 type ExtendedOctokit = Octokit & Api & {

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

@@ -6,4 +6,4 @@ declare const _default: {
 };
 export default _default;
 import { AllowedProviders } from 'cdk8s_renderer';
-export declare function runImporter(force: boolean, generateDefaults: boolean, skipPlan: boolean, claimsPath: string, crsPath: string, configPath: string, claimsDefaultsPath: string, org: string, filters: string[], provider?: AllowedProviders): Promise<void>;
+export declare function runImporter(force: boolean, skipPlan: boolean, claimsPath: string, crsPath: string, configPath: string, claimsDefaultsPath: string, org: string, filters: string[], provider?: AllowedProviders): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@firestartr/cli",
-  "version": "1.50.1-snapshot-40",
+  "version": "1.50.1-snapshot-42",
   "private": false,
   "description": "Commandline tool",
   "main": "build/main.js",