@intentius/chant-lexicon-aws 0.124.52 → 0.124.55
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/api/credential-chain.d.ts +3 -3
- package/dist/api/credential-chain.d.ts.map +1 -1
- package/dist/api/credential-chain.js +2 -2
- package/dist/api/read-client.d.ts +2 -2
- package/dist/api/read-client.d.ts.map +1 -1
- package/dist/api/read-client.js +2 -2
- package/dist/api/{sigv4.d.ts → signing.d.ts} +14 -34
- package/dist/api/signing.d.ts.map +1 -0
- package/dist/api/signing.js +95 -0
- package/dist/codegen/generate-lexicon.d.ts +2 -0
- package/dist/codegen/generate-lexicon.d.ts.map +1 -1
- package/dist/codegen/generate-lexicon.js +1 -0
- package/dist/components/__tests__/mock-cloud-executor.d.ts +4 -0
- package/dist/components/__tests__/mock-cloud-executor.d.ts.map +1 -1
- package/dist/components/__tests__/mock-cloud-executor.js +18 -1
- package/dist/components/apply.d.ts +46 -2
- package/dist/components/apply.d.ts.map +1 -1
- package/dist/components/apply.js +266 -30
- package/dist/components/cfn-adopt-run.d.ts +37 -0
- package/dist/components/cfn-adopt-run.d.ts.map +1 -0
- package/dist/components/cfn-adopt-run.js +104 -0
- package/dist/components/cfn-adopt.d.ts +99 -0
- package/dist/components/cfn-adopt.d.ts.map +1 -0
- package/dist/components/cfn-adopt.js +278 -0
- package/dist/components/cfn-imports.d.ts +84 -0
- package/dist/components/cfn-imports.d.ts.map +1 -0
- package/dist/components/cfn-imports.js +239 -0
- package/dist/components/cloud-executor.d.ts +38 -2
- package/dist/components/cloud-executor.d.ts.map +1 -1
- package/dist/components/cloud-executor.js +84 -2
- package/dist/health.js +1 -1
- package/dist/importable.d.ts +30 -0
- package/dist/importable.d.ts.map +1 -0
- package/dist/importable.js +72 -0
- package/dist/index-identity.d.ts +19 -0
- package/dist/index-identity.d.ts.map +1 -0
- package/dist/index-identity.js +79 -0
- package/dist/index-import.d.ts +25 -0
- package/dist/index-import.d.ts.map +1 -0
- package/dist/index-import.js +132 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/integrity.json +4 -4
- package/dist/listed-types.d.ts +11 -0
- package/dist/listed-types.d.ts.map +1 -0
- package/dist/listed-types.js +52 -0
- package/dist/manifest.json +1 -1
- package/dist/meta.json +13206 -1237
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js +12 -3
- package/dist/reference-catalog.d.ts.map +1 -1
- package/dist/reference-catalog.js +62 -20
- package/dist/skills/chant-aws-carve-terraform.md +21 -14
- package/dist/spec/fetch.d.ts +5 -0
- package/dist/spec/fetch.d.ts.map +1 -1
- package/dist/spec/parse.d.ts +8 -0
- package/dist/spec/parse.d.ts.map +1 -1
- package/dist/spec/parse.js +3 -0
- package/package.json +2 -2
- package/src/api/credential-chain.ts +3 -3
- package/src/api/read-client.test.ts +2 -2
- package/src/api/read-client.ts +3 -3
- package/src/api/{sigv4.test.ts → signing.test.ts} +84 -96
- package/src/api/signing.ts +130 -0
- package/src/codegen/generate-lexicon.ts +3 -0
- package/src/components/__tests__/mock-cloud-executor.ts +20 -1
- package/src/components/apply.ts +288 -30
- package/src/components/cfn-adopt-run.test.ts +227 -0
- package/src/components/cfn-adopt-run.ts +141 -0
- package/src/components/cfn-adopt.test.ts +284 -0
- package/src/components/cfn-adopt.ts +340 -0
- package/src/components/cfn-exports-in-use.test.ts +146 -0
- package/src/components/cfn-imports-preview.test.ts +178 -0
- package/src/components/cfn-imports-three-stacks.test.ts +107 -0
- package/src/components/cfn-imports.test.ts +213 -0
- package/src/components/cfn-imports.ts +246 -0
- package/src/components/cfn-plan-shape-conformance.test.ts +83 -0
- package/src/components/cloud-executor.ts +127 -5
- package/src/components/demo-composed-stacks-floci.e2e.test.ts +235 -0
- package/src/derived-edges.test.ts +142 -0
- package/src/generated/lexicon-aws.json +13206 -1237
- package/src/health.ts +1 -1
- package/src/importable.test.ts +86 -0
- package/src/importable.ts +83 -0
- package/src/index-identity.test.ts +134 -0
- package/src/index-identity.ts +98 -0
- package/src/index-import.test.ts +257 -0
- package/src/index-import.ts +158 -0
- package/src/index-search.test.ts +87 -0
- package/src/index.ts +1 -1
- package/src/listed-types.test.ts +97 -0
- package/src/listed-types.ts +56 -0
- package/src/plugin.ts +13 -3
- package/src/reference-catalog.ts +63 -20
- package/src/skills/chant-aws-carve-terraform.md +21 -14
- package/src/spec/fetch.ts +5 -0
- package/src/spec/parse.test.ts +15 -0
- package/src/spec/parse.ts +12 -0
- package/src/testdata/indexed/identity.listing.json +65 -0
- package/src/testdata/indexed/import.listing.json +126 -0
- package/src/testdata/indexed/listing.json +69 -0
- package/src/testdata/indexed/topology.listing.json +350 -0
- package/src/testdata/three-cloud/dns.graph.json +336 -0
- package/src/three-cloud-parity.test.ts +49 -0
- package/dist/api/sigv4.d.ts.map +0 -1
- package/dist/api/sigv4.js +0 -185
- package/src/api/sigv4.ts +0 -243
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* The AWS credential chain, as the AWS CLI walks it, for `chant lifecycle
|
|
3
3
|
* whoami` (#3954).
|
|
4
4
|
*
|
|
5
|
-
* `resolveCredentials` (./
|
|
5
|
+
* `resolveCredentials` (./signing.ts) reads the three environment variables and
|
|
6
6
|
* nothing else. That is right for the read transport's synchronous signing
|
|
7
7
|
* seam, and it made whoami wrong for anyone whose shell holds a profile rather
|
|
8
8
|
* than keys: `AWS_PROFILE=dev` with an SSO session came back as "no identity
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
* credential JSON, so a malformed one is described, never echoed.
|
|
50
50
|
*/
|
|
51
51
|
import { type AwsReadClientOptions } from "./read-client.js";
|
|
52
|
-
import type { AwsCredentials } from "./
|
|
52
|
+
import type { AwsCredentials } from "./signing.js";
|
|
53
53
|
/** One HTTP exchange for the SSO portal and OIDC calls. Injected by tests. */
|
|
54
54
|
export type CredentialChainHttp = (url: string, init: {
|
|
55
55
|
method: "GET" | "POST";
|
|
@@ -126,7 +126,7 @@ export declare function resetTransportCredentials(): void;
|
|
|
126
126
|
* What the native read transport signs with when the caller injected nothing:
|
|
127
127
|
* the same chain whoami walks, so `lifecycle diff --live` signs as the
|
|
128
128
|
* principal whoami reports. The signing seam (`AwsCredentialResolver` in
|
|
129
|
-
* ./
|
|
129
|
+
* ./signing.ts) is synchronous and the chain is not, so the transport awaits
|
|
130
130
|
* this once before a request and passes the literal credentials in.
|
|
131
131
|
*
|
|
132
132
|
* Environment keys answer directly, as in the chain. Otherwise the walk is
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"credential-chain.d.ts","sourceRoot":"","sources":["../../src/api/credential-chain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AAOH,OAAO,EAA4B,KAAK,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACpF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"credential-chain.d.ts","sourceRoot":"","sources":["../../src/api/credential-chain.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AAOH,OAAO,EAA4B,KAAK,oBAAoB,EAAE,MAAM,eAAe,CAAC;AACpF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAEhD,8EAA8E;AAC9E,MAAM,MAAM,mBAAmB,GAAG,CAChC,GAAG,EAAE,MAAM,EACX,IAAI,EAAE;IAAE,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,KAC7E,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAE/C,mEAAmE;AACnE,MAAM,MAAM,uBAAuB,GAAG,CACpC,OAAO,EAAE,MAAM,KACZ,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAEnE,MAAM,WAAW,sBAAsB;IACrC,iCAAiC;IACjC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IACzC,oFAAoF;IACpF,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,SAAS,CAAC;IAChD,sFAAsF;IACtF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,0DAA0D;IAC1D,IAAI,CAAC,EAAE,mBAAmB,CAAC;IAC3B,+DAA+D;IAC/D,UAAU,CAAC,EAAE,uBAAuB,CAAC;IACrC,sFAAsF;IACtF,GAAG,CAAC,EAAE,oBAAoB,CAAC;IAC3B,6CAA6C;IAC7C,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CAClB;AAED,MAAM,WAAW,wBAAwB;IACvC,WAAW,EAAE,cAAc,CAAC;IAC5B,6FAA6F;IAC7F,MAAM,EAAE,MAAM,CAAC;IACf,oDAAoD;IACpD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,yGAAyG;IACzG,UAAU,CAAC,EAAE,IAAI,CAAC;CACnB;AAED,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,gBAAgB,GAAG,aAAa,CAAC;IACzC,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,qBAAqB,GAC7B;IAAE,QAAQ,EAAE,wBAAwB,CAAA;CAAE,GACtC;IAAE,UAAU,EAAE,0BAA0B,CAAA;CAAE,CAAC;AAE/C,KAAK,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAgBtC;;;;;;GAMG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsB9D;AAgFD;;;GAGG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,GAAE,sBAA2B,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAyCjH;AAqSD,uEAAuE;AACvE,eAAO,MAAM,2BAA2B,QAAa,CAAC;AAEtD;;;GAGG;AACH,eAAO,MAAM,2BAA2B,QAAa,CAAC;AAetD,uFAAuF;AACvF,wBAAgB,yBAAyB,IAAI,IAAI,CAEhD;AAiBD;;;;;;;;;;;;;GAaG;AACH,wBAAsB,oBAAoB,CAAC,OAAO,GAAE,sBAA2B,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC,CAoBpH"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* The AWS credential chain, as the AWS CLI walks it, for `chant lifecycle
|
|
3
3
|
* whoami` (#3954).
|
|
4
4
|
*
|
|
5
|
-
* `resolveCredentials` (./
|
|
5
|
+
* `resolveCredentials` (./signing.ts) reads the three environment variables and
|
|
6
6
|
* nothing else. That is right for the read transport's synchronous signing
|
|
7
7
|
* seam, and it made whoami wrong for anyone whose shell holds a profile rather
|
|
8
8
|
* than keys: `AWS_PROFILE=dev` with an SSO session came back as "no identity
|
|
@@ -474,7 +474,7 @@ async function walkForTransport(options, now) {
|
|
|
474
474
|
* What the native read transport signs with when the caller injected nothing:
|
|
475
475
|
* the same chain whoami walks, so `lifecycle diff --live` signs as the
|
|
476
476
|
* principal whoami reports. The signing seam (`AwsCredentialResolver` in
|
|
477
|
-
* ./
|
|
477
|
+
* ./signing.ts) is synchronous and the chain is not, so the transport awaits
|
|
478
478
|
* this once before a request and passes the literal credentials in.
|
|
479
479
|
*
|
|
480
480
|
* Environment keys answer directly, as in the chain. Otherwise the walk is
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { type AwsCredentialSource } from "./
|
|
2
|
-
export type { AwsCredentials, AwsCredentialResolver, AwsCredentialSource } from "./
|
|
1
|
+
import { type AwsCredentialSource } from "./signing.js";
|
|
2
|
+
export type { AwsCredentials, AwsCredentialResolver, AwsCredentialSource } from "./signing.js";
|
|
3
3
|
/** Injectable HTTP, mirroring `AwsHttp` in the applier so tests avoid the network. */
|
|
4
4
|
export type AwsReadHttp = (url: string, init: {
|
|
5
5
|
headers: Record<string, string>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"read-client.d.ts","sourceRoot":"","sources":["../../src/api/read-client.ts"],"names":[],"mappings":"AAgDA,OAAO,EAAmC,KAAK,mBAAmB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"read-client.d.ts","sourceRoot":"","sources":["../../src/api/read-client.ts"],"names":[],"mappings":"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"}
|
package/dist/api/read-client.js
CHANGED
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
* ## Signing
|
|
21
21
|
*
|
|
22
22
|
* Requests are signed with SigV4 (#1686) when credentials resolve — see
|
|
23
|
-
* `./
|
|
23
|
+
* `./signing.ts`, which signs through core's signer (#4583) so that cedar's AVP client can
|
|
24
24
|
* adopt the same one rather than growing a second. With none injected, they
|
|
25
25
|
* resolve through the AWS CLI's chain (`./credential-chain.ts`, the one
|
|
26
26
|
* `chant lifecycle whoami` walks) once per process, by
|
|
@@ -46,7 +46,7 @@
|
|
|
46
46
|
*/
|
|
47
47
|
import { homedir } from "node:os";
|
|
48
48
|
import { transportCredentials } from "./credential-chain.js";
|
|
49
|
-
import { resolveCredentials, signRequest } from "./
|
|
49
|
+
import { resolveCredentials, signRequest } from "./signing.js";
|
|
50
50
|
const DEFAULT_REGION = "us-east-1";
|
|
51
51
|
const CFN_API_VERSION = "2010-05-15";
|
|
52
52
|
const CLOUD_CONTROL_TARGET_PREFIX = "CloudApiService";
|
|
@@ -1,5 +1,11 @@
|
|
|
1
|
-
/** SHA-256 of the empty string
|
|
1
|
+
/** SHA-256 of the empty string, the payload hash of every bodyless request. */
|
|
2
2
|
export declare const EMPTY_PAYLOAD_SHA256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855";
|
|
3
|
+
/**
|
|
4
|
+
* Headers that are never signed even when a caller sets them: `authorization`
|
|
5
|
+
* is the output, and the others are rewritten in transit by proxies and agents,
|
|
6
|
+
* so signing them produces intermittent 403s rather than security.
|
|
7
|
+
*/
|
|
8
|
+
export declare const UNSIGNED_HEADERS: readonly string[];
|
|
3
9
|
/** A resolved credential set. `sessionToken` is present for STS/role credentials. */
|
|
4
10
|
export interface AwsCredentials {
|
|
5
11
|
accessKeyId: string;
|
|
@@ -15,14 +21,14 @@ export type AwsCredentialResolver = () => AwsCredentials | undefined;
|
|
|
15
21
|
/** Either literal credentials or a resolver for them. */
|
|
16
22
|
export type AwsCredentialSource = AwsCredentials | AwsCredentialResolver;
|
|
17
23
|
/**
|
|
18
|
-
* Credentials for a request: explicit
|
|
24
|
+
* Credentials for a request: explicit, then environment, then absent.
|
|
19
25
|
*
|
|
20
|
-
* A resolver function is authoritative
|
|
26
|
+
* A resolver function is authoritative: if one is injected and it declines,
|
|
21
27
|
* the environment is not consulted behind its back, because the point of
|
|
22
28
|
* injecting one is to control the answer. Literal credentials are likewise
|
|
23
29
|
* final. Only the no-source case falls through to `AWS_ACCESS_KEY_ID` /
|
|
24
30
|
* `AWS_SECRET_ACCESS_KEY` (plus `AWS_SESSION_TOKEN` when set), and a half-set
|
|
25
|
-
* environment
|
|
31
|
+
* environment (a key id with no secret) is absent rather than a signature
|
|
26
32
|
* that cannot verify.
|
|
27
33
|
*
|
|
28
34
|
* The shared profile files are resolved asynchronously by
|
|
@@ -38,45 +44,19 @@ export interface SigV4Request {
|
|
|
38
44
|
url: string;
|
|
39
45
|
headers: Record<string, string>;
|
|
40
46
|
body: string;
|
|
41
|
-
/** Service name as it appears in the credential scope (`cloudformation`, `cloudcontrolapi`,
|
|
47
|
+
/** Service name as it appears in the credential scope (`cloudformation`, `cloudcontrolapi`, ...). */
|
|
42
48
|
service: string;
|
|
43
49
|
region: string;
|
|
44
50
|
credentials: AwsCredentials;
|
|
45
51
|
/** Signing clock. Injected by tests; otherwise now. */
|
|
46
52
|
now?: Date;
|
|
47
53
|
}
|
|
48
|
-
/** `YYYYMMDDTHHMMSSZ` — the `X-Amz-Date` format, which is ISO-8601 basic. */
|
|
49
|
-
export declare function amzDate(date: Date): string;
|
|
50
|
-
/** Lowercase hex SHA-256. */
|
|
51
|
-
export declare function sha256Hex(payload: string): string;
|
|
52
|
-
/**
|
|
53
|
-
* The signing key: four chained HMACs from the secret, so the key on the wire
|
|
54
|
-
* is scoped to one day, one region and one service rather than being the
|
|
55
|
-
* account secret itself.
|
|
56
|
-
*/
|
|
57
|
-
export declare function signingKey(secretAccessKey: string, day: string, region: string, service: string): Buffer;
|
|
58
|
-
/**
|
|
59
|
-
* Header names lowercased, values trimmed with internal whitespace runs
|
|
60
|
-
* collapsed, sorted by name. Returns the canonical block and the `;`-joined
|
|
61
|
-
* signed-header list that has to agree with it exactly.
|
|
62
|
-
*/
|
|
63
|
-
export declare function canonicalHeaders(headers: Record<string, string>): {
|
|
64
|
-
canonical: string;
|
|
65
|
-
signed: string;
|
|
66
|
-
};
|
|
67
|
-
/** The canonical request, verbatim as it is hashed into the string to sign. */
|
|
68
|
-
export declare function canonicalRequest(method: string, url: URL, headers: Record<string, string>, payloadHash: string): {
|
|
69
|
-
canonical: string;
|
|
70
|
-
signed: string;
|
|
71
|
-
};
|
|
72
|
-
/** The string to sign: algorithm, timestamp, scope, hashed canonical request. */
|
|
73
|
-
export declare function stringToSign(timestamp: string, scope: string, canonical: string): string;
|
|
74
54
|
/**
|
|
75
|
-
* The caller's headers plus everything SigV4 adds: `x-amz-date`,
|
|
55
|
+
* The caller's headers, as given, plus everything SigV4 adds: `x-amz-date`,
|
|
76
56
|
* `x-amz-content-sha256`, `x-amz-security-token` when the credentials are
|
|
77
57
|
* temporary, and the `Authorization` header itself.
|
|
78
58
|
*
|
|
79
|
-
* `host` is signed (AWS requires it) but not returned
|
|
59
|
+
* `host` is signed (AWS requires it) but not returned; see the module header.
|
|
80
60
|
*/
|
|
81
61
|
export declare function signRequest(request: SigV4Request): Record<string, string>;
|
|
82
|
-
//# sourceMappingURL=
|
|
62
|
+
//# sourceMappingURL=signing.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signing.d.ts","sourceRoot":"","sources":["../../src/api/signing.ts"],"names":[],"mappings":"AA4BA,+EAA+E;AAC/E,eAAO,MAAM,oBAAoB,qEAAqE,CAAC;AAEvG;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,SAAS,MAAM,EAA+E,CAAC;AAE9H,qFAAqF;AACrF,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED;;;;GAIG;AACH,MAAM,MAAM,qBAAqB,GAAG,MAAM,cAAc,GAAG,SAAS,CAAC;AAErE,yDAAyD;AACzD,MAAM,MAAM,mBAAmB,GAAG,cAAc,GAAG,qBAAqB,CAAC;AAEzE;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,CAAC,EAAE,mBAAmB,EAC5B,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GACpD,cAAc,GAAG,SAAS,CAW5B;AAED,gFAAgF;AAChF,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,6EAA6E;IAC7E,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,qGAAqG;IACrG,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,cAAc,CAAC;IAC5B,uDAAuD;IACvD,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ;AAKD;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAiBzE"}
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* AWS request signing for the shared read transport (#1686), through core's
|
|
3
|
+
* one SigV4 signer (`@intentius/chant/cloud-lister/sigv4`, #4583).
|
|
4
|
+
*
|
|
5
|
+
* This lexicon kept its own SigV4 implementation until #4583; it now holds
|
|
6
|
+
* only the lexicon's signing surface (`signRequest`, `resolveCredentials` and
|
|
7
|
+
* the credential types cedar's AVP client restates) and the header set it
|
|
8
|
+
* signs. Core does the canonicalization and the HMACs.
|
|
9
|
+
*
|
|
10
|
+
* ## What is signed, and what is not
|
|
11
|
+
*
|
|
12
|
+
* Header signing only. `host` is signed but never emitted: `fetch` computes
|
|
13
|
+
* `Host` from the URL and forbids overriding it, so the signer derives the
|
|
14
|
+
* same value from the URL it was given. A transport that rewrites the URL
|
|
15
|
+
* underneath the signer (a proxy that keeps the original `Host`, say) would
|
|
16
|
+
* invalidate the signature; the injectable-HTTP seam is for tests and
|
|
17
|
+
* emulators, not for URL rewriting.
|
|
18
|
+
*
|
|
19
|
+
* `x-amz-content-sha256` is always sent and signed. The headers in
|
|
20
|
+
* {@link UNSIGNED_HEADERS} are sent when a caller sets them but never signed.
|
|
21
|
+
*
|
|
22
|
+
* The canonical path is the URL's pathname as it stands (core's rule, which is
|
|
23
|
+
* S3's). Every caller here POSTs to `/` or reads a Route 53 path of plain
|
|
24
|
+
* segments, where that agrees with the twice-encoded form other services
|
|
25
|
+
* define; a caller with a path that needs encoding is the moment to revisit it.
|
|
26
|
+
*/
|
|
27
|
+
import { signV4 } from "@intentius/chant/cloud-lister/sigv4";
|
|
28
|
+
/** SHA-256 of the empty string, the payload hash of every bodyless request. */
|
|
29
|
+
export const EMPTY_PAYLOAD_SHA256 = "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855";
|
|
30
|
+
/**
|
|
31
|
+
* Headers that are never signed even when a caller sets them: `authorization`
|
|
32
|
+
* is the output, and the others are rewritten in transit by proxies and agents,
|
|
33
|
+
* so signing them produces intermittent 403s rather than security.
|
|
34
|
+
*/
|
|
35
|
+
export const UNSIGNED_HEADERS = ["authorization", "connection", "expect", "user-agent", "x-amzn-trace-id"];
|
|
36
|
+
/**
|
|
37
|
+
* Credentials for a request: explicit, then environment, then absent.
|
|
38
|
+
*
|
|
39
|
+
* A resolver function is authoritative: if one is injected and it declines,
|
|
40
|
+
* the environment is not consulted behind its back, because the point of
|
|
41
|
+
* injecting one is to control the answer. Literal credentials are likewise
|
|
42
|
+
* final. Only the no-source case falls through to `AWS_ACCESS_KEY_ID` /
|
|
43
|
+
* `AWS_SECRET_ACCESS_KEY` (plus `AWS_SESSION_TOKEN` when set), and a half-set
|
|
44
|
+
* environment (a key id with no secret) is absent rather than a signature
|
|
45
|
+
* that cannot verify.
|
|
46
|
+
*
|
|
47
|
+
* The shared profile files are resolved asynchronously by
|
|
48
|
+
* `./credential-chain.ts`, and the read transport passes its answer in as
|
|
49
|
+
* literal credentials (#3958), so this function stays synchronous. Not
|
|
50
|
+
* implemented anywhere: IMDS and the container credential endpoints.
|
|
51
|
+
*/
|
|
52
|
+
export function resolveCredentials(source, env = process.env) {
|
|
53
|
+
if (typeof source === "function")
|
|
54
|
+
return source();
|
|
55
|
+
if (source)
|
|
56
|
+
return source;
|
|
57
|
+
const accessKeyId = env.AWS_ACCESS_KEY_ID;
|
|
58
|
+
const secretAccessKey = env.AWS_SECRET_ACCESS_KEY;
|
|
59
|
+
if (!accessKeyId || !secretAccessKey)
|
|
60
|
+
return undefined;
|
|
61
|
+
return {
|
|
62
|
+
accessKeyId,
|
|
63
|
+
secretAccessKey,
|
|
64
|
+
...(env.AWS_SESSION_TOKEN ? { sessionToken: env.AWS_SESSION_TOKEN } : {}),
|
|
65
|
+
};
|
|
66
|
+
}
|
|
67
|
+
/** The headers core's signer adds, the ones {@link signRequest} returns beside the caller's own. */
|
|
68
|
+
const ADDED = ["x-amz-date", "x-amz-content-sha256", "x-amz-security-token", "authorization"];
|
|
69
|
+
/**
|
|
70
|
+
* The caller's headers, as given, plus everything SigV4 adds: `x-amz-date`,
|
|
71
|
+
* `x-amz-content-sha256`, `x-amz-security-token` when the credentials are
|
|
72
|
+
* temporary, and the `Authorization` header itself.
|
|
73
|
+
*
|
|
74
|
+
* `host` is signed (AWS requires it) but not returned; see the module header.
|
|
75
|
+
*/
|
|
76
|
+
export function signRequest(request) {
|
|
77
|
+
const signed = signV4({
|
|
78
|
+
method: request.method,
|
|
79
|
+
url: request.url,
|
|
80
|
+
headers: request.headers,
|
|
81
|
+
body: request.body,
|
|
82
|
+
region: request.region,
|
|
83
|
+
service: request.service,
|
|
84
|
+
credentials: request.credentials,
|
|
85
|
+
now: request.now ?? new Date(),
|
|
86
|
+
contentSha256: true,
|
|
87
|
+
omitHost: true,
|
|
88
|
+
unsignedHeaders: UNSIGNED_HEADERS,
|
|
89
|
+
});
|
|
90
|
+
const out = { ...request.headers };
|
|
91
|
+
for (const name of ADDED)
|
|
92
|
+
if (signed[name] !== undefined)
|
|
93
|
+
out[name] = signed[name];
|
|
94
|
+
return out;
|
|
95
|
+
}
|
|
@@ -26,6 +26,8 @@ export interface LexiconEntry {
|
|
|
26
26
|
conditionalCreateOnly?: string[];
|
|
27
27
|
replacementStrategy?: "delete_then_create" | "create_then_delete";
|
|
28
28
|
tagging?: ResourceTagging;
|
|
29
|
+
/** The registry schema's handler operations, sorted (#4536). Absent for a legacy type. */
|
|
30
|
+
handlers?: string[];
|
|
29
31
|
runtimeDeprecations?: Record<string, string>;
|
|
30
32
|
}
|
|
31
33
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate-lexicon.d.ts","sourceRoot":"","sources":["../../src/codegen/generate-lexicon.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAExE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAOhF,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,UAAU,GAAG,UAAU,CAAC;IAC9B,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACpC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC1D,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC;;;OAGG;IACH,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,mBAAmB,CAAC,EAAE,oBAAoB,GAAG,oBAAoB,CAAC;IAClE,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9C;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,iBAAiB,EAAE,EAC5B,MAAM,EAAE,cAAc,EACtB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,EAAE,CAAC,EAC/C,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,GACjD,MAAM,
|
|
1
|
+
{"version":3,"file":"generate-lexicon.d.ts","sourceRoot":"","sources":["../../src/codegen/generate-lexicon.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAExE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACxD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAOhF,MAAM,WAAW,YAAY;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,UAAU,GAAG,UAAU,CAAC;IAC9B,OAAO,EAAE,KAAK,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,WAAW,CAAC,EAAE,mBAAmB,EAAE,CAAC;IACpC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC1D,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC;;;OAGG;IACH,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IAChC,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,mBAAmB,CAAC,EAAE,oBAAoB,GAAG,oBAAoB,CAAC;IAClE,OAAO,CAAC,EAAE,eAAe,CAAC;IAC1B,0FAA0F;IAC1F,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAC9C;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,OAAO,EAAE,iBAAiB,EAAE,EAC5B,MAAM,EAAE,cAAc,EACtB,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,mBAAmB,EAAE,CAAC,EAC/C,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,IAAI,GACjD,MAAM,CAgDR;AAED;;GAEG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAYlE"}
|
|
@@ -41,6 +41,7 @@ export function generateLexiconJSON(results, naming, constraints, runtimeDepreca
|
|
|
41
41
|
...(r.resource.conditionalCreateOnly?.length && { conditionalCreateOnly: r.resource.conditionalCreateOnly }),
|
|
42
42
|
...(r.resource.replacementStrategy && { replacementStrategy: r.resource.replacementStrategy }),
|
|
43
43
|
...(r.resource.tagging && { tagging: r.resource.tagging }),
|
|
44
|
+
...(r.resource.handlers?.length && { handlers: r.resource.handlers }),
|
|
44
45
|
...(runtimeDepr && { runtimeDeprecations: runtimeDepr }),
|
|
45
46
|
};
|
|
46
47
|
},
|
|
@@ -47,6 +47,10 @@ export interface FakeStackConfig {
|
|
|
47
47
|
missing?: boolean;
|
|
48
48
|
/** Set by the mock: the empty `REVIEW_IN_PROGRESS` stack a CREATE change set made for a missing stack. */
|
|
49
49
|
shell?: boolean;
|
|
50
|
+
/** The stack's exports (#4466c), export name to the output it is; the value is the output's. */
|
|
51
|
+
exports?: Record<string, string>;
|
|
52
|
+
/** The stacks that import each of this stack's exports now, by export name (#4466c). */
|
|
53
|
+
importedBy?: Record<string, string[]>;
|
|
50
54
|
}
|
|
51
55
|
export interface FakeDeploymentConfig {
|
|
52
56
|
/** Terminal status CodeDeploy reports for this deployment. Default: "Succeeded". */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mock-cloud-executor.d.ts","sourceRoot":"","sources":["../../../src/components/__tests__/mock-cloud-executor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EACV,SAAS,EAIT,aAAa,EAKb,eAAe,EAWhB,MAAM,mBAAmB,CAAC;AAK3B,OAAO,KAAK,EAMV,kBAAkB,EAEnB,MAAM,kDAAkD,CAAC;AAE1D,2LAA2L;AAC3L,KAAK,YAAY,GAAG,aAAa,GAAG;IAAE,KAAK,EAAE,kBAAkB,CAAA;CAAE,CAAC;AAElE,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,OAAO,CAAC;CACf;AAED,2DAA2D;AAC3D,MAAM,WAAW,eAAe;IAC9B,kIAAkI;IAClI,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC;IACtB,+CAA+C;IAC/C,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACjC,kIAAkI;IAClI,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,+FAA+F;IAC/F,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB;;;yBAGqB;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,0GAA0G;IAC1G,KAAK,CAAC,EAAE,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"mock-cloud-executor.d.ts","sourceRoot":"","sources":["../../../src/components/__tests__/mock-cloud-executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -32,7 +32,10 @@ export function createMockCloudExecutor(options = {}) {
|
|
|
32
32
|
let stepCounter = 0;
|
|
33
33
|
function stackStatus(name) {
|
|
34
34
|
const config = stacks.get(name);
|
|
35
|
-
|
|
35
|
+
const exports = config?.exports
|
|
36
|
+
? Object.fromEntries(Object.entries(config.exports).map(([exportName, output]) => [exportName, { output, value: config.outputs?.[output] ?? "" }]))
|
|
37
|
+
: undefined;
|
|
38
|
+
return { stackStatus: config?.terminalStatus ?? "UPDATE_COMPLETE", outputs: config?.outputs ?? {}, ...(exports ? { exports } : {}) };
|
|
36
39
|
}
|
|
37
40
|
const docker = {
|
|
38
41
|
async build(args) {
|
|
@@ -124,6 +127,20 @@ export function createMockCloudExecutor(options = {}) {
|
|
|
124
127
|
stacks.set(stackName, { ...config, shell: false, missing: true });
|
|
125
128
|
return true;
|
|
126
129
|
},
|
|
130
|
+
// Only a mock some stack's `importedBy` was given has ListImports, so the
|
|
131
|
+
// plans of every other test make the calls they always made (#4466c).
|
|
132
|
+
...(Object.values(options.stacks ?? {}).some((c) => c.importedBy !== undefined)
|
|
133
|
+
? {
|
|
134
|
+
async listImports(exportName) {
|
|
135
|
+
record("cloudformation", "listImports", exportName);
|
|
136
|
+
const out = new Set();
|
|
137
|
+
for (const config of stacks.values())
|
|
138
|
+
for (const s of config.importedBy?.[exportName] ?? [])
|
|
139
|
+
out.add(s);
|
|
140
|
+
return [...out].sort();
|
|
141
|
+
},
|
|
142
|
+
}
|
|
143
|
+
: {}),
|
|
127
144
|
async waitForStack(stackName) {
|
|
128
145
|
record("cloudformation", "waitForStack", stackName);
|
|
129
146
|
return stackStatus(stackName);
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
* `run-migration` dispatches on its target transport (ECS one-off task, Lambda
|
|
19
19
|
* invoke, or SSM host command).
|
|
20
20
|
*/
|
|
21
|
-
import type { Capability, PlannedOutputs } from "@intentius/chant/components/capability";
|
|
21
|
+
import type { Capability, DeclaredRead, PlannedOutputs } from "@intentius/chant/components/capability";
|
|
22
22
|
import type { ChangeSetEntry } from "@intentius/chant/change-set";
|
|
23
23
|
import { type PlanShape, type PlanShapeArtifact } from "@intentius/chant/components/covered-round";
|
|
24
24
|
import { type CfnChange, type CfnChangeSet, type CloudExecutor } from "./cloud-executor.js";
|
|
@@ -115,9 +115,25 @@ export declare function cfnPlanShape(stack: string, changeSet: CfnChangeSet, unk
|
|
|
115
115
|
* known at that value (`given`, the inputs of this plan). Both are what
|
|
116
116
|
* the stack's outputs will be, whatever they are now.
|
|
117
117
|
*
|
|
118
|
+
* An output that passes an import through (`Fn::ImportValue` of a name
|
|
119
|
+
* `imports` holds, #4466) is known at the value the exporting stack's plan
|
|
120
|
+
* gave it, which is the value core read for the import.
|
|
121
|
+
*
|
|
118
122
|
* `undefined` when there is no template or no standing stack to read from.
|
|
119
123
|
*/
|
|
120
|
-
export declare function cfnPlannedOutputs(template: unknown, changes: readonly CfnChange[], standing: Record<string, string> | undefined, given?: Record<string, string>): PlannedOutputs | undefined;
|
|
124
|
+
export declare function cfnPlannedOutputs(template: unknown, changes: readonly CfnChange[], standing: Record<string, string> | undefined, given?: Record<string, string>, imports?: Record<string, string>): PlannedOutputs | undefined;
|
|
125
|
+
/**
|
|
126
|
+
* `cfn-deploy`'s `declaredReads` (#4466): each `Fn::ImportValue` of a name
|
|
127
|
+
* exactly one other `cfn-deploy` step's template exports is a read of that
|
|
128
|
+
* component's output, placed under the step's `imports`. A name two steps
|
|
129
|
+
* export is left alone (CloudFormation refuses the second export), and so
|
|
130
|
+
* is a name no step in the project exports: it reads a stack outside it.
|
|
131
|
+
*/
|
|
132
|
+
export declare function cfnDeclaredReads(root: string, members: readonly {
|
|
133
|
+
component: string;
|
|
134
|
+
index: number;
|
|
135
|
+
step: Record<string, unknown>;
|
|
136
|
+
}[]): DeclaredRead[];
|
|
121
137
|
/**
|
|
122
138
|
* How `cfn-deploy` handles a changeset that requires resource replacement.
|
|
123
139
|
* - `block`: refuse to apply; surface the changeset for human review.
|
|
@@ -146,6 +162,14 @@ export interface CfnDeployInput {
|
|
|
146
162
|
onReplace?: CfnReplacePolicy;
|
|
147
163
|
/** Stage DynamoDB GSI changes (add-then-backfill-then-remove) instead of an in-place replace. Default: false. */
|
|
148
164
|
stageGsi?: boolean;
|
|
165
|
+
/**
|
|
166
|
+
* The exports the template imports (`Fn::ImportValue`) from another
|
|
167
|
+
* `cfn-deploy` step of the project, by export name (#4466). Core fills it
|
|
168
|
+
* from `declaredReads` with a `stackOutput()` of the exporting component's
|
|
169
|
+
* output, so a value is `undefined` while that stack's plan cannot say it.
|
|
170
|
+
* Never passed to CloudFormation: the template imports the export itself.
|
|
171
|
+
*/
|
|
172
|
+
imports?: Record<string, string | undefined>;
|
|
149
173
|
}
|
|
150
174
|
export interface CfnDeployOutput {
|
|
151
175
|
/** Final stack status (`CREATE_COMPLETE`, `UPDATE_COMPLETE`, ...). */
|
|
@@ -155,6 +179,24 @@ export interface CfnDeployOutput {
|
|
|
155
179
|
/** Snapshot id captured before an `onReplace: "snapshot-first"` replacement, if one was taken. */
|
|
156
180
|
snapshotId?: string;
|
|
157
181
|
}
|
|
182
|
+
/** One export a plan changes or removes while other stacks import it (#4466c). */
|
|
183
|
+
export interface CfnExportInUse {
|
|
184
|
+
exportName: string;
|
|
185
|
+
/** What the plan does to it, as the refusal says it: "removes", or "changes ... from A to B". */
|
|
186
|
+
change: string;
|
|
187
|
+
/** The stacks that import it now, sorted. */
|
|
188
|
+
importers: string[];
|
|
189
|
+
}
|
|
190
|
+
/**
|
|
191
|
+
* Thrown at plan time when a change set would change or remove an export
|
|
192
|
+
* that another stack still imports (#4466c). CloudFormation refuses that
|
|
193
|
+
* update at apply; the plan refuses it first, naming both stacks.
|
|
194
|
+
*/
|
|
195
|
+
export declare class CfnExportInUseError extends Error {
|
|
196
|
+
readonly stack: string;
|
|
197
|
+
readonly uses: CfnExportInUse[];
|
|
198
|
+
constructor(stack: string, uses: CfnExportInUse[]);
|
|
199
|
+
}
|
|
158
200
|
/**
|
|
159
201
|
* Thrown when a changeset proposes a resource replacement and `onReplace` is
|
|
160
202
|
* `"block"` (the default) — refusing to apply rather than silently destroying
|
|
@@ -190,6 +232,8 @@ export declare class CfnReplacementBlockedError extends Error {
|
|
|
190
232
|
* automatic-rollback mechanism restores the last known-good state.
|
|
191
233
|
*/
|
|
192
234
|
export declare function createCfnDeployCapability(executor?: CloudExecutor): Capability<CfnDeployInput, CfnDeployOutput>;
|
|
235
|
+
/** Flatten the wired `inputs` map plus `imageRef` (already resolved by the driver) to plain string CloudFormation parameters. */
|
|
236
|
+
export declare function flattenCfnInputs(input: CfnDeployInput): Record<string, string> | undefined;
|
|
193
237
|
/** Default `cfn-deploy` capability, backed by the real `CloudExecutor`. */
|
|
194
238
|
export declare const cfnDeployCapability: Capability<CfnDeployInput, CfnDeployOutput>;
|
|
195
239
|
export interface EcsUpdateServiceInput {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/components/apply.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;
|
|
1
|
+
{"version":3,"file":"apply.d.ts","sourceRoot":"","sources":["../../src/components/apply.ts"],"names":[],"mappings":"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"}
|