CodeWhisperer release for April 13, 2023

Co-authored-by: Abhilash Kuhikar <[email protected]>
Co-authored-by: Andrew Yu <[email protected]>
Co-authored-by: Jaden Simon <[email protected]>
Co-authored-by: Lei Gao <[email protected]>
Co-authored-by: Meghana Gunuganti <[email protected]>
Co-authored-by: Pappu Chaudhary <[email protected]>
Co-authored-by: Prateek Chauhan <[email protected]>
Co-authored-by: Rachel Cross <[email protected]>
Co-authored-by: Shao-Hua Lo <[email protected]>
Co-authored-by: Stephen Yuan <[email protected]>
Co-authored-by: Tianxing Cheng <[email protected]>
Co-authored-by: Wade Fang <[email protected]>
Co-authored-by: Walker Cheng <[email protected]>
Co-authored-by: Will Lo <[email protected]>
Co-authored-by: Zoe Lin <[email protected]>

Author: 14 people

.changes/next-release/Feature-0244d757-1d97-434b-bad5-2674b36fb88a.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "CodeWhisperer: Now also provides import recommendations"
+}

.changes/next-release/Feature-09c0ed64-972c-44f0-bb46-6a8b3caf3d2e.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "CodeWhisperer: new code scan features: \n1. highlighting scanned files \n2. stop security scan"
+}

.changes/next-release/Feature-c2871a58-ba03-11ed-afa1-0242ac120002.json

@@ -0,0 +1,4 @@
+{
+	"type": "Feature",
+	"description": "CodeWhisperer: new supported programming languages: c, cpp, go, kotlin, php, ruby, rust, scala, shell, sql. "
+}

package.json

@@ -216,6 +216,10 @@
                         "remoteConnected": {
                             "type": "boolean",
                             "default": false
+                        },
+                        "codeWhispererConnectionExpired": {
+                            "type": "boolean",
+                            "default": false
                         }
                     },
                     "additionalProperties": false
@@ -239,6 +243,11 @@
                     "description": "%AWS.configuration.description.codewhisperer%",
                     "default": true
                 },
