@goldstack/infra-aws 0.4.12 → 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.
@@ -0,0 +1,6 @@
1
+ import { AwsCredentialIdentityProvider, AwsCredentialIdentity } from '@aws-sdk/types';
2
+ export declare function injectCredentials(provider: AwsCredentialIdentityProvider, credentials: AwsCredentialIdentity): void;
3
+ export declare function hasInjectedCredentials(provider: AwsCredentialIdentityProvider): boolean;
4
+ export declare function retrieveInjectedCredentials(provider: AwsCredentialIdentityProvider): AwsCredentialIdentity;
5
+ export declare function getAWSCredentials(provider: AwsCredentialIdentityProvider): Promise<AwsCredentialIdentity>;
6
+ //# sourceMappingURL=awsAuthUtils.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"awsAuthUtils.d.ts","sourceRoot":"","sources":["../../src/awsAuthUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,6BAA6B,EAC7B,qBAAqB,EACtB,MAAM,gBAAgB,CAAC;AAIxB,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,6BAA6B,EACvC,WAAW,EAAE,qBAAqB,GACjC,IAAI,CAEN;AAED,wBAAgB,sBAAsB,CACpC,QAAQ,EAAE,6BAA6B,GACtC,OAAO,CAET;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,6BAA6B,GACtC,qBAAqB,CAEvB;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,6BAA6B,GACtC,OAAO,CAAC,qBAAqB,CAAC,CAsBhC"}
@@ -0,0 +1,38 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.getAWSCredentials = exports.retrieveInjectedCredentials = exports.hasInjectedCredentials = exports.injectCredentials = void 0;
4
+ const client_sts_1 = require("@aws-sdk/client-sts");
5
+ function injectCredentials(provider, credentials) {
6
+ provider._injectedCredentials = credentials;
7
+ }
8
+ exports.injectCredentials = injectCredentials;
9
+ function hasInjectedCredentials(provider) {
10
+ return provider._injectedCredentials != undefined;
11
+ }
12
+ exports.hasInjectedCredentials = hasInjectedCredentials;
13
+ function retrieveInjectedCredentials(provider) {
14
+ return provider._injectedCredentials;
15
+ }
16
+ exports.retrieveInjectedCredentials = retrieveInjectedCredentials;
17
+ async function getAWSCredentials(provider) {
18
+ if (hasInjectedCredentials(provider)) {
19
+ return retrieveInjectedCredentials(provider);
20
+ }
21
+ const client = new client_sts_1.STSClient({ credentials: provider });
22
+ const input = {
23
+ DurationSeconds: 600,
24
+ };
25
+ const command = new client_sts_1.GetSessionTokenCommand(input);
26
+ const response = await client.send(command);
27
+ if (!response.Credentials) {
28
+ throw new Error('Cannot obtain AWS credentials.');
29
+ }
30
+ return {
31
+ accessKeyId: response.Credentials.AccessKeyId || '',
32
+ secretAccessKey: response.Credentials.SecretAccessKey || '',
33
+ sessionToken: response.Credentials.SessionToken,
34
+ expiration: response.Credentials.Expiration,
35
+ };
36
+ }
37
+ exports.getAWSCredentials = getAWSCredentials;
38
+ //# sourceMappingURL=awsAuthUtils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"awsAuthUtils.js","sourceRoot":"","sources":["../../src/awsAuthUtils.ts"],"names":[],"mappings":";;;AAKA,oDAAwE;AAExE,SAAgB,iBAAiB,CAC/B,QAAuC,EACvC,WAAkC;IAEjC,QAAgB,CAAC,oBAAoB,GAAG,WAAW,CAAC;AACvD,CAAC;AALD,8CAKC;AAED,SAAgB,sBAAsB,CACpC,QAAuC;IAEvC,OAAQ,QAAgB,CAAC,oBAAoB,IAAI,SAAS,CAAC;AAC7D,CAAC;AAJD,wDAIC;AAED,SAAgB,2BAA2B,CACzC,QAAuC;IAEvC,OAAQ,QAAgB,CAAC,oBAA6C,CAAC;AACzE,CAAC;AAJD,kEAIC;AAEM,KAAK,UAAU,iBAAiB,CACrC,QAAuC;IAEvC,IAAI,sBAAsB,CAAC,QAAQ,CAAC,EAAE;QACpC,OAAO,2BAA2B,CAAC,QAAQ,CAAC,CAAC;KAC9C;IAED,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,CAAC;IACxD,MAAM,KAAK,GAAG;QACZ,eAAe,EAAE,GAAG;KACrB,CAAC;IACF,MAAM,OAAO,GAAG,IAAI,mCAAsB,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAE5C,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE;QACzB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;KACnD;IAED,OAAO;QACL,WAAW,EAAE,QAAQ,CAAC,WAAW,CAAC,WAAW,IAAI,EAAE;QACnD,eAAe,EAAE,QAAQ,CAAC,WAAW,CAAC,eAAe,IAAI,EAAE;QAC3D,YAAY,EAAE,QAAQ,CAAC,WAAW,CAAC,YAAY;QAC/C,UAAU,EAAE,QAAQ,CAAC,WAAW,CAAC,UAAU;KAC5C,CAAC;AACJ,CAAC;AAxBD,8CAwBC"}
@@ -1,10 +1,10 @@
1
1
  import { AWSConfiguration } from './types/awsAccount';
