-
Notifications
You must be signed in to change notification settings - Fork 72
feat: implement project deploy command #2001
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
+3,590
−223
Closed
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
3253ab0
feat(project): implement project deploy
notgitika 5ae34c8
feat(project): deploy one target per invocation
notgitika 78348f6
refactor(project): load the CDK toolkit lazily and test the adapter
notgitika 5e56870
fix(project): ship the toolkit's bootstrap template with the artifacts
notgitika 5bcd05f
feat(project): log deploy's detailed output to the shared log
notgitika 7e328ea
docs(project): shorten the comments deploy's plumbing carries
notgitika e822485
refactor(project): move CDK behind a project backend
notgitika 5008322
feat(logging): file each run's log under the command that wrote it
notgitika aeba2db
Merge upstream/refactor into feat/project-deploy
notgitika d682e87
fix(logging): write one file per run, named for the run and nothing t…
notgitika 8910f5d
fix(build): name the Windows executable what Bun writes
notgitika d1c1fb2
feat(project): report the outputs of the stack a deploy created
notgitika 85ebc15
fix(logging): keep the log where the CLI's own state is
notgitika 5412990
fix(logging): bound the log directory now that runs no longer share a…
notgitika 9bdfeb6
revert(logging): keep the rotating log every command has written to
notgitika e9365ba
feat(project): write what a deploy shows to the log it points at
notgitika 4cca59c
fix(project): bootstrap only an environment that needs it
notgitika 569c562
fix(project): survive an unmapped toolkit log level, and catch a bad …
notgitika bb0ba2e
fix(project): only treat a usable bootstrap stack as bootstrapped
notgitika File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| import { existsSync } from "node:fs"; | ||
| import { join } from "node:path"; | ||
| import z from "zod"; | ||
| import { ProjectStateError } from "../../errors/errors"; | ||
| import type { ReadWriteJson } from "../../io"; | ||
|
|
||
| // The generated app tags every stack with the target it was synthesized for. Selecting | ||
| // on the tag keeps the CLI from reproducing the app's stack-naming convention. | ||
| const TARGET_TAG = "agentcore:target-name"; | ||
|
|
||
| const STACK_ARTIFACT = "aws:cloudformation:stack"; | ||
|
|
||
| // Artifacts are keyed by the hierarchical id the toolkit matches stack patterns against. | ||
| const AssemblyManifestSchema = z.object({ | ||
| artifacts: z | ||
| .record( | ||
| z.string(), | ||
| z.object({ | ||
| type: z.string(), | ||
| properties: z.object({ tags: z.record(z.string(), z.string()).optional() }).optional(), | ||
| }), | ||
| ) | ||
| .default({}), | ||
| }); | ||
|
|
||
| /** | ||
| * Asks the synthesized manifest which stack belongs to `target`, rather than deriving | ||
| * the name and hoping it matches what synth chose. | ||
| */ | ||
| export async function stackForTarget( | ||
| json: ReadWriteJson, | ||
| assemblyDirectory: string, | ||
| target: string, | ||
| ): Promise<string> { | ||
| const path = join(assemblyDirectory, "manifest.json"); | ||
| // deploy synthesizes immediately before this, so a missing manifest means synth wrote | ||
| // somewhere else rather than that the user skipped a step. | ||
| if (!existsSync(path)) { | ||
| throw new ProjectStateError(`No synthesized cloud assembly was found at ${path}.`); | ||
| } | ||
|
|
||
| const manifest = await json.read(path, AssemblyManifestSchema); | ||
| const stacks = Object.entries(manifest.artifacts).filter( | ||
| ([, artifact]) => artifact.type === STACK_ARTIFACT, | ||
| ); | ||
| const match = stacks.find(([, artifact]) => artifact.properties?.tags?.[TARGET_TAG] === target); | ||
| if (!match) { | ||
| throw new ProjectStateError( | ||
| `The synthesized cloud assembly has no stack for deployment target '${target}'. ` + | ||
| `${path} defines ${stacks.length} stack(s), none tagged ${TARGET_TAG}='${target}'.`, | ||
| ); | ||
| } | ||
| return match[0]; | ||
| } | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shouldn't the synth output the stack name? Is there a reason we need to re-derive it here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nothing is re-derived.
stackForTargetreads synth's manifest.json and selects the stack whoseagentcore:target-nametag matches, precisely so the CLI never reproduces the app's naming conventionThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess re-derive is the wrong word, but I'm wondering why the build doesn't output the stack name allowing us to avoid inspecting the assembly directly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Kept the manifest lookup in #2058 because generic build has no deployment target and may synthesize multiple stacks; the cloud assembly is CDK synth’s structured output, so returning one stack from build would still require this lookup while leaking CDK-specific semantics into the build contract. Clarified the implementation in c76b638 by renaming stackForTarget/stackName to stackArtifactIdForTarget/stackArtifactId.