Merge master to WebStorm

.changes/1.5.json

@@ -0,0 +1,44 @@
+{
+  "date" : "2019-07-29",
+  "version" : "1.5",
+  "entries" : [ {
+    "type" : "feature",
+    "description" : "Support Globals configuration in SAM template for serverless functions."
+  }, {
+    "type" : "feature",
+    "description" : "Enable searching for `requirements.txt` when determining if a python method is a handler to match SAM build"
+  }, {
+    "type" : "feature",
+    "description" : "Enable toolkit in 2019.2 EAP"
+  }, {
+    "type" : "feature",
+    "description" : "Support building only the requested function when sam cli version is newer than 0.16"
+  }, {
+    "type" : "bugfix",
+    "description" : "Upgraded AWS Java SDK to pull in latest model changes (#1099)"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix DynamoDB template for Python does not create correctly."
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix DaemonCodeAnalyzer restart not happening in a read action (#1012)"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix the bug when project is in different drive than the temp folder drive for Windows. #950"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix invalid credentials file reporting an IDE error"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix issue where modifying a cloned run config results in mutation of the original"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix runtime exceptions on project startup and run configuration validation"
+  }, {
+    "type" : "bugfix",
+    "description" : "Fix read/write action issues when invoking a Lambda using SAM (#1081)"
+  }, {
+    "type" : "bugfix",
+    "description" : "Make sure all STS assume role calls are not on the UI thread (#1024)"
+  } ]
+}

.changes/next-release/feature-3821b6a2-89b9-4afb-a9d3-41967bc8d3db.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Add support to link Gradle project."
+}

.changes/next-release/feature-fd0f7a97-bd29-4c7c-9ce9-d11dbaa0a047.json

@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Enable caching of describe calls to avoid repeated network calls for already known resources."
+}

CHANGELOG.md

