Merge branch 'master' of https://github.com/aws/aws-toolkit-vscode into gajjardh/refactor-add-ComputeEnv-telemetry

Author: dhruvigajjar

.changes/2.10.0.json

@@ -0,0 +1,10 @@
+{
+	"date": "2024-02-16",
+	"version": "2.10.0",
+	"entries": [
+		{
+			"type": "Bug Fix",
+			"description": "CDK Explorer: Refresh button is now visible."
+		}
+	]
+}

.changes/next-release/Bug Fix-7858d5db-fde1-4db1-860f-5be3b0bce411.json

@@ -1,3 +1,7 @@
+## 2.10.0 2024-02-16
+
+- **Bug Fix** CDK Explorer: Refresh button is now visible.
+
 ## 2.9.0 2024-02-09
 
 - **Bug Fix** Cloud9: certain filesystem calls did not work in Cloud9

CHANGELOG.md

@@ -2,7 +2,7 @@
     "name": "aws-toolkit-vscode",
     "displayName": "AWS Toolkit - Amazon Q, CodeWhisperer, and more",
     "description": "Including Amazon Q, CodeWhisperer, CodeCatalyst, Application Composer, and support for Lambda, S3, CloudWatch Logs, CloudFormation, and many other services",
-    "version": "2.10.0-SNAPSHOT",
+    "version": "2.11.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -4293,7 +4293,6 @@
         "@types/node-fetch": "^2.6.8",
         "@types/prismjs": "^1.26.0",
         "@types/readline-sync": "^1.4.3",
-        "@types/sanitize-html": "2.3.1",
         "@types/semver": "^7.5.0",
         "@types/sinon": "^10.0.5",
         "@types/sinonjs__fake-timers": "^8.1.2",
@@ -4321,12 +4320,12 @@
         "sass-loader": "^12.6.0",
         "sinon": "^14.0.0",
         "style-loader": "^3.3.1",
+        "ts-node": "^10.9.1",
+        "typescript": "^5.0.4",
         "umd-compat-loader": "^2.1.2",
         "vue-loader": "^17.2.2",
         "vue-style-loader": "^4.1.3",
-        "webfont": "^11.2.26",
-        "typescript": "^5.0.4",
-        "ts-node": "^10.9.1"
+        "webfont": "^11.2.26"
     },
     "dependencies": {
         "@amzn/codewhisperer-streaming": "file:../../src.gen/@amzn/codewhisperer-streaming",
@@ -4367,7 +4366,6 @@
         "mime-types": "^2.1.32",
         "node-fetch": "^2.7.0",
         "portfinder": "^1.0.32",
-        "sanitize-html": "^2.3.3",
         "semver": "^7.5.4",
         "strip-ansi": "^5.2.0",
         "tcp-port-used": "^1.0.1",

package-lock.json

@@ -3,7 +3,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import sanitizeHtml from 'sanitize-html'
 import * as vscode from 'vscode'
 import { ToolkitError } from '../../shared/errors'
 import { getLogger } from '../../shared/logger'
@@ -12,6 +11,7 @@ import { IllegalStateTransition, UserMessageNotFoundError } from '../errors'
 import { SessionState, SessionStateAction, SessionStateConfig, SessionStateInteraction } from '../types'
 import { prepareRepoData } from '../util/files'
 import { uploadCode } from '../util/upload'
+import { encodeHTML } from '../../shared/utilities/textUtilities'
 
 export class ConversationNotStartedState implements Omit<SessionState, 'uploadId'> {
     public tokenSource: vscode.CancellationTokenSource
@@ -90,10 +90,9 @@ export class RefinementState implements SessionState {
                     action.msg
                 )
 
-                this.approach = sanitizeHtml(
+                this.approach = encodeHTML(
                     approach ??
-                        'There has been a problem generating an approach. Please open a conversation in a new tab',
-                    {}
+                        'There has been a problem generating an approach. Please open a conversation in a new tab'
                 )
                 getLogger().debug(`Approach response: %O`, this.approach)
 

packages/toolkit/package.json

@@ -32,7 +32,6 @@ import { activate as activateEc2 } from './ec2/activation'
 import { activate as activateSam } from './shared/sam/activation'
 import { activate as activateS3 } from './s3/activation'
 import * as awsFiletypes from './shared/awsFiletypes'
-import { activate as activateCodeWhisperer, shutdown as codewhispererShutdown } from './codewhisperer/activation'
 import { activate as activateApiGateway } from './apigateway/activation'
 import { activate as activateStepFunctions } from './stepFunctions/activation'
 import { activate as activateSsmDocument } from './ssmDocument/activation'
@@ -133,8 +132,6 @@ export async function activate(context: vscode.ExtensionContext) {
             remoteInvokeOutputChannel: globals.invokeOutputChannel,
         })
 
-        await activateCodeWhisperer(extContext)
-
         await activateAppRunner(extContext)
 
         await activateApiGateway({
@@ -230,7 +227,6 @@ export async function activate(context: vscode.ExtensionContext) {
 
 export async function deactivate() {
     await deactivateShared()
-    await codewhispererShutdown()
     await globals.resourceManager.dispose()
 }
 

packages/toolkit/src/amazonqFeatureDev/session/sessionState.ts

@@ -18,6 +18,7 @@ import { documentationUrl, githubCreateIssueUrl, githubUrl } from './shared/cons
 import { getIdeProperties, aboutToolkit, isCloud9 } from './shared/extensionUtilities'
 import { telemetry } from './shared/telemetry/telemetry'
 import { openUrl } from './shared/utilities/vsCodeUtils'
+import { activate as activateCodeWhisperer, shutdown as codewhispererShutdown } from './codewhisperer/activation'
 
 import { activate as activateLogger } from './shared/logger/activation'
 import { initializeComputeRegion } from './shared/extensionUtilities'
@@ -42,6 +43,9 @@ import { showQuickStartWebview } from './shared/extensionStartup'
 import { ExtContext } from './shared/extensions'
 import { getSamCliContext } from './shared/sam/cli/samCliContext'
 import { UriHandler } from './shared/vscode/uriHandler'
+import { disableAwsSdkWarning } from './shared/awsClientBuilder'
+
+disableAwsSdkWarning()
 
 let localize: nls.LocalizeFunc
 
@@ -131,13 +135,15 @@ export async function activateShared(
         credentialsStore: globals.loginManager.store,
     }
 
+    await activateCodeWhisperer(extContext)
+
     return extContext
 }
 
 /** Deactivation code that is shared between nodejs and browser implementations */
 export async function deactivateShared() {
     await globals.telemetry.shutdown()
-    // await codewhispererShutdown()
+    await codewhispererShutdown()
 }
 /**
  * Registers generic commands used by both browser and node versions of the toolkit.