@firestartr/cli 1.59.3-snapshot-13 → 1.59.3-snapshot-14

package/build/index.js

@@ -357922,42 +357922,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
             },
             additionalProperties: false,
         },
-        GithubRules: {
-            $id: 'firestartr.dev://common/FirestartrGithubRules',
-            type: 'object',
-            properties: {
-                path: { type: 'string' },
-                owners: {
-                    type: 'array',
-                    items: {
-                        $ref: 'firestartr.dev://common/FirestartrOwnerRef',
-                    },
-                },
-            },
-            required: ['path', 'owners'],
-            additionalProperties: false,
-        },
-        GithubSync: {
-            $id: 'firestartr.dev://common/FirestartrGithubSync',
-            type: 'object',
-            properties: {
-                enabled: { type: 'boolean' },
-                period: {
-                    type: 'string',
-                    pattern: '^[0-9]+[smhd]$',
-                },
-                policy: { type: 'string' },
-                schedule: { type: 'string' },
-                schedule_timezone: { type: 'string' },
-            },
-            additionalProperties: false,
-            required: ['enabled'],
-        },
-        TfStateKey: {
-            $id: 'firestartr.dev://common/TerraformStateKey',
-            type: 'string',
-            pattern: '^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[89abAB][0-9a-fA-F]{3}-[0-9a-fA-F]{12,}$',
-        },
     },
 });
 
@@ -357993,7 +357957,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                                     $ref: 'firestartr.dev://github/GithubTeamClaim',
                                 },
                             },
-                            additionalProperties: false,
                         },
                     },
                 },
@@ -358025,7 +357988,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                                     $ref: 'firestartr.dev://github/GithubUserClaim',
                                 },
                             },
-                            additionalProperties: false,
                         },
                     },
                 },
@@ -358071,7 +358033,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                                     $ref: 'firestartr.dev://github/GithubComponentClaim',
                                 },
                             },
-                            additionalProperties: false,
                         },
                     },
                     required: ['owner'],
@@ -358161,7 +358122,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                                     $ref: 'firestartr.dev://terraform/TerraformProvider',
                                 },
                             },
-                            additionalProperties: false,
                             required: ['terraform'],
                         },
                     },
@@ -358199,7 +358159,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                                     $ref: 'firestartr.dev://argocd/ArgoCDProvider',
                                 },
                             },
-                            additionalProperties: false,
                             required: ['argocd'],
                         },
                     },
@@ -358236,7 +358195,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                                     $ref: 'firestartr.dev://secrets/ExternalSecretsProvider',
                                 },
                             },
-                            additionalProperties: false,
                             required: ['external_secrets'],
                         },
                     },
@@ -358276,7 +358234,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                                     $ref: 'firestartr.dev://github/GithubOrgWebhookClaim',
                                 },
                             },
-                            additionalProperties: false,
                         },
                     },
                     required: ['owner'],
@@ -358301,15 +358258,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                 {
                     type: 'object',
                     properties: {
-                        name: {
-                            type: 'string',
-                        },
-                        tfStateKey: {
-                            $ref: 'firestartr.dev://common/TerraformStateKey',
-                        },
-                        sync: {
-                            $ref: 'firestartr.dev://common/FirestartrGithubSync',
-                        },
                         privacy: {
                             type: 'string',
                             enum: ['closed', 'secret'],
@@ -358321,7 +358269,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                             $ref: 'firestartr.dev://common/ClaimName',
                         },
                     },
-                    additionalProperties: false,
                     required: ['org', 'privacy'],
                 },
             ],
@@ -358346,15 +358293,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                 {
                     type: 'object',
                     properties: {
-                        name: {
-                            type: 'string',
-                        },
-                        tfStateKey: {
-                            $ref: 'firestartr.dev://common/TerraformStateKey',
-                        },
-                        sync: {
-                            $ref: 'firestartr.dev://common/FirestartrGithubSync',
-                        },
                         role: {
                             type: 'string',
                             enum: ['admin', 'member'],
@@ -358363,7 +358301,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                             $ref: 'firestartr.dev://common/ClaimName',
                         },
                     },
-                    additionalProperties: false,
                     required: ['org', 'role'],
                 },
             ],
