Merge remote-tracking branch 'upstream/master' into feature-cloudform…

…ation-linter

# Conflicts:
#	jetbrains-core/resources/META-INF/plugin.xml
#	jetbrains-core/src/software/aws/toolkits/jetbrains/core/help/HelpIds.kt
#	jetbrains-core/src/software/aws/toolkits/jetbrains/settings/AwsSettingsConfigurable.java

.changes/1.17.json

@@ -0,0 +1,35 @@
+{
+  "date" : "2020-07-16",
+  "version" : "1.17",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Wrap logstream entries when they are selected (#1863)"
+  }, {
+    "type" : "feature",
+    "description" : "Adding 'Outputs' tab to the CloudFormation Stack Viewer"
+  }, {
+    "type" : "feature",
+    "description" : "Support for SAM CLI version 1.x"
+  }, {
+    "type" : "feature",
+    "description" : "Add support for 2020.2"
+  }, {
+    "type" : "feature",
+    "description" : "Add word wrap to CloudFormation status reasons on selection (#1858)"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix CloudWatch Logs logstream scrolling up automatically in certain circumstances"
+  }, {
+    "type" : "bugfix",
+    "description" : "Change the way we stop SAM CLI processes when debugging to allow docker container to shut down"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix double clicking Cloud Formation node not opening the stack viewer"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix Cloud Formation event viewer not expanding as the window expands"
+  }, {
+    "type" : "bugfix",
+    "description" : "The project SDK is now passed as JAVA_HOME to SAM when building Java functions when not using the build in container option"
+  } ]
+}

.changes/next-release/bugfix-cf15b891-593c-4493-b594-8fda9f30d031.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix Rider building Lambda into incorrect folders"
+}

.changes/next-release/bugfix-d2b78feb-6a6d-4e7f-81dc-af756d3d92a0.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix several uncaught exceptions caused by plugins being installed but not enabled"
+}

.changes/next-release/bugfix-eaed8849-efa2-4aa5-b236-57ce48eb595c.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Improve watching of the AWS profile files to incorporate changes made to the files outisde of the IDE"
+}

.changes/next-release/feature-12cdfa65-4d7a-4c1e-9f61-04b388fce392.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Support colons (`:`) in credential profile names"
+}

.changes/next-release/feature-f6a70036-5fd8-46f5-b70f-3841a04ca0c1.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Several enhancements to the UX around connecting to AWS including:\n- Making connection settings more visible (now visible in the AWS Explorer)\n- Automatically selecting 'default' profile if it exists\n- Better visibility of connection validation workflow (more information when unable to connect)\n- Handling of default regions on credential profile\n- Better UX around partitions\n- Adding ability to refresh connection from the UI"
+}

.run/Run IDE - Core [2020.2].run.xml

