@firestartr/cli 1.51.1-snapshot-04 → 1.51.1-snapshot-06

package/build/index.js

@@ -358995,7 +358995,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.
@@ -365288,12 +365295,19 @@ function getConfigPath() {
     getConfigPath,
 });
 
+;// CONCATENATED MODULE: ../importer/src/logger.ts
+
+/* harmony default export */ const importer_src_logger = (catalog_common.logger);
+
 ;// CONCATENATED MODULE: ../importer/src/decanter/base.ts
 
 
 
 
 
+
+
+
 class Decanter {
     set github(githubInstance) {
         this._github = githubInstance;
@@ -365415,6 +365429,27 @@ class Decanter {
     adapt() {
         return this._adapt();
     }
+    async __loadInitializer(initDefaultPath, isAbsolute = false) {
+        let initPath = initDefaultPath;
+        try {
+            if (!isAbsolute) {
+                // Path construction may throw, so handle it separately
+                try {
+                    initPath = external_path_.join(getConfigPath(), 'resources', initDefaultPath);
+                }
+                catch (err) {
+                    importer_src_logger.error('Error constructing initializer path:', err);
+                    throw new Error(`Failed to construct initializer path for ${initDefaultPath}`);
+                }
+            }
+            const adapter = catalog_common.io.fromYaml(external_fs_.readFileSync(initPath, 'utf-8'));
+            return new InitializerDefault(adapter);
+        }
+        catch (e) {
+            importer_src_logger.error(`Error loading initializer at ${initPath}:`, e);
+            throw new Error(`Failed to load initializer at ${initPath}`);
+        }
+    }
 }
 Decanter.collectionKind = '';
 /* harmony default export */ const decanter_base = (Decanter);
@@ -365432,19 +365467,10 @@ class GithubDecanter extends decanter_base {
     }
 }
 
-;// CONCATENATED MODULE: ../importer/src/logger.ts
-
-/* harmony default export */ const importer_src_logger = (catalog_common.logger);
-
 ;// CONCATENATED MODULE: ../importer/src/decanter/gh/github_group.ts
 
 
 
-
-
-
-
-
 class GroupGithubDecanter extends GithubDecanter {
     constructor() {
         super(...arguments);
@@ -365469,7 +365495,7 @@ class GroupGithubDecanter extends GithubDecanter {
         });
     }
     __decantMembers() {
-        if (this.data.groupDetails.name.includes(`${this.org}-all`)) {
+        if (this.data.groupDetails.name === `${this.org}-all`) {
             importer_src_logger.debug(`Skipping adding members for virtual ${this.data.groupDetails.name} group`);
         }
         else {
@@ -365508,43 +365534,7 @@ class GroupGithubDecanter extends GithubDecanter {
         return this.__validateEqual(members, this.data.members);
     }
     async __adaptInitializerBase(_claim) {
-        let githubGroupDefaultsFilePath;
-        try {
-            githubGroupDefaultsFilePath = external_path_.join(getConfigPath(), 'resources', 'defaults_github_group.yaml');
-        }
-        catch (e) {
-            importer_src_logger.warn('No config path set, using built-in defaults');
-            githubGroupDefaultsFilePath = '';
-        }
-        let adapter;
-        if (githubGroupDefaultsFilePath &&
-            external_fs_.existsSync(githubGroupDefaultsFilePath)) {
-            adapter = catalog_common.io.fromYaml(external_fs_.readFileSync(githubGroupDefaultsFilePath, 'utf-8'));
-        }
-        else {
-            adapter = {
-                name: 'base',
-                apiVersion: 'firestartr.dev/v1',
-                kind: 'FirestartrGithubGroup',
-                defaultValues: {
-                    context: {
-                        backend: {
-                            ref: {
-                                kind: 'FirestartrProviderConfig',
-                                name: 'firestartr-terraform-state',
-                            },
-                        },
-                        provider: {
-                            ref: {
-                                kind: 'FirestartrProviderConfig',
-                                name: 'github-app',
-                            },
-                        },
-                    },
-                },
-            };
-        }
-        return new InitializerDefault(adapter);
+        return await this.__loadInitializer('defaults_github_group.yaml');
     }
     __validateKind(cr) {
         return true;
@@ -365640,12 +365630,6 @@ applyCollectionMixins(GroupCollectionGithubDecanter);
 ;// CONCATENATED MODULE: ../importer/src/decanter/gh/github_member.ts
 
 
-
-
-
-
-
-
 class MemberGithubDecanter extends GithubDecanter {
     constructor() {
         super(...arguments);
@@ -365683,43 +365667,7 @@ class MemberGithubDecanter extends GithubDecanter {
         });
     }
     async __adaptInitializerBase(_claim) {
-        let githubMemberDefaultsFilePath;
-        try {
-            githubMemberDefaultsFilePath = external_path_.join(getConfigPath(), 'resources', 'defaults_github_membership.yaml');
-        }
-        catch (e) {
-            importer_src_logger.warn('No config path set, using built-in defaults');
-            githubMemberDefaultsFilePath = '';
-        }
-        let adapter;
-        if (githubMemberDefaultsFilePath &&
-            external_fs_.existsSync(githubMemberDefaultsFilePath)) {
-            adapter = catalog_common.io.fromYaml(external_fs_.readFileSync(githubMemberDefaultsFilePath, 'utf-8'));
-        }
-        else {
-            adapter = {
-                name: 'base',
-                apiVersion: 'firestartr.dev/v1',
-                kind: 'FirestartrGithubMembership',
-                defaultValues: {
-                    context: {
-                        backend: {
-                            ref: {
-                                kind: 'FirestartrProviderConfig',
-                                name: 'firestartr-terraform-state',
-                            },
-                        },
-                        provider: {
-                            ref: {
-                                kind: 'FirestartrProviderConfig',
-                                name: 'github-app',
-                            },
-                        },
-                    },
-                },
-            };
-        }
-        return new InitializerDefault(adapter);
+        return await this.__loadInitializer('defaults_github_membership.yaml');
     }
 }
 
@@ -365752,11 +365700,6 @@ applyCollectionMixins(MemberCollectionGithubDecanter);
 
 
 
-
-
-
-
-
 const TYPE_MAP = {
     User: 'user',
     Team: 'group',
@@ -366014,74 +365957,7 @@ class RepoGithubDecanter extends GithubDecanter {
         return null;
     }
     async __adaptInitializerBase(_claim) {
-        let githubRepoDefaultsFilePath;
-        try {
-            githubRepoDefaultsFilePath = external_path_.join(getConfigPath(), 'resources', 'defaults_github_repository.yaml');
-        }
-        catch (e) {
-            importer_src_logger.warn('No config path set, using built-in defaults');
-            githubRepoDefaultsFilePath = '';
-        }
-        let adapter;
-        if (githubRepoDefaultsFilePath &&
-            external_fs_.existsSync(githubRepoDefaultsFilePath)) {
-            adapter = catalog_common.io.fromYaml(external_fs_.readFileSync(githubRepoDefaultsFilePath, 'utf-8'));
-        }
-        else {
-            adapter = {
-                name: 'base',
-                apiVersion: 'firestartr.dev/v1',
-                kind: 'FirestartrGithubRepository',
-                defaultValues: {
-                    context: {
-                        backend: {
-                            ref: {
-                                kind: 'FirestartrProviderConfig',
-                                name: 'firestartr-terraform-state',
-                            },
-                        },
-                        provider: {
-                            ref: {
-                                kind: 'FirestartrProviderConfig',
-                                name: 'github-app',
-                            },
-                        },
-                    },
-                    name: this.data.repoDetails.name,
-                    description: this.data.repoDetails.description,
-                    org: this.org,
-                    firestartr: {
-                        technology: { stack: 'none', version: 'none' },
-                    },
-                    repo: {
-                        description: this.data.repoDetails.description,
-                        allowMergeCommit: this.data.repoDetails.allow_merge_commit,
-                        allowSquashMerge: this.data.repoDetails.allow_squash_merge,
-                        allowRebaseMerge: this.data.repoDetails.allow_rebase_merge,
-                        allowAutoMerge: this.data.repoDetails.allow_auto_merge,
-                        deleteBranchOnMerge: this.data.repoDetails.delete_branch_on_merge,
-                        autoInit: true,
-                        archiveOnDestroy: true,
-                        allowUpdateBranch: this.data.repoDetails.allow_update_branch,
-                        hasIssues: this.data.repoDetails.has_issues,
-                        visibility: this.data.repoDetails.visibility,
-                        defaultBranch: this.data.repoDetails.default_branch,
-                    },
-                    permissions: [],
-                    actions: {
-                        oidc: this.data.oidc.use_default
-                            ? undefined
-                            : {
-                                useDefault: this.data.oidc.use_default,
-                                includeClaimKeys: this.data.oidc.include_claim_keys
-                                    ? this.data.oidc.include_claim_keys
-                                    : [],
-                            },
-                    },
-                },
-            };
-        }
-        return new InitializerDefault(adapter);
+        return await this.__loadInitializer('defaults_github_repository.yaml');
     }
     async __adaptOverriderRepo(_claim) {
         return new GithubRepositoryOverrider();
@@ -366325,22 +366201,17 @@ function compileReg(value) {
 });
 
 
-
 //  const MAP_COLLECTION_KIND_CR_KIND: any = {
 //    gh-members: 'FirestartrGithubMembership',
 //    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) {
@@ -366376,97 +366247,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',
-        apiVersion: 'firestartr.dev/v1',
-        kind: 'FirestartrGithubGroup',
-        defaultValues: {
-            org: org,
-        },
-    };
-    catalog_common.io.writeYamlFile('defaults_github_group', defaultGroups, defaultsPath);
-}
-function generateDefaultsForGithubRepos(org, defaultsPath) {
-    const defaultRepos = {
-        name: 'repo_base',
-        apiVersion: 'firestartr.dev/v1',
-        kind: 'FirestartrGithubRepository',
-        defaultValues: {
-            firestartr: {
-                technology: {
-                    stack: 'none',
-                    version: 'none',
-                },
-            },
-            repo: {
-                allowAutoMerge: true,
-                codeowners: ' - ',
-                allowMergeCommit: true,
-                allowSquashMerge: true,
-                allowRebaseMerge: true,
-                deleteBranchOnMerge: true,
-                autoInit: true,
-                archiveOnDestroy: true,
-                allowUpdateBranch: true,
-                hasIssues: true,
-            },
-        },
-    };
-    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);
-}
 
 ;// CONCATENATED MODULE: ./src/subcommands/importer-subcommands.ts
 
@@ -366475,7 +366255,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 },
@@ -366486,7 +366265,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);
     },
 };
 
