Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .oxlintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}
]
},
"ignorePatterns": ["dist/", "node_modules/", "src/assets/"],
"ignorePatterns": ["dist/", "node_modules/", "src/assets/", "src/projectSchemas/v0/"],
"overrides": [
{
"files": ["scripts/**", "src/testing/**", "**/*.test.*", "**/*-test-support.ts"],
Expand Down
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,6 @@ __fixtures__

*.snap
src/assets

# Frozen copy of the v0 0.31.1 schemas; kept byte-identical to upstream.
src/projectSchemas/v0
73 changes: 73 additions & 0 deletions src/core/project/backends/cdk.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import type { DeployBackendInput } from "./types";
import type { ResolvedProjectResource } from "../../../handlers/project/types";
import type { BootstrapState } from "./cdk/environment";
import type { CdkCredentialProvider, CdkOperation, CdkOutputs, CdkRunOptions } from "./cdk/toolkit";
import { v0Fixture } from "../legacy/fixtures-test-support";
import { translateV0Spec } from "../legacy/translate";

const TARGET = {
name: "default",
Expand Down Expand Up @@ -1329,4 +1331,75 @@ describe("CdkBackend.resolveProjectResources", () => {
]),
).toEqual([["gateway", "gw", ["owned", "second"]]]);
});

test("resolves v0-only resources from legacy extras and deployed state", async () => {
const input = await project();
const v0Spec = v0Fixture("baseline.json");
v0Spec.datasets = v0Fixture("top-datasets-nonempty.json").datasets;
v0Spec.abTests = v0Fixture("top-abTests-nonempty.json").abTests;
v0Spec.capacityProviders = v0Fixture("runtime-capacityProvider.json").capacityProviders;
v0Spec.unassignedTargets = v0Fixture("top-unassignedTargets.json").unassignedTargets;
const translated = translateV0Spec(v0Spec);
input.spec = translated.spec;
input.legacy = { format: "v0", v0Spec, extras: translated.extras };
await updateTargetState(json, input.rootPath, TARGET.name, {
stackArn: STACK_ARN,
resources: {
datasets: {
ds1: { datasetId: "dataset-1", datasetArn: "arn:dataset/dataset-1" },
},
abTests: {
ab1: { abTestId: "ab-test-1", abTestArn: "arn:ab-test/ab-test-1" },
},
capacityProviders: {
cp1: {
capacityProviderId: "cp1-AbCdEf1234",
capacityProviderArn: "arn:capacity-provider/cp1-AbCdEf1234",
},
},
},
});
const subject = harness({
describedStack: {
StackName: S,
CreationTime: new Date(0),
StackStatus: "CREATE_COMPLETE",
Outputs: [out(`${S}-GatewayTarget-u1-Id`, "must-not-match-an-unassigned-target")],
},
});

const resources = await subject.backend.resolveProjectResources(input, { target: TARGET });

expect(
resources.filter(({ resourceType, name }) =>
["dataset:ds1", "ab-test:ab1", "capacity-provider:cp1", "gateway-target:u1"].includes(
`${resourceType}:${name}`,
),
),
).toEqual([
{
resourceType: "dataset",
name: "ds1",
deploymentState: "deployed",
arn: "arn:dataset/dataset-1",
},
{
resourceType: "ab-test",
name: "ab1",
deploymentState: "deployed",
arn: "arn:ab-test/ab-test-1",
},
{
resourceType: "capacity-provider",
name: "cp1",
deploymentState: "deployed",
arn: "arn:capacity-provider/cp1-AbCdEf1234",
},
{
resourceType: "gateway-target",
name: "u1",
deploymentState: "local-only",
},
]);
});
});
35 changes: 33 additions & 2 deletions src/core/project/backends/cdk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,15 @@ function cdkId(name: string): string {
return name.replace(/_/g, "");
}

function stringAt(value: unknown, ...path: string[]): string | undefined {
let current = value;
for (const part of path) {
if (typeof current !== "object" || current === null || !(part in current)) return undefined;
current = (current as Record<string, unknown>)[part];
}
return typeof current === "string" ? current : undefined;
}

function findDeployedResourceId(
stack: Stack,
input: Pick<ResolvedDeployedResource, "resourceType" | "name">,
Expand Down Expand Up @@ -584,6 +593,14 @@ export class CdkBackend implements ProjectBackend {
return asArn(byExportName("PolicyEngine", name, "Arn"));
case "config-bundle":
return asArn(byExportName("ConfigBundle", name, "Arn"));
case "dataset":
return asArn(stringAt(recorded?.resources, "datasets", name, "datasetArn"));
case "ab-test":
return asArn(stringAt(recorded?.resources, "abTests", name, "abTestArn"));
case "capacity-provider":
return asArn(
stringAt(recorded?.resources, "capacityProviders", name, "capacityProviderArn"),
);
case "payment-manager":
// @aws/agentcore-cdk's AgentCorePayments construct writes the payment
// outputs at stack scope without an exportName, under keys built from
Expand Down Expand Up @@ -615,9 +632,15 @@ export class CdkBackend implements ProjectBackend {
const resolve = (
resourceType: DeployableResource,
name: string,
options: { owner?: string; children?: ResolvedProjectResource[] } = {},
options: {
owner?: string;
children?: ResolvedProjectResource[];
forceLocalOnly?: boolean;
} = {},
): ResolvedProjectResource => {
const identifier = identifierOf(resourceType, name, options.owner);
const identifier = options.forceLocalOnly
? undefined
: identifierOf(resourceType, name, options.owner);
return {
resourceType,
name,
Expand Down Expand Up @@ -657,6 +680,14 @@ export class CdkBackend implements ProjectBackend {
}),
),
...spec.configBundles.map(({ name }) => resolve("config-bundle", name)),
...(project.legacy?.extras.datasets ?? []).map(({ name }) => resolve("dataset", name)),
...(project.legacy?.extras.abTests ?? []).map(({ name }) => resolve("ab-test", name)),
...(project.legacy?.extras.capacityProviders ?? []).map(({ name }) =>
resolve("capacity-provider", name),
),
...(project.legacy?.extras.unassignedTargets ?? []).map(({ name }) =>
resolve("gateway-target", name, { forceLocalOnly: true }),
),
...(spec.payments ?? []).map((manager) =>
resolve("payment-manager", manager.name, {
children: (manager.connectors ?? []).map(({ name }) =>
Expand Down
12 changes: 12 additions & 0 deletions src/core/project/legacy/__fixtures__/aws-targets_case-dup.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
[
{
"name": "Prod",
"account": "123456789012",
"region": "us-east-1"
},
{
"name": "prod",
"account": "123456789012",
"region": "us-west-2"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"name": "cn",
"account": "123456789012",
"region": "cn-north-1"
}
]
7 changes: 7 additions & 0 deletions src/core/project/legacy/__fixtures__/aws-targets_default.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[
{
"name": "default",
"account": "123456789012",
"region": "us-east-1"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
{
"name": "default",
"account": "123456789012",
"region": "us-east-1",
"profile": "x"
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[
{
"name": "prod-us",
"account": "123456789012",
"region": "us-east-1",
"description": "d"
}
]
Loading
Loading