@goldstack/infra-aws 0.4.62 → 0.4.64
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/awsAuthUtils.d.ts +1 -1
- package/dist/src/awsAuthUtils.d.ts.map +1 -1
- package/dist/src/awsAuthUtils.js +5 -2
- package/dist/src/awsAuthUtils.js.map +1 -1
- package/dist/src/awsUserUtils.d.ts +1 -1
- package/dist/src/awsUserUtils.d.ts.map +1 -1
- package/dist/src/awsUserUtils.js +4 -2
- package/dist/src/awsUserUtils.js.map +1 -1
- package/dist/src/getAWSUser.d.ts.map +1 -1
- package/dist/src/getAWSUser.js +20 -2
- package/dist/src/getAWSUser.js.map +1 -1
- package/dist/src/schemas/awsTerraformStateSchema.json +6 -5
- package/package.json +1 -1
|
@@ -2,5 +2,5 @@ import type { AwsCredentialIdentity, AwsCredentialIdentityProvider } from '@aws-
|
|
|
2
2
|
export declare function injectCredentials(provider: AwsCredentialIdentityProvider, credentials: AwsCredentialIdentity): void;
|
|
3
3
|
export declare function hasInjectedCredentials(provider: AwsCredentialIdentityProvider): boolean;
|
|
4
4
|
export declare function retrieveInjectedCredentials(provider: AwsCredentialIdentityProvider): AwsCredentialIdentity;
|
|
5
|
-
export declare function getAWSCredentials(provider: AwsCredentialIdentityProvider): Promise<AwsCredentialIdentity>;
|
|
5
|
+
export declare function getAWSCredentials(provider: AwsCredentialIdentityProvider, region?: string): Promise<AwsCredentialIdentity>;
|
|
6
6
|
//# sourceMappingURL=awsAuthUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"awsAuthUtils.d.ts","sourceRoot":"","sources":["../../src/awsAuthUtils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAE3F,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,6BAA6B,EACvC,WAAW,EAAE,qBAAqB,GACjC,IAAI,CAGN;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,6BAA6B,GAAG,OAAO,CAGvF;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,6BAA6B,GACtC,qBAAqB,CAGvB;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,6BAA6B,
|
|
1
|
+
{"version":3,"file":"awsAuthUtils.d.ts","sourceRoot":"","sources":["../../src/awsAuthUtils.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAE3F,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,6BAA6B,EACvC,WAAW,EAAE,qBAAqB,GACjC,IAAI,CAGN;AAED,wBAAgB,sBAAsB,CAAC,QAAQ,EAAE,6BAA6B,GAAG,OAAO,CAGvF;AAED,wBAAgB,2BAA2B,CACzC,QAAQ,EAAE,6BAA6B,GACtC,qBAAqB,CAGvB;AAED,wBAAsB,iBAAiB,CACrC,QAAQ,EAAE,6BAA6B,EACvC,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,qBAAqB,CAAC,CA8BhC"}
|
package/dist/src/awsAuthUtils.js
CHANGED
|
@@ -17,7 +17,7 @@ function retrieveInjectedCredentials(provider) {
|
|
|
17
17
|
// biome-ignore lint/suspicious/noExplicitAny: Accessing private property for credential injection
|
|
18
18
|
return provider._injectedCredentials;
|
|
19
19
|
}
|
|
20
|
-
async function getAWSCredentials(provider) {
|
|
20
|
+
async function getAWSCredentials(provider, region) {
|
|
21
21
|
if (hasInjectedCredentials(provider)) {
|
|
22
22
|
return retrieveInjectedCredentials(provider);
|
|
23
23
|
}
|
|
@@ -25,7 +25,10 @@ async function getAWSCredentials(provider) {
|
|
|
25
25
|
if (credentials.sessionToken) {
|
|
26
26
|
return credentials;
|
|
27
27
|
}
|
|
28
|
-
const client = new client_sts_1.STSClient({
|
|
28
|
+
const client = new client_sts_1.STSClient({
|
|
29
|
+
credentials: () => Promise.resolve(credentials),
|
|
30
|
+
region,
|
|
31
|
+
});
|
|
29
32
|
const input = {
|
|
30
33
|
DurationSeconds: 900,
|
|
31
34
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"awsAuthUtils.js","sourceRoot":"","sources":["../../src/awsAuthUtils.ts"],"names":[],"mappings":";;AAGA,8CAMC;AAED,wDAGC;AAED,kEAKC;AAED,
|
|
1
|
+
{"version":3,"file":"awsAuthUtils.js","sourceRoot":"","sources":["../../src/awsAuthUtils.ts"],"names":[],"mappings":";;AAGA,8CAMC;AAED,wDAGC;AAED,kEAKC;AAED,8CAiCC;AAxDD,oDAAwE;AAGxE,SAAgB,iBAAiB,CAC/B,QAAuC,EACvC,WAAkC;IAElC,kGAAkG;IACjG,QAAgB,CAAC,oBAAoB,GAAG,WAAW,CAAC;AACvD,CAAC;AAED,SAAgB,sBAAsB,CAAC,QAAuC;IAC5E,kGAAkG;IAClG,OAAQ,QAAgB,CAAC,oBAAoB,KAAK,SAAS,CAAC;AAC9D,CAAC;AAED,SAAgB,2BAA2B,CACzC,QAAuC;IAEvC,kGAAkG;IAClG,OAAQ,QAAgB,CAAC,oBAA6C,CAAC;AACzE,CAAC;AAEM,KAAK,UAAU,iBAAiB,CACrC,QAAuC,EACvC,MAAe;IAEf,IAAI,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrC,OAAO,2BAA2B,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,WAAW,GAAG,MAAM,QAAQ,EAAE,CAAC;IACrC,IAAI,WAAW,CAAC,YAAY,EAAE,CAAC;QAC7B,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,sBAAS,CAAC;QAC3B,WAAW,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC;QAC/C,MAAM;KACP,CAAC,CAAC;IACH,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,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;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"}
|
|
@@ -5,7 +5,7 @@ export declare function getAWSUserFromEnvironmentVariables(): Promise<AwsCredent
|
|
|
5
5
|
* Obtains AWS user credentials from container environment variables for ECS containers.
|
|
6
6
|
*/
|
|
7
7
|
export declare function getAWSUserFromContainerEnvironment(): Promise<AwsCredentialIdentityProvider>;
|
|
8
|
-
export declare function getCurrentAWSAccountId(credentials: AwsCredentialIdentity | AwsCredentialIdentityProvider): Promise<string>;
|
|
8
|
+
export declare function getCurrentAWSAccountId(credentials: AwsCredentialIdentity | AwsCredentialIdentityProvider, region?: string): Promise<string>;
|
|
9
9
|
export declare function getAWSUserFromDefaultLocalProfile(): Promise<AwsCredentialIdentityProvider>;
|
|
10
10
|
export declare function getAWSUserFromGoldstackConfig(config: AWSConfiguration, userName: string): Promise<AwsCredentialIdentityProvider>;
|
|
11
11
|
//# sourceMappingURL=awsUserUtils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"awsUserUtils.d.ts","sourceRoot":"","sources":["../../src/awsUserUtils.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAI3F,OAAO,KAAK,EAEV,gBAAgB,EAIjB,MAAM,oBAAoB,CAAC;AAE5B,wBAAsB,kCAAkC,IAAI,OAAO,CAAC,6BAA6B,CAAC,
|
|
1
|
+
{"version":3,"file":"awsUserUtils.d.ts","sourceRoot":"","sources":["../../src/awsUserUtils.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAI3F,OAAO,KAAK,EAEV,gBAAgB,EAIjB,MAAM,oBAAoB,CAAC;AAE5B,wBAAsB,kCAAkC,IAAI,OAAO,CAAC,6BAA6B,CAAC,CAejG;AACD;;GAEG;AACH,wBAAsB,kCAAkC,IAAI,OAAO,CAAC,6BAA6B,CAAC,CAWjG;AAsBD,wBAAsB,sBAAsB,CAC1C,WAAW,EAAE,qBAAqB,GAAG,6BAA6B,EAClE,MAAM,CAAC,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,iCAAiC,IAAI,OAAO,CAAC,6BAA6B,CAAC,CAkBhG;AAED,wBAAsB,6BAA6B,CACjD,MAAM,EAAE,gBAAgB,EACxB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,6BAA6B,CAAC,CA6HxC"}
|
package/dist/src/awsUserUtils.js
CHANGED
|
@@ -16,6 +16,8 @@ const awsAuthUtils_1 = require("./awsAuthUtils");
|
|
|
16
16
|
async function getAWSUserFromEnvironmentVariables() {
|
|
17
17
|
(0, assert_1.default)(process.env.AWS_ACCESS_KEY_ID, 'AWS_ACCESS_KEY_ID not defined.');
|
|
18
18
|
(0, assert_1.default)(process.env.AWS_SECRET_ACCESS_KEY, 'AWS_SECRET_ACCESS_KEY not defined');
|
|
19
|
+
const region = process.env.AWS_REGION || process.env.AWS_DEFAULT_REGION;
|
|
20
|
+
(0, assert_1.default)(region, 'Neither AWS_REGION nor AWS_DEFAULT_REGION are defined. One of these environment variables is required when using AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY environment variables.');
|
|
19
21
|
const credentials = (0, credential_providers_1.fromEnv)();
|
|
20
22
|
(0, awsAuthUtils_1.injectCredentials)(credentials, {
|
|
21
23
|
accessKeyId: process.env.AWS_ACCESS_KEY_ID,
|
|
@@ -56,8 +58,8 @@ async function validateCredentials(credentials) {
|
|
|
56
58
|
}
|
|
57
59
|
return true;
|
|
58
60
|
}
|
|
59
|
-
async function getCurrentAWSAccountId(credentials) {
|
|
60
|
-
const client = new client_sts_1.STSClient({ credentials });
|
|
61
|
+
async function getCurrentAWSAccountId(credentials, region) {
|
|
62
|
+
const client = new client_sts_1.STSClient({ credentials, region });
|
|
61
63
|
const command = new client_sts_1.GetCallerIdentityCommand({});
|
|
62
64
|
const response = await client.send(command);
|
|
63
65
|
if (!response.Account) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"awsUserUtils.js","sourceRoot":"","sources":["../../src/awsUserUtils.ts"],"names":[],"mappings":";;;;;AAmBA,
|
|
1
|
+
{"version":3,"file":"awsUserUtils.js","sourceRoot":"","sources":["../../src/awsUserUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAWSUser.d.ts","sourceRoot":"","sources":["../../src/getAWSUser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAWpE;;GAEG;AAEH,eAAO,MAAM,UAAU,GACrB,UAAU,MAAM,EAChB,aAAa,MAAM,KAClB,OAAO,CAAC,6BAA6B,
|
|
1
|
+
{"version":3,"file":"getAWSUser.d.ts","sourceRoot":"","sources":["../../src/getAWSUser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,6BAA6B,EAAE,MAAM,gBAAgB,CAAC;AAWpE;;GAEG;AAEH,eAAO,MAAM,UAAU,GACrB,UAAU,MAAM,EAChB,aAAa,MAAM,KAClB,OAAO,CAAC,6BAA6B,CA2DvC,CAAC"}
|
package/dist/src/getAWSUser.js
CHANGED
|
@@ -15,7 +15,16 @@ const getAWSUser = async (userName, configPath) => {
|
|
|
15
15
|
if (configPath && fs_1.default.existsSync(configPath)) {
|
|
16
16
|
(0, utils_log_1.info)(`Obtaining credentials from goldstack config file in ${configPath}`);
|
|
17
17
|
const config = (0, infraAws_1.readConfig)(configPath);
|
|
18
|
-
|
|
18
|
+
try {
|
|
19
|
+
return await (0, awsUserUtils_1.getAWSUserFromGoldstackConfig)(config, userName);
|
|
20
|
+
}
|
|
21
|
+
catch (error) {
|
|
22
|
+
if (error instanceof Error && error.message.includes('does not exist in AWS configuration')) {
|
|
23
|
+
(0, utils_log_1.info)(`User '${userName}' not found in goldstack config. Falling back to default profile from aws login.`);
|
|
24
|
+
return await (0, awsUserUtils_1.getAWSUserFromDefaultLocalProfile)();
|
|
25
|
+
}
|
|
26
|
+
throw error;
|
|
27
|
+
}
|
|
19
28
|
}
|
|
20
29
|
// Load from ECS environment if running in ECS
|
|
21
30
|
if (process.env.AWS_CONTAINER_CREDENTIALS_RELATIVE_URI) {
|
|
@@ -43,7 +52,16 @@ const getAWSUser = async (userName, configPath) => {
|
|
|
43
52
|
}
|
|
44
53
|
(0, utils_log_1.info)(`Obtaining credentials from goldstack config file.`);
|
|
45
54
|
const config = (0, infraAws_1.readConfig)(configPath);
|
|
46
|
-
|
|
55
|
+
try {
|
|
56
|
+
return await (0, awsUserUtils_1.getAWSUserFromGoldstackConfig)(config, userName);
|
|
57
|
+
}
|
|
58
|
+
catch (error) {
|
|
59
|
+
if (error instanceof Error && error.message.includes('does not exist in AWS configuration')) {
|
|
60
|
+
(0, utils_log_1.info)(`User '${userName}' not found in goldstack config. Falling back to default profile from aws login.`);
|
|
61
|
+
return await (0, awsUserUtils_1.getAWSUserFromDefaultLocalProfile)();
|
|
62
|
+
}
|
|
63
|
+
throw error;
|
|
64
|
+
}
|
|
47
65
|
};
|
|
48
66
|
exports.getAWSUser = getAWSUser;
|
|
49
67
|
//# sourceMappingURL=getAWSUser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAWSUser.js","sourceRoot":"","sources":["../../src/getAWSUser.ts"],"names":[],"mappings":";;;;;;AACA,oDAA4C;AAC5C,4CAAoB;AACpB,iDAKwB;AACxB,yCAAmD;AAEnD;;GAEG;AAEI,MAAM,UAAU,GAAG,KAAK,EAC7B,QAAgB,EAChB,UAAmB,EACqB,EAAE;IAC1C,IAAI,UAAU,IAAI,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5C,IAAA,gBAAI,EAAC,uDAAuD,UAAU,EAAE,CAAC,CAAC;QAC1E,MAAM,MAAM,GAAG,IAAA,qBAAU,EAAC,UAAU,CAAC,CAAC;QACtC,OAAO,MAAM,IAAA,4CAA6B,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"getAWSUser.js","sourceRoot":"","sources":["../../src/getAWSUser.ts"],"names":[],"mappings":";;;;;;AACA,oDAA4C;AAC5C,4CAAoB;AACpB,iDAKwB;AACxB,yCAAmD;AAEnD;;GAEG;AAEI,MAAM,UAAU,GAAG,KAAK,EAC7B,QAAgB,EAChB,UAAmB,EACqB,EAAE;IAC1C,IAAI,UAAU,IAAI,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC5C,IAAA,gBAAI,EAAC,uDAAuD,UAAU,EAAE,CAAC,CAAC;QAC1E,MAAM,MAAM,GAAG,IAAA,qBAAU,EAAC,UAAU,CAAC,CAAC;QACtC,IAAI,CAAC;YACH,OAAO,MAAM,IAAA,4CAA6B,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QAC/D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,qCAAqC,CAAC,EAAE,CAAC;gBAC5F,IAAA,gBAAI,EACF,SAAS,QAAQ,kFAAkF,CACpG,CAAC;gBACF,OAAO,MAAM,IAAA,gDAAiC,GAAE,CAAC;YACnD,CAAC;YACD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAED,8CAA8C;IAC9C,IAAI,OAAO,CAAC,GAAG,CAAC,sCAAsC,EAAE,CAAC;QACvD,OAAO,MAAM,IAAA,iDAAkC,GAAE,CAAC;IACpD,CAAC;IAED,2DAA2D;IAC3D,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;QAClC,OAAO,MAAM,IAAA,iDAAkC,GAAE,CAAC;IACpD,CAAC;IAED,8DAA8D;IAC9D,6DAA6D;IAC7D,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,IAAI,CAAC;YACH,MAAM,cAAc,GAAG,MAAM,IAAA,gDAAiC,GAAE,CAAC;YACjE,IAAA,gBAAI,EAAC,oDAAoD,CAAC,CAAC;YAC3D,OAAO,cAAc,CAAC;QACxB,CAAC;QAAC,MAAM,CAAC;YACP,mCAAmC;QACrC,CAAC;IACH,CAAC;IAED,sDAAsD;IACtD,IAAI,CAAC,IAAA,oBAAS,EAAC,UAAU,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAC;IACJ,CAAC;IAED,IAAA,gBAAI,EAAC,mDAAmD,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,IAAA,qBAAU,EAAC,UAAU,CAAC,CAAC;IACtC,IAAI,CAAC;QACH,OAAO,MAAM,IAAA,4CAA6B,EAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,qCAAqC,CAAC,EAAE,CAAC;YAC5F,IAAA,gBAAI,EACF,SAAS,QAAQ,kFAAkF,CACpG,CAAC;YACF,OAAO,MAAM,IAAA,gDAAiC,GAAE,CAAC;QACnD,CAAC;QACD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CAAC;AA9DW,QAAA,UAAU,cA8DrB"}
|
|
@@ -12,7 +12,9 @@
|
|
|
12
12
|
"type": "array"
|
|
13
13
|
}
|
|
14
14
|
},
|
|
15
|
-
"required": [
|
|
15
|
+
"required": [
|
|
16
|
+
"remoteState"
|
|
17
|
+
],
|
|
16
18
|
"type": "object"
|
|
17
19
|
},
|
|
18
20
|
"Name": {
|
|
@@ -25,9 +27,6 @@
|
|
|
25
27
|
"additionalProperties": false,
|
|
26
28
|
"properties": {
|
|
27
29
|
"accountId": {
|
|
28
|
-
"description": "The AWS account ID where Terraform state resources will be created. If specified, the system will verify that the current AWS credentials match this account before creating S3 buckets or DynamoDB tables, preventing accidental resource creation in the wrong account.",
|
|
29
|
-
"pattern": "^[0-9]{12}$",
|
|
30
|
-
"title": "AWS Account ID",
|
|
31
30
|
"type": "string"
|
|
32
31
|
},
|
|
33
32
|
"terraformStateBucket": {
|
|
@@ -40,7 +39,9 @@
|
|
|
40
39
|
"$ref": "#/definitions/Name"
|
|
41
40
|
}
|
|
42
41
|
},
|
|
43
|
-
"required": [
|
|
42
|
+
"required": [
|
|
43
|
+
"user"
|
|
44
|
+
],
|
|
44
45
|
"type": "object"
|
|
45
46
|
},
|
|
46
47
|
"TerraformDynamoDBTable": {
|