@@ -368401,21 +368180,28 @@ class Entity {
             throw new Error(ErrorMessage);
         }
         const { kind, name, needsSecret } = ref;
-        if (!needsSecret) {
-            const cr = this.deps[`${kind}-${name}`].cr;
-            return (cr.metadata?.annotations?.[EXTERNAL_NAME_ANNOTATION] || cr.metadata.name);
-        }
-        else {
-            if (!propertyRef) {
-                const ErrorMessage = `resolveRef:
+        try {
+            if (!needsSecret) {
+                const cr = this.deps[`${kind}-${name}`].cr;
+                return (cr.metadata?.annotations?.[EXTERNAL_NAME_ANNOTATION] ||
+                    cr.metadata.name);
+            }
+            else {
+                if (!propertyRef) {
+                    const ErrorMessage = `resolveRef:
 
-                Entity with kind ${this.kind} ${this.metadata.name}
+                  Entity with kind ${this.kind} ${this.metadata.name}
 
-                needs a propertyRef to resolve the secret`;
-                provisioner_src_logger.error(ErrorMessage);
-                throw new Error(ErrorMessage);
+                  needs a propertyRef to resolve the secret`;
+                    provisioner_src_logger.error(ErrorMessage);
+                    throw new Error(ErrorMessage);
+                }
+                return Buffer.from(this.deps[`${kind}-${name}`].secret.data[propertyRef], 'base64').toString('utf8');
             }
