Merge branch 'master' into abrooksv-removeBaseState

aws · Jul 3, 2019 · e9763de · e9763de
2 parents 1d0bd0b + 24fe434
commit e9763de
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/.changes/next-release/feature-cb661cae-8df6-44fb-a238-9246bfe8af9e.json b/.changes/next-release/feature-cb661cae-8df6-44fb-a238-9246bfe8af9e.json
@@ -0,0 +1,4 @@
+{
+  "type" : "feature",
+  "description" : "Support building only the requested function when sam cli version is newer than 0.16"
+}
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/LambdaBuilder.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/LambdaBuilder.kt
@@ -17,6 +17,7 @@ import com.intellij.openapi.util.Key
 import com.intellij.openapi.util.io.FileUtil
 import com.intellij.psi.PsiElement
 import com.intellij.util.io.Compressor
+import com.intellij.util.text.SemVer
 import software.amazon.awssdk.services.lambda.model.Runtime
 import software.aws.toolkits.core.utils.exists
 import software.aws.toolkits.core.utils.getLogger
@@ -112,6 +113,13 @@ abstract class LambdaBuilder {
                 }
             }
 
+            // TODO: FIX_WHEN_SAM_MIN_IS_0.16
+            SemVer.parseFromText(SamCommon.getVersionString())?.let {
+                if (it.isGreaterOrEqualThan(0, 16, 0)) {
+                    commandLine.withParameters(logicalId)
+                }
+            }
+
             val pathMappings = listOf(
                 PathMapping(templateLocation.parent.resolve(codeLocation).toString(), "/"),
                 PathMapping(buildDir.resolve(logicalId).toString(), "/")

diff --git a/resources/resources/software/aws/toolkits/resources/localized_messages.properties b/resources/resources/software/aws/toolkits/resources/localized_messages.properties
@@ -160,10 +160,10 @@ aws.settings.sam.show_all_gutter_icons_tooltip=When enabled, show gutter icons i
 aws.settings.title=AWS
 aws.settings.sam.find.title=SAM CLI Configuration
 aws.settings.sam.find.description=Select path to SAM CLI executable
-aws.settings.telemetry.option=Send anonymized usage metrics to AWS
+aws.settings.telemetry.option=Send usage metrics to AWS
 aws.settings.telemetry.description=Help us improve our product! Allow us to collect basic usage data.
 aws.settings.telemetry.prompt.title=AWS Toolkit
-aws.settings.telemetry.prompt.message=Anonymized usage metrics are collected by default. Click <a href="">here</a> to adjust this behavior.
+aws.settings.telemetry.prompt.message=Usage metrics are collected by default. Click <a href="">here</a> to adjust this behavior.
 aws.notification.title=AWS Toolkit
 aws.notification.credentials_missing=Error: AWS credentials not configured
 aws.notification.sam_cli_not_valid=Error: {0}. Click <a href="">here</a> to reconfigure AWS SAM.