Merge branch 'feature/rubysecurityscans' of https://github.com/LaxmanReddyAileni/aws-toolkit-vscode into feature/rubysecurityscans

Author: laileni-aws

.changes/next-release/Bug Fix-dc5d5825-4d0e-4a2e-9ec3-63b4a0466662.json

@@ -0,0 +1,4 @@
+{
+	"type": "Bug Fix",
+	"description": "Amazon Q: Input prompt gets wrapped to new line which avoids focusing"
+}

package-lock.json

@@ -4353,7 +4353,7 @@
         "@aws-sdk/shared-ini-file-loader": "^3.46.0",
         "@aws-sdk/smithy-client": "^3.46.0",
         "@aws-sdk/util-arn-parser": "^3.46.0",
-        "@aws/mynah-ui-chat": "npm:@aws/[email protected].9",
+        "@aws/mynah-ui-chat": "npm:@aws/[email protected].10",
         "@gerhobbelt/gitignore-parser": "^0.2.0-9",
         "@iarna/toml": "^2.2.5",
         "@vscode/debugprotocol": "^1.57.0",

package.json

@@ -23,9 +23,9 @@ import { AuthController } from '../../../amazonq/auth/controller'
 import { getLogger } from '../../../shared/logger'
 import { submitFeedback } from '../../../feedback/vue/submitFeedback'
 import { placeholder } from '../../../shared/vscode/commands2'
-import { ExternalBrowserUtils } from '../../../amazonq/commons/externalBrowser/externalBrowserUtils'
 import { userGuideURL } from '../../../amazonq/webview/ui/texts/constants'
 import { EditorContentController } from '../../../amazonq/commons/controllers/contentController'
