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

package/build/index.js

@@ -151708,7 +151708,7 @@ module.exports = exports.default;
 
 /***/ }),
 
-/***/ 60762:
+/***/ 89323:
 /***/ ((module, exports) => {
 
 
@@ -151775,7 +151775,7 @@ var _isArrayLike = __nccwpck_require__(10860);
 
 var _isArrayLike2 = _interopRequireDefault(_isArrayLike);
 
-var _getIterator = __nccwpck_require__(60762);
+var _getIterator = __nccwpck_require__(89323);
 
 var _getIterator2 = _interopRequireDefault(_getIterator);
 
@@ -357285,10 +357285,13 @@ class RevisionNormalizer extends Normalizer {
     }
 }
 
+// EXTERNAL MODULE: external "fs/promises"
+var external_fs_promises_ = __nccwpck_require__(73292);
 ;// CONCATENATED MODULE: ../cdk8s_renderer/src/normalizers/tfworkspace.ts
 
 
 
+
 class TFWorkspaceNormalizer extends Normalizer {
     constructor() {
         super(...arguments);
@@ -357316,6 +357319,15 @@ class TFWorkspaceNormalizer extends Normalizer {
                         const normalizedContent = await normalizeModuleContent(dirTfRootModule);
                         cr.spec['module'] = normalizedContent;
                     }
+                    if ('files' in claim.providers.terraform) {
+                        try {
+                            const additionalFiles = await loadAdditionalFiles(claim.providers.terraform['files'], external_path_.dirname(claimPath));
+                            cr.spec['files'] = additionalFiles;
+                        }
+                        catch (err) {
+                            throw new Error(`Loading additional files for TFWorkspace: ${claim.name}: ${err && err.message ? err.message : err}`);
+                        }
+                    }
                     return cr;
                 },
                 identify() {
@@ -357328,7 +357340,9 @@ class TFWorkspaceNormalizer extends Normalizer {
 async function normalizeModuleContent(tfRootModulePath) {
     let content = '';
     const files = {};
-    await crawl(tfRootModulePath, (entry) => {
+    await crawl(tfRootModulePath, 
+    // bring all files, not only tf
+    (entry) => {
         return entry.endsWith('.tf');
     }, (entry, data) => {
         files[entry] = data;
@@ -357342,6 +357356,33 @@ ${files[entry]}
     });
     return content;
 }
+async function loadAdditionalFiles(files, tfRootModulePath) {
+    const specFiles = [];
+    for (const additionalFile of files) {
+        const specFile = {
+            path: additionalFile.destination,
+            content: await loadAdditionalFile(additionalFile.source, tfRootModulePath),
+        };
+        specFiles.push(specFile);
+    }
+    return specFiles;
+}
+async function loadAdditionalFile(source, tfRootModulePath) {
+    try {
+        const filePath = external_path_.join(tfRootModulePath, source);
+        const stats = await external_fs_promises_.stat(filePath);
+        if (!stats.isFile()) {
+            throw new Error(`${source} is not a file`);
+        }
+        const content = await external_fs_promises_.readFile(filePath, {
+            encoding: 'utf8',
+        });
+        return Buffer.from(content, 'utf8').toString('base64');
+    }
+    catch (err) {
+        throw new Error(`Loading additional tfworkspace file ${source}: ${err && err.message ? err.message : err}`);
+    }
+}
 function validatek8sLimits(moduleContent) {
     const moduleLength = moduleContent.length;
     return moduleLength > 0 && moduleLength < 750000;
@@ -358120,6 +358161,14 @@ 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'],
                 },
@@ -358335,6 +358384,26 @@ const GithubSchemas = [
 /* harmony default export */ const terraform_schema = ({
     $id: 'TerraformProvider',
     definitions: {
+        TerraformProviderFiles: {
+            $id: 'firestartr.dev://terraform/TerraformProviderFiles',
+            description: 'A list of files included in the terraform project',
+            type: 'array',
+            items: {
+                type: 'object',
+                properties: {
+                    source: {
+                        type: 'string',
+                        description: 'path of the original file to include in the final CR',
+                    },
+                    destination: {
+                        type: 'string',
+                        description: 'path where the file will be placed in the final terraform project',
+                    },
+                },
+                additionalProperties: false,
+                required: ['source', 'destination'],
+            },
+        },
         TerraformProvider: {
             $id: 'firestartr.dev://terraform/TerraformProvider',
             type: 'object',
@@ -358364,6 +358433,9 @@ const GithubSchemas = [
                             type: 'string',
                             enum: ['remote', 'inline', 'Remote', 'Inline'],
                         },
+                        files: {
+                            $ref: 'firestartr.dev://terraform/TerraformProviderFiles',
+                        },
                         sync: {
                             type: 'object',
                             properties: {
@@ -362246,6 +362318,7 @@ 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)),
@@ -363378,6 +363451,7 @@ function toJson_FirestartrTerraformWorkspaceSpec(obj) {
         'module': obj.module,
         'source': obj.source,
         'values': obj.values,
+        'files': obj.files?.map(y => toJson_FirestartrTerraformWorkspaceSpecFiles(y)),
         'references': obj.references?.map(y => toJson_FirestartrTerraformWorkspaceSpecReferences(y)),
         'writeConnectionSecretToRef': toJson_FirestartrTerraformWorkspaceSpecWriteConnectionSecretToRef(obj.writeConnectionSecretToRef),
     };
@@ -363424,6 +363498,21 @@ var FirestartrTerraformWorkspaceSpecSource;
     /** Inline */
     FirestartrTerraformWorkspaceSpecSource["INLINE"] = "Inline";
 })(FirestartrTerraformWorkspaceSpecSource || (FirestartrTerraformWorkspaceSpecSource = {}));
+/**
+ * Converts an object of type 'FirestartrTerraformWorkspaceSpecFiles' to JSON representation.
+ */
+/* eslint-disable max-len, @stylistic/max-len, quote-props, @stylistic/quote-props */
+function toJson_FirestartrTerraformWorkspaceSpecFiles(obj) {
+    if (obj === undefined) {
+        return undefined;
+    }
+    const result = {
+        'content': obj.content,
+        'path': obj.path,
+    };
+    // filter undefined values
+    return Object.entries(result).reduce((r, i) => (i[1] === undefined) ? r : ({ ...r, [i[0]]: i[1] }), {});
+}
 /**
  * Converts an object of type 'FirestartrTerraformWorkspaceSpecReferences' to JSON representation.
  */
@@ -364371,6 +364460,7 @@ 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),
@@ -370405,7 +370495,7 @@ async function runTerraform(entity, command, stream) {
     // filter environment variables to exclude those starting with 'GITHUB'
     const env = Object.fromEntries(Object.entries(process.env).filter(([key]) => !key.startsWith('GITHUB')));
     return new Promise((ok, ko) => {
-        const terraformProcess = (0,external_child_process_.spawn)('terraform', [...command], {
+        const terraformProcess = (0,external_child_process_.spawn)('tofu', [...command], {
             stdio: ['inherit', 'pipe', 'pipe'],
             cwd: workDir,
             env,
@@ -371805,7 +371895,7 @@ async function output(path, secrets) {
 }
 async function tfExec(path, args, secrets, extraArgs = ['-input=false'], stream) {
     return new Promise((ok, ko) => {
-        const tfProcess = (0,external_child_process_.spawn)('terraform', args.concat(extraArgs), {
+        const tfProcess = (0,external_child_process_.spawn)('tofu', args.concat(extraArgs), {
             cwd: path,
             stdio: ['inherit', 'pipe', 'pipe'],
         });
@@ -372284,6 +372374,37 @@ class WriterProviderJson extends writer {
     }
 }
 
+;// CONCATENATED MODULE: ../terraform_provisioner/src/writer_additional_files.ts
+
+
+
+class WriterAdditionalFiles extends writer {
+    constructor(files) {
+        super();
+        this.files = files;
+    }
+    // this writer does not "write" anything per se
+    // it just complies with the abstract class it inherits from
+    async _render() {
+        return '';
+    }
+    async writeToTerraformProject(projectPath) {
+        for (const file of this.files) {
+            try {
+                const targetPath = external_path_.resolve(projectPath, file.path);
+                const absProjectPath = external_path_.resolve(projectPath);
+                if (!targetPath.startsWith(absProjectPath + external_path_.sep)) {
+                    throw new Error(`Path traversal detected: ${file.path}`);
+                }
+                await external_fs_promises_.writeFile(targetPath, Buffer.from(file.content, 'base64').toString('utf8'));
+            }
+            catch (err) {
+                throw new Error(`Error writing additional file: ${file.path}: ${err}`);
+            }
+        }
+    }
+}
+
 ;// CONCATENATED MODULE: ../terraform_provisioner/src/project_tf.ts
 
 
@@ -372291,6 +372412,7 @@ class WriterProviderJson extends writer {
 
 
 
+
 class project_tf_TFProjectManager {
     constructor(ctx) {
         this.tfOutput = '';
@@ -372298,6 +372420,9 @@ class project_tf_TFProjectManager {
         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);
+        if ('files' in ctx) {
+            this.additionalFilesWriter = new WriterAdditionalFiles(ctx['files']);
+        }
         this.secrets = ctx.secrets;
     }
     setStreamCallbacks(fnData, fnEnd, reopen = true) {
@@ -372318,6 +372443,10 @@ class project_tf_TFProjectManager {
         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'));
+        if (this.additionalFilesWriter) {
+            await this.additionalFilesWriter.render();
+            await this.additionalFilesWriter.writeToTerraformProject(this.projectPath);
+        }
     }
     async __init() {
         this.tfOutput += await init(this.projectPath, this.secrets, this.stream);
@@ -372449,6 +372578,7 @@ var lib_ajv_default = /*#__PURE__*/__nccwpck_require__.n(lib_ajv);
 
 
 
+
 class TFProjectManagerRemote {
     constructor(ctx) {
         this.tfOutput = '';
@@ -372457,6 +372587,9 @@ class TFProjectManagerRemote {
         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);
+        if ('files' in ctx) {
+            this.additionalFilesWriter = new WriterAdditionalFiles(ctx['files']);
+        }
         this.tfVarsJsonWriter = new WriterTfVarsJson(ctx.values, ctx.references);
     }
     getOutput() {
@@ -372480,6 +372613,10 @@ class TFProjectManagerRemote {
         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'));
+        if (this.additionalFilesWriter) {
+            await this.additionalFilesWriter.render();
+            await this.additionalFilesWriter.writeToTerraformProject(this.projectPath);
+        }
     }
     async __configGit() {
         external_fs_.existsSync('/home/node/.gitconfig') &&
@@ -373390,6 +373527,9 @@ function buildProvisionerContext(item, deps) {
     context['type'] = item.spec.source;
     context['inline'] = item.spec.module;
     context['module'] = item.spec.module;
+    if ('files' in item.spec) {
+        context['files'] = item.spec.files;
+    }
     context['values'] = JSON.parse(item.spec.values);
     const result = adaptProviders(item, deps);
     context['requiredProviders'] = result.providers;

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

@@ -1014,6 +1014,10 @@ export interface FirestartrGithubRepositorySpecRepo {
      * @schema FirestartrGithubRepositorySpecRepo#pages
      */
     readonly pages?: any;
+    /**
+     * @schema FirestartrGithubRepositorySpecRepo#topics
+     */
+    readonly topics?: string[];
     /**
      * @schema FirestartrGithubRepositorySpecRepo#visibility
      */
@@ -2304,6 +2308,12 @@ export interface FirestartrTerraformWorkspaceSpec {
      * @schema FirestartrTerraformWorkspaceSpec#values
      */
     readonly values?: string;
+    /**
+     * A list of files to be created in the Terraform workspace directory.
+     *
+     * @schema FirestartrTerraformWorkspaceSpec#files
+     */
+    readonly files?: FirestartrTerraformWorkspaceSpecFiles[];
     /**
      * @schema FirestartrTerraformWorkspaceSpec#references
      */
@@ -2356,6 +2366,27 @@ export declare enum FirestartrTerraformWorkspaceSpecSource {
     /** Inline */
     INLINE = "Inline"
 }
+/**
+ * @schema FirestartrTerraformWorkspaceSpecFiles
+ */
+export interface FirestartrTerraformWorkspaceSpecFiles {
+    /**
+     * The base64 encoded content of the file.
+     *
+     * @schema FirestartrTerraformWorkspaceSpecFiles#content
+     */
+    readonly content: string;
+    /**
+     * The target relative path for the file within the Terraform workspace directory.
+     *
+     * @schema FirestartrTerraformWorkspaceSpecFiles#path
+     */
+    readonly path: string;
+}
+/**
+ * Converts an object of type 'FirestartrTerraformWorkspaceSpecFiles' to JSON representation.
+ */
+export declare function toJson_FirestartrTerraformWorkspaceSpecFiles(obj: FirestartrTerraformWorkspaceSpecFiles | undefined): Record<string, any> | undefined;
 /**
  * @schema FirestartrTerraformWorkspaceSpecReferences
  */

package/build/packages/cdk8s_renderer/src/charts/catalog/tfWorkspaceChart.d.ts

@@ -20,6 +20,7 @@ export declare class CatalogTFWorkspaceChart extends BaseCatalogChart {
                 source: import("../../../imports/firestartr.dev").FirestartrTerraformWorkspaceSpecSource;
                 module: string;
                 values: any;
+                files: import("../../claims/tfworkspaces/tfworkspace").TerraformProviderAdditionalFiles;
                 context: {
                     providers: {
                         name: string;

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

@@ -505,6 +505,14 @@ declare const schemas: {
                         secrets: {
                             $ref: string;
                         };
+                        topics: {
+                            type: string;
+                            items: {
+                                type: string;
+                                maxLength: number;
+                                pattern: string;
+                            };
+                        };
                     };
                     required: string[];
                     $ref?: undefined;
@@ -651,6 +659,26 @@ declare const schemas: {
     })[] | {
         $id: string;
         definitions: {
+            TerraformProviderFiles: {
+                $id: string;
+                description: string;
+                type: string;
+                items: {
+                    type: string;
+                    properties: {
+                        source: {
+                            type: string;
+                            description: string;
+                        };
+                        destination: {
+                            type: string;
+                            description: string;
+                        };
+                    };
+                    additionalProperties: boolean;
+                    required: string[];
+                };
+            };
             TerraformProvider: {
                 $id: string;
                 type: string;
@@ -674,6 +702,9 @@ declare const schemas: {
                             type: string;
                             enum: string[];
                         };
+                        files: {
+                            $ref: string;
+                        };
                         sync: {
                             type: string;
                             properties: {

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

@@ -35,6 +35,14 @@ 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,6 +140,14 @@ 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,6 +28,7 @@ export interface IGithubRepositoryClaim extends IComponentClaim {
                 name: string;
                 orphan: boolean;
             }[];
+            topics?: string[];
         };
     };
 }

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

@@ -1,6 +1,26 @@
 export declare const TerraformSchemas: {
     $id: string;
     definitions: {
+        TerraformProviderFiles: {
+            $id: string;
+            description: string;
+            type: string;
+            items: {
+                type: string;
+                properties: {
+                    source: {
+                        type: string;
+                        description: string;
+                    };
+                    destination: {
+                        type: string;
+                        description: string;
+                    };
+                };
+                additionalProperties: boolean;
+                required: string[];
+            };
+        };
         TerraformProvider: {
             $id: string;
             type: string;
@@ -24,6 +44,9 @@ export declare const TerraformSchemas: {
                         type: string;
                         enum: string[];
                     };
+                    files: {
+                        $ref: string;
+                    };
                     sync: {
                         type: string;
                         properties: {

package/build/packages/cdk8s_renderer/src/claims/tfworkspaces/terraform.schema.d.ts

@@ -1,6 +1,26 @@
 declare const _default: {
     $id: string;
     definitions: {
+        TerraformProviderFiles: {
+            $id: string;
+            description: string;
+            type: string;
+            items: {
+                type: string;
+                properties: {
+                    source: {
+                        type: string;
+                        description: string;
+                    };
+                    destination: {
+                        type: string;
+                        description: string;
+                    };
+                };
+                additionalProperties: boolean;
+                required: string[];
+            };
+        };
         TerraformProvider: {
             $id: string;
             type: string;
@@ -24,6 +44,9 @@ declare const _default: {
                         type: string;
                         enum: string[];
                     };
+                    files: {
+                        $ref: string;
+                    };
                     sync: {
                         type: string;
                         properties: {

package/build/packages/cdk8s_renderer/src/claims/tfworkspaces/tfworkspace.d.ts

@@ -1,5 +1,10 @@
 import { FirestartrTerraformWorkspaceSpecSource } from '../../../imports/firestartr.dev';
 import { Workspace } from '../base/workspace';
+export interface TerraformProviderAdditionalFile {
+    source: string;
+    destination: string;
+}
+export type TerraformProviderAdditionalFiles = TerraformProviderAdditionalFile[];
 export interface TFWorkspace extends Workspace {
     kind: 'TFWorkspaceClaim';
     resourceType: string;
@@ -10,6 +15,7 @@ export interface TFWorkspace extends Workspace {
             source: FirestartrTerraformWorkspaceSpecSource.INLINE | FirestartrTerraformWorkspaceSpecSource.REMOTE;
             module: string;
             values: any;
+            files: TerraformProviderAdditionalFiles;
             context: {
                 providers: {
                     name: string;

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

@@ -2,11 +2,13 @@
 import { WriterMainTf } from './writer_main_tf';
 import { WriterTfVarsJson } from './writer_tfvars_json';
 import { WriterProviderJson } from './writer_provider_tf_json';
+import { WriterAdditionalFiles } from './writer_additional_files';
 import { PassThrough } from 'stream';
 export declare class TFProjectManager {
     mainTfWriter: WriterMainTf;
     providerJsonWriter: WriterProviderJson;
     tfVarsJsonWriter: WriterTfVarsJson;
+    additionalFilesWriter: WriterAdditionalFiles;
     secrets: any[];
     projectPath: string;
     tfOutput: any;

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

@@ -2,11 +2,13 @@
 import { WriterTerraform } from './writer_terraform';
 import { WriterTfVarsJson } from './writer_tfvars_json';
 import { WriterProviderJson } from './writer_provider_tf_json';
+import { WriterAdditionalFiles } from './writer_additional_files';
 import { PassThrough } from 'stream';
 export declare class TFProjectManagerRemote {
     writerTerraform: WriterTerraform;
     providerJsonWriter: WriterProviderJson;
     tfVarsJsonWriter: WriterTfVarsJson;
+    additionalFilesWriter: WriterAdditionalFiles;
     ctx: any;
     secrets: any[];
     projectPath: string;

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

@@ -0,0 +1,13 @@
+import Writer from './writer';
+export interface FirestartrTerraformWorkspaceSpecFile {
+    content: string;
+    path: string;
+}
+type FirestartrTerraformWorkspaceSpecFiles = FirestartrTerraformWorkspaceSpecFile[];
+export declare class WriterAdditionalFiles extends Writer {
+    files: FirestartrTerraformWorkspaceSpecFile[];
+    constructor(files: FirestartrTerraformWorkspaceSpecFiles);
+    _render(): Promise<string>;
+    writeToTerraformProject(projectPath: string): Promise<void>;
+}
+export {};

package/package.json

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