@firestartr/cli 1.50.1-snapshot-6 → 1.50.1-snapshot-7

package/build/index.js

@@ -309585,19 +309585,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);
@@ -309607,7 +309598,7 @@ class GroupGithubDecanter extends GithubDecanter {
         this.claim = {
             kind: this.claimKind,
             version: this.VERSION(),
-            name: this.data.groupDetails.slug,
+            name: this.data.groupDetails.name,
             description: this.data.groupDetails.description,
             type: 'business-unit',
         };
@@ -309631,7 +309622,7 @@ class GroupGithubDecanter extends GithubDecanter {
     __decantProviders() {
         this.__patchClaim({
             op: 'add',
-            value: { github: { name: this.data.groupDetails.slug, org: this.org } },
+            value: { github: { name: this.data.groupDetails.name, org: this.org } },
             path: '/providers',
         });
     }
@@ -309639,13 +309630,13 @@ class GroupGithubDecanter extends GithubDecanter {
         if (this.data.groupDetails.parent) {
             this.__patchClaim({
                 op: 'add',
-                value: `group:${this.data.groupDetails.parent.slug}`,
+                value: `group:${this.data.groupDetails.parent.name}`,
                 path: '/parent',
             });
         }
     }
     async __gatherMembers() {
-        this.data['members'] = (await github_0.team.getTeamMembers(this.data.groupDetails.slug, this.org)).map((member) => {
+        this.data['members'] = (await github_0.team.getTeamMembers(this.data.groupDetails.name, this.org)).map((member) => {
             return { name: member.login, role: member.role };
         });
     }
@@ -309654,43 +309645,28 @@ 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',
-                            },
+        const adapterBase = {
+            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(adapter);
+            },
+        };
+        return new InitializerDefault(adapterBase);
     }
     __validateKind(cr) {
         return true;
@@ -309787,11 +309763,6 @@ applyCollectionMixins(GroupCollectionGithubDecanter);
 
 
 
-
-
-
-
-
 class MemberGithubDecanter extends GithubDecanter {
     constructor() {
         super(...arguments);
@@ -309829,43 +309800,28 @@ 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',
-                            },
+        const adapterBase = {
+            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(adapter);
+            },
+        };
+        return new InitializerDefault(adapterBase);
     }
 }
 
@@ -309898,11 +309854,6 @@ applyCollectionMixins(MemberCollectionGithubDecanter);
 
 
 
-
-
-
-
-
 const TYPE_MAP = {
     User: 'user',
     Team: 'group',
@@ -309919,6 +309870,7 @@ class RepoGithubDecanter extends GithubDecanter {
             version: this.VERSION(),
             type: 'service',
             lifecycle: 'production',
+            system: `system:${this.org}-system`,
             name: this.data.repoDetails.name,
         };
     }
@@ -310156,74 +310108,59 @@ 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',
-                            },
+        const adapterBase = {
+            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,
+                },
+                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,
-                    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
-                                    : [],
-                            },
-                    },
+                    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,
                 },
-            };
-        }
-        return new InitializerDefault(adapter);
+                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);
     }
     async __adaptOverriderRepo(_claim) {
         return new GithubRepositoryOverrider();
@@ -310259,6 +310196,10 @@ 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

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