@goldstack/utils-terraform 0.3.43 → 0.3.47

package/dist/src/terraformBuild.spec.js

@@ -1,25 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_sh_1 = require("@goldstack/utils-sh");
-const terraformBuild_1 = require("./terraformBuild");
-describe('Terraform Utils', () => {
-    it('Should convert variable names to Python variable Names', () => {
-        expect((0, terraformBuild_1.convertToPythonVariable)('myVarName')).toEqual('my_var_name');
-        expect((0, terraformBuild_1.convertToPythonVariable)('awsRegion')).toEqual('aws_region');
-        expect((0, terraformBuild_1.convertToPythonVariable)('hostedZoneDomain')).toEqual('hosted_zone_domain');
-        expect((0, terraformBuild_1.convertToPythonVariable)('websiteDomain')).toEqual('website_domain');
-        expect((0, terraformBuild_1.convertToPythonVariable)('websiteDomainRedirect')).toEqual('website_domain_redirect');
-        expect((0, terraformBuild_1.convertToPythonVariable)('defaultCacheDuration')).toEqual('default_cache_duration');
-    });
-    it('Should convert variables name from Pything variable names', () => {
-        expect((0, terraformBuild_1.convertFromPythonVariable)('my_var_name')).toEqual('myVarName');
-        expect((0, terraformBuild_1.convertFromPythonVariable)('aws_region')).toEqual('awsRegion');
-    });
-    it('Should read variables from variables.tf', () => {
-        const testDir = './goldstackLocal/test-variables/';
-        (0, utils_sh_1.mkdir)('-p', testDir);
-        const oldDir = (0, utils_sh_1.pwd)();
-        (0, utils_sh_1.cd)(testDir);
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_sh_1 = require("@goldstack/utils-sh");
+const terraformBuild_1 = require("./terraformBuild");
+describe('Terraform Utils', () => {
+    it('Should convert variable names to Python variable Names', () => {
+        expect((0, terraformBuild_1.convertToPythonVariable)('myVarName')).toEqual('my_var_name');
+        expect((0, terraformBuild_1.convertToPythonVariable)('awsRegion')).toEqual('aws_region');
+        expect((0, terraformBuild_1.convertToPythonVariable)('hostedZoneDomain')).toEqual('hosted_zone_domain');
+        expect((0, terraformBuild_1.convertToPythonVariable)('websiteDomain')).toEqual('website_domain');
+        expect((0, terraformBuild_1.convertToPythonVariable)('websiteDomainRedirect')).toEqual('website_domain_redirect');
+        expect((0, terraformBuild_1.convertToPythonVariable)('defaultCacheDuration')).toEqual('default_cache_duration');
+    });
+    it('Should convert variables name from Pything variable names', () => {
+        expect((0, terraformBuild_1.convertFromPythonVariable)('my_var_name')).toEqual('myVarName');
+        expect((0, terraformBuild_1.convertFromPythonVariable)('aws_region')).toEqual('awsRegion');
+    });
+    it('Should read variables from variables.tf', () => {
+        const testDir = './goldstackLocal/test-variables/';
+        (0, utils_sh_1.mkdir)('-p', testDir);
+        const oldDir = (0, utils_sh_1.pwd)();
+        (0, utils_sh_1.cd)(testDir);
         (0, utils_sh_1.write)(`
 variable "aws_region" {
   description = "Region where the S3 bucket is deployed."
@@ -29,15 +29,15 @@ variable "aws_region" {
 variable "bucket_name" {
   description = "Name of the S3 bucket."
   type = string
-}`, './variables.tf');
-        const vars = (0, terraformBuild_1.getVariablesFromHCL)({
-            awsRegion: 'us-east-1',
-            bucketName: 'test-bucket',
-        });
-        expect(vars).toHaveLength(2);
-        expect(vars[0][0]).toEqual('aws_region');
-        expect(vars[0][1]).toEqual('us-east-1');
-        (0, utils_sh_1.cd)(oldDir);
-    });
-});
+}`, './variables.tf');
+        const vars = (0, terraformBuild_1.getVariablesFromHCL)({
+            awsRegion: 'us-east-1',
+            bucketName: 'test-bucket',
+        });
+        expect(vars).toHaveLength(2);
+        expect(vars[0][0]).toEqual('aws_region');
+        expect(vars[0][1]).toEqual('us-east-1');
+        (0, utils_sh_1.cd)(oldDir);
+    });
+});
 //# sourceMappingURL=terraformBuild.spec.js.map

package/dist/src/terraformCli.d.ts

@@ -1,13 +1,15 @@
-import { CloudProvider } from './cloudProvider';
-export declare type Variables = [string, string][];
-interface TerraformOptions {
-    dir?: string;
-    provider: CloudProvider;
-    variables?: Variables;
-    backendConfig?: Variables;
-    options?: string[];
-}
-export declare const assertTerraform: () => void;
-export declare const tf: (cmd: string, options: TerraformOptions) => string;
-export {};
+import { CloudProvider } from './cloudProvider';
+import { TerraformVersion } from './types/utilsTerraformConfig';
+export declare type Variables = [string, string][];
+interface TerraformOptions {
+    dir?: string;
+    provider: CloudProvider;
+    variables?: Variables;
+    backendConfig?: Variables;
+    version: TerraformVersion;
+    options?: string[];
+}
+export declare const assertTerraform: () => void;
+export declare const tf: (cmd: string, options: TerraformOptions) => string;
+export {};
 //# sourceMappingURL=terraformCli.d.ts.map

package/dist/src/terraformCli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"terraformCli.d.ts","sourceRoot":"","sources":["../../src/terraformCli.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,oBAAY,SAAS,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;AAiB3C,UAAU,gBAAgB;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,aAAa,CAAC;IACxB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAuBD,eAAO,MAAM,eAAe,QAAO,IAQlC,CAAC;AAsBF,eAAO,MAAM,EAAE,QAAS,MAAM,WAAW,gBAAgB,KAAG,MAO3D,CAAC"}
+{"version":3,"file":"terraformCli.d.ts","sourceRoot":"","sources":["../../src/terraformCli.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAEhE,oBAAY,SAAS,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;AAiB3C,UAAU,gBAAgB;IACxB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,aAAa,CAAC;IACxB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,aAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,OAAO,EAAE,gBAAgB,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAuBD,eAAO,MAAM,eAAe,QAAO,IAQlC,CAAC;AAgCF,eAAO,MAAM,EAAE,QAAS,MAAM,WAAW,gBAAgB,KAAG,MAO3D,CAAC"}

package/dist/src/terraformCli.js

@@ -1,69 +1,73 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tf = exports.assertTerraform = void 0;
-const utils_sh_1 = require("@goldstack/utils-sh");
-const utils_docker_1 = require("@goldstack/utils-docker");
-const utils_log_1 = require("@goldstack/utils-log");
-const renderVariables = (variables) => {
-    if (variables.length === 0) {
-        return '';
-    }
-    return variables.map(([key, value]) => `-var \"${key}=${value}\" `).join('');
-};
-const renderBackendConfig = (variables) => {
-    if (variables.length === 0) {
-        return '';
-    }
-    return variables
-        .map(([key, value]) => `-backend-config=\"${key}=${value}\" `)
-        .join('');
-};
-const execWithDocker = (cmd, options) => {
-    var _a;
-    if (!options.dir) {
-        options.dir = (0, utils_sh_1.pwd)();
-    }
-    (0, utils_docker_1.assertDocker)();
-    const cmd3 = `docker run --rm -v "${options.dir}":/app ` +
-        ` ${options.provider.generateEnvVariableString()} ` +
-        '-w /app ' +
-        `${(0, utils_docker_1.imageTerraform)()} ${cmd} ` +
-        ` ${renderBackendConfig(options.backendConfig || [])} ` +
-        ` ${renderVariables(options.variables || [])} ` +
-        ` ${((_a = options.options) === null || _a === void 0 ? void 0 : _a.join(' ')) || ''} `;
-    console.debug('Running Terraform in Docker');
-    console.debug(cmd3);
-    return (0, utils_sh_1.exec)(cmd3);
-};
-const assertTerraform = () => {
-    if (!(0, utils_sh_1.commandExists)('terraform')) {
-        (0, utils_log_1.fatal)('Terraform is not installed.\n\n' +
-            'Install terraform CLI or Docker (preferred).');
-        throw new Error();
-    }
-};
-exports.assertTerraform = assertTerraform;
-const execWithCli = (cmd, options) => {
-    var _a;
-    if (!options.dir) {
-        options.dir = (0, utils_sh_1.pwd)();
-    }
-    (0, exports.assertTerraform)();
-    options.provider.setEnvVariables();
-    const execCmd = `terraform ${cmd} ` +
-        ` ${renderBackendConfig(options.backendConfig || [])} ` +
-        ` ${renderVariables(options.variables || [])} ` +
-        ` ${((_a = options.options) === null || _a === void 0 ? void 0 : _a.join(' ')) || ''} `;
-    console.debug('Running Terraform in cli');
-    console.debug(execCmd);
-    return (0, utils_sh_1.exec)(execCmd);
-};
-const tf = (cmd, options) => {
-    // always prefer running with Docker
-    if ((0, utils_docker_1.hasDocker)()) {
-        return execWithDocker(cmd, options);
-    }
-    return execWithCli(cmd, options);
-};
-exports.tf = tf;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tf = exports.assertTerraform = void 0;
+const utils_sh_1 = require("@goldstack/utils-sh");
+const utils_docker_1 = require("@goldstack/utils-docker");
+const utils_log_1 = require("@goldstack/utils-log");
+const renderVariables = (variables) => {
+    if (variables.length === 0) {
+        return '';
+    }
+    return variables.map(([key, value]) => `-var \"${key}=${value}\" `).join('');
+};
+const renderBackendConfig = (variables) => {
+    if (variables.length === 0) {
+        return '';
+    }
+    return variables
+        .map(([key, value]) => `-backend-config=\"${key}=${value}\" `)
+        .join('');
+};
+const execWithDocker = (cmd, options) => {
+    var _a;
+    if (!options.dir) {
+        options.dir = (0, utils_sh_1.pwd)();
+    }
+    (0, utils_docker_1.assertDocker)();
+    const cmd3 = `docker run --rm -v "${options.dir}":/app ` +
+        ` ${options.provider.generateEnvVariableString()} ` +
+        '-w /app ' +
+        `${(0, utils_docker_1.imageTerraform)(options.version)} ${cmd} ` +
+        ` ${renderBackendConfig(options.backendConfig || [])} ` +
+        ` ${renderVariables(options.variables || [])} ` +
+        ` ${((_a = options.options) === null || _a === void 0 ? void 0 : _a.join(' ')) || ''} `;
+    console.debug('Running Terraform in Docker');
+    console.debug(cmd3);
+    return (0, utils_sh_1.exec)(cmd3);
+};
+const assertTerraform = () => {
+    if (!(0, utils_sh_1.commandExists)('terraform')) {
+        (0, utils_log_1.fatal)('Terraform is not installed.\n\n' +
+            'Install terraform CLI or Docker (preferred).');
+        throw new Error();
+    }
+};
+exports.assertTerraform = assertTerraform;
+const execWithCli = (cmd, options) => {
+    var _a;
+    if (!options.dir) {
+        options.dir = (0, utils_sh_1.pwd)();
+    }
+    (0, exports.assertTerraform)();
+    const version = (0, utils_sh_1.exec)('terraform version');
+    if (version.indexOf(options.version) === -1) {
+        throw new Error(`Invalid local Terraform version detected: [${version.split('\n')[0]}], expected version compatible with [${options.version}]. Please install this version locally or install Docker for Goldstack to run the correct Terraform version required for this deployment using Docker.`);
+    }
+    options.provider.setEnvVariables();
+    const execCmd = `terraform ${cmd} ` +
+        ` ${renderBackendConfig(options.backendConfig || [])} ` +
+        ` ${renderVariables(options.variables || [])} ` +
+        ` ${((_a = options.options) === null || _a === void 0 ? void 0 : _a.join(' ')) || ''} `;
+    console.debug('Running Terraform in cli');
+    console.debug(execCmd);
+    return (0, utils_sh_1.exec)(execCmd);
+};
+const tf = (cmd, options) => {
+    // always prefer running with Docker
+    if ((0, utils_docker_1.hasDocker)()) {
+        return execWithDocker(cmd, options);
+    }
+    return execWithCli(cmd, options);
+};
+exports.tf = tf;
 //# sourceMappingURL=terraformCli.js.map

package/dist/src/terraformCli.js.map

@@ -1 +1 @@
-{"version":3,"file":"terraformCli.js","sourceRoot":"","sources":["../../src/terraformCli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"terraformCli.js","sourceRoot":"","sources":["../../src/terraformCli.ts"],"names":[],"mappings":"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"}

package/dist/src/terraformCli.spec.d.ts

@@ -1,2 +1,2 @@
-export {};
+export {};
 //# sourceMappingURL=terraformCli.spec.d.ts.map

package/dist/src/terraformCli.spec.js

@@ -1,20 +1,30 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const utils_sh_1 = require("@goldstack/utils-sh");
-const terraformCli_1 = require("./terraformCli");
-const MockCloudProvider_1 = __importDefault(require("./MockCloudProvider"));
-const path_1 = __importDefault(require("path"));
-describe('Terraform CLI', () => {
-    it('Should accept folder with spaces', async () => {
-        const testDir = './goldstackLocal/cli-folder-w-space/My Dir';
-        (0, utils_sh_1.mkdir)('-p', testDir);
-        (0, terraformCli_1.tf)('init', {
-            dir: path_1.default.resolve(testDir),
-            provider: new MockCloudProvider_1.default(),
-        });
-    });
-});
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_sh_1 = require("@goldstack/utils-sh");
+const terraformCli_1 = require("./terraformCli");
+const MockCloudProvider_1 = __importDefault(require("./MockCloudProvider"));
+const path_1 = __importDefault(require("path"));
+describe('Terraform CLI', () => {
+    it('Should accept folder with spaces (v0.12)', async () => {
+        const testDir = './goldstackLocal/cli-folder-w-space/0.12/My Dir';
+        (0, utils_sh_1.mkdir)('-p', testDir);
+        (0, terraformCli_1.tf)('init', {
+            dir: path_1.default.resolve(testDir),
+            version: '0.12',
+            provider: new MockCloudProvider_1.default(),
+        });
+    });
+    it('Should accept folder with spaces (v0.13', async () => {
+        const testDir = './goldstackLocal/cli-folder-w-space/0.13/My Dir';
+        (0, utils_sh_1.mkdir)('-p', testDir);
+        (0, terraformCli_1.tf)('init', {
+            dir: path_1.default.resolve(testDir),
+            version: '0.13',
+            provider: new MockCloudProvider_1.default(),
+        });
+    });
+});
 //# sourceMappingURL=terraformCli.spec.js.map

package/dist/src/terraformCli.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"terraformCli.spec.js","sourceRoot":"","sources":["../../src/terraformCli.spec.ts"],"names":[],"mappings":";;;;;AAAA,kDAA4C;AAC5C,iDAAoC;AACpC,4EAAoD;AAEpD,gDAAwB;AAExB,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,kCAAkC,EAAE,KAAK,IAAI,EAAE;QAChD,MAAM,OAAO,GAAG,4CAA4C,CAAC;QAC7D,IAAA,gBAAK,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrB,IAAA,iBAAE,EAAC,MAAM,EAAE;YACT,GAAG,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC;YAC1B,QAAQ,EAAE,IAAI,2BAAiB,EAAE;SAClC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"terraformCli.spec.js","sourceRoot":"","sources":["../../src/terraformCli.spec.ts"],"names":[],"mappings":";;;;;AAAA,kDAA4C;AAC5C,iDAAoC;AACpC,4EAAoD;AAEpD,gDAAwB;AAExB,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,OAAO,GAAG,iDAAiD,CAAC;QAClE,IAAA,gBAAK,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrB,IAAA,iBAAE,EAAC,MAAM,EAAE;YACT,GAAG,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC;YAC1B,OAAO,EAAE,MAAM;YACf,QAAQ,EAAE,IAAI,2BAAiB,EAAE;SAClC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,EAAE,CAAC,yCAAyC,EAAE,KAAK,IAAI,EAAE;QACvD,MAAM,OAAO,GAAG,iDAAiD,CAAC;QAClE,IAAA,gBAAK,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACrB,IAAA,iBAAE,EAAC,MAAM,EAAE;YACT,GAAG,EAAE,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC;YAC1B,OAAO,EAAE,MAAM;YACf,QAAQ,EAAE,IAAI,2BAAiB,EAAE;SAClC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/types/utilsTerraformConfig.d.ts

@@ -1,27 +1,36 @@
-import { Deployment } from '@goldstack/infra';
-/**
- * Name of the property that should be converted into a Terraform variable.
- *
- * @title Terraform Variable
- *
- */
-export declare type TerraformVariable = string;
-/**
- * Key used for Terraform state persisted in Terraform state bucket.
- *
- * Will be auto-generated upon first deployment if not provided.
- *
- * @title Terraform State Key
- */
-export declare type TerraformStateKey = string;
-/**
- * Define which of the deployment variables will be made available for terraform.
- *
- * @title Terraform Variables
- */
-export declare type TerraformVariables = TerraformVariable[];
-export interface TerraformDeployment extends Deployment {
-    terraformVariables?: TerraformVariables;
-    tfStateKey?: TerraformStateKey;
-}
+import { Deployment } from '@goldstack/infra';
+/**
+ * Name of the property that should be converted into a Terraform variable.
+ *
+ * @title Terraform Variable
+ *
+ */
+export declare type TerraformVariable = string;
+/**
+ * Key used for Terraform state persisted in Terraform state bucket.
+ *
+ * Will be auto-generated upon first deployment if not provided.
+ *
+ * @title Terraform State Key
+ */
+export declare type TerraformStateKey = string;
+/**
+ * Version of Terraform that the remote state for this deployment was created with.
+ *
+ * Go to the next version using `yarn infra upgrade [deploymentName] [targetVersion]`. Note that Terraform versions should only be increased one at a time, so for instance you can go from v0.12 to v0.13 but not from v0.12 to v0.14.
+ *
+ * @default '0.12'
+ */
+export declare type TerraformVersion = '0.12' | '0.13';
+/**
+ * Define which of the deployment variables will be made available for terraform.
+ *
+ * @title Terraform Variables
+ */
+export declare type TerraformVariables = TerraformVariable[];
+export interface TerraformDeployment extends Deployment {
+    terraformVariables?: TerraformVariables;
+    tfStateKey?: TerraformStateKey;
+    tfVersion?: TerraformVersion;
+}
 //# sourceMappingURL=utilsTerraformConfig.d.ts.map

package/dist/src/types/utilsTerraformConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utilsTerraformConfig.d.ts","sourceRoot":"","sources":["../../../src/types/utilsTerraformConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;;;GAKG;AACH,oBAAY,iBAAiB,GAAG,MAAM,CAAC;AAEvC;;;;;;GAMG;AACH,oBAAY,iBAAiB,GAAG,MAAM,CAAC;AAEvC;;;;GAIG;AACH,oBAAY,kBAAkB,GAAG,iBAAiB,EAAE,CAAC;AAErD,MAAM,WAAW,mBAAoB,SAAQ,UAAU;IACrD,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,iBAAiB,CAAC;CAChC"}
+{"version":3,"file":"utilsTerraformConfig.d.ts","sourceRoot":"","sources":["../../../src/types/utilsTerraformConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C;;;;;GAKG;AACH,oBAAY,iBAAiB,GAAG,MAAM,CAAC;AAEvC;;;;;;GAMG;AACH,oBAAY,iBAAiB,GAAG,MAAM,CAAC;AAEvC;;;;;;GAMG;AACH,oBAAY,gBAAgB,GAAG,MAAM,GAAG,MAAM,CAAC;AAE/C;;;;GAIG;AACH,oBAAY,kBAAkB,GAAG,iBAAiB,EAAE,CAAC;AAErD,MAAM,WAAW,mBAAoB,SAAQ,UAAU;IACrD,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,UAAU,CAAC,EAAE,iBAAiB,CAAC;IAC/B,SAAS,CAAC,EAAE,gBAAgB,CAAC;CAC9B"}

package/dist/src/types/utilsTerraformConfig.js

@@ -1,3 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=utilsTerraformConfig.js.map

package/dist/src/utilsTerraform.d.ts

@@ -1,10 +1,10 @@
-export type { TerraformDeployment, TerraformVariable, TerraformVariables, } from './types/utilsTerraformConfig';
-import { CloudProvider } from './cloudProvider';
-export type { CloudProvider } from './cloudProvider';
-export { tf } from './terraformCli';
-export { getVariablesFromProperties } from './terraformBuild';
-export declare const infraCommands: () => any;
-export declare const terraformCli: (args: string[], options: {
-    provider: CloudProvider;
-}) => void;
+export type { TerraformDeployment, TerraformVariable, TerraformVariables, } from './types/utilsTerraformConfig';
+import { CloudProvider } from './cloudProvider';
+export type { CloudProvider } from './cloudProvider';
+export { tf } from './terraformCli';
+export { getVariablesFromProperties } from './terraformBuild';
+export declare const infraCommands: () => any;
+export declare const terraformCli: (args: string[], options: {
+    provider: CloudProvider;
+}) => void;
 //# sourceMappingURL=utilsTerraform.d.ts.map

package/dist/src/utilsTerraform.js

@@ -1,63 +1,63 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.terraformCli = exports.infraCommands = exports.getVariablesFromProperties = exports.tf = void 0;
-const terraformBuild_1 = require("./terraformBuild");
-var terraformCli_1 = require("./terraformCli");
-Object.defineProperty(exports, "tf", { enumerable: true, get: function () { return terraformCli_1.tf; } });
-var terraformBuild_2 = require("./terraformBuild");
-Object.defineProperty(exports, "getVariablesFromProperties", { enumerable: true, get: function () { return terraformBuild_2.getVariablesFromProperties; } });
-const infraCommands = () => {
-    const deploymentPositional = (yargs) => {
-        return yargs.positional('deployment', {
-            type: 'string',
-            describe: 'Name of the deployment this command should be applied to',
-            demandOption: true,
-        });
-    };
-    return (yargs) => {
-        return yargs
-            .command('up <deployment>', 'Stands up infrastructure for the specified deployment', deploymentPositional)
-            .command('init <deployment>', 'Initialises Terraform working directory for deployment', deploymentPositional)
-            .command('plan <deployment>', 'Creates a Terraform execution plan for deployment', deploymentPositional)
-            .command('apply <deployment>', 'Applies the last Terraform execution plan calculated using `infra plan`', deploymentPositional)
-            .command('destroy <deployment>', 'DANGER: Destroys all deployed infrastructure for the deployment', (yargs) => {
-            return deploymentPositional(yargs).option('yes', {
-                alias: 'y',
-                description: 'DANGER: If provided, confirmation for deleting infrastructure resources will be skipped.',
-                default: false,
-                demandOption: false,
-                type: 'boolean',
-            });
-        });
-    };
-};
-exports.infraCommands = infraCommands;
-const terraformCli = (args, options) => {
-    const [operation, ...opArgs] = args;
-    const build = new terraformBuild_1.TerraformBuild(options.provider);
-    if (operation === 'up') {
-        build.init(opArgs);
-        build.plan(opArgs);
-        build.apply(opArgs);
-        return;
-    }
-    if (operation === 'init') {
-        build.init(opArgs);
-        return;
-    }
-    if (operation === 'plan') {
-        build.plan(opArgs);
-        return;
-    }
-    if (operation === 'apply') {
-        build.apply(opArgs);
-        return;
-    }
-    if (operation === 'destroy') {
-        build.destroy(opArgs);
-        return;
-    }
-    throw new Error('Unknown infrastructure operation: ' + operation);
-};
-exports.terraformCli = terraformCli;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.terraformCli = exports.infraCommands = exports.getVariablesFromProperties = exports.tf = void 0;
+const terraformBuild_1 = require("./terraformBuild");
+var terraformCli_1 = require("./terraformCli");
+Object.defineProperty(exports, "tf", { enumerable: true, get: function () { return terraformCli_1.tf; } });
+var terraformBuild_2 = require("./terraformBuild");
+Object.defineProperty(exports, "getVariablesFromProperties", { enumerable: true, get: function () { return terraformBuild_2.getVariablesFromProperties; } });
+const infraCommands = () => {
+    const deploymentPositional = (yargs) => {
+        return yargs.positional('deployment', {
+            type: 'string',
+            describe: 'Name of the deployment this command should be applied to',
+            demandOption: true,
+        });
+    };
+    return (yargs) => {
+        return yargs
+            .command('up <deployment>', 'Stands up infrastructure for the specified deployment', deploymentPositional)
+            .command('init <deployment>', 'Initialises Terraform working directory for deployment', deploymentPositional)
+            .command('plan <deployment>', 'Creates a Terraform execution plan for deployment', deploymentPositional)
+            .command('apply <deployment>', 'Applies the last Terraform execution plan calculated using `infra plan`', deploymentPositional)
+            .command('destroy <deployment>', 'DANGER: Destroys all deployed infrastructure for the deployment', (yargs) => {
+            return deploymentPositional(yargs).option('yes', {
+                alias: 'y',
+                description: 'DANGER: If provided, confirmation for deleting infrastructure resources will be skipped.',
+                default: false,
+                demandOption: false,
+                type: 'boolean',
+            });
+        });
+    };
+};
+exports.infraCommands = infraCommands;
+const terraformCli = (args, options) => {
+    const [operation, ...opArgs] = args;
+    const build = new terraformBuild_1.TerraformBuild(options.provider);
+    if (operation === 'up') {
+        build.init(opArgs);
+        build.plan(opArgs);
+        build.apply(opArgs);
+        return;
+    }
+    if (operation === 'init') {
+        build.init(opArgs);
+        return;
+    }
+    if (operation === 'plan') {
+        build.plan(opArgs);
+        return;
+    }
+    if (operation === 'apply') {
+        build.apply(opArgs);
+        return;
+    }
+    if (operation === 'destroy') {
+        build.destroy(opArgs);
+        return;
+    }
+    throw new Error('Unknown infrastructure operation: ' + operation);
+};
+exports.terraformCli = terraformCli;
 //# sourceMappingURL=utilsTerraform.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@goldstack/utils-terraform",
-  "version": "0.3.43",
+  "version": "0.3.47",
   "description": "Run Terraform commands easily as npm package scripts",
   "keywords": [
     "goldstack",
@@ -40,7 +40,7 @@
     "@goldstack/infra": "0.3.24",
     "@goldstack/infra-aws": "0.3.31",
     "@goldstack/utils-config": "0.3.23",
-    "@goldstack/utils-docker": "0.3.27",
+    "@goldstack/utils-docker": "0.3.29",
     "@goldstack/utils-log": "0.2.9",
     "@goldstack/utils-package": "0.3.26",
     "@goldstack/utils-sh": "0.4.22",