Merge branch 'aws:master' into master

Author: laileni-aws

.changes/1.98.0.json

@@ -0,0 +1,18 @@
+{
+	"date": "2023-11-09",
+	"version": "1.98.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CodeWhisperer, CodeCatalyst may require login again after Switching VSCode workspaces"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "\"Scanning CloudFormation templates...\" message `Cancel` button does not fully stop the scan"
+		},
+		{
+			"type": "Bug Fix",
+			"description": "ECS: `SimulatePrincipalPolicy` permission is no longer required for users to run `exec command`"
+		}
+	]
+}

.changes/next-release/Bug Fix-bbaf4ca5-56ad-47cc-949c-11fc91a8bff1.json

@@ -1,3 +1,9 @@
+## 1.98.0 2023-11-09
+
+- **Bug Fix** CodeWhisperer, CodeCatalyst may require login again after Switching VSCode workspaces
+- **Bug Fix** "Scanning CloudFormation templates..." message `Cancel` button does not fully stop the scan
+- **Bug Fix** ECS: `SimulatePrincipalPolicy` permission is no longer required for users to run `exec command`
+
 ## 1.97.0 2023-11-02
 
 - **Bug Fix** CodeWhisperer: fix and improve closing symbols handling (brackets, parenthesis, quotes etc)

CHANGELOG.md

@@ -44,6 +44,12 @@ phases:
     build:
         commands:
             - export HOME=/home/codebuild-user
+            # TODO: run lint as a separate codebuild job.
+            - |
+                if [ "$VSCODE_TEST_VERSION" = 'insiders' ] ; then
+                    npm run testCompile
+                    npm run lint
+                fi
             - xvfb-run npm test --silent
             - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
             - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g') # Encode `#` in the URL because otherwise the url is clipped in the Codecov.io site

buildspec/linuxTests.yml

@@ -2,7 +2,7 @@
     "name": "aws-toolkit-vscode",
     "displayName": "AWS Toolkit",
     "description": "Including CodeWhisperer, CodeCatalyst, and support for Lambda, S3, CloudWatch Logs, and many other services",
-    "version": "1.98.0-SNAPSHOT",
+    "version": "1.99.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],

package-lock.json

@@ -111,6 +111,7 @@ export function registerDevfileWatcher(devenvClient: DevEnvClient): vscode.Dispo
     const registry = new DevfileRegistry()
     const codelensProvider = new DevfileCodeLensProvider(registry, devenvClient)
     registry.addWatchPatterns([devfileGlobPattern])
