@goldstack/utils-terraform-aws 0.4.14 → 0.4.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/tfState.d.ts +3 -2
- package/dist/src/tfState.d.ts.map +1 -1
- package/dist/src/tfState.js +5 -2
- package/dist/src/tfState.js.map +1 -1
- package/dist/src/utilsTerraformAws.d.ts +4 -3
- package/dist/src/utilsTerraformAws.d.ts.map +1 -1
- package/dist/src/utilsTerraformAws.js +9 -10
- package/dist/src/utilsTerraformAws.js.map +1 -1
- package/package.json +4 -3
package/dist/src/tfState.d.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { AwsCredentialIdentity } from '@aws-sdk/types';
|
|
2
2
|
export declare const createState: (params: {
|
|
3
|
-
credentials:
|
|
3
|
+
credentials: AwsCredentialIdentity;
|
|
4
4
|
dynamoDBTableName: string;
|
|
5
5
|
bucketName: string;
|
|
6
|
+
awsRegion: string;
|
|
6
7
|
}) => Promise<void>;
|
|
7
8
|
//# sourceMappingURL=tfState.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tfState.d.ts","sourceRoot":"","sources":["../../src/tfState.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tfState.d.ts","sourceRoot":"","sources":["../../src/tfState.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AA+DvD,eAAO,MAAM,WAAW,WAAkB;IACxC,WAAW,EAAE,qBAAqB,CAAC;IACnC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;CACnB,KAAG,QAAQ,IAAI,CAQf,CAAC"}
|
package/dist/src/tfState.js
CHANGED
|
@@ -51,9 +51,12 @@ const assertS3Bucket = async (params) => {
|
|
|
51
51
|
}
|
|
52
52
|
};
|
|
53
53
|
const createState = async (params) => {
|
|
54
|
-
const dynamoDB = new aws_sdk_1.default.DynamoDB({
|
|
54
|
+
const dynamoDB = new aws_sdk_1.default.DynamoDB({
|
|
55
|
+
apiVersion: '2012-08-10',
|
|
56
|
+
region: params.awsRegion,
|
|
57
|
+
});
|
|
55
58
|
await assertDynamoDBTable({ dynamoDB, tableName: params.dynamoDBTableName });
|
|
56
|
-
const s3 = new aws_sdk_1.default.S3({ apiVersion: '2006-03-01' });
|
|
59
|
+
const s3 = new aws_sdk_1.default.S3({ apiVersion: '2006-03-01', region: params.awsRegion });
|
|
57
60
|
await assertS3Bucket({ s3, bucketName: params.bucketName });
|
|
58
61
|
};
|
|
59
62
|
exports.createState = createState;
|
package/dist/src/tfState.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tfState.js","sourceRoot":"","sources":["../../src/tfState.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA0B;
|
|
1
|
+
{"version":3,"file":"tfState.js","sourceRoot":"","sources":["../../src/tfState.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA0B;AAG1B,MAAM,mBAAmB,GAAG,KAAK,EAAE,MAGlC,EAAE,EAAE;IACH,4HAA4H;IAC5H,MAAM,QAAQ,GAAG;QACf,oBAAoB,EAAE;YACpB;gBACE,aAAa,EAAE,QAAQ;gBACvB,aAAa,EAAE,GAAG;aACnB;SACF;QACD,SAAS,EAAE;YACT;gBACE,aAAa,EAAE,QAAQ;gBACvB,OAAO,EAAE,MAAM;aAChB;SACF;QACD,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,WAAW,EAAE,iBAAiB;KAC/B,CAAC;IAEF,IAAI;QACF,MAAM,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC;KACvD;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,KAAK,GAAG,CAAC,CAAC;QAChB,sDAAsD;QACtD,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAwB,EAAE;YACpD,MAAM,IAAI,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SAChC;KACF;AACH,CAAC,CAAC;AAEF,MAAM,cAAc,GAAG,KAAK,EAAE,MAG7B,EAAiB,EAAE;IAClB,MAAM,YAAY,GAAG;QACnB,MAAM,EAAE,MAAM,CAAC,UAAU;KAC1B,CAAC;IACF,IAAI;QACF,OAAO,CAAC,GAAG,CACT,+CAA+C,EAC/C,YAAY,CAAC,MAAM,CACpB,CAAC;QAEF,MAAM,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CAAC;KACtD;IAAC,OAAO,KAAK,EAAE;QACd,yCAAyC;QACzC,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,yBAAyB,EAAE;YACrD,OAAO,CAAC,KAAK,CACX,uBAAuB,EACvB,MAAM,CAAC,UAAU,EACjB,aAAa,EACb,KAAK,CAAC,IAAI,CACX,CAAC;YACF,MAAM,IAAI,KAAK,CAAC,iCAAiC,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;SACpE;KACF;AACH,CAAC,CAAC;AAEK,MAAM,WAAW,GAAG,KAAK,EAAE,MAKjC,EAAiB,EAAE;IAClB,MAAM,QAAQ,GAAG,IAAI,iBAAG,CAAC,QAAQ,CAAC;QAChC,UAAU,EAAE,YAAY;QACxB,MAAM,EAAE,MAAM,CAAC,SAAS;KACzB,CAAC,CAAC;IACH,MAAM,mBAAmB,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC7E,MAAM,EAAE,GAAG,IAAI,iBAAG,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAC9E,MAAM,cAAc,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC,CAAC;AAC9D,CAAC,CAAC;AAbW,QAAA,WAAW,eAatB"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { AWSTerraformState } from '@goldstack/infra-aws';
|
|
2
2
|
import { CloudProvider, TerraformDeployment, TerraformOptions } from '@goldstack/utils-terraform';
|
|
3
|
-
import
|
|
3
|
+
import { AwsCredentialIdentity } from '@aws-sdk/types';
|
|
4
4
|
export declare class AWSCloudProvider implements CloudProvider {
|
|
5
|
-
user:
|
|
5
|
+
user: AwsCredentialIdentity;
|
|
6
|
+
region: string;
|
|
6
7
|
remoteStateConfig: AWSTerraformState;
|
|
7
8
|
generateEnvVariableString: () => string;
|
|
8
9
|
setEnvVariables: () => void;
|
|
9
10
|
getTfStateVariables: (deployment: TerraformDeployment) => [string, string][];
|
|
10
|
-
constructor(credentials:
|
|
11
|
+
constructor(credentials: AwsCredentialIdentity, awsConfig: AWSTerraformState, region: string);
|
|
11
12
|
}
|
|
12
13
|
export declare const terraformAwsCli: (args: string[], options?: TerraformOptions) => Promise<void>;
|
|
13
14
|
//# sourceMappingURL=utilsTerraformAws.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utilsTerraformAws.d.ts","sourceRoot":"","sources":["../../src/utilsTerraformAws.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,
|
|
1
|
+
{"version":3,"file":"utilsTerraformAws.d.ts","sourceRoot":"","sources":["../../src/utilsTerraformAws.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAGlB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAEL,aAAa,EACb,mBAAmB,EACnB,gBAAgB,EACjB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAiBvD,qBAAa,gBAAiB,YAAW,aAAa;IACpD,IAAI,EAAE,qBAAqB,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,iBAAiB,EAAE,iBAAiB,CAAC;IAErC,yBAAyB,QAAO,MAAM,CAOpC;IAEF,eAAe,QAAO,IAAI,CAKxB;IAEF,mBAAmB,eACL,mBAAmB,KAC9B,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAmCnB;gBAGA,WAAW,EAAE,qBAAqB,EAClC,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,MAAM;CAMjB;AAED,eAAO,MAAM,eAAe,SACpB,MAAM,EAAE,YACJ,gBAAgB,KACzB,QAAQ,IAAI,CAwCd,CAAC"}
|
|
@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.terraformAwsCli = exports.AWSCloudProvider = void 0;
|
|
7
7
|
const infra_aws_1 = require("@goldstack/infra-aws");
|
|
8
8
|
const utils_terraform_1 = require("@goldstack/utils-terraform");
|
|
9
|
-
const aws_sdk_1 = __importDefault(require("aws-sdk"));
|
|
10
9
|
const tfState_1 = require("./tfState");
|
|
11
10
|
const crypto_1 = __importDefault(require("crypto"));
|
|
12
11
|
const getRemoteStateConfig = (config, userName) => {
|
|
@@ -17,17 +16,17 @@ const getRemoteStateConfig = (config, userName) => {
|
|
|
17
16
|
return userConfig[0];
|
|
18
17
|
};
|
|
19
18
|
class AWSCloudProvider {
|
|
20
|
-
constructor(credentials, awsConfig) {
|
|
19
|
+
constructor(credentials, awsConfig, region) {
|
|
21
20
|
this.generateEnvVariableString = () => {
|
|
22
21
|
return (`-e AWS_ACCESS_KEY_ID=${this.user.accessKeyId} ` +
|
|
23
22
|
`-e AWS_SECRET_ACCESS_KEY=${this.user.secretAccessKey} ` +
|
|
24
23
|
`-e AWS_SESSION_TOKEN=${this.user.sessionToken || ''} ` +
|
|
25
|
-
`-e AWS_DEFAULT_REGION=${
|
|
24
|
+
`-e AWS_DEFAULT_REGION=${this.region} `);
|
|
26
25
|
};
|
|
27
26
|
this.setEnvVariables = () => {
|
|
28
27
|
process.env.AWS_ACCESS_KEY_ID = this.user.accessKeyId;
|
|
29
28
|
process.env.AWS_SECRET_ACCESS_KEY = this.user.secretAccessKey;
|
|
30
|
-
process.env.AWS_DEFAULT_REGION =
|
|
29
|
+
process.env.AWS_DEFAULT_REGION = this.region;
|
|
31
30
|
process.env.AWS_SESSION_TOKEN = this.user.sessionToken || '';
|
|
32
31
|
};
|
|
33
32
|
this.getTfStateVariables = (deployment) => {
|
|
@@ -40,9 +39,6 @@ class AWSCloudProvider {
|
|
|
40
39
|
if (!ddTable) {
|
|
41
40
|
throw new Error(`TF state DynamoDB table not defined for user ${deployment.awsUser}`);
|
|
42
41
|
}
|
|
43
|
-
if (!aws_sdk_1.default.config.region) {
|
|
44
|
-
throw new Error('AWS region not defined');
|
|
45
|
-
}
|
|
46
42
|
const tfKey = deployment.tfStateKey;
|
|
47
43
|
if (!tfKey) {
|
|
48
44
|
throw new Error('Terraform state key not defined');
|
|
@@ -50,19 +46,21 @@ class AWSCloudProvider {
|
|
|
50
46
|
return [
|
|
51
47
|
['bucket', bucket],
|
|
52
48
|
['key', `${tfKey}`],
|
|
53
|
-
['region',
|
|
49
|
+
['region', this.region],
|
|
54
50
|
['dynamodb_table', ddTable],
|
|
55
51
|
];
|
|
56
52
|
};
|
|
57
53
|
this.user = credentials;
|
|
58
54
|
this.remoteStateConfig = awsConfig;
|
|
55
|
+
this.region = region;
|
|
59
56
|
}
|
|
60
57
|
}
|
|
61
58
|
exports.AWSCloudProvider = AWSCloudProvider;
|
|
62
59
|
const terraformAwsCli = async (args, options) => {
|
|
63
60
|
const deploymentName = args[1];
|
|
64
61
|
const deployment = (0, infra_aws_1.readDeploymentFromPackageConfig)(deploymentName);
|
|
65
|
-
const
|
|
62
|
+
const provider = await (0, infra_aws_1.getAWSUser)(deployment.awsUser);
|
|
63
|
+
const credentials = await (0, infra_aws_1.getAWSCredentials)(provider);
|
|
66
64
|
const awsTerraformConfig = (0, infra_aws_1.assertTerraformConfig)(deployment.awsUser);
|
|
67
65
|
const projectHash = crypto_1.default.randomBytes(20).toString('hex');
|
|
68
66
|
const remoteStateConfig = getRemoteStateConfig(awsTerraformConfig, deployment.awsUser);
|
|
@@ -78,10 +76,11 @@ const terraformAwsCli = async (args, options) => {
|
|
|
78
76
|
bucketName: remoteStateConfig.terraformStateBucket,
|
|
79
77
|
dynamoDBTableName: remoteStateConfig.terraformStateDynamoDBTable,
|
|
80
78
|
credentials,
|
|
79
|
+
awsRegion: deployment.awsRegion,
|
|
81
80
|
});
|
|
82
81
|
(0, utils_terraform_1.terraformCli)(args, {
|
|
83
82
|
...options,
|
|
84
|
-
provider: new AWSCloudProvider(credentials, awsTerraformConfig),
|
|
83
|
+
provider: new AWSCloudProvider(credentials, awsTerraformConfig, deployment.awsRegion),
|
|
85
84
|
});
|
|
86
85
|
};
|
|
87
86
|
exports.terraformAwsCli = terraformAwsCli;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utilsTerraformAws.js","sourceRoot":"","sources":["../../src/utilsTerraformAws.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"utilsTerraformAws.js","sourceRoot":"","sources":["../../src/utilsTerraformAws.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@goldstack/utils-terraform-aws",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.16",
|
|
4
4
|
"description": "Easily deploy Terraform IaC with npm package scripts",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"goldstack",
|
|
@@ -36,12 +36,13 @@
|
|
|
36
36
|
"version:apply:force": "yarn version $@ && yarn version apply"
|
|
37
37
|
},
|
|
38
38
|
"dependencies": {
|
|
39
|
-
"@
|
|
39
|
+
"@aws-sdk/types": "^3.468.0",
|
|
40
|
+
"@goldstack/infra-aws": "0.4.14",
|
|
40
41
|
"@goldstack/utils-config": "0.4.9",
|
|
41
42
|
"@goldstack/utils-log": "0.3.9",
|
|
42
43
|
"@goldstack/utils-package": "0.4.9",
|
|
43
44
|
"@goldstack/utils-sh": "0.5.9",
|
|
44
|
-
"@goldstack/utils-terraform": "0.4.
|
|
45
|
+
"@goldstack/utils-terraform": "0.4.15",
|
|
45
46
|
"aws-sdk": "2.1525.0"
|
|
46
47
|
},
|
|
47
48
|
"devDependencies": {
|