2
- import AWS from 'aws-sdk';
3
- export declare function getAWSUserFromEnvironmentVariables(): Promise<AWS.Credentials>;
2
+ import { AwsCredentialIdentityProvider } from '@aws-sdk/types';
3
+ export declare function getAWSUserFromEnvironmentVariables(): Promise<AwsCredentialIdentityProvider>;
4
4
  /**
5
5
  * Obtains AWS user credentials from container environment variables for ECS containers.
6
6
  */
7
- export declare function getAWSUserFromContainerEnvironment(): Promise<AWS.ECSCredentials>;
8
- export declare function getAWSUserFromDefaultLocalProfile(): Promise<AWS.Credentials>;
9
- export declare function getAWSUserFromGoldstackConfig(config: AWSConfiguration, userName: string): Promise<AWS.Credentials>;
7
+ export declare function getAWSUserFromContainerEnvironment(): Promise<AwsCredentialIdentityProvider>;
8
+ export declare function getAWSUserFromDefaultLocalProfile(): Promise<AwsCredentialIdentityProvider>;
9
+ export declare function getAWSUserFromGoldstackConfig(config: AWSConfiguration, userName: string): Promise<AwsCredentialIdentityProvider>;
10
10
  //# sourceMappingURL=awsUserUtils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"awsUserUtils.d.ts","sourceRoot":"","sources":["../../src/awsUserUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAKjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,GAAG,MAAM,SAAS,CAAC;AAE1B,wBAAsB,kCAAkC,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAenF;AACD;;GAEG;AACH,wBAAsB,kCAAkC,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAkBtF;AAED,wBAAsB,iCAAiC,IAAI,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAmBlF;AAED,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CA8H1B"}