+    registry.rebuild()
 
     const codelensDisposable = vscode.languages.registerCodeLensProvider(
         {

package.json

@@ -48,7 +48,7 @@ import globals from '../../shared/extensionGlobals'
 import { telemetry } from '../../shared/telemetry/telemetry'
 import { LambdaArchitecture, Result, Runtime } from '../../shared/telemetry/telemetry'
 import { getTelemetryReason, getTelemetryResult } from '../../shared/errors'
-import { openUrl } from '../../shared/utilities/vsCodeUtils'
+import { openUrl, replaceVscodeVars } from '../../shared/utilities/vsCodeUtils'
 
 export const samInitTemplateFiles: string[] = ['template.yaml', 'template.yml']
 export const samInitReadmeFile: string = 'README.TOOLKIT.md'
@@ -395,8 +395,7 @@ export async function addInitialLaunchConfiguration(
         const targetDir: string = path.dirname(targetUri.fsPath)
         const filtered = configurations.filter(config => {
             let templatePath: string = (config.invokeTarget as TemplateTargetProperties).templatePath
-            // TODO: write utility function that does this for other variables too
-            templatePath = templatePath.replace('${workspaceFolder}', folder.uri.fsPath)
+            templatePath = replaceVscodeVars(templatePath, folder.uri.fsPath)
 
             return (
                 isTemplateTargetProperties(config.invokeTarget) &&

src/codecatalyst/devfile.ts

@@ -15,6 +15,7 @@ import * as CloudFormation from './cloudformation'
 import { Commands } from '../vscode/commands2'
 import globals from '../extensionGlobals'
 import { SamCliSettings } from '../sam/cli/samCliSettings'
+import { Timeout } from '../utilities/timeoutUtils'
 
 /**
  * Creates a CloudFormationTemplateRegistry which retains the state of CloudFormation templates in a workspace.
@@ -56,12 +57,12 @@ export async function activate(extensionContext: vscode.ExtensionContext): Promi
  * and slowing down the extension starting up.
  */
 function setTemplateRegistryInGlobals(registry: CloudFormationTemplateRegistry) {
-    const registrySetupFunc = async (registry: CloudFormationTemplateRegistry) => {
-        await registry.addExcludedPattern(CloudFormation.devfileExcludePattern)
-        await registry.addExcludedPattern(CloudFormation.templateFileExcludePattern)
-        await registry.addWatchPatterns([CloudFormation.templateFileGlobPattern])
-        await registry.watchUntitledFiles()
-
+    const registrySetupFunc = async (registry: CloudFormationTemplateRegistry, cancellationTimeout: Timeout) => {
+        registry.addExcludedPattern(CloudFormation.devfileExcludePattern)
+        registry.addExcludedPattern(CloudFormation.templateFileExcludePattern)
+        registry.addWatchPatterns([CloudFormation.templateFileGlobPattern])
+        registry.watchUntitledFiles()
+        await registry.rebuild(cancellationTimeout)
         return registry
     }
 

src/lambda/commands/createNewSamApp.ts

@@ -14,7 +14,7 @@ import { getLambdaDetails } from '../../lambda/utils'
 import { WatchedFiles, WatchedItem } from './watchedFiles'
 import { getLogger } from '../logger'
 import globals from '../extensionGlobals'
-import { sleep } from '../utilities/timeoutUtils'
+import { Timeout, sleep } from '../utilities/timeoutUtils'
 import { localize } from '../utilities/vsCodeUtils'
 import { PerfLog } from '../logger/logger'
 
@@ -71,7 +71,8 @@ export class AsyncCloudFormationTemplateRegistry {
     constructor(
         private readonly instance: CloudFormationTemplateRegistry,
         private readonly asyncSetupFunc: (
-            instance: CloudFormationTemplateRegistry
+            instance: CloudFormationTemplateRegistry,
+            cancelSetup: Timeout
         ) => Promise<CloudFormationTemplateRegistry>
     ) {}
 
@@ -86,18 +87,21 @@ export class AsyncCloudFormationTemplateRegistry {
         }
 
         let perf: PerfLog
+        const cancelSetup = new Timeout(30 * 60 * 1000) // 30 min
         if (!this.setupPromise) {
             perf = new PerfLog('cfn: template registry setup')
-            this.setupPromise = this.asyncSetupFunc(this.instance)
+            this.setupPromise = this.asyncSetupFunc(this.instance, cancelSetup)
         }
         this.setupPromise.then(() => {
             if (perf) {
                 perf.done()
             }
             this.isSetup = true
+            cancelSetup.dispose()
         })
         // Show user a message indicating setup is in progress
         if (this.setupProgressMessage === undefined) {
+            // TODO: use showMessageWithCancel() ?
             this.setupProgressMessage = vscode.window.withProgress(
                 {
                     location: vscode.ProgressLocation.Notification,
@@ -111,6 +115,7 @@ export class AsyncCloudFormationTemplateRegistry {
                     token.onCancellationRequested(() => {
                         // Allows for new message to be created if templateRegistry variable attempted to be used again
                         this.setupProgressMessage = undefined
+                        cancelSetup.cancel()
                     })
                     getLogger().debug('cfn: getInstance() requested, still initializing')
                     while (!this.isSetup) {