Fix JavaLocalLambdaRunConfigurationIntegrationTest integ tests #4549

vchikoti1998 · 2024-06-05T03:56:43Z

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)

Description

The gradle instance in the test should be configured to use a different user home than the instance of gradle running the test

Checklist

My code follows the code style of this project
I have added tests to cover my changes
A short description of the change has been added to the CHANGELOG if the change is customer-facing in the IDE.
I have added metrics for my changes (if required)

License

I confirm that my contribution is made under the terms of the Apache 2.0 license.

vchikoti1998 · 2024-06-05T03:57:23Z

/runIntegrationTest

rli · 2024-06-05T15:53:47Z

gradle.properties

@@ -18,7 +18,7 @@ kotlin.code.style=official
 # Gradle settings
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.jvmargs=-Xmx2048m
+org.gradle.jvmargs=-Xmx4096m


why do we need this?

modified for testing, may be this is an issue, but it doesn't appear to be.
reverting this change

rli · 2024-06-05T19:38:33Z

...ws/toolkits/jetbrains/services/lambda/java/JavaLocalLambdaRunConfigurationIntegrationTest.kt

+    }
+
+    private fun createGradlePropertiesFile(gradleUserHome: File) {
+        val gradlePropertiesFile = File(gradleUserHome, "gradle.properties")


shouldn't this be the project root? how would a gradle instance discover this location if the configuration is self-referential with nothing outside referencing it?

rli · 2024-06-05T19:39:09Z

...ws/toolkits/jetbrains/services/lambda/java/JavaLocalLambdaRunConfigurationIntegrationTest.kt

+        gradlePropertiesFile.writeText(
+            """
+            org.gradle.jvmargs=-Xmx4096m
+            gradle.user.home=${gradleUserHome.absolutePath}


something that is also unclear at the moment is if we are actually allowed to modify the user home in this manner, or if this is too late because gradle has already selected a user home

So, in this case shall we try using Env Variable GRADLE_USER_HOME, so it can be set before Gradle initializes.
will test this out

vchikoti1998 · 2024-06-12T21:48:19Z

/retryBuilds

vchikoti1998 · 2024-06-17T19:58:50Z

This is rider IntegrationTest error:

Execution failed for task ':plugin-toolkit:jetbrains-rider:integrationTest'.
> Process 'Gradle Test Executor 2' finished with non-zero exit value 1

will work on separate PR

rli · 2024-06-17T23:00:04Z

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

@@ -4,13 +4,16 @@
 package software.aws.toolkits.jetbrains.services.lambda.steps

 import com.intellij.execution.configurations.GeneralCommandLine
+import org.junit.AfterClass


this code is in the src tree, which generally means it is not appropriate to reference any libraries that are used in tests. in an upcoming PR, we pull in some build system improvements that remove a lot of test libraries from the classpath, which will make this harder to do

sure, will provide in the test class

rli · 2024-06-17T23:01:26Z

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

@@ -24,12 +27,14 @@ data class BuildLambdaRequest(

 class BuildLambda(private val request: BuildLambdaRequest) : SamCliStep() {
    override val stepName: String = message("lambda.create.step.build")
+    private val buildEnvVars = mapOf("GRADLE_USER_HOME" to gradleUserHomeDir)


i dont think we always want to set the Gradle home directory to a temp directory. this should only be set if configured by a test

vchikoti1998 · 2024-06-19T18:57:33Z

as discussed offline:

looking at the documentation for SAM build to see if there is another way to pass the Gradle user home environment variable without modifying the run configuration. 
If no alternative method is found, figure out to proceed to modify the existing run configuration to include the Gradle user home environment variable.

rli · 2024-06-21T22:57:00Z

...ws/toolkits/jetbrains/services/lambda/java/JavaLocalLambdaRunConfigurationIntegrationTest.kt

@@ -95,6 +98,7 @@ class JavaLocalLambdaRunConfigurationIntegrationTest(private val runtime: Lambda
    fun tearDown() {
        CompilerTestUtil.disableExternalCompiler(projectRule.project)
        MockCredentialsManager.getInstance().reset()
+        File(gradleUserHomeDir).deleteRecursively()


if this is in the temp directory, do we still need to cleanup?

Reverted changes, since we doesn't required temp dir

rli · 2024-06-21T22:57:12Z

...ws/toolkits/jetbrains/services/lambda/java/JavaLocalLambdaRunConfigurationIntegrationTest.kt

@@ -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),


does this need to be mutable?

Reverted changes

rli · 2024-06-21T22:57:44Z

...ws/toolkits/jetbrains/services/lambda/java/JavaLocalLambdaRunConfigurationIntegrationTest.kt

-            credentialsProviderId = mockId
+            credentialsProviderId = mockId,
+            environmentVariables = mutableMapOf("GRADLE_USER_HOME" to gradleUserHomeDir),
+            samOptions = SamOptions(buildInContainer = true)


can you explain why we need to build in container? why would we want to do one over the other?

As expected, making it run in a containerized environment doesn't require env vars to be set The test case passed since container has its own grade user home dir.

rli · 2024-06-21T22:59:44Z

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

@@ -102,6 +102,10 @@ fun GeneralCommandLine.samBuildCommand(
    addParameter(buildDir.toString())
    if (samOptions.buildInContainer) {
        withParameters("--use-container")
+        environmentVariables.forEach { (key, value) ->


im not sure it's a good idea for the container environment to always inherit these

rli · 2024-06-21T23:02:45Z

...st/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(),


why does it need to be mutable

Reverted these changes

vchikoti1998 · 2024-07-01T05:33:24Z

Building in a container ensures the build environment matches the AWS Lambda runtime, reducing runtime errors and improving deployment consistency. This is essential when local runtimes or dependencies differ from those required by Lambda. In addition, containerized builds can provide isolated environments that avoid conflicts with other local dependencies or configurations.

sonarqubecloud · 2024-07-10T18:41:11Z

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
28.6% Duplication on New Code

See analysis details on SonarCloud

testing integ tests

93f7afb

vchikoti1998 requested a review from a team as a code owner June 5, 2024 03:56

vchikoti1998 added 2 commits June 5, 2024 01:42

add gradle user home

e461ac4

increased memory to 4gb

897d9f0

rli reviewed Jun 5, 2024

View reviewed changes

deleting lock file if exists

823b54c

vchikoti1998 mentioned this pull request Jun 5, 2024

Fix Rider Test Suites #4419

Merged

5 tasks

fix trimIndent

82f471c

rli reviewed Jun 5, 2024

View reviewed changes

vchikoti1998 added 12 commits June 5, 2024 12:51

fix detekt

45e90e8

setup gradle.properties to tst-project dir

c03058f

test

6af9479

tst

b720ba1

tst with module main path

2ea0f42

set property Gradle_user_home

6b7379e

set env var for specific lambda runConfig

c8e352f

created a tem folder

dcf4c88

tst

0da051f

temp

6c6137c

envVar in SamBuildLambda

f7af73e

testing

8ddbc85

vchikoti1998 and others added 7 commits June 12, 2024 16:16

Memory size bumped

9fa1948

cleanUp folder

e934195

add sleep

294b61b

removed sleep

f15e33e

inclue stacktrace

d7f60a0

revert stacktrace

cdc67b0

Merge branch 'main' into vchikoti/javaLocalLambdaRunConfigInteg_Test

f9e97d5

vchikoti1998 added 4 commits June 16, 2024 03:29

set env var

c1b5951

stacktrace for linuxIntegs

341784e

cleanUp tempdir

5eb7e29

cleanUp code

968ef56

rli reviewed Jun 17, 2024

View reviewed changes

vchikoti1998 added 3 commits June 18, 2024 04:34

addressed feedback

78dbd55

remove @afterclass in src

9bd6e08

test

0fef2f6

vchikoti1998 and others added 3 commits June 19, 2024 13:22

Merge branch 'main' into vchikoti/javaLocalLambdaRunConfigInteg_Test

8d3ca01

add sam build option flag

d2c098a

revert test case samExecuableTest

6afb57e

rli reviewed Jun 21, 2024

View reviewed changes

vchikoti1998 and others added 3 commits June 23, 2024 13:14

Merge branch 'main' into vchikoti/javaLocalLambdaRunConfigInteg_Test

e28dca9

comment out for test

7966412

changes reverted

caacfef

vchikoti1998 changed the title ~~Testing JavaLocalLambdaRunConfigurationIntegrationTest integ tests~~ Fix JavaLocalLambdaRunConfigurationIntegrationTest integ tests Jun 25, 2024

vchikoti1998 and others added 4 commits June 27, 2024 23:10

set env var in runconfig

7f82b2d

Merge branch 'main' into vchikoti/javaLocalLambdaRunConfigInteg_Test

568b258

added buildInContainer

371b856

removed env map

f1c5342

vchikoti1998 and others added 2 commits July 8, 2024 10:59

Merge branch 'main' into vchikoti/javaLocalLambdaRunConfigInteg_Test

93c06ce

add comment

cd041d4

rli approved these changes Jul 10, 2024

View reviewed changes

Merge branch 'main' into vchikoti/javaLocalLambdaRunConfigInteg_Test

72495b2

vchikoti1998 merged commit f97e9be into main Jul 10, 2024
12 of 16 checks passed

vchikoti1998 deleted the vchikoti/javaLocalLambdaRunConfigInteg_Test branch July 10, 2024 22:58

Fix JavaLocalLambdaRunConfigurationIntegrationTest integ tests #4549

Fix JavaLocalLambdaRunConfigurationIntegrationTest integ tests #4549

Uh oh!

Conversation

vchikoti1998 commented Jun 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Types of changes

Description

Checklist

License

Uh oh!

vchikoti1998 commented Jun 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vchikoti1998 Jun 5, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vchikoti1998 commented Jun 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vchikoti1998 commented Jun 17, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vchikoti1998 commented Jun 19, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vchikoti1998 commented Jul 1, 2024

Uh oh!

sonarqubecloud bot commented Jul 10, 2024

Quality Gate passed

Uh oh!

Uh oh!

Uh oh!

vchikoti1998 commented Jun 5, 2024 •

edited

Loading

vchikoti1998 commented Jun 5, 2024 •

edited

Loading

vchikoti1998 Jun 5, 2024 •

edited

Loading

vchikoti1998 commented Jun 12, 2024 •

edited

Loading