1
+ {"version":3,"file":"awsUserUtils.d.ts","sourceRoot":"","sources":["../../src/awsUserUtils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAKjB,MAAM,oBAAoB,CAAC;AAW5B,OAAO,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAG/D,wBAAsB,kCAAkC,IAAI,OAAO,CAAC,6BAA6B,CAAC,CAajG;AACD;;GAEG;AACH,wBAAsB,kCAAkC,IAAI,OAAO,CAAC,6BAA6B,CAAC,CAajG;AAwBD,wBAAsB,iCAAiC,IAAI,OAAO,CAAC,6BAA6B,CAAC,CAoBhG;AAED,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,6BAA6B,CAAC,CAiIxC"}
@@ -5,16 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
6
  exports.getAWSUserFromGoldstackConfig = exports.getAWSUserFromDefaultLocalProfile = exports.getAWSUserFromContainerEnvironment = exports.getAWSUserFromEnvironmentVariables = void 0;
7
7
  const assert_1 = __importDefault(require("assert"));
8
- const aws_sdk_1 = __importDefault(require("aws-sdk"));
8
+ const client_sts_1 = require("@aws-sdk/client-sts");
9
+ const credential_providers_1 = require("@aws-sdk/credential-providers");
10
+ const awsAuthUtils_1 = require("./awsAuthUtils");
9
11
  async function getAWSUserFromEnvironmentVariables() {
10
12
  (0, assert_1.default)(process.env.AWS_ACCESS_KEY_ID, 'AWS_ACCESS_KEY_ID not defined.');
11
13
  (0, assert_1.default)(process.env.AWS_SECRET_ACCESS_KEY, 'AWS_SECRET_ACCESS_KEY not defined');
12
- const region = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION;
13
- (0, assert_1.default)(region, 'Neither AWS_REGION nor AWS_DEFAULT_REGION are defined.');
14
- const credentials = new aws_sdk_1.default.EnvironmentCredentials('AWS');
15
- await credentials.getPromise();
16
- aws_sdk_1.default.config.credentials = credentials;
17
- aws_sdk_1.default.config.update({ region });
14
+ const credentials = (0, credential_providers_1.fromEnv)();
15
+ (0, awsAuthUtils_1.injectCredentials)(credentials, {
16
+ accessKeyId: process.env.AWS_ACCESS_KEY_ID,
17
+ secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
18
+ });
18
19
  return credentials;
19
20
  }
20
21
  exports.getAWSUserFromEnvironmentVariables = getAWSUserFromEnvironmentVariables;
@@ -22,33 +23,49 @@ exports.getAWSUserFromEnvironmentVariables = getAWSUserFromEnvironmentVariables;
22
23
  * Obtains AWS user credentials from container environment variables for ECS containers.
23
24
  */
24
25
  async function getAWSUserFromContainerEnvironment() {
25
- const ecsCredentials = new aws_sdk_1.default.ECSCredentials({
26
- httpOptions: { timeout: 5000 },
26
+ const ecsCredentials = (0, credential_providers_1.fromContainerMetadata)({
27
+ timeout: 5000,
27
28
  maxRetries: 10, // retry 10 times
28
29
  });
29
- await ecsCredentials.getPromise();
30
- aws_sdk_1.default.config.credentials = ecsCredentials;
31
30
  if (!process.env.AWS_REGION) {
32
31
  throw new Error('AWS region environment variable ("AWS_REGION") not defined for ECS task.');
33
32
  }
34
- aws_sdk_1.default.config.update({ region: process.env.AWS_REGION });
35
33
  return ecsCredentials;
36
34
  }
37
35
  exports.getAWSUserFromContainerEnvironment = getAWSUserFromContainerEnvironment;
36
+ async function validateCredentials(credentials) {
37
+ if ((0, awsAuthUtils_1.hasInjectedCredentials)(credentials)) {
38
+ return true;
39
+ }
40
+ const client = new client_sts_1.STSClient({
41
+ credentials,
42
+ });
43
+ const input = {};
44
+ const command = new client_sts_1.GetCallerIdentityCommand(input);
45
+ try {
46
+ const response = await client.send(command);
47
+ if (!response.Account) {
48
+ return false;
49
+ }
50
+ }
51
+ catch (e) {
52
+ return false;
53
+ }
54
+ return true;
55
+ }
38
56
  async function getAWSUserFromDefaultLocalProfile() {
39
- let credentials = new aws_sdk_1.default.SharedIniFileCredentials();
57
+ let credentials = (0, credential_providers_1.fromIni)();
40
58
  const envVarValues = {
41
59
  AWS_SDK_LOAD_CONFIG: process.env.AWS_SDK_LOAD_CONFIG,
42
60
  };
43
- // if no access key is found, try loading process_credentials
44
- if (!credentials.accessKeyId) {
61
+ if (!(await validateCredentials(credentials))) {
62
+ console.warn('Cannot load credentials from INI file. Trying process credentials instead.');
63
+ // if no access key is found, try loading process_credentials
45
64
  // see https://github.com/aws/aws-sdk-js/pull/1391
46
65
  process.env.AWS_SDK_LOAD_CONFIG = '1';
47
- credentials = new aws_sdk_1.default.ProcessCredentials();
48
- await credentials.refreshPromise();
66
+ credentials = (0, credential_providers_1.fromProcess)();
49
67
  }
50
68
  resetEnvironmentVariables(envVarValues);
51
- aws_sdk_1.default.config.credentials = credentials;
52
69
  return credentials;
53
70
  }
54
71
  exports.getAWSUserFromDefaultLocalProfile = getAWSUserFromDefaultLocalProfile;
@@ -81,9 +98,9 @@ async function getAWSUserFromGoldstackConfig(config, userName) {
81
98
  filename = userConfig.awsCredentialsFileName;
82
99
  }
83
100
  if (userConfig.credentialsSource !== 'process') {
84
- credentials = new aws_sdk_1.default.SharedIniFileCredentials({
101
+ credentials = (0, credential_providers_1.fromIni)({
85
102
  profile: userConfig.profile,
86
- filename: filename,
103
+ filepath: filename,
87
104
  });
88
105
  }
89
106
  else {
@@ -93,22 +110,21 @@ async function getAWSUserFromGoldstackConfig(config, userName) {
93
110
  if (!userConfig.awsCredentialsFileName) {
94
111
  process.env.AWS_SDK_LOAD_CONFIG = '1';
95
112
  }
96
- credentials = new aws_sdk_1.default.ProcessCredentials({
113
+ credentials = (0, credential_providers_1.fromProcess)({
97
114
  profile: userConfig.profile,
98
- filename: filename,
115
+ filepath: filename,
99
116
  });
100
- await credentials.refreshPromise();
101
117
  }
102
118
  resetEnvironmentVariables(envVarValues);
103
- if (!credentials.accessKeyId) {
104
- throw new Error('Cannot load profile ' +
105
- userConfig.profile +
106
- ' from AWS configuration for user ' +
107
- user.name +
108
- '. Please perform `aws login` for the profile using the AWS CLI.');
109
- }
110
- aws_sdk_1.default.config.credentials = credentials;
111
- aws_sdk_1.default.config.update({ region: userConfig.awsDefaultRegion });
119
+ // if (!(await validateCredentials(credentials))) {
120
+ // throw new Error(
121
+ // 'Cannot load profile ' +
122
+ // userConfig.profile +
123
+ // ' from AWS configuration for user ' +
124
+ // user.name +
125
+ // '. Please perform `aws login` for the profile using the AWS CLI.'
126
+ // );
127
+ // }
112
128
  return credentials;
113
129
  }
114
130
  if (user.type === 'apiKey') {
@@ -116,12 +132,13 @@ async function getAWSUserFromGoldstackConfig(config, userName) {
116
132
  if (!config.awsAccessKeyId || !config.awsSecretAccessKey) {
117
133
  throw new Error(`AWS Access credentials not defined for user ${userName}. Define them in infra/aws/config.json.`);
118
134
  }
119
- const credentials = new aws_sdk_1.default.Credentials({
120
- accessKeyId: config.awsAccessKeyId || '',
121
- secretAccessKey: config.awsSecretAccessKey || '',
135
+ process.env.AWS_ACCESS_KEY_ID = config.awsAccessKeyId;
136
+ process.env.AWS_SECRET_ACCESS_KEY = config.awsSecretAccessKey;
137
+ const credentials = (0, credential_providers_1.fromEnv)();
138
+ (0, awsAuthUtils_1.injectCredentials)(credentials, {
139
+ accessKeyId: config.awsAccessKeyId,
140
+ secretAccessKey: config.awsSecretAccessKey,
122
141
  });
123
- aws_sdk_1.default.config.credentials = credentials;
124
- aws_sdk_1.default.config.update({ region: config.awsDefaultRegion });
125
142
  return credentials;
126
143
  }
127
144
  if (user.type === 'environmentVariables') {
@@ -138,12 +155,13 @@ async function getAWSUserFromGoldstackConfig(config, userName) {
138
155
  if (!awsDefaultRegion) {
139
156
  throw new Error(`Environment variable expected but not found: ${userConfig.awsDefaultRegionVariableName}`);
140
157
  }
141
- const credentials = new aws_sdk_1.default.Credentials({
142
- accessKeyId: awsAccessKeyId,
143
- secretAccessKey: awsSecretAccessKey,
158
+ process.env.AWS_ACCESS_KEY_ID = awsAccessKeyId;
159
+ process.env.AWS_SECRET_ACCESS_KEY = awsSecretAccessKey;
160
+ const credentials = (0, credential_providers_1.fromEnv)();
161
+ (0, awsAuthUtils_1.injectCredentials)(credentials, {
162
+ accessKeyId: process.env.AWS_ACCESS_KEY_ID,
163
+ secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
144
164
  });
145
- aws_sdk_1.default.config.credentials = credentials;
146
- aws_sdk_1.default.config.update({ region: awsDefaultRegion });
147
165
  return credentials;
148
166
  }
149
167
  throw new Error(`Unknown user config type ${user.type}`);
@@ -1 +1 @@
1
- {"version":3,"file":"awsUserUtils.js","sourceRoot":"","sources":["../../src/awsUserUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"awsUserUtils.js","sourceRoot":"","sources":["../../src/awsUserUtils.ts"],"names":[],"mappings":"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"}
@@ -1,10 +1,11 @@
1
1
  import { AWSConfiguration, AWSUser, AWSProfileConfig, AWSAPIKeyUserConfig, AWSAccessKeyId, AWSSecretAccessKey, Name } from './types/awsAccount';
2
- import AWS from 'aws-sdk';
2
+ import { AwsCredentialIdentityProvider } from '@aws-sdk/types';
3
3
  import { AWSTerraformState, RemoteState } from './types/awsTerraformState';
4
4
  import { AWSRegion, AWSEnvironmentVariableUserConfig } from './types/awsAccount';
5
5
  export type { AWSConfiguration, AWSUser, AWSRegion, AWSAccessKeyId, AWSSecretAccessKey, AWSProfileConfig as AWSLocalUserConfig, AWSAPIKeyUserConfig as AWSAPIKeyUser, AWSEnvironmentVariableUserConfig, AWSTerraformState, RemoteState, };
6
6
  import { AWSDeployment } from './types/awsDeployment';
7
7
  export type { AWSDeployment, AWSDeploymentRegion, AWSUserName, } from './types/awsDeployment';
8
+ export { getAWSCredentials } from './awsAuthUtils';
8
9
  export declare const readDeploymentFromPackageConfig: (deploymentName: string, path?: string) => AWSDeployment;
9
10
  export declare const assertTerraformConfig: (user: Name, path?: string) => AWSTerraformState;
10
11
  export declare const writeTerraformConfig: (config: AWSTerraformState, path?: string) => void;
@@ -12,8 +13,12 @@ export declare const hasConfig: (path?: string) => boolean;
12
13
  export declare const readConfig: (path?: string) => AWSConfiguration;
13
14
  export declare const writeConfig: (config: AWSConfiguration, path?: string) => void;
14
15
  export declare const createDefaultConfig: () => AWSConfiguration;
16
+ /**
17
+ * Resets the environment variables set after obtaining AWS user.
18
+ */
19
+ export declare const resetAWSUser: () => void;
15
20
  /**
16
21
  * Obtains AWS user credentials from config file or environment variables.
17
22
  */
18
- export declare const getAWSUser: (userName: string, configPath?: string) => Promise<AWS.Credentials>;
23
+ export declare const getAWSUser: (userName: string, configPath?: string) => Promise<AwsCredentialIdentityProvider>;
19
24
  //# sourceMappingURL=infraAws.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"infraAws.d.ts","sourceRoot":"","sources":["../../src/infraAws.ts"],"names":[],"mappings":"AASA,OAAO,EACL,gBAAgB,EAChB,OAAO,EACP,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EACd,kBAAkB,EAClB,IAAI,EACL,MAAM,oBAAoB,CAAC;AAI5B,OAAO,GAAG,MAAM,SAAS,CAAC;AAE1B,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE3E,OAAO,EACL,SAAS,EACT,gCAAgC,EACjC,MAAM,oBAAoB,CAAC;AAE5B,YAAY,EACV,gBAAgB,EAChB,OAAO,EACP,SAAS,EACT,cAAc,EACd,kBAAkB,EAClB,gBAAgB,IAAI,kBAAkB,EACtC,mBAAmB,IAAI,aAAa,EACpC,gCAAgC,EAChC,iBAAiB,EACjB,WAAW,GACZ,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAQtD,YAAY,EACV,aAAa,EACb,mBAAmB,EACnB,WAAW,GACZ,MAAM,uBAAuB,CAAC;AAE/B,eAAO,MAAM,+BAA+B,mBAC1B,MAAM,SACf,MAAM,KACZ,aAcF,CAAC;AAEF,eAAO,MAAM,qBAAqB,SAC1B,IAAI,SACH,MAAM,KACZ,iBAuBF,CAAC;AAEF,eAAO,MAAM,oBAAoB,WACvB,iBAAiB,SAClB,MAAM,KACZ,IAKF,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,MAAM,KAAG,OAOzC,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,MAAM,KAAG,gBAa1C,CAAC;AAEF,eAAO,MAAM,WAAW,WAAY,gBAAgB,SAAS,MAAM,KAAG,IAKrE,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAO,gBAItC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,aACX,MAAM,eACH,MAAM,KAClB,QAAQ,IAAI,WAAW,CAmBzB,CAAC"}
1
+ {"version":3,"file":"infraAws.d.ts","sourceRoot":"","sources":["../../src/infraAws.ts"],"names":[],"mappings":"AASA,OAAO,EACL,gBAAgB,EAChB,OAAO,EACP,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EACd,kBAAkB,EAClB,IAAI,EACL,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAE/D,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAE3E,OAAO,EACL,SAAS,EACT,gCAAgC,EACjC,MAAM,oBAAoB,CAAC;AAE5B,YAAY,EACV,gBAAgB,EAChB,OAAO,EACP,SAAS,EACT,cAAc,EACd,kBAAkB,EAClB,gBAAgB,IAAI,kBAAkB,EACtC,mBAAmB,IAAI,aAAa,EACpC,gCAAgC,EAChC,iBAAiB,EACjB,WAAW,GACZ,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAQtD,YAAY,EACV,aAAa,EACb,mBAAmB,EACnB,WAAW,GACZ,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAKnD,eAAO,MAAM,+BAA+B,mBAC1B,MAAM,SACf,MAAM,KACZ,aAcF,CAAC;AAEF,eAAO,MAAM,qBAAqB,SAC1B,IAAI,SACH,MAAM,KACZ,iBAuBF,CAAC;AAEF,eAAO,MAAM,oBAAoB,WACvB,iBAAiB,SAClB,MAAM,KACZ,IAKF,CAAC;AAEF,eAAO,MAAM,SAAS,UAAW,MAAM,KAAG,OAOzC,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,MAAM,KAAG,gBAa1C,CAAC;AAEF,eAAO,MAAM,WAAW,WAAY,gBAAgB,SAAS,MAAM,KAAG,IAKrE,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAO,gBAItC,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,YAAY,QAAO,IAG/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,UAAU,aACX,MAAM,eACH,MAAM,KAClB,QAAQ,6BAA6B,CAmBvC,CAAC"}
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
3
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
4
4
  };
5
5
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.getAWSUser = exports.createDefaultConfig = exports.writeConfig = exports.readConfig = exports.hasConfig = exports.writeTerraformConfig = exports.assertTerraformConfig = exports.readDeploymentFromPackageConfig = void 0;
6
+ exports.getAWSUser = exports.resetAWSUser = exports.createDefaultConfig = exports.writeConfig = exports.readConfig = exports.hasConfig = exports.writeTerraformConfig = exports.assertTerraformConfig = exports.readDeploymentFromPackageConfig = exports.getAWSCredentials = void 0;
7
7
  const fs_1 = __importDefault(require("fs"));
8
8
  const utils_config_1 = require("@goldstack/utils-config");
9
9
  const utils_package_1 = require("@goldstack/utils-package");
@@ -12,6 +12,10 @@ const accountConfigSchema_json_1 = __importDefault(require("./schemas/accountCon
12
12
  const deploymentConfigSchema_json_1 = __importDefault(require("./schemas/deploymentConfigSchema.json"));
13
13
  const awsTerraformStateSchema_json_1 = __importDefault(require("./schemas/awsTerraformStateSchema.json"));
14
14
  const awsUserUtils_1 = require("./awsUserUtils");
15
+ var awsAuthUtils_1 = require("./awsAuthUtils");
16
+ Object.defineProperty(exports, "getAWSCredentials", { enumerable: true, get: function () { return awsAuthUtils_1.getAWSCredentials; } });
17
+ // deactivate warning message while v3 upgrade in process
18
+ process.env.AWS_SDK_JS_SUPPRESS_MAINTENANCE_MODE_MESSAGE = '1';
15
19
  const readDeploymentFromPackageConfig = (deploymentName, path) => {
16
20
  const packageConfig = (0, utils_package_1.readPackageConfig)(path);
17
21
  const deployment = packageConfig.deployments.find((d) => d.name === deploymentName);
@@ -88,6 +92,14 @@ const createDefaultConfig = () => {
88
92
  };
89
93
  };
90
94
  exports.createDefaultConfig = createDefaultConfig;
95
+ /**
96
+ * Resets the environment variables set after obtaining AWS user.
97
+ */
98
+ const resetAWSUser = () => {
99
+ delete process.env.AWS_ACCESS_KEY_ID;
100
+ delete process.env.AWS_SECRET_ACCESS_KEY;
101
+ };
102
+ exports.resetAWSUser = resetAWSUser;
91
103
  /**
92
104
  * Obtains AWS user credentials from config file or environment variables.
93
105
  */
@@ -1 +1 @@
1
- {"version":3,"file":"infraAws.js","sourceRoot":"","sources":["../../src/infraAws.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"infraAws.js","sourceRoot":"","sources":["../../src/infraAws.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@goldstack/infra-aws",
3
- "version": "0.4.12",
3
+ "version": "0.4.14",
4
4
  "description": "Utilities to work with AWS infrastructure via the cli.",
5
5
  "keywords": [
6
6
  "goldstack",
@@ -39,19 +39,21 @@
39
39
  "version:apply:force": "yarn version $@ && yarn version apply"
40
40
  },
41
41
  "dependencies": {
42
+ "@aws-sdk/client-sts": "^3.484.0",
43
+ "@aws-sdk/credential-providers": "^3.484.0",
44
+ "@aws-sdk/types": "^3.468.0",
42
45
  "@goldstack/infra": "0.4.9",
43
46
  "@goldstack/utils-config": "0.4.9",
44
47
  "@goldstack/utils-log": "0.3.9",
45
48
  "@goldstack/utils-package": "0.4.9",
46
49
  "@goldstack/utils-sh": "0.5.9",
47
- "aws-sdk": "^2.1222.0",
48
- "axios": "0.21.2",
50
+ "axios": "1.6.0",
49
51
  "handlebars": "4.7.7"
50
52
  },
51
53
  "devDependencies": {
52
54
  "@goldstack/utils-git": "0.2.9",
53
- "@swc/core": "^1.3.55",
54
- "@swc/jest": "^0.2.26",
55
+ "@swc/core": "^1.3.74",
56
+ "@swc/jest": "^0.2.27",
55
57
  "@types/jest": "^29.0.1",
56
58
  "@types/node": "^18.7.13",
57
59
  "jest": "^29.3.1",