Merge staging into feature/mde

Author: justinmk3

.changes/1.56.0.json

@@ -0,0 +1,26 @@
+{
+	"date": "2022-11-28",
+	"version": "1.56.0",
+	"entries": [
+		{
+			"type": "Feature",
+			"description": "Amazon CodeWhisperer now adds new access methods with AWS Builder ID and AWS IAM Identity Center to enable and get started. "
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon CodeWhisperer recommendations are more context aware. We are removing the overlaps from CodeWhisperer suggestions specifically when the cursor is inside a code block."
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon CodeWhisperer now supports TypeScript and C# programming languages."
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon CodeWhisperer is now available as a supported feature and no longer an experimental feature."
+		},
+		{
+			"type": "Feature",
+			"description": "Amazon CodeWhisperer now supports JavaScript for Security Scan to catch security vulnerabilities."
+		}
+	]
+}

.eslintignore

@@ -2,6 +2,7 @@ node_modules/**
 **/*.json
 src/shared/telemetry/clienttelemetry.d.ts
 src/codewhisperer/client/codewhispererclient.d.ts
+src/codewhisperer/client/codewhispereruserclient.d.ts
 types/clientcodecatalyst.d.ts
 **/*.gen.ts
 src/testFixtures/workspaceFolder/ts-plain-sam-app/

.gitignore

@@ -26,6 +26,7 @@ src/shared/telemetry/vscodeTelemetry.json
 # Auto generated type definitions
 src/shared/telemetry/clienttelemetry.d.ts
 src/codewhisperer/client/codewhispererclient.d.ts
+src/codewhisperer/client/codewhispereruserclient.d.ts
 types/clientcodecatalyst.d.ts
 
 # Generated by tests

CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.56.0 2022-11-28
+
+- **Feature** Amazon CodeWhisperer now adds new access methods with AWS Builder ID and AWS IAM Identity Center to enable and get started. 
+- **Feature** Amazon CodeWhisperer recommendations are more context aware. We are removing the overlaps from CodeWhisperer suggestions specifically when the cursor is inside a code block.
+- **Feature** Amazon CodeWhisperer now supports TypeScript and C# programming languages.
+- **Feature** Amazon CodeWhisperer is now available as a supported feature and no longer an experimental feature.
+- **Feature** Amazon CodeWhisperer now supports JavaScript for Security Scan to catch security vulnerabilities.
+
 ## 1.55.0 2022-11-23
 
 - **Bug Fix** logging: `aws.viewLogsAtMessage` no longer fails when the log message cannot be found

package-lock.json

@@ -2,7 +2,7 @@
     "name": "aws-toolkit-vscode",
     "displayName": "AWS Toolkit",
     "description": "Amazon Web Services toolkit for browsing and updating cloud resources",
-    "version": "1.56.0-SNAPSHOT",
+    "version": "1.57.0-SNAPSHOT",
     "extensionKind": [
         "workspace"
     ],
@@ -273,18 +273,13 @@
                     "markdownDescription": "%AWS.configuration.description.experiments%",
                     "default": {
                         "jsonResourceModification": false,
-                        "CodeWhisperer": true,
                         "samSyncCode": false
                     },
                     "properties": {
                         "jsonResourceModification": {
                             "type": "boolean",
                             "default": false
                         },
-                        "CodeWhisperer": {
-                            "type": "boolean",
-                            "default": true
-                        },
                         "samSyncCode": {
                             "type": "boolean",
                             "default": false
@@ -824,6 +819,10 @@
                     "command": "aws.codecatalyst.removeConnection",
                     "when": "false"
                 },
+                {
+                    "command": "aws.codeWhisperer.removeConnection",
+                    "when": "false"
+                },
                 {
                     "command": "aws.downloadSchemaItemCode",
                     "when": "false"
@@ -1830,14 +1829,24 @@
                 },
                 {
                     "command": "aws.codeWhisperer.configure",
-                    "when": "viewItem == awsCodeWhispererNode && !isCloud9",
+                    "when": "viewItem =~ /^awsCodeWhispererNode/ && !isCloud9",
                     "group": "inline@2"
                 },
                 {
                     "command": "aws.codeWhisperer.introduction",
-                    "when": "viewItem == awsCodeWhispererNode && !isCloud9 && CODEWHISPERER_TERMS_ACCEPTED",
+                    "when": "viewItem =~ /^awsCodeWhispererNode/ && !isCloud9 && CODEWHISPERER_TERMS_ACCEPTED",
                     "group": "inline@1"
                 },
+                {
+                    "command": "aws.codeWhisperer.removeConnection",
+                    "when": "viewItem == awsCodeWhispererNodeSaved",
+                    "group": "0@1"
+                },
+                {
+                    "command": "aws.codeWhisperer.removeConnection",
+                    "when": "viewItem == awsCodeWhispererNodeSaved",
+                    "group": "inline@3"
+                },
                 {
                     "command": "aws.cdk.refresh",
                     "when": "viewItem == awsCdkRootNode",
@@ -3112,6 +3121,12 @@
                     }
                 }
             },
+            {
+                "command": "aws.codeWhisperer.removeConnection",
+                "title": "%AWS.command.codewhisperer.removeConnection%",
+                "category": "%AWS.title%",
+                "icon": "$(debug-disconnect)"
+            },
             {
                 "command": "aws.dev.openMenu",
                 "title": "Open Developer Menu",
@@ -3483,7 +3498,7 @@
         "report": "nyc report --reporter=html --reporter=json"
     },
     "devDependencies": {
-        "@aws-toolkits/telemetry": "^1.0.79",
+        "@aws-toolkits/telemetry": "^1.0.80",
         "@cspotcode/source-map-support": "^0.8.1",
         "@sinonjs/fake-timers": "^8.1.0",
         "@types/adm-zip": "^0.4.34",

package.json

@@ -18,7 +18,7 @@
     "AWS.configuration.description.suppressPrompts": "Prompts which ask for confirmation. Checking an item suppresses the prompt.",
     "AWS.configuration.enableCodeLenses": "Enable SAM hints in source files",
     "AWS.configuration.description.resources.enabledResources": "AWS resources to display in the 'Resources' portion of the explorer.",
-    "AWS.configuration.description.experiments": "Try experimental features and give feedback. Note that experimental features may be removed at any time.\n * `jsonResourceModification` - Enables basic create, update, and delete support for cloud resources via the JSON Resources explorer component \n * `CodeWhisperer` - CodeWhisperer helps improve efficiency by providing real-time code suggestions from AI models. [Learn More](https://aws.amazon.com/codewhisperer). Use a keyboard shortcut to request suggestions from CodeWhisperer while writing code. Default keyboard shortcut is [Alt(Option) + C], can be updated in Keyboard Shortcuts.\n * `samSyncCode` - Adds an additional code-only option when synchronizing SAM applications. Code-only synchronizations are faster but can cause drift in the CloudFormation stack. Does nothing when using the legacy SAM deploy feature.",
+    "AWS.configuration.description.experiments": "Try experimental features and give feedback. Note that experimental features may be removed at any time.\n * `jsonResourceModification` - Enables basic create, update, and delete support for cloud resources via the JSON Resources explorer component.\n * `samSyncCode` - Adds an additional code-only option when synchronizing SAM applications. Code-only synchronizations are faster but can cause drift in the CloudFormation stack. Does nothing when using the legacy SAM deploy feature.",
     "AWS.stepFunctions.asl.format.enable.desc": "Enables the default formatter used with Amazon States Language files",
     "AWS.stepFunctions.asl.maxItemsComputed.desc": "The maximum number of outline symbols and folding regions computed (limited for performance reasons).",
     "AWS.configuration.description.awssam.debug.api": "API Gateway configuration",
@@ -74,7 +74,7 @@
     "AWS.command.apig.copyUrl": "Copy URL",
     "AWS.command.apig.invokeRemoteRestApi": "Invoke on AWS",
     "AWS.command.apig.invokeRemoteRestApi.cn": "Invoke on Amazon",
-    "AWS.command.auth.addConnection": "Add new Connection",
+    "AWS.command.auth.addConnection": "Add New Connection",
     "AWS.command.auth.switchConnections": "Switch Connections",
     "AWS.command.auth.signout": "Sign out",
     "AWS.command.github": "View Source on GitHub",
@@ -185,6 +185,7 @@
     "AWS.command.resources.configure": "Show Resources...",
     "AWS.command.codewhisperer.introduction": "What is CodeWhisperer?",
     "AWS.command.codewhisperer.configure": "CodeWhisperer Settings",
+    "AWS.command.codewhisperer.removeConnection": "Remove Connection from Tool",
     "AWS.lambda.explorerTitle": "Explorer",
     "AWS.developerTools.explorerTitle": "Developer Tools",
     "AWS.cloudWatchLogs.limit.desc": "Maximum amount of log entries pulled per request from CloudWatch Logs (max 10000)",

package.nls.json

@@ -1,37 +1,43 @@
-## How to Use Amazon CodeWhisperer
+## Using Amazon CodeWhisperer
 
-Welcome to the Amazon CodeWhisperer preview! CodeWhisperer uses machine learning to generate code suggestions
-from the existing code and comments in your IDE. Supported languages include: **Java, Python, and JavaScript**.
+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**.
 
-### TAB. Left Arrow. Right Arrow. That’s all!
+---
 
-You should automatically see inline code suggestions. Use the **TAB key to accept** a suggestion. CodeWhisperer may
-provide multiple suggestions to choose from, use **[left arrow] and [right arrow] to navigate** between suggestions.
+**Navigating with the tab and arrow keys**
 
-That’s all you need to know. If you don’t like the suggestions you see, simply keep typing (or hit ESC key).
-The suggestions will go away and CodeWhisperer will generate new ones at a later point based on the additional context.
+As you enter your code, CodeWhisperer will offer inline code suggestions. Use **TAB to accept** a suggestion. CodeWhisperer may provide multiple suggestions to choose from. Use **[left arrow] and [right arrow] to navigate** between suggestions.
 
-### Requesting Suggestions Manually
+If you don’t like the suggestions you see, keep typing (or hit ESC). The suggestions will disappear, and CodeWhisperer will generate new ones at a later point based on the additional context.
 
-You can also request a suggestion at any time, use **Option C** on Mac and **ALT C** on Windows. Once you receive
-the suggestions use TAB to accept and the Arrow keys to navigate.
+<img src="twosum_vsc.gif" style="max-height:400px;" alt="twosum">
 
-### How to get the best recommendations
+---
 
--   More context = better recommendations. You will see better recommendations when your current file has more
-    existing code.
+**Requesting suggestions manually**
 
--   Write more comments and be more descriptive. “Function to upload a file to S3” will get better results than
-    “Upload a file.”
+You can request suggestions at any time. Use **Option-C** on Mac or **ALT-C** on Windows. After you receive suggestions, use TAB to accept and arrow keys to navigate.
 
--   Try to specify the libraries you prefer by inserting import statements.
+---
 
--   Use descriptive names for variable and functions. A function called “upload_file_to_S3” will get better results
-    than a function called “file_upload”
+**Getting the best recommendations**
 
--   Break down complex tasks into smaller tasks and write descriptive comments.
+For best results, follow these practices.
 
-### How to provide feedback
+-   Give CodeWhisperer something to work with. The more code your file contains, the more context CodeWhisperer has for generating recommendations.
+-   Write descriptive comments. “Function to upload a file to S3” will get better results than “Upload a file”.
+-   Specify the libraries you prefer by using import statements.
+-   Use descriptive names for variable and functions. A function called “upload_file_to_S3” will get better results than a function called “file_upload”.
+-   Break down complex tasks into simpler tasks.
 
-CodeWhisperer is in preview, let us know what your think by sharing feedback (using the AWS Toolkit
-feedback button) or reaching out to [[email protected]](mailto:[email protected]) .
+---
+
+**Further reading**
+
+To learn more about working with CodeWhisperer and VS Code, see [CodeWhisperer for VS Code](https://docs.aws.amazon.com/toolkit-for-vscode/latest/userguide/codewhisperer.html).
+
+---
+
+**Providing feedback**
+
+CodeWhisperer is in preview. Let us know what you think by sharing feedback (using the AWS Toolkit feedback button) or by reaching out to [[email protected]](mailto:[email protected]).

resources/markdown/WelcomeToCodeWhisperer.md

@@ -218,6 +218,10 @@ ${fileContents}
             serviceJsonPath: 'src/codewhisperer/client/service-2.json',
             serviceName: 'CodeWhispererClient',
         },
+        {
+            serviceJsonPath: 'src/codewhisperer/client/user-service-2.json',
+            serviceName: 'CodeWhispererUserClient',
+        },
     ]
     await generateServiceClients(serviceClientDefinitions)
 })()