@goldstack/utils-aws-cli 0.3.31 → 0.3.35

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,4 +1,5 @@
1
1
  import { ExecParams } from '@goldstack/utils-sh';
2
+ import AWS from 'aws-sdk';
2
3
  export declare const assertAwsCli: () => void;
3
4
  interface AWSExecParams {
4
5
  credentials: AWS.Credentials;
@@ -7,8 +8,8 @@ interface AWSExecParams {
7
8
  workDir?: string;
8
9
  options?: ExecParams;
9
10
  }
10
- export declare const execWithDocker: (params: AWSExecParams) => string;
11
- export declare const execWithCli: (params: AWSExecParams) => string;
12
- export declare const awsCli: (params: AWSExecParams) => string;
11
+ export declare const execWithDocker: (params: AWSExecParams) => Promise<string>;
12
+ export declare const execWithCli: (params: AWSExecParams) => Promise<string>;
13
+ export declare const awsCli: (params: AWSExecParams) => Promise<string>;
13
14
  export {};
14
15
  //# sourceMappingURL=utilsAwsCli.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"utilsAwsCli.d.ts","sourceRoot":"","sources":["../../src/utilsAwsCli.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,UAAU,EAEX,MAAM,qBAAqB,CAAC;AAS7B,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,WAAY,aAAa,KAAG,MAsBtD,CAAC;AAEF,eAAO,MAAM,WAAW,WAAY,aAAa,KAAG,MAqBnD,CAAC;AAEF,eAAO,MAAM,MAAM,WAAY,aAAa,KAAG,MAM9C,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,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,CAuBhB,CAAC;AAEF,eAAO,MAAM,WAAW,WAAkB,aAAa,KAAG,QAAQ,MAAM,CAoBvE,CAAC;AAEF,eAAO,MAAM,MAAM,WAAkB,aAAa,KAAG,QAAQ,MAAM,CAMlE,CAAC"}
@@ -17,7 +17,7 @@ const assertAwsCli = () => {
17
17
  }
18
18
  };
19
19
  exports.assertAwsCli = assertAwsCli;
20
- const execWithDocker = (params) => {
20
+ const execWithDocker = async (params) => {
21
21
  (0, utils_docker_1.assertDocker)();
22
22
  const awsUserConfig = `-e AWS_ACCESS_KEY_ID=${params.credentials.accessKeyId} ` +
23
23
  `-e AWS_SECRET_ACCESS_KEY=${params.credentials.secretAccessKey} ` +
@@ -26,13 +26,14 @@ const execWithDocker = (params) => {
26
26
  const mountDir = params.workDir || (0, utils_sh_1.pwd)();
27
27
  (0, utils_sh_1.assertDirectoryExists)(mountDir, 'Cannot execute AWS cli command since working directory does not exist: aws ' +
28
28
  params.command);
29
- return (0, utils_sh_1.exec)('docker run --rm ' +
29
+ return (0, utils_sh_1.execAsync)('docker run --rm ' +
30
30
  awsUserConfig +
31
31
  `-v "${mountDir}":/app ` +
32
- ` ${(0, utils_docker_1.imageGoldstackBuild)()} aws ${params.command}`, params.options);
32
+ '-w /app ' +
33
+ ` ${(0, utils_docker_1.imageAWSCli)()} ${params.command}`, params.options);
33
34
  };
34
35
  exports.execWithDocker = execWithDocker;
35
- const execWithCli = (params) => {
36
+ const execWithCli = async (params) => {
36
37
  (0, exports.assertAwsCli)();
37
38
  process.env.AWS_ACCESS_KEY_ID = params.credentials.accessKeyId;
38
39
  process.env.AWS_SECRET_ACCESS_KEY = params.credentials.secretAccessKey;
@@ -40,17 +41,16 @@ const execWithCli = (params) => {
40
41
  process.env.AWS_DEFAULT_REGION = params.region;
41
42
  (0, utils_sh_1.assertDirectoryExists)(params.workDir || (0, utils_sh_1.pwd)(), 'Cannot execute command for AWS cli: aws ' + params.command);
42
43
  const previousDir = (0, utils_sh_1.pwd)();
43
- console.log('Executing AWS cli command in', params.workDir);
44
44
  (0, utils_sh_1.cd)(params.workDir || (0, utils_sh_1.pwd)());
45
45
  try {
46
- return (0, utils_sh_1.exec)(`aws ${params.command}`, params.options);
46
+ return await (0, utils_sh_1.execAsync)(`aws ${params.command}`, params.options);
47
47
  }
48
48
  finally {
49
49
  (0, utils_sh_1.cd)(previousDir);
50
50
  }
51
51
  };
52
52
  exports.execWithCli = execWithCli;
53
- const awsCli = (params) => {
53
+ const awsCli = async (params) => {
54
54
  if ((0, utils_docker_1.hasDocker)()) {
55
55
  return (0, exports.execWithDocker)(params);
56
56
  }
@@ -1 +1 @@
1
- {"version":3,"file":"utilsAwsCli.js","sourceRoot":"","sources":["../../src/utilsAwsCli.ts"],"names":[],"mappings":"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"}
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,OAAO,IAAA,oBAAS,EACd,kBAAkB;QAChB,aAAa;QACb,OAAO,QAAQ,SAAS;QACxB,UAAU;QACV,IAAI,IAAA,0BAAW,GAAE,IAAI,MAAM,CAAC,OAAO,EAAE,EACvC,MAAM,CAAC,OAAO,CACf,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,cAAc,kBAyBzB;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,OAAO,MAAM,IAAA,oBAAS,EAAC,OAAO,MAAM,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;KACjE;YAAS;QACR,IAAA,aAAE,EAAC,WAAW,CAAC,CAAC;KACjB;AACH,CAAC,CAAC;AApBW,QAAA,WAAW,eAoBtB;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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@goldstack/utils-aws-cli",
3
- "version": "0.3.31",
3
+ "version": "0.3.35",
4
4
  "description": "Wrapper to help with running commands with the AWS cli",
5
5
  "keywords": [
6
6
  "goldstack",
@@ -40,14 +40,14 @@
40
40
  "version:apply:force": "yarn version $@ && yarn version apply"
41
41
  },
42
42
  "dependencies": {
43
- "@goldstack/infra-aws": "0.3.26",
44
- "@goldstack/utils-docker": "0.3.21",
45
- "@goldstack/utils-log": "0.2.8",
46
- "@goldstack/utils-sh": "0.4.19",
47
- "aws-sdk": "^2.995.0"
43
+ "@goldstack/infra-aws": "0.3.29",
44
+ "@goldstack/utils-docker": "0.3.25",
45
+ "@goldstack/utils-log": "0.2.9",
46
+ "@goldstack/utils-sh": "0.4.22",
47
+ "aws-sdk": "2.1001.0"
48
48
  },
49
49
  "devDependencies": {
50
- "@goldstack/utils-git": "0.1.28",
50
+ "@goldstack/utils-git": "0.1.29",
51
51
  "@types/jest": "^27.0.2",
52
52
  "@types/node": "^16.11.0",
53
53
  "jest": "^26.6.3",