@goldstack/utils-aws-cli 0.4.13 → 0.4.14

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.
@@ -1,8 +1,8 @@
1
1
  import { ExecParams } from '@goldstack/utils-sh';
2
- import AWS from 'aws-sdk';
2
+ import { AwsCredentialIdentityProvider } from '@aws-sdk/types';
3
3
  export declare const assertAwsCli: () => void;
4
4
  interface AWSExecParams {
5
- credentials: AWS.Credentials;
5
+ credentials: AwsCredentialIdentityProvider;
6
6
  command: string;
7
7
  region: string;
8
8
  workDir?: string;
@@ -1 +1 @@
1
- {"version":3,"file":"utilsAwsCli.d.ts","sourceRoot":"","sources":["../../src/utilsAwsCli.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,UAAU,EAGX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,GAAG,MAAM,SAAS,CAAC;AAI1B,eAAO,MAAM,YAAY,QAAO,IAiB/B,CAAC;AAEF,UAAU,aAAa;IACrB,WAAW,EAAE,GAAG,CAAC,WAAW,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,UAAU,CAAC;CACtB;AAED,eAAO,MAAM,cAAc,WACjB,aAAa,KACpB,QAAQ,MAAM,CAsBhB,CAAC;AAEF,eAAO,MAAM,WAAW,WAAkB,aAAa,KAAG,QAAQ,MAAM,CAqBvE,CAAC;AAEF,eAAO,MAAM,MAAM,WAAkB,aAAa,KAAG,QAAQ,MAAM,CAMlE,CAAC"}
1
+ {"version":3,"file":"utilsAwsCli.d.ts","sourceRoot":"","sources":["../../src/utilsAwsCli.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,UAAU,EAGX,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAK/D,eAAO,MAAM,YAAY,QAAO,IAiB/B,CAAC;AAEF,UAAU,aAAa;IACrB,WAAW,EAAE,6BAA6B,CAAC;IAC3C,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,UAAU,CAAC;CACtB;AAED,eAAO,MAAM,cAAc,WACjB,aAAa,KACpB,QAAQ,MAAM,CAuBhB,CAAC;AAEF,eAAO,MAAM,WAAW,WAAkB,aAAa,KAAG,QAAQ,MAAM,CAsBvE,CAAC;AAEF,eAAO,MAAM,MAAM,WAAkB,aAAa,KAAG,QAAQ,MAAM,CAMlE,CAAC"}
@@ -2,6 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.awsCli = exports.execWithCli = exports.execWithDocker = exports.assertAwsCli = void 0;
4
4
  const utils_sh_1 = require("@goldstack/utils-sh");
5
+ const infra_aws_1 = require("@goldstack/infra-aws");
5
6
  const utils_log_1 = require("@goldstack/utils-log");
6
7
  const utils_docker_1 = require("@goldstack/utils-docker");
7
8
  const assertAwsCli = () => {
@@ -19,9 +20,10 @@ const assertAwsCli = () => {
19
20
  exports.assertAwsCli = assertAwsCli;
20
21
  const execWithDocker = async (params) => {
21
22
  (0, utils_docker_1.assertDocker)();
22
- const awsUserConfig = `-e AWS_ACCESS_KEY_ID=${params.credentials.accessKeyId} ` +
23
- `-e AWS_SECRET_ACCESS_KEY=${params.credentials.secretAccessKey} ` +
24
- `-e AWS_SESSION_TOKEN=${params.credentials.sessionToken || ''} ` +
23
+ const credentials = await (0, infra_aws_1.getAWSCredentials)(params.credentials);
24
+ const awsUserConfig = `-e AWS_ACCESS_KEY_ID=${credentials.accessKeyId} ` +
25
+ `-e AWS_SECRET_ACCESS_KEY=${credentials.secretAccessKey} ` +
26
+ `-e AWS_SESSION_TOKEN=${credentials.sessionToken || ''} ` +
25
27
  `-e AWS_DEFAULT_REGION=${params.region} `;
26
28
  const mountDir = params.workDir || (0, utils_sh_1.pwd)();
27
29
  (0, utils_sh_1.assertDirectoryExists)(mountDir, 'Cannot execute AWS cli command since working directory does not exist: aws ' +
@@ -36,9 +38,10 @@ const execWithDocker = async (params) => {
36
38
  exports.execWithDocker = execWithDocker;
37
39
  const execWithCli = async (params) => {
38
40
  (0, exports.assertAwsCli)();
39
- process.env.AWS_ACCESS_KEY_ID = params.credentials.accessKeyId;
40
- process.env.AWS_SECRET_ACCESS_KEY = params.credentials.secretAccessKey;
41
- process.env.AWS_SESSION_TOKEN = params.credentials.sessionToken || '';
41
+ const credentials = await (0, infra_aws_1.getAWSCredentials)(params.credentials);
42
+ process.env.AWS_ACCESS_KEY_ID = credentials.accessKeyId;
43
+ process.env.AWS_SECRET_ACCESS_KEY = credentials.secretAccessKey;
44
+ process.env.AWS_SESSION_TOKEN = credentials.sessionToken || '';
42
45
  process.env.AWS_DEFAULT_REGION = params.region;
43
46
  (0, utils_sh_1.assertDirectoryExists)(params.workDir || (0, utils_sh_1.pwd)(), 'Cannot execute command for AWS cli: aws ' + params.command);
44
47
  const previousDir = (0, utils_sh_1.pwd)();
@@ -1 +1 @@
1
- {"version":3,"file":"utilsAwsCli.js","sourceRoot":"","sources":["../../src/utilsAwsCli.ts"],"names":[],"mappings":";;;AAAA,kDAQ6B;AAE7B,oDAA6C;AAC7C,0DAA+E;AAExE,MAAM,YAAY,GAAG,GAAS,EAAE;IACrC,IAAI,CAAC,IAAA,wBAAa,EAAC,KAAK,CAAC,EAAE;QACzB,IAAA,iBAAK,EACH,sHAAsH,CACvH,CAAC;QACF,MAAM,IAAI,KAAK,EAAE,CAAC;KACnB;IAED,MAAM,OAAO,GAAG,IAAA,eAAI,EAAC,eAAe,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAExD,IAAI,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAE;QACvC,IAAA,iBAAK,EACH,0EAA0E,OAAO,GAAG;YAClF,mDAAmD,CACtD,CAAC;QACF,MAAM,IAAI,KAAK,EAAE,CAAC;KACnB;AACH,CAAC,CAAC;AAjBW,QAAA,YAAY,gBAiBvB;AAUK,MAAM,cAAc,GAAG,KAAK,EACjC,MAAqB,EACJ,EAAE;IACnB,IAAA,2BAAY,GAAE,CAAC;IAEf,MAAM,aAAa,GACjB,wBAAwB,MAAM,CAAC,WAAW,CAAC,WAAW,GAAG;QACzD,4BAA4B,MAAM,CAAC,WAAW,CAAC,eAAe,GAAG;QACjE,wBAAwB,MAAM,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,GAAG;QAChE,yBAAyB,MAAM,CAAC,MAAM,GAAG,CAAC;IAC5C,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,IAAI,IAAA,cAAG,GAAE,CAAC;IAEzC,IAAA,gCAAqB,EACnB,QAAQ,EACR,6EAA6E;QAC3E,MAAM,CAAC,OAAO,CACjB,CAAC;IACF,MAAM,OAAO,GACX,kBAAkB;QAClB,aAAa;QACb,OAAO,QAAQ,SAAS;QACxB,UAAU;QACV,IAAI,IAAA,0BAAW,GAAE,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;IACxC,OAAO,IAAA,oBAAS,EAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;AAC5C,CAAC,CAAC;AAxBW,QAAA,cAAc,kBAwBzB;AAEK,MAAM,WAAW,GAAG,KAAK,EAAE,MAAqB,EAAmB,EAAE;IAC1E,IAAA,oBAAY,GAAE,CAAC;IAEf,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC;IAC/D,OAAO,CAAC,GAAG,CAAC,qBAAqB,GAAG,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC;IACvE,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAAC,YAAY,IAAI,EAAE,CAAC;IACtE,OAAO,CAAC,GAAG,CAAC,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC;IAE/C,IAAA,gCAAqB,EACnB,MAAM,CAAC,OAAO,IAAI,IAAA,cAAG,GAAE,EACvB,0CAA0C,GAAG,MAAM,CAAC,OAAO,CAC5D,CAAC;IAEF,MAAM,WAAW,GAAG,IAAA,cAAG,GAAE,CAAC;IAC1B,IAAA,aAAE,EAAC,MAAM,CAAC,OAAO,IAAI,IAAA,cAAG,GAAE,CAAC,CAAC;IAC5B,IAAI;QACF,MAAM,OAAO,GAAG,OAAO,MAAM,CAAC,OAAO,EAAE,CAAC;QACxC,OAAO,MAAM,IAAA,oBAAS,EAAC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;KACjD;YAAS;QACR,IAAA,aAAE,EAAC,WAAW,CAAC,CAAC;KACjB;AACH,CAAC,CAAC;AArBW,QAAA,WAAW,eAqBtB;AAEK,MAAM,MAAM,GAAG,KAAK,EAAE,MAAqB,EAAmB,EAAE;IACrE,IAAI,IAAA,wBAAS,GAAE,EAAE;QACf,OAAO,IAAA,sBAAc,EAAC,MAAM,CAAC,CAAC;KAC/B;IAED,OAAO,IAAA,mBAAW,EAAC,MAAM,CAAC,CAAC;AAC7B,CAAC,CAAC;AANW,QAAA,MAAM,UAMjB"}
1
+ {"version":3,"file":"utilsAwsCli.js","sourceRoot":"","sources":["../../src/utilsAwsCli.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@goldstack/utils-aws-cli",
3
- "version": "0.4.13",
3
+ "version": "0.4.14",
4
4
  "description": "Wrapper to help with running commands with the AWS cli",
5
5
  "keywords": [
6
6
  "goldstack",
@@ -40,11 +40,11 @@
40
40
  "version:apply:force": "yarn version $@ && yarn version apply"
41
41
  },
42
42
  "dependencies": {
43
- "@goldstack/infra-aws": "0.4.13",
43
+ "@aws-sdk/types": "^3.468.0",
44
+ "@goldstack/infra-aws": "0.4.14",
44
45
  "@goldstack/utils-docker": "0.4.10",
45
46
  "@goldstack/utils-log": "0.3.9",
46
- "@goldstack/utils-sh": "0.5.9",
47
- "aws-sdk": "2.1525.0"
47
+ "@goldstack/utils-sh": "0.5.9"
48
48
  },
49
49
  "devDependencies": {
50
50
  "@goldstack/utils-git": "0.2.9",