Merge master into feature/debugconfig #1189

.changes/1.11.0.json

@@ -0,0 +1,38 @@
+{
+    "date": "2020-07-18",
+    "version": "1.11.0",
+    "entries": [
+        {
+            "type": "Breaking Change",
+            "description": "Bumped minimum (inclusive) supported SAM CLI version from 0.38.0 to 0.47.0."
+        },
+        {
+            "type": "Bug Fix",
+            "description": "Amazon States Language Server: Replaces \"True\" strings of End with boolean in snippets."
+        },
+        {
+            "type": "Bug Fix",
+            "description": "Makes the ItemsPath property of Map state optional in ASL linter."
+        },
+        {
+            "type": "Bug Fix",
+            "description": "Amazon States Language Server: Adds validation of next property for Catch of Map state."
+        },
+        {
+            "type": "Bug Fix",
+            "description": "Amazon States Language Server: Adds missing \"Comment\" property for ChoiceRules, Catcher and Retrier."
+        },
+        {
+            "type": "Feature",
+            "description": "Amazon States Language Server: Adds validation of JSON Paths within Parameters."
+        },
+        {
+            "type": "Feature",
+            "description": "Added `dotnetcore3.1` app creation and local run support. Local debug is not currently supported."
+        },
+        {
+            "type": "Feature",
+            "description": "support SAM CLI version 1.x"
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.11.0 2020-07-18
+
+- **Breaking Change** Bumped minimum (inclusive) supported SAM CLI version from 0.38.0 to 0.47.0.
+- **Bug Fix** Amazon States Language Server: Replaces "True" strings of End with boolean in snippets.
+- **Bug Fix** Makes the ItemsPath property of Map state optional in ASL linter.
+- **Bug Fix** Amazon States Language Server: Adds validation of next property for Catch of Map state.
+- **Bug Fix** Amazon States Language Server: Adds missing "Comment" property for ChoiceRules, Catcher and Retrier.
+- **Feature** Amazon States Language Server: Adds validation of JSON Paths within Parameters.
+- **Feature** Added `dotnetcore3.1` app creation and local run support. Local debug is not currently supported.
+- **Feature** support SAM CLI version 1.x
+
 ## 1.10.0 2020-05-27
 
 - **Feature** Add basic visualisation capability for step function state machines defined in YAML.

buildspec/linuxIntegrationTests.yml

@@ -47,6 +47,7 @@ phases:
         commands:
             - export AWS_TOOLKIT_TEST_USER_DIR=/tmp/
             - export AWS_TOOLKIT_TEST_NO_COLOR=1
+            - export NO_COVERAGE=true
             - npm install --unsafe-perm
             - xvfb-run npm run integrationTest
 

package.json

@@ -2,7 +2,7 @@
     "name": "aws-toolkit-vscode",
     "displayName": "AWS Toolkit",
     "description": "An extension for working with Amazon Web Services",
-    "version": "1.11.0-SNAPSHOT",
+    "version": "1.12.0-SNAPSHOT",
     "publisher": "amazonwebservices",
     "license": "Apache-2.0",
     "repository": {
@@ -32,6 +32,7 @@
     "preview": false,
     "qna": "https://github.com/aws/aws-toolkit-vscode/issues",
     "activationEvents": [
+        "onStartupFinished",
         "onDebugResolve:aws-sam",
         "onCommand:aws.login",
         "onCommand:aws.credential.profile.create",
@@ -874,7 +875,7 @@
         "@types/glob": "^7.1.1",
         "@types/js-yaml": "^3.12.0",
         "@types/lodash": "^4.14.136",
-        "@types/lolex": "^3.1.1",
+        "@types/lolex": "^5.1.0",
         "@types/marked": "^0.6.5",
         "@types/mocha": "^7.0.2",
         "@types/node": "^10.14.22",
@@ -900,7 +901,7 @@
         "husky": "^2.3.0",
         "istanbul": "^0.4.5",
         "json-schema-to-typescript": "^8.2.0",
-        "lolex": "^4.2.0",
+        "lolex": "^5.1.0",
         "marked": "^0.7.0",
         "mocha": "^7.1.1",
         "mocha-junit-reporter": "^1.23.3",
@@ -923,7 +924,7 @@
     },
     "dependencies": {
         "adm-zip": "^0.4.13",
-        "amazon-states-language-service": "^1.1.2",
+        "amazon-states-language-service": "^1.1.6",
         "async-lock": "^1.1.3",
         "aws-sdk": "^2.581.0",
         "cloudformation-schema-js-yaml": "^1.0.1",
@@ -934,7 +935,7 @@
         "immutable": "^4.0.0-rc.12",
         "js-yaml": "^3.13.1",
         "jsonc-parser": "^2.0.2",
-        "lodash": "^4.17.15",
+        "lodash": "^4.17.19",
         "moment": "^2.24.0",
         "original-fs": "^1.1.0",
         "portfinder": "^1.0.25",

package.nls.json

@@ -246,6 +246,7 @@
     "AWS.message.toolkitInfo": "OS:  {0} {1} {2}\nVisual Studio Code Version:  {3}\nAWS Toolkit Version:  {4}\n",
     "AWS.output.building.sam.application": "Building SAM Application...",
     "AWS.output.building.sam.application.complete": "Build complete.",
+    "AWS.output.sam.local.no.net.3.1.debug": "SAM debugging is not supported for dotnetcore3.1 runtime. Function will run locally without debug.",
     "AWS.output.sam.local.attaching": "Attaching debugger to SAM Application...",
     "AWS.output.sam.local.attach.success": "Debugger attached",
     "AWS.output.sam.local.attach.failure": "Unable to attach Debugger. Check the Terminal tab for output. If it took longer than expected to successfully start, you may still attach to it.",
@@ -282,6 +283,8 @@
     "AWS.sam.debugger.missingRuntime": "Debug Configurations with an invoke target of \"{0}\" require a valid Lambda runtime value, expected one of [{1}]",
     "AWS.sam.debugger.missingPayloadFile": "Payload file not found: \"{0}\"",
     "AWS.sam.local.invoke.python.server.not.available": "Unable to communicate with the Python Debug Adapter. The debugger might not successfully attach to your SAM Application.",
+    "aws.cloudWatchLogs.viewLogStream.workflow.prompt": "Select a log stream",
+    "aws.cloudWatchLogs.viewLogStream.workflow.noStreams": "[No Log Events found]",
     "AWS.samcli.detect.settings.updated": "Settings updated.",
     "AWS.samcli.detect.settings.not.updated": "No settings changes necessary.",
     "AWS.samcli.deploy.general.error": "An error occurred while deploying a SAM Application. {0}",
@@ -315,15 +318,15 @@
     "AWS.samcli.deploy.stackName.error.length": "A stack name must not be longer than 128 characters",
     "AWS.samcli.deploy.statusbar.message": "$(cloud-upload) Deploying SAM Application to {0}...",
     "AWS.samcli.deploy.template.prompt": "Which SAM Template would you like to deploy to AWS?",
-    "AWS.samcli.configured.location": "Configured SAM CLI Location: {0}",
+    "AWS.samcli.configured.location": "SAM CLI Location: {0}",
     "AWS.samcli.error.notFound": "Cannot find SAM CLI, which is required to create new Serverless Applications and debug them locally. If you have already installed the SAM CLI, update your User Settings by locating it.",
     "AWS.samcli.error.notFound.brief": "Failed to get SAM CLI location",
     "AWS.samcli.error.invalid_schema_support_version": "Installed SAM executable does not support templates that require Event Schema selection. Required minimum version {0}, but found {1}",
     "AWS.samcli.local.invoke.ended": "Local invoke of SAM Application has ended.",
     "AWS.samcli.local.invoke.error": "Error running local SAM Application: {0}",
     "AWS.samcli.local.invoke.port.not.open": "The debug port doesn't appear to be open. The debugger might not succeed when attaching to your SAM Application.",
     "AWS.samcli.local.invoke.runtime.unsupported": "Unsupported {0} runtime: {1}",
-    "AWS.samcli.local.invoke.debugger.install": "Installing .NET Core Debugger to {0}...",
+    "AWS.samcli.local.invoke.debugger.install": "Installing .NET Core Debugger to {0} using Docker image {1}...",
     "AWS.samcli.local.invoke.debugger.install.failed": "Error installing .NET Core Debugger: {0}",
     "AWS.samcli.local.invoke.debugger.timeout": "The SAM process did not make the debugger available within the time limit",
     "AWS.samcli.notification.not.found": "Cannot find SAM CLI. It is required in order to work with Serverless Applications locally.",
@@ -370,7 +373,11 @@
     "AWS.generic.response.no": "No",
     "AWS.generic.response.yes": "Yes",
     "AWS.generic.notImplemented": "Not implemented",
+    "AWS.generic.refresh": "Refresh",
     "AWS.template.error.showErrorDetails.title": "Error details for",
     "AWS.template.error.showErrorDetails.errorCode": "Error code",
-    "AWS.template.error.showErrorDetails.errorMessage": "Error message"
+    "AWS.template.error.showErrorDetails.errorMessage": "Error message",
+    "AWS.picker.dynamic.noItemsFound.detail": "Click here to go back",
+    "AWS.picker.dynamic.noItemsFound.label": "[No items found]",
+    "AWS.picker.dynamic.errorNode.label": "There was an error retrieving more items."
 }

src/awsexplorer/activation.ts

@@ -5,6 +5,7 @@
 
 import * as vscode from 'vscode'
 
+import { viewLogStream } from '../cloudWatchLogs/commands/viewLogStream'
 import { LogGroupNode } from '../cloudWatchLogs/explorer/logGroupNode'
 import { submitFeedback } from '../feedback/commands/submitFeedback'
 import { deleteCloudFormation } from '../lambda/commands/deleteCloudFormation'
@@ -200,8 +201,9 @@ async function registerAwsExplorerCommands(
     )
 
     context.subscriptions.push(
-        vscode.commands.registerCommand('aws.cloudWatchLogs.viewLogStream', async (node: LogGroupNode) =>
-            vscode.window.showInformationMessage('Not implemented')
+        vscode.commands.registerCommand(
+            'aws.cloudWatchLogs.viewLogStream',
+            async (node: LogGroupNode) => await viewLogStream(node)
         )
     )
 }