@@ -358394,125 +358331,14 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                             type: 'string',
                             description: 'The github repo name',
                         },
-                        tfStateKey: {
-                            $ref: 'firestartr.dev://common/TerraformStateKey',
-                        },
                         orgPermissions: {
                             type: 'string',
                             description: 'The level of org Permission',
                         },
-                        sync: {
-                            $ref: 'firestartr.dev://common/FirestartrGithubSync',
-                        },
-                        technology: {
-                            type: 'object',
-                            properties: {
-                                stack: { type: 'string' },
-                                version: { type: 'string' },
-                            },
-                            additionalProperties: false,
-                            required: ['stack', 'version'],
-                        },
-                        defaultBranch: {
-                            type: 'string',
-                        },
-                        branchStrategy: {
-                            type: 'object',
-                            description: 'A branch strategy for a claim',
-                            properties: {
-                                name: {
-                                    type: 'string',
-                                },
-                                defaultBranch: {
-                                    type: 'string',
-                                },
-                            },
-                            additionalProperties: false,
-                            required: ['name'],
-                        },
-                        additionalBranches: {
-                            type: 'array',
-                            items: {
-                                type: 'object',
-                                properties: {
-                                    name: { type: 'string' },
-                                    orphan: { type: 'boolean' },
-                                },
-                                additionalProperties: false,
-                                required: ['name', 'orphan'],
-                            },
-                        },
-                        actions: {
-                            type: 'object',
-                            description: 'Actions configuration',
-                            properties: {
-                                oidc: {
-                                    type: 'object',
-                                    properties: {
-                                        useDefault: { type: 'boolean' },
-                                        includeClaimKeys: {
-                                            type: 'array',
-                                            items: { type: 'string' },
-                                        },
-                                    },
-                                    additionalProperties: false,
-                                },
-                            },
-                            additionalProperties: false,
-                            required: ['oidc'],
-                        },
                         archiveOnDestroy: {
                             type: 'boolean',
                             description: 'whether this repo should be archived when the claim is deleted',
                         },
-                        allowMergeCommit: {
-                            type: 'boolean',
-                        },
-                        allowSquashMerge: {
-                            type: 'boolean',
-                        },
-                        allowRebaseMerge: {
-                            type: 'boolean',
-                        },
-                        allowAutoMerge: {
-                            type: 'boolean',
-                        },
-                        deleteBranchOnMerge: {
-                            type: 'boolean',
-                        },
-                        autoInit: {
-                            type: 'boolean',
-                        },
-                        allowUpdateBranch: {
-                            type: 'boolean',
-                        },
-                        hasIssues: {
-                            type: 'boolean',
-                        },
-                        hasWiki: {
-                            type: 'boolean',
-                        },
-                        pages: {
-                            type: 'object',
-                            properties: {
-                                cname: { type: 'string' },
-                                source: {
-                                    type: 'object',
-                                    properties: {
-                                        branch: { type: 'string' },
-                                        path: { type: 'string' },
-                                    },
-                                    additionalProperties: false,
-                                },
-                            },
-                            additionalProperties: false,
-                        },
-                        additionalRules: {
-                            type: 'array',
-                            items: {
-                                $ref: 'firestartr.dev://common/FirestartrGithubRules',
-                            },
-                        },
                         visibility: {
                             type: 'string',
                             enum: ['private', 'public', 'internal'],
@@ -358541,14 +358367,8 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                                 pattern: '^[a-z0-9][a-z0-9-]*$',
                             },
                         },
-                        overrides: {
-                            type: 'object',
-                            properties: {},
-                            additionalProperties: true,
-                        },
                     },
-                    additionalProperties: false,
-                    required: ['visibility', 'org', 'branchStrategy'],
+                    required: ['visibility', 'org'],
                 },
             ],
         },
@@ -358570,12 +358390,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                 {
                     type: 'object',
                     properties: {
-                        name: {
-                            type: 'string',
-                        },
-                        tfStateKey: {
-                            $ref: 'firestartr.dev://common/TerraformStateKey',
-                        },
                         orgName: {
                             $ref: 'firestartr.dev://common/ClaimName',
                         },
@@ -358606,11 +358420,9 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                                     },
                                 },
                             },
