@firestartr/cli 1.54.0-snapshot-3 → 1.54.0-snapshot-5

package/build/index.js

@@ -356921,6 +356921,49 @@ class PolicyInitializer extends InitializerPatches {
 PolicyInitializer.applicableKinds = ['TFWorkspaceClaim'];
 
 
+;// CONCATENATED MODULE: ../cdk8s_renderer/src/initializers/metadata.ts
+
+class MetadataInitializer extends InitializerPatches {
+    constructor() {
+        super(...arguments);
+        this.applicableProviders = ['^catalog'];
+    }
+    async __validate() {
+        return true;
+    }
+    async __patches(claim, _previousCR) {
+        return [
+            {
+                validate(cr) {
+                    return true;
+                },
+                apply(cr) {
+                    if ('annotations' in claim && typeof claim.annotations === 'object') {
+                        cr.metadata = cr.metadata || {};
+                        const crAnnotations = cr.metadata.annotations ?? {};
+                        cr.metadata.annotations = {
+                            ...claim.annotations,
+                            ...crAnnotations,
+                        };
+                    }
+                    return cr;
+                },
+                identify() {
+                    return 'initializers/MetadataInitializer';
+                },
+            },
+        ];
+    }
+}
+MetadataInitializer.applicableKinds = [
+    'ComponentClaim',
+    'GroupClaim',
+    'UserClaim',
+    'TFWorkspaceClaim',
+    'OrgWebhookClaim',
+];
+
+
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/initializers/index.ts
 
 
@@ -356931,12 +356974,14 @@ PolicyInitializer.applicableKinds = ['TFWorkspaceClaim'];
 
 
 
+
 const INITIALIZERS = [
     UUIDInitializer,
     InitializerClaimRef,
     BackstageInitializer,
     PolicyInitializer,
     SyncerInitializer,
+    MetadataInitializer,
 ];
 const INITIALIZERS_BY_FILE_NAME = {
     [TechnologyInitializer.FILE_NAME()]: TechnologyInitializer,
@@ -358075,14 +358120,6 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                         secrets: {
                             $ref: 'firestartr.dev://github/GithubComponentClaimSecrets',
                         },
-                        topics: {
-                            type: 'array',
-                            items: {
-                                type: 'string',
-                                maxLength: 50,
-                                pattern: '^[a-z0-9][a-z0-9-]*$',
-                            },
-                        },
                     },
                     required: ['visibility', 'org'],
                 },
