npm - @firestartr/cli - Versions diffs - 1.50.0 → 1.50.1-snapshot - Mend

@firestartr/cli 1.50.0 → 1.50.1-snapshot

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (2) hide show

package/build/index.js +149 -88
package/package.json +1 -1

package/build/index.js CHANGED Viewed

@@ -309585,10 +309585,19 @@ 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);
@@ -309645,28 +309654,43 @@ class GroupGithubDecanter extends GithubDecanter {
         return this.__validateEqual(members, this.data.members);
     }
     async __adaptInitializerBase(_claim) {
-        const adapterBase = {
-            name: 'base',
-            apiVersion: 'firestartr.dev/v1',
-            kind: 'FirestartrGithubGroup',
-            defaultValues: {
-                context: {
-                    backend: {
-                        ref: {
-                            kind: 'FirestartrProviderConfig',
-                            name: 'firestartr-terraform-state',
+        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',
+                        provider: {
+                            ref: {
+                                kind: 'FirestartrProviderConfig',
+                                name: 'github-app',
+                            },
                         },
                     },
                 },
-            },
-        };
-        return new InitializerDefault(adapterBase);
+            };
+        }
+        return new InitializerDefault(adapter);
     }
     __validateKind(cr) {
         return true;
@@ -309763,6 +309787,11 @@ applyCollectionMixins(GroupCollectionGithubDecanter);
 class MemberGithubDecanter extends GithubDecanter {
     constructor() {
         super(...arguments);
@@ -309800,28 +309829,43 @@ class MemberGithubDecanter extends GithubDecanter {
         });
     }
     async __adaptInitializerBase(_claim) {
-        const adapterBase = {
-            name: 'base',
-            apiVersion: 'firestartr.dev/v1',
-            kind: 'FirestartrGithubMembership',
-            defaultValues: {
-                context: {
-                    backend: {
-                        ref: {
-                            kind: 'FirestartrProviderConfig',
-                            name: 'firestartr-terraform-state',
+        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',
+                        provider: {
+                            ref: {
+                                kind: 'FirestartrProviderConfig',
+                                name: 'github-app',
+                            },
                         },
                     },
                 },
-            },
-        };
-        return new InitializerDefault(adapterBase);
+            };
+        }
+        return new InitializerDefault(adapter);
     }
 }
@@ -309854,6 +309898,11 @@ applyCollectionMixins(MemberCollectionGithubDecanter);
 const TYPE_MAP = {
     User: 'user',
     Team: 'group',
@@ -310108,59 +310157,75 @@ class RepoGithubDecanter extends GithubDecanter {
         return null;
     }
     async __adaptInitializerBase(_claim) {
-        const adapterBase = {
-            name: 'base',
-            apiVersion: 'firestartr.dev/v1',
-            kind: 'FirestartrGithubRepository',
-            defaultValues: {
-                context: {
-                    backend: {
-                        ref: {
-                            kind: 'FirestartrProviderConfig',
-                            name: 'firestartr-terraform-state',
+        let githubRepoDefaultsFilePath;
+        try {
+            githubRepoDefaultsFilePath = external_path_.join(getConfigPath(), 'resources', 'defaults_github_membership.yaml');
+        }
+        catch (e) {
+            importer_src_logger.warn('No config path set, using built-in defaults');
+            console.log('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',
+                        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: {
+                    name: this.data.repoDetails.name,
                     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
-                                : [],
-                        },
+                    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(adapterBase);
+            };
+        }
+        return new InitializerDefault(adapter);
     }
     async __adaptOverriderRepo(_claim) {
         return new GithubRepositoryOverrider();
@@ -310196,10 +310261,6 @@ RepoCollectionGithubDecanter.collectionKind = 'gh-repo';
 applyCollectionMixins(RepoCollectionGithubDecanter);
 /* harmony default export */ const github_repo_collection = (RepoCollectionGithubDecanter);
-;// CONCATENATED MODULE: ../importer/src/logger.ts
-/* harmony default export */ const importer_src_logger = (catalog_common.logger);
 ;// CONCATENATED MODULE: ../importer/src/decanter/index.ts

package/package.json CHANGED Viewed

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