From ff304f71476078706dfa59bdb664ce913bc0a564 Mon Sep 17 00:00:00 2001 From: Vichym Date: Thu, 31 Oct 2024 17:08:14 -0700 Subject: [PATCH 1/3] fix(lambda): remove template path from sam deploy command --- packages/core/src/shared/sam/deploy.ts | 4 ---- packages/core/src/test/shared/sam/deploy.test.ts | 6 ------ packages/core/src/testInteg/sam.test.ts | 2 -- 3 files changed, 12 deletions(-) diff --git a/packages/core/src/shared/sam/deploy.ts b/packages/core/src/shared/sam/deploy.ts index 35cb29f95a9..6154e2e3def 100644 --- a/packages/core/src/shared/sam/deploy.ts +++ b/packages/core/src/shared/sam/deploy.ts @@ -377,10 +377,6 @@ export async function runDeploy(arg: any, wizardParams?: DeployParams): Promise< throw ToolkitError.chain(error, 'Failed to build SAM template', { details: { ...buildFlags } }) } - // Pass built template to deployFlags - const templatePath = vscode.Uri.joinPath(params.projectRoot, '.aws-sam', 'build', 'template.yaml').fsPath - deployFlags.push('--template-file', `${templatePath}`) - // Create a child process to run the SAM deploy command const deployProcess = new ChildProcess(samCliPath, ['deploy', ...deployFlags], { spawnOptions: await addTelemetryEnvVar({ diff --git a/packages/core/src/test/shared/sam/deploy.test.ts b/packages/core/src/test/shared/sam/deploy.test.ts index 37d94c4b10d..1da271fbdfb 100644 --- a/packages/core/src/test/shared/sam/deploy.test.ts +++ b/packages/core/src/test/shared/sam/deploy.test.ts @@ -709,8 +709,6 @@ describe('SAM Deploy', () => { '--parameter-overrides', `ParameterKey=SourceBucketName,ParameterValue=${mockDeployParams.SourceBucketName} ` + `ParameterKey=DestinationBucketName,ParameterValue=${mockDeployParams.DestinationBucketName}`, - '--template-file', - vscode.Uri.joinPath(projectRoot, '.aws-sam', 'build', 'template.yaml').fsPath, ], { spawnOptions: { @@ -787,8 +785,6 @@ describe('SAM Deploy', () => { '--parameter-overrides', `ParameterKey=SourceBucketName,ParameterValue=${mockDeployParams.SourceBucketName} ` + `ParameterKey=DestinationBucketName,ParameterValue=${mockDeployParams.DestinationBucketName}`, - '--template-file', - vscode.Uri.joinPath(projectRoot, '.aws-sam', 'build', 'template.yaml').fsPath, ], { spawnOptions: { @@ -867,8 +863,6 @@ describe('SAM Deploy', () => { '--parameter-overrides', `ParameterKey=SourceBucketName,ParameterValue=${mockDeployParams.SourceBucketName} ` + `ParameterKey=DestinationBucketName,ParameterValue=${mockDeployParams.DestinationBucketName}`, - '--template-file', - vscode.Uri.joinPath(projectRoot, '.aws-sam', 'build', 'template.yaml').fsPath, ], { spawnOptions: { diff --git a/packages/core/src/testInteg/sam.test.ts b/packages/core/src/testInteg/sam.test.ts index 5960df8bc20..03d00165e22 100644 --- a/packages/core/src/testInteg/sam.test.ts +++ b/packages/core/src/testInteg/sam.test.ts @@ -883,8 +883,6 @@ describe('SAM Integration Tests', async function () { '--capabilities', 'CAPABILITY_IAM', 'CAPABILITY_NAMED_IAM', - '--template-file', - vscode.Uri.joinPath(mockDeployParams.projectRoot, '.aws-sam', 'build', 'template.yaml').fsPath, ]) // Check that runInTerminal is called with the correct arguments for deploy From 604b2117a9e9fe7ee9bdbe36a8f2e1bad8d69942 Mon Sep 17 00:00:00 2001 From: Vichym Date: Thu, 31 Oct 2024 17:20:51 -0700 Subject: [PATCH 2/3] add info to change log --- packages/toolkit/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md index c611cdb50c3..65a0546853f 100644 --- a/packages/toolkit/CHANGELOG.md +++ b/packages/toolkit/CHANGELOG.md @@ -1,3 +1,6 @@ +## 3.33.0 2024-11-06 +- **Bug Fix** SAM: Save SAM deploy parameters to correct samconfig.toml in project folder + ## 3.31.0 2024-10-30 - **Feature** SAM: Added support for Java 21 Lambda runtime From 654c2fce3c95e515b7e6a5880e738433b89d94a0 Mon Sep 17 00:00:00 2001 From: Vichym Date: Fri, 1 Nov 2024 10:54:10 -0700 Subject: [PATCH 3/3] revert manual update to CHANGELOG.md --- .../Bug Fix-1ade44c5-bd1f-4b8f-a7f3-f2740ebb8097.json | 4 ++++ packages/toolkit/CHANGELOG.md | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 packages/toolkit/.changes/next-release/Bug Fix-1ade44c5-bd1f-4b8f-a7f3-f2740ebb8097.json diff --git a/packages/toolkit/.changes/next-release/Bug Fix-1ade44c5-bd1f-4b8f-a7f3-f2740ebb8097.json b/packages/toolkit/.changes/next-release/Bug Fix-1ade44c5-bd1f-4b8f-a7f3-f2740ebb8097.json new file mode 100644 index 00000000000..366b89443fc --- /dev/null +++ b/packages/toolkit/.changes/next-release/Bug Fix-1ade44c5-bd1f-4b8f-a7f3-f2740ebb8097.json @@ -0,0 +1,4 @@ +{ + "type": "Bug Fix", + "description": "SAM: Save SAM deploy parameters to correct samconfig.toml in project folder" +} diff --git a/packages/toolkit/CHANGELOG.md b/packages/toolkit/CHANGELOG.md index 65a0546853f..c611cdb50c3 100644 --- a/packages/toolkit/CHANGELOG.md +++ b/packages/toolkit/CHANGELOG.md @@ -1,6 +1,3 @@ -## 3.33.0 2024-11-06 -- **Bug Fix** SAM: Save SAM deploy parameters to correct samconfig.toml in project folder - ## 3.31.0 2024-10-30 - **Feature** SAM: Added support for Java 21 Lambda runtime