+                "aws.codeWhisperer.importRecommendation": {
+                    "type": "boolean",
+                    "description": "%AWS.configuration.description.codewhisperer.importRecommendation%",
+                    "default": true
+                },
                 "aws.codeWhisperer.shareCodeWhispererContentWithAWS": {
                     "type": "boolean",
                     "markdownDescription": "%AWS.configuration.description.codewhisperer.shareCodeWhispererContentWithAWS%",

package.nls.json

@@ -70,7 +70,8 @@
     "AWS.configuration.description.awssam.debug.snippets.api.label.cn": "Amazon SAM: API Gateway lambda invoke",
     "AWS.configuration.description.awssam.debug.snippets.api.description.cn": "A new configuration for invoking an Amazon Lambda in a CloudFormation template, simulating API Gateway",
     "AWS.configuration.description.codewhisperer": "When checked, CodeWhisperer will include suggestions with code references",
-    "AWS.configuration.description.codewhisperer.shareCodeWhispererContentWithAWS": "When checked, your content processed by CodeWhisperer may be used for service improvement. Unchecking this box will cause AWS to delete any of your content used for that purpose. The information used to provide the CodeWhisperer service to you will not be affected. See the Preview terms and [Service Terms](https://aws.amazon.com/service-terms/) for more detail.",
+    "AWS.configuration.description.codewhisperer.shareCodeWhispererContentWithAWS": "When checked, your content processed by CodeWhisperer may be used for service improvement (except for content processed by the Enterprise CodeWhisperer service tier). Unchecking this box will cause AWS to delete any of your content used for that purpose. The information used to provide the CodeWhisperer service to you will not be affected. See the [Service Terms](https://aws.amazon.com/service-terms) for more detail.",
+    "AWS.configuration.description.codewhisperer.importRecommendation": "CodeWhisperer will add import statements with code suggestions when necessary",
     "AWS.command.apig.copyUrl": "Copy URL",
     "AWS.command.apig.invokeRemoteRestApi": "Invoke on AWS",
     "AWS.command.apig.invokeRemoteRestApi.cn": "Invoke on Amazon",

resources/markdown/WelcomeToCodeWhisperer.md

@@ -1,6 +1,6 @@
 ## Using Amazon CodeWhisperer
 
-CodeWhisperer uses machine learning to generate code suggestions from the existing code and comments in your IDE. Supported languages include **Java, Python, JavaScript, C# and TypeScript**.
+CodeWhisperer uses machine learning to generate code suggestions from the existing code and comments in your IDE. Supported languages include **Java, Python, JavaScript, C# , TypeScript, C, C++, Go, Rust, PHP, Scala, Kotlin, Ruby, Shell and SQL**.
 
 ---
 
@@ -20,6 +20,12 @@ You can request suggestions at any time. Use **Option-C** on Mac or **ALT-C** on
 
 ---
 
+**Customizing keyboard shortcuts**
+
+You can change CodeWhisperer keyboard shortcuts in [Keyboard Shortcuts Editor](https://code.visualstudio.com/docs/getstarted/keybindings). To open Keyboard Shortcuts Editor, go to Settings, and click on Keyboard shortcuts.
+
+---
+
 **Getting the best recommendations**
 
 For best results, follow these practices.

src/codewhisperer/activation.ts

@@ -2,7 +2,6 @@
  * Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-
 import { AWSError, CognitoIdentityCredentials, Service } from 'aws-sdk'
 import apiConfig = require('./service-2.json')
 import userApiConfig = require('./user-service-2.json')
@@ -17,15 +16,10 @@ import { CodeWhispererSettings } from '../util/codewhispererSettings'
 import { getCognitoCredentials } from '../util/cognitoIdentity'
 import { PromiseResult } from 'aws-sdk/lib/request'
 import { getLogger } from '../../shared/logger'
-import { throttle } from 'lodash'
 import { Credentials } from 'aws-sdk'
 import { AuthUtil } from '../util/authUtil'
 import { TelemetryHelper } from '../util/telemetryHelper'
-
-const refreshCredentials = throttle(() => {
-    getLogger().verbose('codewhisperer: invalidating expired credentials')
-    globals.awsContext.credentialsShim?.refresh()
-}, 60000)
+import { isSsoConnection } from '../../credentials/auth'
 
 export type ProgrammingLanguage = Readonly<
     CodeWhispererClient.ProgrammingLanguage | CodeWhispererUserClient.ProgrammingLanguage
@@ -41,6 +35,7 @@ export type ListRecommendationsResponse =
     | CodeWhispererUserClient.GenerateCompletionsResponse
 export type GenerateRecommendationsResponse = CodeWhispererClient.GenerateRecommendationsResponse
 export type Recommendation = CodeWhispererClient.Recommendation | CodeWhispererUserClient.Completion
+export type Completion = CodeWhispererUserClient.Completion
 export type Reference = CodeWhispererClient.Reference | CodeWhispererUserClient.Reference
 export type References = CodeWhispererClient.References | CodeWhispererUserClient.References
 export type CreateUploadUrlRequest = Readonly<
@@ -66,7 +61,8 @@ export type CreateUploadUrlResponse =
 export type CreateCodeScanResponse =
     | CodeWhispererClient.CreateCodeScanResponse
     | CodeWhispererUserClient.StartCodeAnalysisResponse
-
+export type Import = CodeWhispererUserClient.Import
+export type Imports = CodeWhispererUserClient.Imports
 export class DefaultCodeWhispererClient {
     private credentials?: CognitoIdentityCredentials
 
@@ -93,7 +89,7 @@ export class DefaultCodeWhispererClient {
             {
                 apiConfig: apiConfig,
                 region: CodeWhispererConstants.region,
-                credentials: this.credentials,
+                credentials: this.credentials ?? (await AuthUtil.instance.getCredentials()),
                 endpoint: CodeWhispererConstants.endpoint,
                 onRequestSetup: [
                     req => {
@@ -121,7 +117,7 @@ export class DefaultCodeWhispererClient {
                                     resp.error?.code === 'AccessDeniedException' &&
                                     resp.error.message.match(/expired/i)
                                 ) {
-                                    refreshCredentials()
+                                    AuthUtil.instance.reauthenticate()
                                     resp.error.retryable = true
                                 }
                             })
@@ -165,12 +161,11 @@ export class DefaultCodeWhispererClient {
     }
 
     private isBearerTokenAuth(): boolean {
-        // return true if access token is cleared because of SSO code path
         const accessToken = globals.context.globalState.get<string | undefined>(CodeWhispererConstants.accessToken)
-        if (!accessToken) {
-            return true
+        if (accessToken) {
+            return false
         }
-        return AuthUtil.instance.isConnected()
+        return isSsoConnection(AuthUtil.instance.conn)
     }
 
     public async generateRecommendations(
@@ -196,9 +191,9 @@ export class DefaultCodeWhispererClient {
         request: CreateUploadUrlRequest
     ): Promise<PromiseResult<CreateUploadUrlResponse, AWSError>> {
         if (this.isBearerTokenAuth()) {
-            return (await this.createUserSdkClient()).createArtifactUploadUrl(request).promise()
+            return (await this.createUserSdkClient()).createUploadUrl(request).promise()
         }
-        return (await this.createSdkClient()).createUploadUrl(request).promise()
+        return (await this.createSdkClient()).createCodeScanUploadUrl(request).promise()
     }
 
     public async createCodeScan(

src/codewhisperer/client/codewhisperer.ts

@@ -1,13 +1,19 @@
 {
     "pagination": {
-        "ListRecommendations": {
+        "ListCodeScanFindings": {
+            "input_token": "nextToken",
+            "output_token": "nextToken"
+        },
+        "ListProfiles": {
             "input_token": "nextToken",
             "output_token": "nextToken",
-            "limit_key": "maxResults"
+            "limit_key": "maxResults",
+            "result_key": "profiles"
         },
-        "ListSecurityIssues": {
+        "ListRecommendations": {
             "input_token": "nextToken",
-            "output_token": "nextToken"
+            "output_token": "nextToken",
+            "limit_key": "maxResults"
         }
     }
 }