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

package/build/index.js

@@ -151708,7 +151708,7 @@ module.exports = exports.default;
 
 /***/ }),
 
-/***/ 89323:
+/***/ 60762:
 /***/ ((module, exports) => {
 
 
@@ -151775,7 +151775,7 @@ var _isArrayLike = __nccwpck_require__(10860);
 
 var _isArrayLike2 = _interopRequireDefault(_isArrayLike);
 
-var _getIterator = __nccwpck_require__(89323);
+var _getIterator = __nccwpck_require__(60762);
 
 var _getIterator2 = _interopRequireDefault(_getIterator);
 
@@ -357285,13 +357285,10 @@ 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);
@@ -357319,15 +357316,6 @@ 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() {
@@ -357356,33 +357344,6 @@ ${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;
@@ -358145,10 +358106,26 @@ const external_node_child_process_namespaceObject = __WEBPACK_EXTERNAL_createReq
                             type: 'string',
                             description: 'The github organization name',
                         },
+                        name: {
+                            type: 'string',
+                            description: 'The github repo name',
+                        },
+                        orgPermissions: {
+                            type: 'string',
+                            description: 'The level of org Permission',
+                        },
+                        archiveOnDestroy: {
+                            type: 'boolean',
+                            description: 'whether this repo should be archived when the claim is deleted',
+                        },
                         visibility: {
                             type: 'string',
                             enum: ['private', 'public', 'internal'],
                         },
+                        description: {
+                            type: 'string',
+                            description: 'The purpose of this repo',
+                        },
                         features: {
                             type: 'array',
                             items: {
@@ -358384,26 +358361,6 @@ 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',
@@ -358433,9 +358390,6 @@ const GithubSchemas = [
                             type: 'string',
                             enum: ['remote', 'inline', 'Remote', 'Inline'],
                         },
-                        files: {
-                            $ref: 'firestartr.dev://terraform/TerraformProviderFiles',
-                        },
                         sync: {
                             type: 'object',
                             properties: {
@@ -363451,7 +363405,6 @@ 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),
     };
@@ -363498,21 +363451,6 @@ 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.
  */
@@ -369469,7 +369407,7 @@ function provisionRepository(scope, fsGithubRepository) {
         allowAutoMerge: fsGithubRepository.spec.repo.allowAutoMerge,
         deleteBranchOnMerge: fsGithubRepository.spec.repo.deleteBranchOnMerge,
         autoInit: fsGithubRepository.spec.repo.autoInit,
-        archiveOnDestroy: true,
+        archiveOnDestroy: fsGithubRepository.spec.repo.archiveOnDestroy,
         allowUpdateBranch: fsGithubRepository.spec.repo.allowUpdateBranch,
         hasIssues: fsGithubRepository.spec.repo.hasIssues,
         visibility: fsGithubRepository.spec.repo.visibility,
@@ -372374,37 +372312,6 @@ 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
 
 
@@ -372412,7 +372319,6 @@ class WriterAdditionalFiles extends writer {
 
 
 
-
 class project_tf_TFProjectManager {
     constructor(ctx) {
         this.tfOutput = '';
@@ -372420,9 +372326,6 @@ 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) {
@@ -372443,10 +372346,6 @@ 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);
@@ -372578,7 +372477,6 @@ var lib_ajv_default = /*#__PURE__*/__nccwpck_require__.n(lib_ajv);
 
 
 
-
 class TFProjectManagerRemote {
     constructor(ctx) {
         this.tfOutput = '';
@@ -372587,9 +372485,6 @@ 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() {
@@ -372613,10 +372508,6 @@ 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') &&
@@ -373527,9 +373418,6 @@ 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

@@ -2308,12 +2308,6 @@ 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
      */
@@ -2366,27 +2360,6 @@ 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,7 +20,6 @@ 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

@@ -489,10 +489,26 @@ declare const schemas: {
                             type: string;
                             description: string;
                         };
+                        name: {
+                            type: string;
+                            description: string;
+                        };
+                        orgPermissions: {
+                            type: string;
+                            description: string;
+                        };
+                        archiveOnDestroy: {
+                            type: string;
+                            description: string;
+                        };
                         visibility: {
                             type: string;
                             enum: string[];
                         };
+                        description: {
+                            type: string;
+                            description: string;
+                        };
                         features: {
                             type: string;
                             items: {
@@ -659,26 +675,6 @@ 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;
@@ -702,9 +698,6 @@ 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

@@ -19,10 +19,26 @@ declare const _default: {
                         type: string;
                         description: string;
                     };
+                    name: {
+                        type: string;
+                        description: string;
+                    };
+                    orgPermissions: {
+                        type: string;
+                        description: string;
+                    };
+                    archiveOnDestroy: {
+                        type: string;
+                        description: string;
+                    };
                     visibility: {
                         type: string;
                         enum: string[];
                     };
+                    description: {
+                        type: string;
+                        description: string;
+                    };
                     features: {
                         type: string;
                         items: {

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

@@ -124,10 +124,26 @@ export declare const GithubSchemas: ({
                         type: string;
                         description: string;
                     };
+                    name: {
+                        type: string;
+                        description: string;
+                    };
+                    orgPermissions: {
+                        type: string;
+                        description: string;
+                    };
+                    archiveOnDestroy: {
+                        type: string;
+                        description: string;
+                    };
                     visibility: {
                         type: string;
                         enum: string[];
                     };
+                    description: {
+                        type: string;
+                        description: string;
+                    };
                     features: {
                         type: string;
                         items: {

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

@@ -1,26 +1,6 @@
 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;
@@ -44,9 +24,6 @@ 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,26 +1,6 @@
 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;
@@ -44,9 +24,6 @@ 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,10 +1,5 @@
 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;
@@ -15,7 +10,6 @@ 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,13 +2,11 @@
 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,13 +2,11 @@
 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/package.json

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

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

@@ -1,13 +0,0 @@
-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 {};