Merge master into feature/emr

aws-toolkit-automation · web-flow · commit 0b1879032c4a · 2024-11-03T18:27:24.000+01:00
diff --git 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/shared/sam/sync.ts b/packages/core/src/shared/sam/sync.ts
@@ -354,16 +354,24 @@ export class SyncWizard extends Wizard<SyncParams> {
         })
 
         this.form.ecrRepoUri.bindPrompter(({ region }) => createEcrPrompter(new DefaultEcrClient(region!)), {
-            showWhen: ({ template }) => !!template && hasImageBasedResources(template.data),
+            showWhen: ({ template, paramsSource }) =>
+                !!template &&
+                hasImageBasedResources(template.data) &&
+                (paramsSource === ParamsSource.Flags || paramsSource === ParamsSource.SpecifyAndSave),
         })
 
         // todo wrap with localize
-        this.form.syncFlags.bindPrompter(() =>
-            createMultiPick(syncFlagItems, {
-                title: 'Specify parameters for sync',
-                placeholder: 'Press enter to proceed with highlighted option',
-                buttons: createCommonButtons(samSyncParamUrl),
-            })
+        this.form.syncFlags.bindPrompter(
+            () =>
+                createMultiPick(syncFlagItems, {
+                    title: 'Specify parameters for sync',
+                    placeholder: 'Press enter to proceed with highlighted option',
+                    buttons: createCommonButtons(samSyncParamUrl),
+                }),
+            {
+                showWhen: ({ paramsSource }) =>
+                    paramsSource === ParamsSource.Flags || paramsSource === ParamsSource.SpecifyAndSave,
+            }
         )
     }
 }
diff --git 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/test/shared/sam/sync.test.ts b/packages/core/src/test/shared/sam/sync.test.ts
@@ -105,8 +105,14 @@ describe('SyncWizard', async function () {
     })
 
     it('prompts for ECR repo if template has image-based resource', async function () {
-        const template = { uri: vscode.Uri.file('/'), data: createBaseImageTemplate() }
-        const tester = await createTester({ template })
+        const workspaceUri = vscode.workspace.workspaceFolders?.[0]?.uri || vscode.Uri.file('/')
+        const rootFolderUri = vscode.Uri.joinPath(workspaceUri, 'my')
+        const templateUri = vscode.Uri.joinPath(rootFolderUri, 'template.yaml')
+        const template = { uri: templateUri, data: createBaseImageTemplate() }
+        const tester = await createTester({
+            template,
+            paramsSource: ParamsSource.Flags,
+        })
         tester.ecrRepoUri.assertShow()
     })
 
@@ -116,6 +122,12 @@ describe('SyncWizard', async function () {
         tester.ecrRepoUri.assertDoesNotShow()
     })
 
+    it('skips prompt for ECR repo if param source is to use samconfig', async function () {
+        const template = { uri: vscode.Uri.file('/'), data: createBaseTemplate() }
+        const tester = await createTester({ template, paramsSource: ParamsSource.SamConfig })
+        tester.ecrRepoUri.assertDoesNotShow()
+    })
+
     it("uses the template's workspace subfolder as the project root is not set", async function () {
         const workspaceUri = vscode.workspace.workspaceFolders?.[0]?.uri
         assert.ok(workspaceUri)
diff --git 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
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
@@ -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/.changes/next-release/Bug Fix-2ad71338-1d0f-4bbf-a9e9-ac0f12be7a4d.json b/packages/toolkit/.changes/next-release/Bug Fix-2ad71338-1d0f-4bbf-a9e9-ac0f12be7a4d.json
@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "SAM: Skip unnecessary prompters for sync operation when using flag from samconfig.toml file"
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +{
 +	"type": "Bug Fix",
 +	"description": "SAM: Save SAM deploy parameters to correct samconfig.toml in project folder"
 +}