@@ -1,3 +1,18 @@
+# _1.5_ (2019-07-29)
+- **(Feature)** Support Globals configuration in SAM template for serverless functions.
+- **(Feature)** Enable searching for `requirements.txt` when determining if a python method is a handler to match SAM build
+- **(Feature)** Enable toolkit in 2019.2 EAP
+- **(Feature)** Support building only the requested function when sam cli version is newer than 0.16
+- **(Bug Fix)** Upgraded AWS Java SDK to pull in latest model changes ([#1099](https://github.com/aws/aws-toolkit-jetbrains/issues/1099))
+- **(Bug Fix)** Fix DynamoDB template for Python does not create correctly.
+- **(Bug Fix)** Fix DaemonCodeAnalyzer restart not happening in a read action ([#1012](https://github.com/aws/aws-toolkit-jetbrains/issues/1012))
+- **(Bug Fix)** Fix the bug when project is in different drive than the temp folder drive for Windows. [#950](https://github.com/aws/aws-toolkit-jetbrains/issues/950)
+- **(Bug Fix)** Fix invalid credentials file reporting an IDE error
+- **(Bug Fix)** Fix issue where modifying a cloned run config results in mutation of the original
+- **(Bug Fix)** Fix runtime exceptions on project startup and run configuration validation
+- **(Bug Fix)** Fix read/write action issues when invoking a Lambda using SAM ([#1081](https://github.com/aws/aws-toolkit-jetbrains/issues/1081))
+- **(Bug Fix)** Make sure all STS assume role calls are not on the UI thread ([#1024](https://github.com/aws/aws-toolkit-jetbrains/issues/1024))
+
 # _1.4_ (2019-06-10)
 - **(Feature)** Usability enhancements to the CloudFormation UI
   - color coding status similar to the AWS Console

build.gradle

@@ -99,6 +99,10 @@ subprojects {
 
     testlogger {
         showFullStackTraces true
+        showStandardStreams true
+        showPassedStandardStreams false
+        showSkippedStandardStreams true
+        showFailedStandardStreams true
     }
 
     test {
@@ -107,6 +111,11 @@ subprojects {
             includes = ["software.aws.toolkits.*"]
             excludes = ["software.aws.toolkits.ktlint"]
         }
+
+        reports {
+            junitXml.enabled = false
+            html.enabled = true
+        }
     }
 
     idea {
@@ -134,13 +143,6 @@ subprojects {
         testClassesDirs = sourceSets.integrationTest.output.classesDirs
         classpath = sourceSets.integrationTest.runtimeClasspath
 
-        binResultsDir = file("$buildDir/integration-test-results/binary/integrationTest")
-
-        reports {
-            html.destination file("$buildDir/reports/integration-test")
-            junitXml.destination file("$buildDir/integration-test-results")
-        }
-
         jacoco {
             excludes = ["com.sun.*"] // See https://groups.google.com/forum/#!topic/jacoco/H0gDwxNuhK4
         }

buildspec/linuxIntegrationTests.yml

@@ -30,3 +30,15 @@ phases:
       - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
       - curl -s https://codecov.io/bash > codecov.sh
       - if [ "$CODE_COV_TOKEN" ]; then bash ./codecov.sh -t $CODE_COV_TOKEN -F integtest || true; fi
+
+  post_build:
+    commands:
+      - TEST_ARTIFACTS="/tmp/testArtifacts"
+      - mkdir $TEST_ARTIFACTS
+      - rsync -rmv --include='*/' --include '**/build/idea-sandbox/system*/log/**' --exclude='*' . $TEST_ARTIFACTS/ || true
+      - rsync -rmv --include='*/' --include '**/build/reports/**' --exclude='*' . $TEST_ARTIFACTS/ || true
+
+artifacts:
+  files:
+    - "**/*"
+  base-directory: /tmp/testArtifacts

buildspec/linuxTests.yml

@@ -23,3 +23,15 @@ phases:
       - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
       - curl -s https://codecov.io/bash > codecov.sh
       - if [ "$CODE_COV_TOKEN" ]; then bash ./codecov.sh -t $CODE_COV_TOKEN -F unittest || true; fi
+
+  post_build:
+    commands:
+      - TEST_ARTIFACTS="/tmp/testArtifacts"
+      - mkdir $TEST_ARTIFACTS
+      - rsync -rmv --include='*/' --include '**/build/idea-sandbox/system*/log/**' --exclude='*' . $TEST_ARTIFACTS/ || true
+      - rsync -rmv --include='*/' --include '**/build/reports/**' --exclude='*' . $TEST_ARTIFACTS/ || true
+
+artifacts:
+  files:
+    - "**/*"
+  base-directory: /tmp/testArtifacts

buildspec/linuxUiTests.yml

@@ -19,6 +19,7 @@ phases:
       - apt-get update
       - apt-get install -y xvfb icewm procps ffmpeg libswt-gtk-3-java
       - pip install --user aws-sam-cli
+
   build:
     commands:
       - Xvfb :99 -screen 0 1920x1080x24 &
@@ -33,16 +34,25 @@ phases:
         ffmpeg -f x11grab -video_size 1920x1080 -i :99 -codec:v libx264 -r 12 /tmp/screen_recording.mp4 &
         fi
       - ./gradlew guiTest coverageReport --info --console plain
+
   post_build:
     commands:
+      - TEST_ARTIFACTS="/tmp/testArtifacts"
+      - mkdir $TEST_ARTIFACTS
+      - rsync -r guitest.log $TEST_ARTIFACTS/gui/ || true
+      - rsync -rmv --include='*/' --include '**/build/idea-sandbox/system*/log/**' --exclude='*' . $TEST_ARTIFACTS/ || true
+      - rsync -rmv --include='*/' --include '**/build/reports/**' --exclude='*' . $TEST_ARTIFACTS/ || true
+
       - if [ "$RECORD_UI" ]; then pkill -2 ffmpeg; while pgrep ffmpeg > /dev/null; do sleep 1; done; fi
-      - if [ "$RECORD_UI" ]; then cp /tmp/screen_recording.mp4 jetbrains-core-gui/build/idea-sandbox/system/log/screen_recording.mp4; fi
+      - if [ "$RECORD_UI" ]; then cp /tmp/screen_recording.mp4 $TEST_ARTIFACTS/gui/; fi
+
       - VCS_COMMIT_ID="${CODEBUILD_RESOLVED_SOURCE_VERSION}"
       - CI_BUILD_URL=$(echo $CODEBUILD_BUILD_URL | sed 's/#/%23/g') # Encode `#` in the URL because otherwise the url is clipped in the Codecov.io site
       - CI_BUILD_ID="${CODEBUILD_BUILD_ID}"
       - curl -s https://codecov.io/bash > codecov.sh
       - if [ "$CODEBUILD_BUILD_SUCCEEDING" ] && [ "$CODE_COV_TOKEN" ]; then bash ./codecov.sh -t $CODE_COV_TOKEN -F uitest || true; fi
+
 artifacts:
+  base-directory: /tmp/testArtifacts
   files:
-    - guitest.log
-    - jetbrains-core-gui/build/idea-sandbox/system/log/**/*
+    - "**/*"

buildspec/windowsTests.yml

@@ -5,6 +5,23 @@ env:
     CI: true
 
 phases:
+  install:
+    commands:
+      - choco install -y --no-progress codecov
+
   build:
     commands:
-      - ./gradlew check --info --full-stacktrace --console plain
+      - ./gradlew check coverageReport --info --full-stacktrace --console plain
+
+  post_build:
+    commands:
+      - |
+        if(-Not($Env:CODEBUILD_BUILD_SUCCEEDING -eq "0" -Or $Env:CODE_COV_TOKEN -eq $null)) {
+          $env:VCS_COMMIT_ID=$Env:CODEBUILD_RESOLVED_SOURCE_VERSION;
+          $env:CI_BUILD_URL=[uri]::EscapeUriString($Env:CODEBUILD_BUILD_URL);
+          $env:CI_BUILD_ID=$Env:CODEBUILD_BUILD_ID;
+          codecov -t $Env:CODE_COV_TOKEN `
+            --flag unittest `
+            -f "build/reports/jacoco/coverageReport/coverageReport.xml" `
+            -c $Env:CODEBUILD_RESOLVED_SOURCE_VERSION
+        }

core/src/software/aws/toolkits/core/region/Partitions.kt

@@ -49,7 +49,6 @@ object PartitionParser {
 
 object ServiceEndpointResource : RemoteResource {
     override val urls: List<String> = listOf(
-        "http://idetoolkits.amazonwebservices.com/endpoints.json",
         "https://aws-toolkit-endpoints.s3.amazonaws.com/endpoints.json"
     )
     override val name: String = "service-endpoints.json"

core/src/software/aws/toolkits/core/utils/LogUtils.kt

@@ -45,6 +45,17 @@ fun <T> Logger.tryOrThrowNullable(message: String, level: Level = Level.ERROR, b
     throw e
 }
 
+/**
+ * Execute the given block and return the result. Log a warning when the result is null
+ */
+fun <T> Logger.logWhenNull(message: String, level: Level = Level.WARN, block: () -> T?): T? {
+    val value = block()
+    if (value == null) {
+        log(level) { message }
+    }
+    return value
+}
+
 fun Logger.log(level: Level, exception: Throwable? = null, block: () -> String) {
     when (level) {
         Level.ERROR -> error(exception, block)

core/tst/software/aws/toolkits/core/utils/LogUtilsTest.kt

@@ -148,6 +148,13 @@ class LogUtilsTest {
         verify(log).debug("debug", null)
     }
 
+    @Test
+    fun logWhenNull() {
+        val result = log.logWhenNull("message", level = Level.WARN) { null }
+        verify(log).warn("message", null)
+        assertThat(result, equalTo(null))
+    }
+
     @Before
     fun setup() {
         reset(log)