@@ -0,0 +1,27 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run IDE - Core [2020.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2020.2">
+    <log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-core/build/idea-sandbox/system/log/idea.log" />
+    <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="ALTERNATIVE_IDE_PROFILE_NAME" value="2020.2" />
+        </map>
+      </option>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-core" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="runIde" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <GradleScriptDebugEnabled>false</GradleScriptDebugEnabled>
+    <method v="2" />
+  </configuration>
+</component>

.run/Run IDE - Rider [2020.2].run.xml

@@ -0,0 +1,27 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run IDE - Rider [2020.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2020.2">
+    <log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-rider/build/idea-sandbox/system/log/idea.log" />
+    <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="ALTERNATIVE_IDE_PROFILE_NAME" value="2020.2" />
+        </map>
+      </option>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-rider" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="runIde" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <GradleScriptDebugEnabled>false</GradleScriptDebugEnabled>
+    <method v="2" />
+  </configuration>
+</component>

.run/Run IDE - Ultimate [2020.2].run.xml

@@ -0,0 +1,27 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run IDE - Ultimate [2020.2]" type="GradleRunConfiguration" factoryName="Gradle" folderName="2020.2">
+    <log_file alias="idea.log" path="$PROJECT_DIR$/jetbrains-ultimate/build/idea-sandbox/system/log/idea.log" />
+    <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="ALTERNATIVE_IDE_PROFILE_NAME" value="2020.2" />
+        </map>
+      </option>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/jetbrains-ultimate" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="runIde" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <GradleScriptDebugEnabled>false</GradleScriptDebugEnabled>
+    <method v="2" />
+  </configuration>
+</component>

CHANGELOG.md

@@ -1,3 +1,15 @@
+# _1.17_ (2020-07-16)
+- **(Feature)** Wrap logstream entries when they are selected ([#1863](https://github.com/aws/aws-toolkit-jetbrains/issues/1863))
+- **(Feature)** Adding 'Outputs' tab to the CloudFormation Stack Viewer
+- **(Feature)** Support for SAM CLI version 1.x
+- **(Feature)** Add support for 2020.2
+- **(Feature)** Add word wrap to CloudFormation status reasons on selection ([#1858](https://github.com/aws/aws-toolkit-jetbrains/issues/1858))
+- **(Bug Fix)** Fix CloudWatch Logs logstream scrolling up automatically in certain circumstances
+- **(Bug Fix)** Change the way we stop SAM CLI processes when debugging to allow docker container to shut down
+- **(Bug Fix)** Fix double clicking Cloud Formation node not opening the stack viewer
+- **(Bug Fix)** Fix Cloud Formation event viewer not expanding as the window expands
+- **(Bug Fix)** The project SDK is now passed as JAVA_HOME to SAM when building Java functions when not using the build in container option
+
 # _1.16_ (2020-05-27)
 - **(Breaking Change)** The toolkit now requires 2019.3 or newer
 - **(Feature)** Add support for GoLand, CLion, RubyMine, and PhpStorm

CONTRIBUTING.md

@@ -24,13 +24,11 @@ reported the issue. Please try to include as much information as you can. Detail
 
 * [Java 11](https://docs.aws.amazon.com/corretto/latest/corretto-11-ug/downloads-list.html)
 * [Git](https://git-scm.com/)
-* Dotnet Framework (Windows) or Mono (Linux, macOS)
+* Dotnet Framework (Windows)
   * macOS steps:
     ```
-    brew install mono
     brew cask install dotnet-sdk
     ```
-  * Note: You can skip this if you do not want to build Rider support by adding `-PskipRider` to any Gradle command.
 
 ### Instructions
 
@@ -104,11 +102,12 @@ To test your changes locally, you can run the project from IntelliJ or gradle.
   - Requires [`cfn-lint`](https://github.com/aws-cloudformation/cfn-python-lint/) CLI to be on your `$PATH`.
 - To run **GUI tests**:
   ```
-  ./gradlew guiTest
+  ./gradlew uiTestCore
   ```
   - To debug GUI tests,
-    1. Set `runIde.debugOptions.enabled=true` in the gradle file.
-    2. When prompted, attach your (IntelliJ) debugger to port 5005.
+    1. Start the IDE that will be debugged `./gradlew :jetbrains-core:runIdeForUiTests --debug-jvm`
+	2. In your running Intellij instance `Run -> Attach to process` attach to the ide test debug process.
+    4. Run `./gradlew uiTestCore`. This will attach to the running debug IDE instance and run tests.
 
 ### Logging
 

README.md

@@ -3,7 +3,7 @@
 [![Gitter](https://badges.gitter.im/aws/aws-toolkit-jetbrains.svg)](https://gitter.im/aws/aws-toolkit-jetbrains?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Downloads](https://img.shields.io/jetbrains/plugin/d/11349-aws-toolkit.svg)](https://plugins.jetbrains.com/plugin/11349-aws-toolkit) 
 [![Version](https://img.shields.io/jetbrains/plugin/v/11349.svg?label=version)](https://plugins.jetbrains.com/plugin/11349-aws-toolkit)
-[![LGTM Grade](https://img.shields.io/lgtm/grade/java/github/aws/aws-toolkit-jetbrains)](https://lgtm.com/projects/g/aws/aws-toolkit-jetbrains/)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=aws_aws-toolkit-jetbrains&metric=alert_status)](https://sonarcloud.io/dashboard?id=aws_aws-toolkit-jetbrains)
 
 # AWS Toolkit for JetBrains