@@ -362209,7 +362246,6 @@ function toJson_FirestartrGithubRepositorySpecRepo(obj) {
         'hasIssues': obj.hasIssues,
         'hasWiki': obj.hasWiki,
         'pages': obj.pages,
-        'topics': obj.topics?.map(y => y),
         'visibility': obj.visibility,
         'defaultBranch': obj.defaultBranch,
         'additionalBranches': obj.additionalBranches?.map(y => toJson_FirestartrGithubRepositorySpecRepoAdditionalBranches(y)),
@@ -364335,7 +364371,6 @@ class GithubRepositoryChart extends BaseGithubChart {
                     defaultBranch: claim.providers.github?.branchStrategy?.defaultBranch,
                     codeowners: createCodeOwnersData(claim),
                     additionalBranches: claim.providers.github.additionalBranches || [],
-                    topics: claim.providers.github.topics || [],
                 },
                 actions,
                 permissions: this.createPermissions(claim),
@@ -371931,25 +371966,36 @@ class WriterBackend extends writer {
 class WriterProvider extends writer {
     constructor(providers) {
         super();
+        this.jsonOutput = {};
         this.providers = providers;
     }
+    async render(renderType = 'tf') {
+        await this._render();
+        if (renderType === 'tf') {
+            return this.output.trim();
+        }
+        else if (renderType === 'json') {
+            return JSON.stringify(this.jsonOutput, null, 2);
+        }
+        else {
+            throw new Error(`Unsupported render type: ${renderType}`);
+        }
+    }
     async _render() {
         for (const provider of this.providers) {
-            this.output += this.__renderProvider(provider);
+            if (provider.inline) {
+                this.output += provider.inline + '\n';
+            }
+            else {
+                this.__populateJsonOutput(provider);
+            }
         }
     }
-    __renderProvider(provider) {
-        let configString = '';
-        if (provider.inline)
-            return provider.inline;
-        for (const key in provider.config) {
-            configString += `${key} = "${provider.config[key]}"\n`;
+    __populateJsonOutput(provider) {
+        if (this.jsonOutput[provider.name] === undefined) {
+            this.jsonOutput[provider.name] = [];
         }
-        return `
-    provider "${provider.name}" {
-
- ${configString}
-}`;
+        this.jsonOutput[provider.name].push(provider.config);
     }
 }
 
@@ -371985,6 +372031,26 @@ class WriterTerraform extends writer {
         this.tfStateKey = tfStateKey;
         this.writeRequiredProvidersBlock = writeRequiredProvidersBlock;
     }
+    async render(renderType = 'tf') {
+        if (renderType === 'tf') {
+            return super.render();
+        }
+        else {
+            await this._renderJson();
+            return this.output.trim();
+        }
+    }
+    async _renderJson() {
+        const providersString = await new WriterProvider(this.requiredProviders).render('json');
+        if (providersString.trim() !== '{}') {
+            this.output = `{
+  "provider": ${providersString}
+}`; // providersString is already a JSON object string
+        }
+        else {
+            this.output = ''; // No providers to include
+        }
+    }
     async _render() {
         const providersString = await new WriterProvider(this.requiredProviders).render();
         let backend = '';
@@ -372193,17 +372259,44 @@ function fCheckString(keys, refs) {
     return true;
 }
 
+;// CONCATENATED MODULE: ../terraform_provisioner/src/writer_provider_tf_json.ts
+
+
+
+class WriterProviderJson extends writer {
+    constructor(mainBlock, providers, backend, tfStateKey) {
+        super();
+        this.mainBlock = mainBlock;
+        this.providers = providers;
+        this.backend = backend;
+        this.tfStateKey = tfStateKey;
+    }
+    async _render() {
+        this.output = await new WriterTerraform(this.providers, this.backend, this.tfStateKey, false).render('json');
+    }
+    writeToTerraformProject(mainTfPath) {
+        if (this.output.trim() === '') {
+            terraform_provisioner_src_logger.info(`Skipping writing ${mainTfPath} as there is no provider to write.`);
+        }
+        else {
+            super.writeToTerraformProject(mainTfPath);
+        }
+    }
+}
+
 ;// CONCATENATED MODULE: ../terraform_provisioner/src/project_tf.ts
 
 
 
 
 
+
 class project_tf_TFProjectManager {
     constructor(ctx) {
         this.tfOutput = '';
         this.projectPath = ctx.projectPath;
         this.mainTfWriter = new WriterMainTf(ctx.inline, ctx.requiredProviders, ctx.backend, ctx.tfStateKey);
+        this.providerJsonWriter = new WriterProviderJson(ctx.inline, ctx.requiredProviders, ctx.backend, ctx.tfStateKey);
         this.tfVarsJsonWriter = new WriterTfVarsJson(ctx.values, ctx.references);
         this.secrets = ctx.secrets;
     }
@@ -372220,7 +372313,9 @@ class project_tf_TFProjectManager {
     }
     async build() {
         await this.mainTfWriter.render();
-        this.mainTfWriter.writeToTerraformProject(external_path_.join(this.projectPath, 'main.tf'));
+        this.mainTfWriter.writeToTerraformProject(external_path_.join(this.projectPath, 'firestartr-main.tf'));
+        await this.providerJsonWriter.render();
+        this.providerJsonWriter.writeToTerraformProject(external_path_.join(this.projectPath, 'firestartr-providers.tf.json'));
         await this.tfVarsJsonWriter.render();
         this.tfVarsJsonWriter.writeToTerraformProject(external_path_.join(this.projectPath, 'terraform.tfvars.json'));
     }
@@ -372353,14 +372448,16 @@ var lib_ajv_default = /*#__PURE__*/__nccwpck_require__.n(lib_ajv);
 
 
 
+
 class TFProjectManagerRemote {
     constructor(ctx) {
         this.tfOutput = '';
         this.ctx = ctx;
         this.projectPath = ctx.projectPath;
+        this.secrets = ctx.secrets;
         this.writerTerraform = new WriterTerraform(ctx.requiredProviders, ctx.backend, ctx.tfStateKey, false);
+        this.providerJsonWriter = new WriterProviderJson(ctx.inline, ctx.requiredProviders, ctx.backend, ctx.tfStateKey);
         this.tfVarsJsonWriter = new WriterTfVarsJson(ctx.values, ctx.references);
-        this.secrets = ctx.secrets;
     }
     getOutput() {
         return this.tfOutput;
@@ -372378,7 +372475,9 @@ class TFProjectManagerRemote {
         await this.__configGit();
         await this.__initFromModule();
         await this.writerTerraform.render();
-        this.writerTerraform.writeToTerraformProject(external_path_.join(this.projectPath, 'terraform.tf'));
+        this.writerTerraform.writeToTerraformProject(external_path_.join(this.projectPath, 'firestartr-terraform.tf'));
+        await this.providerJsonWriter.render();
+        this.providerJsonWriter.writeToTerraformProject(external_path_.join(this.projectPath, 'firestartr-providers.tf.json'));
         await this.tfVarsJsonWriter.render();
         this.tfVarsJsonWriter.writeToTerraformProject(external_path_.join(this.projectPath, 'terraform.tfvars.json'));
     }
@@ -374281,7 +374380,7 @@ async function tfWorkspacePlan(opts) {
         fDebug('Context built');
         const command = getCommandByStatus(status);
         fDebug('Running terraform provisioner');
-        const tfOutput = await runTerraformProvisioner(ctx, command);
+        const tfOutput = await runTerraformProvisioner(ctx, command, undefined);
         fDebug('Terraform provisioner finished');
         fDebug('Publishing plan');
         await publishPlan(cr, tfOutput, prNumber, repo, owner);

package/build/packages/cdk8s_renderer/imports/firestartr.dev.d.ts

@@ -1014,10 +1014,6 @@ export interface FirestartrGithubRepositorySpecRepo {
      * @schema FirestartrGithubRepositorySpecRepo#pages
      */
     readonly pages?: any;
-    /**
-     * @schema FirestartrGithubRepositorySpecRepo#topics
-     */
-    readonly topics?: string[];
     /**
      * @schema FirestartrGithubRepositorySpecRepo#visibility
      */

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

@@ -505,14 +505,6 @@ declare const schemas: {
                         secrets: {
                             $ref: string;
                         };
-                        topics: {
-                            type: string;
-                            items: {
-                                type: string;
-                                maxLength: number;
-                                pattern: string;
-                            };
-                        };
                     };
                     required: string[];
                     $ref?: undefined;

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

@@ -35,14 +35,6 @@ declare const _default: {
                     secrets: {
                         $ref: string;
                     };
-                    topics: {
-                        type: string;
-                        items: {
-                            type: string;
-                            maxLength: number;
-                            pattern: string;
-                        };
-                    };
                 };
                 required: string[];
                 $ref?: undefined;

package/build/packages/cdk8s_renderer/src/claims/github/index.d.ts

@@ -140,14 +140,6 @@ export declare const GithubSchemas: ({
                     secrets: {
                         $ref: string;
                     };
-                    topics: {
-                        type: string;
-                        items: {
-                            type: string;
-                            maxLength: number;
-                            pattern: string;
-                        };
-                    };
                 };
                 required: string[];
                 $ref?: undefined;

package/build/packages/cdk8s_renderer/src/claims/github/repository.d.ts

@@ -28,7 +28,6 @@ export interface IGithubRepositoryClaim extends IComponentClaim {
                 name: string;
                 orphan: boolean;
             }[];
-            topics?: string[];
         };
     };
 }

package/build/packages/cdk8s_renderer/src/initializers/metadata.d.ts

@@ -0,0 +1,11 @@
+import { InitializerPatches } from './base';
+export declare class MetadataInitializer extends InitializerPatches {
+    applicableProviders: string[];
+    static applicableKinds: string[];
+    __validate(): Promise<boolean>;
+    __patches(claim: any, _previousCR: any): Promise<{
+        validate(cr: any): boolean;
+        apply(cr: any): any;
+        identify(): string;
+    }[]>;
+}

package/build/packages/terraform_provisioner/src/project_tf.d.ts

@@ -1,9 +1,11 @@
 /// <reference types="node" />
 import { WriterMainTf } from './writer_main_tf';
 import { WriterTfVarsJson } from './writer_tfvars_json';
+import { WriterProviderJson } from './writer_provider_tf_json';
 import { PassThrough } from 'stream';
 export declare class TFProjectManager {
     mainTfWriter: WriterMainTf;
+    providerJsonWriter: WriterProviderJson;
     tfVarsJsonWriter: WriterTfVarsJson;
     secrets: any[];
     projectPath: string;

package/build/packages/terraform_provisioner/src/project_tf_remote.d.ts

@@ -1,9 +1,11 @@
 /// <reference types="node" />
 import { WriterTerraform } from './writer_terraform';
 import { WriterTfVarsJson } from './writer_tfvars_json';
+import { WriterProviderJson } from './writer_provider_tf_json';
 import { PassThrough } from 'stream';
 export declare class TFProjectManagerRemote {
     writerTerraform: WriterTerraform;
+    providerJsonWriter: WriterProviderJson;
     tfVarsJsonWriter: WriterTfVarsJson;
     ctx: any;
     secrets: any[];

package/build/packages/terraform_provisioner/src/writer_provider.d.ts

@@ -1,7 +1,9 @@
 import Writer from './writer';
 export declare class WriterProvider extends Writer {
     providers: any[];
+    jsonOutput: {};
     constructor(providers: any[]);
+    render(renderType?: string): Promise<string>;
     _render(): Promise<void>;
-    __renderProvider(provider: any): any;
+    __populateJsonOutput(provider: any): void;
 }

package/build/packages/terraform_provisioner/src/writer_provider_tf_json.d.ts

@@ -0,0 +1,10 @@
+import Writer from './writer';
+export declare class WriterProviderJson extends Writer {
+    providers: Array<any>;
+    mainBlock: string;
+    tfStateKey: string;
+    backend: any;
+    constructor(mainBlock: string, providers: Array<any>, backend: any, tfStateKey: string);
+    _render(): Promise<void>;
+    writeToTerraformProject(mainTfPath: string): void;
+}

package/build/packages/terraform_provisioner/src/writer_terraform.d.ts

@@ -5,5 +5,7 @@ export declare class WriterTerraform extends Writer {
     backend: any;
     tfStateKey: string;
     constructor(requiredProviders: Array<any>, backend: any, tfStateKey: string, writeRequiredProvidersBlock?: boolean);
+    render(renderType?: string): Promise<string>;
+    _renderJson(): Promise<void>;
     _render(): Promise<void>;
 }

package/package.json

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