Fix JavaLocalLambdaRunConfigurationIntegrationTest integ tests

plugins/toolkit/jetbrains-core/it/software/aws/toolkits/jetbrains/services/lambda/java/JavaLocalLambdaRunConfigurationIntegrationTest.kt

@@ -19,6 +19,7 @@ import software.aws.toolkits.core.utils.RuleUtils
 import software.aws.toolkits.jetbrains.core.credentials.MockCredentialsManager
 import software.aws.toolkits.jetbrains.services.lambda.execution.local.createHandlerBasedRunConfiguration
 import software.aws.toolkits.jetbrains.services.lambda.execution.local.createTemplateRunConfiguration
+import software.aws.toolkits.jetbrains.services.lambda.sam.SamOptions
 import software.aws.toolkits.jetbrains.utils.addBreakpoint
 import software.aws.toolkits.jetbrains.utils.checkBreakPointHit
 import software.aws.toolkits.jetbrains.utils.executeRunConfigurationAndWait
@@ -30,6 +31,8 @@ import software.aws.toolkits.jetbrains.utils.samImageRunDebugTest
 import software.aws.toolkits.jetbrains.utils.setSamExecutableFromEnvironment
 import software.aws.toolkits.jetbrains.utils.setUpGradleProject
 import software.aws.toolkits.jetbrains.utils.setUpJdk
+import java.io.File
+import java.nio.file.Files
 
 @RunWith(Parameterized::class)
 class JavaLocalLambdaRunConfigurationIntegrationTest(private val runtime: LambdaRuntime) {
@@ -51,11 +54,11 @@ class JavaLocalLambdaRunConfigurationIntegrationTest(private val runtime: Lambda
     private val mockId = "MockCredsId"
     private val mockCreds = AwsBasicCredentials.create("Access", "ItsASecret")
     private val input = RuleUtils.randomName()
+    private val gradleUserHomeDir = Files.createTempDirectory("test-gradle-user-home").toAbsolutePath().toString()
 
     @Before
     fun setUp() {
         setSamExecutableFromEnvironment()
-
         val fixture = projectRule.fixture
         val module = fixture.addModule("main")
         val psiClass = fixture.addClass(
@@ -95,6 +98,7 @@ class JavaLocalLambdaRunConfigurationIntegrationTest(private val runtime: Lambda
     fun tearDown() {
         CompilerTestUtil.disableExternalCompiler(projectRule.project)
         MockCredentialsManager.getInstance().reset()
+        File(gradleUserHomeDir).deleteRecursively()
     }
 
     @Test
@@ -103,7 +107,9 @@ class JavaLocalLambdaRunConfigurationIntegrationTest(private val runtime: Lambda
             project = projectRule.project,
             runtime = runtime.toSdkRuntime(),
             input = "\"Hello World\"",
-            credentialsProviderId = mockId
+            credentialsProviderId = mockId,
+            environmentVariables = mutableMapOf("GRADLE_USER_HOME" to gradleUserHomeDir),
+            samOptions = SamOptions(buildInContainer = true)
         )
         assertThat(runConfiguration).isNotNull
 
@@ -120,7 +126,9 @@ class JavaLocalLambdaRunConfigurationIntegrationTest(private val runtime: Lambda
             runtime = runtime.toSdkRuntime(),
             input = projectRule.fixture.tempDirFixture.createFile("tmp", "\"Hello World\"").canonicalPath!!,
             inputIsFile = true,
-            credentialsProviderId = mockId
+            credentialsProviderId = mockId,
+            environmentVariables = mutableMapOf("GRADLE_USER_HOME" to gradleUserHomeDir),
+            samOptions = SamOptions(buildInContainer = true)
         )
         assertThat(runConfiguration).isNotNull
 
@@ -152,7 +160,9 @@ class JavaLocalLambdaRunConfigurationIntegrationTest(private val runtime: Lambda
             templateFile = templateFile.containingFile.virtualFile.path,
             logicalId = "SomeFunction",
             input = "\"Hello World\"",
-            credentialsProviderId = mockId
+            credentialsProviderId = mockId,
+            environmentVariables = mutableMapOf("GRADLE_USER_HOME" to gradleUserHomeDir),
+            samOptions = SamOptions(buildInContainer = true)
         )
 
         assertThat(runConfiguration).isNotNull
@@ -185,7 +195,9 @@ class JavaLocalLambdaRunConfigurationIntegrationTest(private val runtime: Lambda
             templateFile = templateFile.containingFile.virtualFile.path,
             logicalId = "SomeFunction",
             input = "\"Hello World\"",
-            credentialsProviderId = mockId
+            credentialsProviderId = mockId,
+            environmentVariables = mutableMapOf("GRADLE_USER_HOME" to gradleUserHomeDir),
+            samOptions = SamOptions(buildInContainer = true)
         )
 
         assertThat(runConfiguration).isNotNull
@@ -204,7 +216,9 @@ class JavaLocalLambdaRunConfigurationIntegrationTest(private val runtime: Lambda
             project = projectRule.project,
             runtime = runtime.toSdkRuntime(),
             input = "\"Hello World\"",
-            credentialsProviderId = mockId
+            credentialsProviderId = mockId,
+            environmentVariables = mutableMapOf("GRADLE_USER_HOME" to gradleUserHomeDir),
+            samOptions = SamOptions(buildInContainer = true)
         )
         assertThat(runConfiguration).isNotNull
 

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/sam/SamExecutable.kt

@@ -102,6 +102,10 @@
     addParameter(buildDir.toString())
     if (samOptions.buildInContainer) {
         withParameters("--use-container")
+        environmentVariables.forEach { (key, value) ->
+            withParameters("--container-env-var")
+            withParameters("$key=$value")
+        }
     }
 
     if (samOptions.skipImagePull) {

plugins/toolkit/jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/steps/BuildLambda.kt

@@ -26,6 +26,7 @@ class BuildLambda(private val request: BuildLambdaRequest) : SamCliStep() {
     override val stepName: String = message("lambda.create.step.build")
 
     override fun constructCommandLine(context: Context): GeneralCommandLine = getCli().samBuildCommand(
+
         templatePath = request.templatePath,
         logicalId = request.logicalId,
         buildDir = request.buildDir,

plugins/toolkit/jetbrains-core/tst/software/aws/toolkits/jetbrains/services/lambda/execution/local/CreateRunConfiguration.kt

@@ -36,9 +36,11 @@ fun createTemplateRunConfiguration(
     inputIsFile: Boolean = false,
     credentialsProviderId: String? = null,
     region: AwsRegion? = getDefaultRegion(),
+    environmentVariables: MutableMap<String, String> = mutableMapOf(),
     samOptions: SamOptions = SamOptions()
 ): LocalLambdaRunConfiguration {
     val runConfiguration = samRunConfiguration(project)
+    runConfiguration.environmentVariables(environmentVariables)
     runConfiguration.useTemplate(templateFile, logicalId)
     runConfiguration.isImage = isImage
     runConfiguration.runtime(runtime)