-                            additionalProperties: false,
                             required: ['url', 'contentType', 'events', 'secretRef'],
                         },
                     },
-                    additionalProperties: false,
                     required: ['orgName', 'webhook'],
                 },
             ],
@@ -358814,9 +358626,6 @@ const GithubSchemas = [
                         name: {
                             type: 'string',
                         },
-                        tfStateKey: {
-                            $ref: 'firestartr.dev://common/TerraformStateKey',
-                        },
                         source: {
                             type: 'string',
                             enum: ['remote', 'inline', 'Remote', 'Inline'],
@@ -358908,7 +358717,6 @@ const GithubSchemas = [
                             additionalProperties: false,
                         },
                     },
-                    additionalProperties: false,
                     required: ['values', 'context', 'source', 'name'],
                 },
             ],
@@ -359041,7 +358849,6 @@ const ArgoCDSchemas = [argocd_schema];
                     enum: ['SecretStore', 'ClusterSecretStore'],
                 },
             },
-            additionalProperties: false,
             required: ['name'],
         },
         ExternalSecretsSection: {
@@ -359077,9 +358884,6 @@ const ArgoCDSchemas = [argocd_schema];
                     template: { type: 'object' },
                     secretName: { type: 'string' },
                     refreshInterval: { type: 'string' },
-                    updatePolicy: { type: 'string' },
-                    deletionPolicy: { type: 'string' },
-                    conversionStrategy: { type: 'string' },
                     generator: {
                         type: 'object',
                         properties: {
@@ -359102,15 +358906,19 @@ const ArgoCDSchemas = [argocd_schema];
                                     'Grafana',
                                 ],
                             },
-                            apiVersion: { type: 'string' },
-                            conversionStrategy: { type: 'string' },
-                            outputKey: { type: 'string' },
+                            apiVersion: {
+                                type: 'string',
+                            },
+                            conversionStrategy: {
+                                type: 'string',
+                            },
+                            outputKey: {
+                                type: 'string',
+                            },
                         },
-                        additionalProperties: false,
                         required: ['name'],
                     },
                 },
-                additionalProperties: false,
                 required: ['secretName', 'generator'],
             },
         },
