envilder 0.11.1 → 0.12.1
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/docs/changelogs/cli.md +34 -8
- package/docs/changelogs/gha.md +38 -6
- package/docs/changelogs/sdk-dotnet.md +0 -13
- package/docs/changelogs/sdk-nodejs.md +10 -7
- package/lib/envilder/apps/shared/ContainerConfiguration.d.ts.map +1 -1
- package/lib/envilder/apps/shared/ContainerConfiguration.js +3 -3
- package/lib/envilder/apps/shared/ContainerConfiguration.js.map +1 -1
- package/lib/envilder/core/infrastructure/aws/AwsSecretProviderFactory.d.ts +3 -1
- package/lib/envilder/core/infrastructure/aws/AwsSecretProviderFactory.d.ts.map +1 -1
- package/lib/envilder/core/infrastructure/aws/AwsSecretProviderFactory.js +33 -8
- package/lib/envilder/core/infrastructure/aws/AwsSecretProviderFactory.js.map +1 -1
- package/lib/envilder/core/infrastructure/aws/AwsSsmSecretProvider.d.ts +12 -1
- package/lib/envilder/core/infrastructure/aws/AwsSsmSecretProvider.d.ts.map +1 -1
- package/lib/envilder/core/infrastructure/aws/AwsSsmSecretProvider.js +66 -2
- package/lib/envilder/core/infrastructure/aws/AwsSsmSecretProvider.js.map +1 -1
- package/lib/envilder/core/infrastructure/variableStore/FileVariableStore.d.ts +3 -0
- package/lib/envilder/core/infrastructure/variableStore/FileVariableStore.d.ts.map +1 -1
- package/lib/envilder/core/infrastructure/variableStore/FileVariableStore.js +72 -3
- package/lib/envilder/core/infrastructure/variableStore/FileVariableStore.js.map +1 -1
- package/lib/sdks/nodejs/src/infrastructure/secret-provider-factory.d.ts +1 -0
- package/lib/sdks/nodejs/src/infrastructure/secret-provider-factory.d.ts.map +1 -1
- package/lib/sdks/nodejs/src/infrastructure/secret-provider-factory.js +27 -5
- package/lib/sdks/nodejs/src/infrastructure/secret-provider-factory.js.map +1 -1
- package/package.json +2 -1
package/docs/changelogs/cli.md
CHANGED
|
@@ -5,17 +5,43 @@ For SDK-specific changes, see `sdk-dotnet.md`, `sdk-python.md`, or `sdk-nodejs.m
|
|
|
5
5
|
|
|
6
6
|
---
|
|
7
7
|
|
|
8
|
-
## [0.
|
|
8
|
+
## [0.12.1] - 2026-06-26
|
|
9
9
|
|
|
10
10
|
### Fixed
|
|
11
11
|
|
|
12
|
-
* **
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
the
|
|
18
|
-
|
|
12
|
+
* **Honor `$config.profile` for the AWS region, not just credentials** —
|
|
13
|
+
When a map file set an AWS profile via `$config.profile`, Envilder applied
|
|
14
|
+
it to credentials only; the AWS SDK fell back to the default profile's
|
|
15
|
+
region and silently read or wrote SSM parameters in the wrong
|
|
16
|
+
account-region. Envilder now sets `AWS_PROFILE` so the AWS SDK resolves
|
|
17
|
+
both the profile's region and its (SSO-capable) credentials natively.
|
|
18
|
+
Region resolution order is `AWS_REGION` > `AWS_DEFAULT_REGION` >
|
|
19
|
+
profile region > `us-east-1` fallback
|
|
20
|
+
([#382](https://github.com/macalbert/envilder/issues/382))
|
|
21
|
+
|
|
22
|
+
### Added
|
|
23
|
+
|
|
24
|
+
* **Log the effective AWS identity before resolving secrets** —
|
|
25
|
+
Before the first read or write, Envilder logs
|
|
26
|
+
`AWS identity → account=… region=… profile=…` so a misrouted account
|
|
27
|
+
or region is immediately visible. The account is read from the active
|
|
28
|
+
credentials, falling back to an STS `GetCallerIdentity` call when not
|
|
29
|
+
present, then `unknown`
|
|
30
|
+
([#382](https://github.com/macalbert/envilder/issues/382))
|
|
31
|
+
|
|
32
|
+
---
|
|
33
|
+
|
|
34
|
+
## [0.12.0] - 2026-06-26
|
|
35
|
+
|
|
36
|
+
### Changed
|
|
37
|
+
|
|
38
|
+
* **Preserve existing `.env` formatting on pull** — When the target `.env`
|
|
39
|
+
file already exists, Envilder now updates values in place instead of
|
|
40
|
+
rewriting the file from scratch. Full-line comments, blank lines, key
|
|
41
|
+
ordering, `export` prefixes, and surrounding spacing are preserved; only
|
|
42
|
+
the values of mapped keys are replaced, and new keys are appended at the
|
|
43
|
+
end. (Inline comments after a value, e.g. `KEY=val # note`, are not
|
|
44
|
+
preserved.)
|
|
19
45
|
|
|
20
46
|
---
|
|
21
47
|
|
package/docs/changelogs/gha.md
CHANGED
|
@@ -1,12 +1,44 @@
|
|
|
1
|
-
## [0.
|
|
1
|
+
## [0.12.1] - 2026-06-26
|
|
2
2
|
|
|
3
3
|
### Fixed
|
|
4
4
|
|
|
5
|
-
* **
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
5
|
+
* **Honor `$config.profile` for the AWS region, not just credentials** —
|
|
6
|
+
When a map file set an AWS profile via `$config.profile`, the action
|
|
7
|
+
applied it to credentials only; the AWS SDK fell back to the default
|
|
8
|
+
profile's region and silently read SSM parameters from the wrong
|
|
9
|
+
account-region. The action now sets `AWS_PROFILE` so the AWS SDK resolves
|
|
10
|
+
both the profile's region and its (SSO-capable) credentials natively.
|
|
11
|
+
Region resolution order is `AWS_REGION` > `AWS_DEFAULT_REGION` >
|
|
12
|
+
profile region > `us-east-1` fallback
|
|
13
|
+
([#382](https://github.com/macalbert/envilder/issues/382))
|
|
14
|
+
|
|
15
|
+
### Added
|
|
16
|
+
|
|
17
|
+
* **Log the effective AWS identity before resolving secrets** —
|
|
18
|
+
Before the first read, the action logs
|
|
19
|
+
`AWS identity → account=… region=… profile=…` so a misrouted account
|
|
20
|
+
or region is immediately visible. The account is read from the active
|
|
21
|
+
credentials, falling back to an STS `GetCallerIdentity` call when not
|
|
22
|
+
present, then `unknown`
|
|
23
|
+
([#382](https://github.com/macalbert/envilder/issues/382))
|
|
24
|
+
|
|
25
|
+
---
|
|
26
|
+
|
|
27
|
+
## [0.12.0] - 2026-06-26
|
|
28
|
+
|
|
29
|
+
### Changed
|
|
30
|
+
|
|
31
|
+
* **Preserve existing `.env` formatting on pull** — When the target `.env`
|
|
32
|
+
file already exists, the action now updates values in place instead of
|
|
33
|
+
rewriting the file from scratch. Full-line comments, blank lines, key
|
|
34
|
+
ordering, `export` prefixes, and surrounding spacing are preserved; only
|
|
35
|
+
the values of mapped keys are replaced, and new keys are appended at the
|
|
36
|
+
end. (Inline comments after a value, e.g. `KEY=val # note`, are not
|
|
37
|
+
preserved.)
|
|
38
|
+
|
|
39
|
+
### Dependencies
|
|
40
|
+
|
|
41
|
+
* Bundle updated with latest CLI core
|
|
10
42
|
|
|
11
43
|
---
|
|
12
44
|
|
|
@@ -1,16 +1,3 @@
|
|
|
1
|
-
## [0.4.1] - 2026-06-25
|
|
2
|
-
|
|
3
|
-
### Fixed
|
|
4
|
-
|
|
5
|
-
* **AWS SSO / assumed-role profiles now resolve at runtime** — Added the
|
|
6
|
-
`AWSSDK.SSO` and `AWSSDK.SSOOIDC` dependencies so SSO and IAM Identity
|
|
7
|
-
Center profiles (via `WithProfile()` or `$config.profile`) build their
|
|
8
|
-
credentials at runtime. Previously these profiles threw
|
|
9
|
-
`Assembly AWSSDK.SSOOIDC could not be found`
|
|
10
|
-
([#364](https://github.com/macalbert/envilder/issues/364))
|
|
11
|
-
|
|
12
|
-
---
|
|
13
|
-
|
|
14
1
|
## [0.4.0] - 2026-05-18
|
|
15
2
|
|
|
16
3
|
### Changed
|
|
@@ -1,13 +1,16 @@
|
|
|
1
|
-
## [0.3.1] - 2026-06-
|
|
1
|
+
## [0.3.1] - 2026-06-26
|
|
2
2
|
|
|
3
3
|
### Fixed
|
|
4
4
|
|
|
5
|
-
* **
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
(
|
|
5
|
+
* **Honor the `profile` option for the AWS region, not just credentials** —
|
|
6
|
+
When a profile was set via the `profile` option or `$config.profile`, the
|
|
7
|
+
SDK applied it to credentials only; the AWS SDK fell back to the default
|
|
8
|
+
profile's region and silently read SSM parameters from the wrong
|
|
9
|
+
account-region. The SDK now sets `AWS_PROFILE` so the AWS SDK resolves both
|
|
10
|
+
the profile's region and its (SSO-capable) credentials natively. Region
|
|
11
|
+
resolution order is `AWS_REGION` > `AWS_DEFAULT_REGION` > profile
|
|
12
|
+
region > `us-east-1` fallback
|
|
13
|
+
([#382](https://github.com/macalbert/envilder/issues/382))
|
|
11
14
|
|
|
12
15
|
---
|
|
13
16
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContainerConfiguration.d.ts","sourceRoot":"","sources":["../../../../src/envilder/apps/shared/ContainerConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAO3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAKxE,OAAO,EACL,KAAK,oBAAoB,EAE1B,MAAM,+DAA+D,CAAC;AAKvE,MAAM,MAAM,qBAAqB,GAAG,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ContainerConfiguration.d.ts","sourceRoot":"","sources":["../../../../src/envilder/apps/shared/ContainerConfiguration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAO3C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAKxE,OAAO,EACL,KAAK,oBAAoB,EAE1B,MAAM,+DAA+D,CAAC;AAKvE,MAAM,MAAM,qBAAqB,GAAG,oBAAoB,CAAC;AAazD,wBAAgB,+BAA+B,CAC7C,SAAS,EAAE,SAAS,EACpB,MAAM,GAAE,aAAkB,EAC1B,OAAO,GAAE,qBAA0B,GAClC,IAAI,CAqCN;AAED,wBAAgB,4BAA4B,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAoBvE"}
|
|
@@ -9,7 +9,7 @@ import { ConsoleLogger } from '../../core/infrastructure/logger/ConsoleLogger.js
|
|
|
9
9
|
import { FileVariableStore } from '../../core/infrastructure/variableStore/FileVariableStore.js';
|
|
10
10
|
import { TYPES } from '../../core/types.js';
|
|
11
11
|
const providerFactories = {
|
|
12
|
-
aws: (config) => createAwsSecretProvider(config),
|
|
12
|
+
aws: (config, _options, logger) => createAwsSecretProvider(config, logger),
|
|
13
13
|
azure: (config, options) => createAzureSecretProvider(config, options),
|
|
14
14
|
};
|
|
15
15
|
export function configureInfrastructureServices(container, config = {}, options = {}) {
|
|
@@ -17,6 +17,7 @@ export function configureInfrastructureServices(container, config = {}, options
|
|
|
17
17
|
if (!container.isBound(TYPES.ILogger)) {
|
|
18
18
|
container.bind(TYPES.ILogger).to(ConsoleLogger).inSingletonScope();
|
|
19
19
|
}
|
|
20
|
+
const logger = container.get(TYPES.ILogger);
|
|
20
21
|
if (!container.isBound(TYPES.IVariableStore)) {
|
|
21
22
|
container
|
|
22
23
|
.bind(TYPES.IVariableStore)
|
|
@@ -25,7 +26,6 @@ export function configureInfrastructureServices(container, config = {}, options
|
|
|
25
26
|
}
|
|
26
27
|
const selectedProvider = ((_a = config.provider) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || 'aws';
|
|
27
28
|
if (config.profile && selectedProvider !== 'aws') {
|
|
28
|
-
const logger = container.get(TYPES.ILogger);
|
|
29
29
|
logger.warn(`--profile is only supported with the aws provider` +
|
|
30
30
|
` and will be ignored` +
|
|
31
31
|
` (current provider: ${selectedProvider}).`);
|
|
@@ -36,7 +36,7 @@ export function configureInfrastructureServices(container, config = {}, options
|
|
|
36
36
|
` Supported providers:` +
|
|
37
37
|
` ${Object.keys(providerFactories).join(', ')}`);
|
|
38
38
|
}
|
|
39
|
-
const secretProvider = factory(config, options);
|
|
39
|
+
const secretProvider = factory(config, options, logger);
|
|
40
40
|
container
|
|
41
41
|
.bind(TYPES.ISecretProvider)
|
|
42
42
|
.toConstantValue(secretProvider);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContainerConfiguration.js","sourceRoot":"","sources":["../../../../src/envilder/apps/shared/ContainerConfiguration.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,4BAA4B,EAAE,MAAM,iEAAiE,CAAC;AAC/G,OAAO,EAAE,8BAA8B,EAAE,MAAM,2EAA2E,CAAC;AAC3H,OAAO,EAAE,8BAA8B,EAAE,MAAM,2EAA2E,CAAC;AAC3H,OAAO,EAAE,wBAAwB,EAAE,MAAM,+DAA+D,CAAC;AACzG,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAKhF,OAAO,EAAE,uBAAuB,EAAE,MAAM,2DAA2D,CAAC;AACpG,OAAO,EAEL,yBAAyB,GAC1B,MAAM,+DAA+D,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,mDAAmD,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,8DAA8D,CAAC;AACjG,OAAO,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"ContainerConfiguration.js","sourceRoot":"","sources":["../../../../src/envilder/apps/shared/ContainerConfiguration.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import type { MapFileConfig } from '../../domain/MapFileConfig.js';
|
|
2
|
+
import type { ILogger } from '../../domain/ports/ILogger.js';
|
|
2
3
|
import type { ISecretProvider } from '../../domain/ports/ISecretProvider.js';
|
|
3
|
-
export declare function
|
|
4
|
+
export declare function resolveRegionWithFallback(profile?: string): Promise<string>;
|
|
5
|
+
export declare function createAwsSecretProvider(config: MapFileConfig, logger: ILogger): ISecretProvider;
|
|
4
6
|
//# sourceMappingURL=AwsSecretProviderFactory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsSecretProviderFactory.d.ts","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSecretProviderFactory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAG7E,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,aAAa,
|
|
1
|
+
{"version":3,"file":"AwsSecretProviderFactory.d.ts","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSecretProviderFactory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAG7E,wBAAsB,yBAAyB,CAC7C,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAYjB;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,OAAO,GACd,eAAe,CAWjB"}
|
|
@@ -1,12 +1,37 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
1
10
|
import { SSM } from '@aws-sdk/client-ssm';
|
|
2
|
-
import {
|
|
11
|
+
import { STS } from '@aws-sdk/client-sts';
|
|
3
12
|
import { AwsSsmSecretProvider } from './AwsSsmSecretProvider.js';
|
|
4
|
-
export function
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
13
|
+
export function resolveRegionWithFallback(profile) {
|
|
14
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
15
|
+
if (process.env.AWS_REGION) {
|
|
16
|
+
return process.env.AWS_REGION;
|
|
17
|
+
}
|
|
18
|
+
if (process.env.AWS_DEFAULT_REGION) {
|
|
19
|
+
return process.env.AWS_DEFAULT_REGION;
|
|
20
|
+
}
|
|
21
|
+
try {
|
|
22
|
+
return yield new SSM(profile ? { profile } : {}).config.region();
|
|
23
|
+
}
|
|
24
|
+
catch (_a) {
|
|
25
|
+
return 'us-east-1';
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
}
|
|
29
|
+
export function createAwsSecretProvider(config, logger) {
|
|
30
|
+
const { profile } = config;
|
|
31
|
+
const region = () => resolveRegionWithFallback(profile);
|
|
32
|
+
const clientConfig = profile ? { profile, region } : { region };
|
|
33
|
+
const ssm = new SSM(clientConfig);
|
|
34
|
+
const sts = new STS(Object.assign(Object.assign({}, clientConfig), { maxAttempts: 1, requestHandler: { requestTimeout: 2000 } }));
|
|
35
|
+
return new AwsSsmSecretProvider(ssm, logger, sts, profile);
|
|
11
36
|
}
|
|
12
37
|
//# sourceMappingURL=AwsSecretProviderFactory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsSecretProviderFactory.js","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSecretProviderFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"AwsSecretProviderFactory.js","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSecretProviderFactory.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC1C,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAI1C,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,UAAgB,yBAAyB,CAC7C,OAAgB;;QAEhB,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;YAC3B,OAAO,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC;QAChC,CAAC;QACD,IAAI,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;YACnC,OAAO,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC;QACxC,CAAC;QACD,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnE,CAAC;QAAC,WAAM,CAAC;YACP,OAAO,WAAW,CAAC;QACrB,CAAC;IACH,CAAC;CAAA;AAED,MAAM,UAAU,uBAAuB,CACrC,MAAqB,EACrB,MAAe;IAEf,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAC3B,MAAM,MAAM,GAAG,GAAG,EAAE,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;IACxD,MAAM,YAAY,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;IAChE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,YAAY,CAAC,CAAC;IAClC,MAAM,GAAG,GAAG,IAAI,GAAG,iCACd,YAAY,KACf,WAAW,EAAE,CAAC,EACd,cAAc,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,IACxC,CAAC;IACH,OAAO,IAAI,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC;AAC7D,CAAC"}
|
|
@@ -1,9 +1,20 @@
|
|
|
1
1
|
import { type SSM } from '@aws-sdk/client-ssm';
|
|
2
|
+
import { type STS } from '@aws-sdk/client-sts';
|
|
3
|
+
import type { ILogger } from '../../domain/ports/ILogger.js';
|
|
2
4
|
import type { ISecretProvider } from '../../domain/ports/ISecretProvider.js';
|
|
3
5
|
export declare class AwsSsmSecretProvider implements ISecretProvider {
|
|
4
6
|
private ssm;
|
|
5
|
-
|
|
7
|
+
private logger;
|
|
8
|
+
private sts;
|
|
9
|
+
private profile?;
|
|
10
|
+
private identityLogged;
|
|
11
|
+
constructor(ssm: SSM, logger: ILogger, sts: STS, profile?: string);
|
|
6
12
|
getSecret(name: string): Promise<string | undefined>;
|
|
7
13
|
setSecret(name: string, value: string): Promise<void>;
|
|
14
|
+
private logIdentityOnce;
|
|
15
|
+
private resolveRegion;
|
|
16
|
+
private resolveAccount;
|
|
17
|
+
private tryCredentialsAccount;
|
|
18
|
+
private tryStsAccount;
|
|
8
19
|
}
|
|
9
20
|
//# sourceMappingURL=AwsSsmSecretProvider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsSsmSecretProvider.d.ts","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSsmSecretProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,GAAG,EACT,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"AwsSsmSecretProvider.d.ts","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSsmSecretProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,GAAG,EACT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAA4B,KAAK,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAIzE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AAE7E,qBACa,oBAAqB,YAAW,eAAe;IAC1D,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,MAAM,CAAU;IACxB,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,cAAc,CAAS;gBAEnB,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM;IAO3D,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IA0BpD,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAW7C,eAAe;YAef,aAAa;YAQb,cAAc;YAQd,qBAAqB;YASrB,aAAa;CAQ5B"}
|
|
@@ -17,15 +17,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
17
17
|
});
|
|
18
18
|
};
|
|
19
19
|
import { GetParameterCommand, PutParameterCommand, } from '@aws-sdk/client-ssm';
|
|
20
|
+
import { GetCallerIdentityCommand } from '@aws-sdk/client-sts';
|
|
20
21
|
import { injectable } from 'inversify';
|
|
21
22
|
import { EnvironmentVariable } from '../../domain/EnvironmentVariable.js';
|
|
22
23
|
import { SecretOperationError } from '../../domain/errors/DomainErrors.js';
|
|
23
24
|
let AwsSsmSecretProvider = class AwsSsmSecretProvider {
|
|
24
|
-
constructor(ssm) {
|
|
25
|
+
constructor(ssm, logger, sts, profile) {
|
|
26
|
+
this.identityLogged = false;
|
|
25
27
|
this.ssm = ssm;
|
|
28
|
+
this.logger = logger;
|
|
29
|
+
this.sts = sts;
|
|
30
|
+
this.profile = profile;
|
|
26
31
|
}
|
|
27
32
|
getSecret(name) {
|
|
28
33
|
return __awaiter(this, void 0, void 0, function* () {
|
|
34
|
+
yield this.logIdentityOnce();
|
|
29
35
|
try {
|
|
30
36
|
const command = new GetParameterCommand({
|
|
31
37
|
Name: name,
|
|
@@ -48,6 +54,7 @@ let AwsSsmSecretProvider = class AwsSsmSecretProvider {
|
|
|
48
54
|
}
|
|
49
55
|
setSecret(name, value) {
|
|
50
56
|
return __awaiter(this, void 0, void 0, function* () {
|
|
57
|
+
yield this.logIdentityOnce();
|
|
51
58
|
const command = new PutParameterCommand({
|
|
52
59
|
Name: name,
|
|
53
60
|
Value: value,
|
|
@@ -57,10 +64,67 @@ let AwsSsmSecretProvider = class AwsSsmSecretProvider {
|
|
|
57
64
|
yield this.ssm.send(command);
|
|
58
65
|
});
|
|
59
66
|
}
|
|
67
|
+
logIdentityOnce() {
|
|
68
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
69
|
+
var _a;
|
|
70
|
+
if (this.identityLogged) {
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
this.identityLogged = true;
|
|
74
|
+
const [region, account] = yield Promise.all([
|
|
75
|
+
this.resolveRegion(),
|
|
76
|
+
this.resolveAccount(),
|
|
77
|
+
]);
|
|
78
|
+
const profile = (_a = this.profile) !== null && _a !== void 0 ? _a : 'default';
|
|
79
|
+
this.logger.info(`AWS identity → account=${account} region=${region} profile=${profile}`);
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
resolveRegion() {
|
|
83
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
84
|
+
try {
|
|
85
|
+
return yield this.ssm.config.region();
|
|
86
|
+
}
|
|
87
|
+
catch (_a) {
|
|
88
|
+
return 'unknown';
|
|
89
|
+
}
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
resolveAccount() {
|
|
93
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
94
|
+
const fromCredentials = yield this.tryCredentialsAccount();
|
|
95
|
+
if (fromCredentials) {
|
|
96
|
+
return fromCredentials;
|
|
97
|
+
}
|
|
98
|
+
return this.tryStsAccount();
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
tryCredentialsAccount() {
|
|
102
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
103
|
+
try {
|
|
104
|
+
const credentials = yield this.ssm.config.credentials();
|
|
105
|
+
return credentials.accountId;
|
|
106
|
+
}
|
|
107
|
+
catch (_a) {
|
|
108
|
+
return undefined;
|
|
109
|
+
}
|
|
110
|
+
});
|
|
111
|
+
}
|
|
112
|
+
tryStsAccount() {
|
|
113
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
114
|
+
var _a;
|
|
115
|
+
try {
|
|
116
|
+
const identity = yield this.sts.send(new GetCallerIdentityCommand({}));
|
|
117
|
+
return (_a = identity.Account) !== null && _a !== void 0 ? _a : 'unknown';
|
|
118
|
+
}
|
|
119
|
+
catch (_b) {
|
|
120
|
+
return 'unknown';
|
|
121
|
+
}
|
|
122
|
+
});
|
|
123
|
+
}
|
|
60
124
|
};
|
|
61
125
|
AwsSsmSecretProvider = __decorate([
|
|
62
126
|
injectable(),
|
|
63
|
-
__metadata("design:paramtypes", [Function])
|
|
127
|
+
__metadata("design:paramtypes", [Function, Object, Function, String])
|
|
64
128
|
], AwsSsmSecretProvider);
|
|
65
129
|
export { AwsSsmSecretProvider };
|
|
66
130
|
//# sourceMappingURL=AwsSsmSecretProvider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AwsSsmSecretProvider.js","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSsmSecretProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,OAAO,EACL,mBAAmB,EACnB,mBAAmB,GAEpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"AwsSsmSecretProvider.js","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/aws/AwsSsmSecretProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,OAAO,EACL,mBAAmB,EACnB,mBAAmB,GAEpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,wBAAwB,EAAY,MAAM,qBAAqB,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAKpE,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IAO/B,YAAY,GAAQ,EAAE,MAAe,EAAE,GAAQ,EAAE,OAAgB;QAFzD,mBAAc,GAAG,KAAK,CAAC;QAG7B,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEK,SAAS,CAAC,IAAY;;YAC1B,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAC7B,IAAI,CAAC;gBACH,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC;oBACtC,IAAI,EAAE,IAAI;oBACV,cAAc,EAAE,IAAI;iBACrB,CAAC,CAAC;gBACH,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACnD,OAAO,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC;YAC1B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IACE,OAAO,KAAK,KAAK,QAAQ;oBACzB,KAAK,KAAK,IAAI;oBACd,MAAM,IAAI,KAAK;oBACf,KAAK,CAAC,IAAI,KAAK,mBAAmB,EAClC,CAAC;oBACD,OAAO,SAAS,CAAC;gBACnB,CAAC;gBACD,MAAM,YAAY,GAChB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBACzD,MAAM,IAAI,oBAAoB,CAC5B,wBAAwB,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,YAAY,EAAE,CACpF,CAAC;YACJ,CAAC;QACH,CAAC;KAAA;IAEK,SAAS,CAAC,IAAY,EAAE,KAAa;;YACzC,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,IAAI,mBAAmB,CAAC;gBACtC,IAAI,EAAE,IAAI;gBACV,KAAK,EAAE,KAAK;gBACZ,IAAI,EAAE,cAAc;gBACpB,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;YACH,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/B,CAAC;KAAA;IAEa,eAAe;;;YAC3B,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;gBACxB,OAAO;YACT,CAAC;YACD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC;YAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;gBAC1C,IAAI,CAAC,aAAa,EAAE;gBACpB,IAAI,CAAC,cAAc,EAAE;aACtB,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,MAAA,IAAI,CAAC,OAAO,mCAAI,SAAS,CAAC;YAC1C,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,0BAA0B,OAAO,WAAW,MAAM,YAAY,OAAO,EAAE,CACxE,CAAC;QACJ,CAAC;KAAA;IAEa,aAAa;;YACzB,IAAI,CAAC;gBACH,OAAO,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACxC,CAAC;YAAC,WAAM,CAAC;gBACP,OAAO,SAAS,CAAC;YACnB,CAAC;QACH,CAAC;KAAA;IAEa,cAAc;;YAC1B,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC3D,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO,eAAe,CAAC;YACzB,CAAC;YACD,OAAO,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9B,CAAC;KAAA;IAEa,qBAAqB;;YACjC,IAAI,CAAC;gBACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;gBACxD,OAAO,WAAW,CAAC,SAAS,CAAC;YAC/B,CAAC;YAAC,WAAM,CAAC;gBACP,OAAO,SAAS,CAAC;YACnB,CAAC;QACH,CAAC;KAAA;IAEa,aAAa;;;YACzB,IAAI,CAAC;gBACH,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,wBAAwB,CAAC,EAAE,CAAC,CAAC,CAAC;gBACvE,OAAO,MAAA,QAAQ,CAAC,OAAO,mCAAI,SAAS,CAAC;YACvC,CAAC;YAAC,WAAM,CAAC;gBACP,OAAO,SAAS,CAAC;YACnB,CAAC;QACH,CAAC;KAAA;CACF,CAAA;AAnGY,oBAAoB;IADhC,UAAU,EAAE;;GACA,oBAAoB,CAmGhC"}
|
|
@@ -9,6 +9,9 @@ export declare class FileVariableStore implements IVariableStore {
|
|
|
9
9
|
private readJsonFile;
|
|
10
10
|
getEnvironment(source: string): Promise<Record<string, string>>;
|
|
11
11
|
saveEnvironment(destination: string, envVariables: Record<string, string>): Promise<void>;
|
|
12
|
+
private readExistingEnvContent;
|
|
13
|
+
private buildEnvContent;
|
|
14
|
+
private formatValue;
|
|
12
15
|
private escapeEnvValue;
|
|
13
16
|
}
|
|
14
17
|
export declare function readMapFileConfig(mapPath: string): Promise<MapFileConfig>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileVariableStore.d.ts","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/variableStore/FileVariableStore.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EACd,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAG3E,qBACa,iBAAkB,YAAW,cAAc;IACtD,OAAO,CAAC,MAAM,CAAU;gBAEW,MAAM,EAAE,OAAO;IAO5C,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAK3D,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;YAchD,YAAY;IAmBpB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAc/D,eAAe,CACnB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACnC,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"FileVariableStore.d.ts","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/variableStore/FileVariableStore.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EACd,MAAM,+BAA+B,CAAC;AACvC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AAG3E,qBACa,iBAAkB,YAAW,cAAc;IACtD,OAAO,CAAC,MAAM,CAAU;gBAEW,MAAM,EAAE,OAAO;IAO5C,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAK3D,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;YAchD,YAAY;IAmBpB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAc/D,eAAe,CACnB,WAAW,EAAE,MAAM,EACnB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACnC,OAAO,CAAC,IAAI,CAAC;YAgBF,sBAAsB;IAoBpC,OAAO,CAAC,eAAe;IA+CvB,OAAO,CAAC,WAAW;IAqBnB,OAAO,CAAC,cAAc;CASvB;AAED,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,aAAa,CAAC,CAkBxB"}
|
|
@@ -99,9 +99,8 @@ let FileVariableStore = class FileVariableStore {
|
|
|
99
99
|
}
|
|
100
100
|
saveEnvironment(destination, envVariables) {
|
|
101
101
|
return __awaiter(this, void 0, void 0, function* () {
|
|
102
|
-
const
|
|
103
|
-
|
|
104
|
-
.join('\n');
|
|
102
|
+
const existingContent = yield this.readExistingEnvContent(destination);
|
|
103
|
+
const envContent = this.buildEnvContent(existingContent, envVariables);
|
|
105
104
|
try {
|
|
106
105
|
yield fs.writeFile(destination, envContent);
|
|
107
106
|
}
|
|
@@ -112,6 +111,76 @@ let FileVariableStore = class FileVariableStore {
|
|
|
112
111
|
}
|
|
113
112
|
});
|
|
114
113
|
}
|
|
114
|
+
readExistingEnvContent(destination) {
|
|
115
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
116
|
+
try {
|
|
117
|
+
return yield fs.readFile(destination, 'utf-8');
|
|
118
|
+
}
|
|
119
|
+
catch (error) {
|
|
120
|
+
if (error instanceof Error &&
|
|
121
|
+
error.code === 'ENOENT') {
|
|
122
|
+
return null;
|
|
123
|
+
}
|
|
124
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
125
|
+
this.logger.error(`Failed to read environment file: ${message}`);
|
|
126
|
+
throw new EnvironmentFileError(`Failed to read environment file: ${message}`);
|
|
127
|
+
}
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
buildEnvContent(existingContent, envVariables) {
|
|
131
|
+
const pending = Object.assign({}, envVariables);
|
|
132
|
+
if (existingContent === null) {
|
|
133
|
+
return Object.entries(pending)
|
|
134
|
+
.map(([key, value]) => `${key}=${this.escapeEnvValue(value)}`)
|
|
135
|
+
.join('\n');
|
|
136
|
+
}
|
|
137
|
+
const newline = existingContent.includes('\r\n') ? '\r\n' : '\n';
|
|
138
|
+
const hasTrailingNewline = /\r?\n$/.test(existingContent);
|
|
139
|
+
const lines = existingContent === '' ? [] : existingContent.split(/\r?\n/);
|
|
140
|
+
if (hasTrailingNewline) {
|
|
141
|
+
lines.pop();
|
|
142
|
+
}
|
|
143
|
+
const assignmentRegex = /^(\s*(?:export\s+)?)([\w.-]+)(\s*=\s*)(.*)$/;
|
|
144
|
+
const updatedKeys = new Set();
|
|
145
|
+
const mergedLines = lines.map((line) => {
|
|
146
|
+
const match = assignmentRegex.exec(line);
|
|
147
|
+
if (match === null) {
|
|
148
|
+
return line;
|
|
149
|
+
}
|
|
150
|
+
const [, prefix, key, separator, originalValue] = match;
|
|
151
|
+
if (!Object.hasOwn(pending, key)) {
|
|
152
|
+
return line;
|
|
153
|
+
}
|
|
154
|
+
updatedKeys.add(key);
|
|
155
|
+
const value = this.formatValue(pending[key], originalValue);
|
|
156
|
+
return `${prefix}${key}${separator}${value}`;
|
|
157
|
+
});
|
|
158
|
+
for (const key of updatedKeys) {
|
|
159
|
+
delete pending[key];
|
|
160
|
+
}
|
|
161
|
+
const appended = Object.entries(pending).map(([key, value]) => `${key}=${this.escapeEnvValue(value)}`);
|
|
162
|
+
const allLines = appended.length > 0 ? [...mergedLines, ...appended] : mergedLines;
|
|
163
|
+
const result = allLines.join(newline);
|
|
164
|
+
return hasTrailingNewline ? result + newline : result;
|
|
165
|
+
}
|
|
166
|
+
formatValue(newValue, originalValue) {
|
|
167
|
+
const trimmed = originalValue.trim();
|
|
168
|
+
const quote = trimmed[0];
|
|
169
|
+
const isQuoted = trimmed.length >= 2 &&
|
|
170
|
+
(quote === '"' || quote === "'") &&
|
|
171
|
+
trimmed[trimmed.length - 1] === quote;
|
|
172
|
+
// Only keep the original quotes when the new value can be wrapped safely.
|
|
173
|
+
// A value containing the same quote, a backslash, or a newline would
|
|
174
|
+
// produce a string dotenv cannot parse back, so fall back to the
|
|
175
|
+
// unquoted escaped form instead of corrupting the value.
|
|
176
|
+
const isSafeToWrap = !newValue.includes(quote) &&
|
|
177
|
+
!newValue.includes('\\') &&
|
|
178
|
+
!/[\r\n]/.test(newValue);
|
|
179
|
+
if (isQuoted && isSafeToWrap) {
|
|
180
|
+
return `${quote}${newValue}${quote}`;
|
|
181
|
+
}
|
|
182
|
+
return this.escapeEnvValue(newValue);
|
|
183
|
+
}
|
|
115
184
|
escapeEnvValue(value) {
|
|
116
185
|
// codeql[js/incomplete-sanitization]
|
|
117
186
|
// CodeQL flags this as incomplete sanitization because we don't escape backslashes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileVariableStore.js","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/variableStore/FileVariableStore.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FileVariableStore.js","sourceRoot":"","sources":["../../../../../src/envilder/core/infrastructure/variableStore/FileVariableStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,4 +2,5 @@ import type { EnvilderOptions } from '../domain/envilder-options.js';
|
|
|
2
2
|
import type { MapFileConfig } from '../domain/map-file-config.js';
|
|
3
3
|
import type { ISecretProvider } from '../domain/ports/secret-provider.js';
|
|
4
4
|
export declare function createSecretProvider(config: MapFileConfig, options?: EnvilderOptions): ISecretProvider;
|
|
5
|
+
export declare function resolveRegionWithFallback(profile?: string): Promise<string>;
|
|
5
6
|
//# sourceMappingURL=secret-provider-factory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secret-provider-factory.d.ts","sourceRoot":"","sources":["../../../../../src/sdks/nodejs/src/infrastructure/secret-provider-factory.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"secret-provider-factory.d.ts","sourceRoot":"","sources":["../../../../../src/sdks/nodejs/src/infrastructure/secret-provider-factory.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAK1E,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,aAAa,EACrB,OAAO,CAAC,EAAE,eAAe,GACxB,eAAe,CAmBjB;AAcD,wBAAsB,yBAAyB,CAC7C,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,MAAM,CAAC,CAYjB"}
|
|
@@ -1,5 +1,13 @@
|
|
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
+
});
|
|
9
|
+
};
|
|
1
10
|
import { SSMClient } from '@aws-sdk/client-ssm';
|
|
2
|
-
import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
|
|
3
11
|
import { DefaultAzureCredential } from '@azure/identity';
|
|
4
12
|
import { SecretClient } from '@azure/keyvault-secrets';
|
|
5
13
|
import { SecretProviderType } from '../domain/secret-provider-type.js';
|
|
@@ -30,11 +38,25 @@ function createAzureProvider(vaultUrl) {
|
|
|
30
38
|
const client = new SecretClient(vaultUrl, credential);
|
|
31
39
|
return new AzureKeyVaultSecretProvider(client);
|
|
32
40
|
}
|
|
41
|
+
export function resolveRegionWithFallback(profile) {
|
|
42
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
43
|
+
if (process.env.AWS_REGION) {
|
|
44
|
+
return process.env.AWS_REGION;
|
|
45
|
+
}
|
|
46
|
+
if (process.env.AWS_DEFAULT_REGION) {
|
|
47
|
+
return process.env.AWS_DEFAULT_REGION;
|
|
48
|
+
}
|
|
49
|
+
try {
|
|
50
|
+
return yield new SSMClient(profile ? { profile } : {}).config.region();
|
|
51
|
+
}
|
|
52
|
+
catch (_a) {
|
|
53
|
+
return 'us-east-1';
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
}
|
|
33
57
|
function createAwsProvider(profile) {
|
|
34
|
-
const
|
|
35
|
-
|
|
36
|
-
: {};
|
|
37
|
-
const client = new SSMClient(clientOptions);
|
|
58
|
+
const region = () => resolveRegionWithFallback(profile);
|
|
59
|
+
const client = new SSMClient(profile ? { profile, region } : { region });
|
|
38
60
|
return new AwsSsmSecretProvider(client);
|
|
39
61
|
}
|
|
40
62
|
function normalize(value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secret-provider-factory.js","sourceRoot":"","sources":["../../../../../src/sdks/nodejs/src/infrastructure/secret-provider-factory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"secret-provider-factory.js","sourceRoot":"","sources":["../../../../../src/sdks/nodejs/src/infrastructure/secret-provider-factory.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "envilder",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.12.1",
|
|
4
4
|
"packageManager": "pnpm@11.5.1+sha512.93f7b57422ea7068257235b4c16eb60762eb68e1dc23723199cc739043ea9be2c4143274a399d8c6defa2b1176226d9ca1c4b63482d6200c1a8fbaa78c1d1485",
|
|
5
5
|
"description": "A CLI and GitHub Action that securely centralizes your environment variables from AWS SSM or Azure Key Vault as a single source of truth",
|
|
6
6
|
"homepage": "https://envilder.com",
|
|
@@ -92,6 +92,7 @@
|
|
|
92
92
|
"type": "module",
|
|
93
93
|
"dependencies": {
|
|
94
94
|
"@aws-sdk/client-ssm": "^3.1063.0",
|
|
95
|
+
"@aws-sdk/client-sts": "^3.1075.0",
|
|
95
96
|
"@aws-sdk/credential-providers": "^3.1063.0",
|
|
96
97
|
"@azure/core-rest-pipeline": "^1.23.0",
|
|
97
98
|
"@azure/identity": "^4.13.1",
|