-            return Buffer.from(this.deps[`${kind}-${name}`].secret.data[propertyRef], 'base64').toString('utf8');
+        }
+        catch (error) {
+            const errorMsg = `Error resolving ref for ${kind}-${name}: ${error}`;
+            throw new Error(errorMsg);
         }
     }
     resolveSecretRef(ref) {

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/build/packages/importer/src/decanter/base.d.ts

@@ -1,4 +1,4 @@
-import { ImportInitializer, UUIDInitializer, NameNormalizer, InitializerClaimRef } from 'cdk8s_renderer';
+import { ImportInitializer, UUIDInitializer, NameNormalizer, InitializerClaimRef, InitializerDefault } from 'cdk8s_renderer';
 export default class Decanter {
     data: any;
     claimKind: string | undefined;
@@ -78,4 +78,5 @@ export default class Decanter {
             normalizers: NameNormalizer[];
         };
     }>;
+    __loadInitializer(initDefaultPath: string, isAbsolute?: boolean): Promise<InitializerDefault>;
 }

package/build/packages/importer/src/decanter/gh/github_member.d.ts

@@ -1,9 +1,8 @@
 import { GithubDecanter } from './base';
-import { InitializerDefault } from 'cdk8s_renderer';
 export default class MemberGithubDecanter extends GithubDecanter {
     claimKind: string;
     __decantStart(): void;
     __gatherRoleInOrg(): Promise<void>;
     __decantProviders(): void;
-    __adaptInitializerBase(_claim: any): Promise<InitializerDefault>;
+    __adaptInitializerBase(_claim: any): Promise<import("../../../../cdk8s_renderer").InitializerDefault>;
 }

package/package.json

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