@@ -366377,6 +366185,7 @@ function walkArray(arr, symbolsToResolve, renderClaim) {
 
 
 
+
 /*
  * Function called when rendering from the importer class.
  *
@@ -366390,6 +366199,16 @@ function walkArray(arr, symbolsToResolve, renderClaim) {
  *
  */
 async function renderFromImports(rClaims, crs = {}, catalogOutputDir = '/tmp/.catalog', crOutputDir = '/tmp/.resources') {
+    // Apply claim defaults (same as runRenderer path does via loadClaim/patchClaim)
+    try {
+        const defaults = loadClaimDefaults();
+        for (const renderClaim of Object.values(rClaims)) {
+            renderClaim.claim = loader_patchClaim(renderClaim.claim, defaults);
+        }
+    }
+    catch (e) {
+        cdk8s_renderer_src_logger.warn(`Could not apply claim defaults: ${e.message}`);
+    }
     // type: is the kind of the claim
     // value: is the imported-ref (the name in Github, can be with special characters, spaces, etc)
     const fSolver = (type, value) => {
@@ -367114,7 +366933,7 @@ class RepoGithubDecanter extends GithubDecanter {
         const outsideMaintainers = this.data.teamsAndMembers.outsideMembers
             .filter((member) => member.role === 'maintain')
             .map((member) => {
-            return `collaborator:${member.name}`;
+            return `collaborator:${member.name.toLowerCase()}`;
         });
         const teamMaintainers = this.data.teamsAndMembers.teams
             .filter((team) => team.role === 'maintain')
@@ -367139,7 +366958,7 @@ class RepoGithubDecanter extends GithubDecanter {
         const outsideAdmins = this.data.teamsAndMembers.outsideMembers
             .filter((member) => member.role === 'admin')
             .map((member) => {
-            return `collaborator:${member.name}`;
+            return `collaborator:${member.name.toLowerCase()}`;
         });
         const teamAdmins = this.data.teamsAndMembers.teams
             .filter((team) => team.role === 'admin')
@@ -367148,13 +366967,13 @@ class RepoGithubDecanter extends GithubDecanter {
         });
         const admins = directAdmins.concat(outsideAdmins).concat(teamAdmins);
         const overrides = {};
-        if (admins && admins.length > 0) {
-            this.__patchClaim({
-                op: 'add',
-                value: admins[0],
-                path: '/owner',
-            });
-        }
+        // if (admins && admins.length > 0) {
+        //   this.__patchClaim({
+        //     op: 'add',
+        //     value: admins[0],
+        //     path: '/owner',
+        //   });
+        // }
         if (admins && admins.length > 1) {
             overrides['additionalAdmins'] = [];
             for (let i = 1; i < admins.length; i++) {
@@ -367174,7 +366993,7 @@ class RepoGithubDecanter extends GithubDecanter {
         const outsideWriters = this.data.teamsAndMembers.outsideMembers
             .filter((member) => member.role === 'push')
             .map((member) => {
-            return `collaborator:${member.name}`;
+            return `collaborator:${member.name.toLowerCase()}`;
         });
         const teamWriters = this.data.teamsAndMembers.teams
             .filter((team) => ['push', 'write'].includes(team.role))
@@ -367198,7 +367017,7 @@ class RepoGithubDecanter extends GithubDecanter {
         const outsideReaders = this.data.teamsAndMembers.outsideMembers
             .filter((member) => member.role === 'pull')
             .map((member) => {
-            return `collaborator:${member.name}`;
+            return `collaborator:${member.name.toLowerCase()}`;
         });
         const teamReaders = this.data.teamsAndMembers.teams
             .filter((team) => ['pull', 'read'].includes(team.role))
@@ -377084,7 +376903,7 @@ const crs_analyzerSubcommand = {
 };
 
 ;// CONCATENATED MODULE: ./package.json
-const package_namespaceObject = JSON.parse('{"i8":"1.59.3-snapshot-13"}');
+const package_namespaceObject = JSON.parse('{"i8":"1.59.3-snapshot-14"}');
 ;// CONCATENATED MODULE: ../../package.json
 const package_namespaceObject_1 = {"i8":"1.59.3"};
 ;// CONCATENATED MODULE: ./src/subcommands/index.ts

package/build/packages/cdk8s_renderer/src/claims/base/schemas/argodeploy.schema.d.ts

@@ -27,7 +27,6 @@ declare const _default: {
                                 $ref: string;
                             };
                         };
-                        additionalProperties: boolean;
                         required: string[];
                     };
                 };

package/build/packages/cdk8s_renderer/src/claims/base/schemas/common-meta.schema.d.ts

@@ -117,52 +117,6 @@ declare const _default: {
             };
             additionalProperties: boolean;
         };
-        GithubRules: {
-            $id: string;
-            type: string;
-            properties: {
-                path: {
-                    type: string;
-                };
-                owners: {
-                    type: string;
-                    items: {
-                        $ref: string;
-                    };
-                };
-            };
-            required: string[];
-            additionalProperties: boolean;
-        };
-        GithubSync: {
-            $id: string;
-            type: string;
-            properties: {
-                enabled: {
-                    type: string;
-                };
-                period: {
-                    type: string;
-                    pattern: string;
-                };
-                policy: {
-                    type: string;
-                };
-                schedule: {
-                    type: string;
-                };
-                schedule_timezone: {
-                    type: string;
-                };
-            };
-            additionalProperties: boolean;
-            required: string[];
-        };
-        TfStateKey: {
-            $id: string;
-            type: string;
-            pattern: string;
-        };
     };
 };
 export default _default;

package/build/packages/cdk8s_renderer/src/claims/base/schemas/component.schema.d.ts

@@ -40,7 +40,6 @@ declare const _default: {
                                 $ref: string;
                             };
                         };
-                        additionalProperties: boolean;
                     };
                 };
                 required: string[];

package/build/packages/cdk8s_renderer/src/claims/base/schemas/group.schema.d.ts

@@ -36,7 +36,6 @@ declare const _default: {
                                 $ref: string;
                             };
                         };
-                        additionalProperties: boolean;
                     };
                 };
                 $ref?: undefined;