+import { openUrl } from '../../../shared/utilities/vsCodeUtils'
 
 export interface ChatControllerEventEmitters {
     readonly processHumanChatMessage: EventEmitter<any>
@@ -441,7 +441,7 @@ To learn more, visit the _[Amazon Q User Guide](${userGuideURL})_.
     }
 
     private processLink(message: any) {
-        ExternalBrowserUtils.instance.openLink(message.link)
+        openUrl(vscode.Uri.parse(message.link))
     }
 
     private insertCodeAtPosition(message: any) {

src/amazonq/commons/externalBrowser/externalBrowserUtils.ts

@@ -39,6 +39,7 @@ import {
     applySecurityFix,
     signoutCodeWhisperer,
     showManageCwConnections,
+    fetchFeatureConfigsCmd,
 } from './commands/basicCommands'
 import { sleep } from '../shared/utilities/timeoutUtils'
 import { ReferenceLogViewProvider } from './service/referenceLogViewProvider'
@@ -206,6 +207,8 @@ export async function activate(context: ExtContext): Promise<void> {
         selectCustomizationPrompt.register(),
         // notify new customizations
         notifyNewCustomizationsCmd.register(),
+        // fetch feature configs
+        fetchFeatureConfigsCmd.register(),
         /**
          * On recommendation acceptance
          */

src/amazonqFeatureDev/controllers/chat/controller.ts

@@ -7,7 +7,12 @@ import { AWSError, Credentials, Service } from 'aws-sdk'
 import globals from '../../shared/extensionGlobals'
 import * as CodeWhispererClient from './codewhispererclient'
 import * as CodeWhispererUserClient from './codewhispereruserclient'
-import { ListAvailableCustomizationsResponse, SendTelemetryEventRequest } from './codewhispereruserclient'
+import {
+    ListAvailableCustomizationsResponse,
+    ListFeatureEvaluationsRequest,
+    ListFeatureEvaluationsResponse,
+    SendTelemetryEventRequest,
+} from './codewhispereruserclient'
 import * as CodeWhispererConstants from '../models/constants'
 import { ServiceOptions } from '../../shared/awsClientBuilder'
 import { hasVendedIamCredentials } from '../../auth/auth'
@@ -22,6 +27,9 @@ import { session } from '../util/codeWhispererSession'
 import { getLogger } from '../../shared/logger'
 import { indent } from '../../shared/utilities/textUtilities'
 import { keepAliveHeader } from './agent'
+import { getOptOutPreference } from '../util/commonUtil'
+import * as os from 'os'
+import { getClientId } from '../../shared/telemetry/util'
 
 export type ProgrammingLanguage = Readonly<
     CodeWhispererClient.ProgrammingLanguage | CodeWhispererUserClient.ProgrammingLanguage
@@ -219,17 +227,46 @@ export class DefaultCodeWhispererClient {
     }
 
     public async sendTelemetryEvent(request: SendTelemetryEventRequest) {
-        const requestWithOptOut: SendTelemetryEventRequest = {
+        const requestWithCommonFields: SendTelemetryEventRequest = {
             ...request,
-            optOutPreference: globals.telemetry.telemetryEnabled ? 'OPTIN' : 'OPTOUT',
+            optOutPreference: getOptOutPreference(),
+            userContext: {
+                ideCategory: 'VSCODE',
+                operatingSystem: this.getOperatingSystem(),
+                product: 'CodeWhisperer',
+                clientId: await getClientId(globals.context.globalState),
+            },
         }
         if (!AuthUtil.instance.isValidEnterpriseSsoInUse() && !globals.telemetry.telemetryEnabled) {
             return
         }
-        const response = await (await this.createUserSdkClient()).sendTelemetryEvent(requestWithOptOut).promise()
+        const response = await (await this.createUserSdkClient()).sendTelemetryEvent(requestWithCommonFields).promise()
         getLogger().debug(`codewhisperer: sendTelemetryEvent requestID: ${response.$response.requestId}`)
     }
 
+    public async listFeatureEvaluations(): Promise<ListFeatureEvaluationsResponse> {
+        const request: ListFeatureEvaluationsRequest = {
+            userContext: {
+                ideCategory: 'VSCODE',
+                operatingSystem: this.getOperatingSystem(),
+                product: 'CodeWhisperer',
+                clientId: await getClientId(globals.context.globalState),
+            },
+        }
+        return (await this.createUserSdkClient()).listFeatureEvaluations(request).promise()
+    }
+
+    private getOperatingSystem(): string {
+        const osId = os.platform() // 'darwin', 'win32', 'linux', etc.
+        if (osId === 'darwin') {
+            return 'MAC'
+        } else if (osId === 'win32') {
+            return 'WINDOWS'
+        } else {
+            return 'LINUX'
+        }
+    }
+
     /**
      * @description Use this function to start the transformation job.
      * @param request

src/codewhisperer/activation.ts

@@ -53,6 +53,8 @@
             "output": { "shape": "CreateUploadUrlResponse" },
             "errors": [
                 { "shape": "ThrottlingException" },
+                { "shape": "ConflictException" },
+                { "shape": "ResourceNotFoundException" },
                 { "shape": "InternalServerException" },
                 { "shape": "ValidationException" },
                 { "shape": "AccessDeniedException" }
@@ -116,6 +118,8 @@
             "output": { "shape": "GetTaskAssistCodeGenerationResponse" },
             "errors": [
                 { "shape": "ThrottlingException" },
+                { "shape": "ConflictException" },
+                { "shape": "ResourceNotFoundException" },
                 { "shape": "InternalServerException" },
                 { "shape": "ValidationException" },
                 { "shape": "AccessDeniedException" }
@@ -241,6 +245,8 @@
             "output": { "shape": "StartTaskAssistCodeGenerationResponse" },
             "errors": [
                 { "shape": "ThrottlingException" },
+                { "shape": "ConflictException" },
+                { "shape": "ResourceNotFoundException" },
                 { "shape": "InternalServerException" },
                 { "shape": "ValidationException" },
                 { "shape": "AccessDeniedException" }
@@ -474,6 +480,7 @@
                 "contentMd5": { "shape": "CreateUploadUrlRequestContentMd5String" },
                 "contentChecksum": { "shape": "CreateUploadUrlRequestContentChecksumString" },
                 "contentChecksumType": { "shape": "ContentChecksumType" },
+                "contentLength": { "shape": "CreateUploadUrlRequestContentLengthLong" },
                 "artifactType": { "shape": "ArtifactType" },
                 "uploadIntent": { "shape": "UploadIntent" },
                 "uploadContext": { "shape": "UploadContext" }
@@ -485,6 +492,11 @@
             "min": 1,
             "sensitive": true
         },
+        "CreateUploadUrlRequestContentLengthLong": {
+            "type": "long",
+            "box": true,
+            "min": 1
+        },
         "CreateUploadUrlRequestContentMd5String": {
             "type": "string",
             "max": 128,
@@ -521,7 +533,7 @@
             "type": "string",
             "max": 950,
             "min": 0,
-            "pattern": "$|^arn:[-.a-z0-9]{1,63}:codewhisperer:([-.a-z0-9]{0,63}:){2}([a-zA-Z0-9-_:/]){1,1023}"
+            "pattern": "arn:[-.a-z0-9]{1,63}:codewhisperer:([-.a-z0-9]{0,63}:){2}([a-zA-Z0-9-_:/]){1,1023}"
         },
         "CustomizationName": {
             "type": "string",
@@ -955,7 +967,8 @@
         "PreSignedUrl": {
             "type": "string",
             "max": 2048,
-            "min": 1
+            "min": 1,
+            "sensitive": true
         },
         "PrimitiveInteger": { "type": "integer" },
         "ProgrammingLanguage": {
@@ -1442,7 +1455,8 @@
             "members": {
                 "ideCategory": { "shape": "IdeCategory" },
                 "operatingSystem": { "shape": "OperatingSystem" },
-                "product": { "shape": "UserContextProductString" }
+                "product": { "shape": "UserContextProductString" },
+                "clientId": { "shape": "UUID" }
             }
         },
         "UserContextProductString": {
@@ -1518,7 +1532,8 @@
                 "recommendationLatencyMilliseconds": { "shape": "Double" },
                 "timestamp": { "shape": "Timestamp" },
                 "suggestionReferenceCount": { "shape": "PrimitiveInteger" },
-                "generatedLine": { "shape": "PrimitiveInteger" }
+                "generatedLine": { "shape": "PrimitiveInteger" },
+                "numberOfRecommendations": { "shape": "PrimitiveInteger" }
             }
         },
         "ValidationException": {

src/codewhisperer/client/codewhisperer.ts

@@ -32,6 +32,7 @@ import { FileSystemCommon } from '../../srcShared/fs'
 import { Mutable } from '../../shared/utilities/tsUtils'
 import { CodeWhispererSource } from './types'
 import { showManageConnections } from '../../auth/ui/vue/show'
+import { FeatureConfigProvider } from '../service/featureConfigProvider'
 
 export const toggleCodeSuggestions = Commands.declare(
     { id: 'aws.codeWhisperer.toggleCodeSuggestion', compositeKey: { 1: 'source' } },
@@ -246,6 +247,13 @@ export const notifyNewCustomizationsCmd = Commands.declare(
     }
 )
 
+export const fetchFeatureConfigsCmd = Commands.declare(
+    { id: 'aws.codeWhisperer.fetchFeatureConfigs', logging: false },
+    () => () => {
+        FeatureConfigProvider.instance.fetchFeatureConfigs()
+    }
+)
+
 export const applySecurityFix = Commands.declare(
     'aws.codeWhisperer.applySecurityFix',
     () => async (issue: CodeScanIssue, filePath: string, source: Component) => {

src/codewhisperer/client/user-service-2.json

@@ -8,7 +8,6 @@ import * as CodeWhispererConstants from '../models/constants'
 import { runtimeLanguageContext } from '../util/runtimeLanguageContext'
 import { Recommendation } from '../client/codewhisperer'
 import { LicenseUtil } from '../util/licenseUtil'
-import { TelemetryHelper } from '../util/telemetryHelper'
 import { RecommendationHandler } from './recommendationHandler'
 import { session } from '../util/codeWhispererSession'
 /**
@@ -60,7 +59,7 @@ export function getCompletionItem(
             recommendation,
             RecommendationHandler.instance.requestId,
             session.sessionId,
-            TelemetryHelper.instance.triggerType,
+            session.triggerType,
             session.getCompletionType(recommendationIndex),
             languageContext.language,
             references,