Upgrade 212 profile to stable SDKs (#2746)

* Fix go tests by making the image version configurable

Author: abrooksv

buildSrc/src/main/kotlin/software/aws/toolkits/gradle/intellij/IdeVersions.kt

@@ -125,37 +125,37 @@ object IdeVersions {
             name = "2021.2",
             community = ProductProfile(
                 sdkFlavor = IdeFlavor.IC,
-                sdkVersion = "212.4638.7-EAP-SNAPSHOT",
+                sdkVersion = "2021.2",
                 plugins = commonPlugins + listOf(
                     "java",
                     "com.intellij.gradle",
                     "org.jetbrains.idea.maven",
-                    "PythonCore:212.4638.10",
-                    "Docker:212.4638.7"
+                    "PythonCore:212.4746.96",
+                    "Docker:212.4746.92"
                 )
             ),
             ultimate = ProductProfile(
                 sdkFlavor = IdeFlavor.IU,
-                sdkVersion = "212.4638.7-EAP-SNAPSHOT",
+                sdkVersion = "2021.2",
                 plugins = commonPlugins + listOf(
                     "JavaScript",
                     // Transitive dependency needed for javascript
                     // Can remove when https://github.com/JetBrains/gradle-intellij-plugin/issues/608 is fixed
                     "com.intellij.css",
                     "JavaScriptDebugger",
                     "com.intellij.database",
-                    "Pythonid:212.4638.7",
-                    "org.jetbrains.plugins.go:212.4638.7"
+                    "Pythonid:212.4746.96",
+                    "org.jetbrains.plugins.go:212.4746.92"
                 )
             ),
             rider = RiderProfile(
-                sdkVersion = "2021.2-SNAPSHOT",
+                sdkVersion = "2021.2",
                 plugins = commonPlugins + listOf(
                     "rider-plugins-appender" // Workaround for https://youtrack.jetbrains.com/issue/IDEA-179607
                 ),
                 netFrameworkTarget = "net472",
                 rdGenVersion = "0.212.315",
-                nugetVersion = "2021.2.0-eap05"
+                nugetVersion = "2021.2.0"
             )
         ),
     ).associateBy { it.name }

jetbrains-core/tst/software/aws/toolkits/jetbrains/utils/RunConfigTestUtils.kt

@@ -162,14 +162,23 @@ fun checkBreakPointHit(project: Project, callback: () -> Unit = {}): Ref<Boolean
     return debuggerIsHit
 }
 
-fun readProject(relativePath: String, sourceFileName: String, projectRule: CodeInsightTestFixtureRule): Pair<VirtualFile, VirtualFile> {
+fun readProject(
+    relativePath: String,
+    sourceFileName: String,
+    projectRule: CodeInsightTestFixtureRule,
+    templatePatches: Map<String, String> = emptyMap()
+): Pair<VirtualFile, VirtualFile> {
     val testDataPath = Paths.get(System.getProperty("testDataPath"), relativePath).toFile()
     val (source, template) = testDataPath.walk().fold<File, Pair<VirtualFile?, VirtualFile?>>(Pair(null, null)) { acc, file ->
         // skip directories which are part of the walk
         if (!file.isFile) {
             return@fold acc
         }
-        val virtualFile = projectRule.fixture.addFileToModule(projectRule.module, file.relativeTo(testDataPath).path, file.readText()).virtualFile
+
+        var fileText = file.readText()
+        templatePatches.forEach { (search, replace) -> fileText = fileText.replace(search, replace) }
+
+        val virtualFile = projectRule.fixture.addFileToModule(projectRule.module, file.relativeTo(testDataPath).path, fileText).virtualFile
         when (virtualFile.name) {
             "template.yaml" -> {
                 acc.first to virtualFile
@@ -197,6 +206,7 @@ fun readProject(relativePath: String, sourceFileName: String, projectRule: CodeI
 fun samImageRunDebugTest(
     projectRule: CodeInsightTestFixtureRule,
     relativePath: String,
+    templatePatches: Map<String, String> = emptyMap(),
     sourceFileName: String,
     runtime: LambdaRuntime,
     mockCredentialsId: String,
@@ -205,7 +215,7 @@ fun samImageRunDebugTest(
     addBreakpoint: (() -> Unit)? = null
 ) {
     assumeImageSupport()
-    val (_, template) = readProject(relativePath, sourceFileName, projectRule)
+    val (_, template) = readProject(relativePath, sourceFileName, projectRule, templatePatches)
 
     addBreakpoint?.let { it() }
 

jetbrains-ultimate/it/software/aws/toolkits/jetbrains/services/lambda/go/GoLocalRunConfigurationIntegrationTest.kt

@@ -37,6 +37,7 @@ import software.aws.toolkits.jetbrains.utils.checkBreakPointHit
 import software.aws.toolkits.jetbrains.utils.executeRunConfigurationAndWait
 import software.aws.toolkits.jetbrains.utils.rules.HeavyGoCodeInsightTestFixtureRule
 import software.aws.toolkits.jetbrains.utils.rules.addGoModFile
+import software.aws.toolkits.jetbrains.utils.rules.compatibleGoForIde
 import software.aws.toolkits.jetbrains.utils.rules.ensureCorrectGoVersion
 import software.aws.toolkits.jetbrains.utils.rules.runGoModTidy
 import software.aws.toolkits.jetbrains.utils.samImageRunDebugTest
@@ -272,6 +273,7 @@ class GoLocalRunConfigurationIntegrationTest(private val runtime: LambdaRuntime)
     fun samIsExecutedImage(): Unit = samImageRunDebugTest(
         projectRule = projectRule,
         relativePath = "samProjects/image/$runtime",
+        templatePatches = mapOf("[GoVersion]" to (compatibleGoForIde() ?: "1")),
         sourceFileName = "main.go",
         runtime = runtime,
         mockCredentialsId = mockId,
@@ -284,6 +286,7 @@ class GoLocalRunConfigurationIntegrationTest(private val runtime: LambdaRuntime)
         samImageRunDebugTest(
             projectRule = projectRule,
             relativePath = "samProjects/image/$runtime",
+            templatePatches = mapOf("[GoVersion]" to (compatibleGoForIde() ?: "1")),
             sourceFileName = "main.go",
             runtime = runtime,
             mockCredentialsId = mockId,

jetbrains-ultimate/tst/software/aws/toolkits/jetbrains/utils/rules/GoCodeInsightTestFixtureRule.kt

@@ -100,19 +100,23 @@ fun runGoModTidy(goModFile: VirtualFile) {
     }
 }
 
+fun compatibleGoForIde() = when (ApplicationInfo.getInstance().build.baselineVersion) {
+    202 -> "1.14.15" // TODO: FIX_WHEN_MIN_IS_202
+    203 -> "1.15.14" // TODO: FIX_WHEN_MIN_IS_203
+    else -> null
+}
+
 fun CodeInsightTestFixture.ensureCorrectGoVersion(disposable: Disposable) {
-    val versionCmd = GeneralCommandLine("goenv").withParameters("--version")
-    if (ExecUtil.execAndGetOutput(versionCmd).exitCode != 0) {
+    val versionCmd = GeneralCommandLine("goenv").withParameters("version")
+    val output = ExecUtil.execAndGetOutput(versionCmd)
+    if (output.exitCode != 0) {
         println("WARNING: goenv not found, can't switch Go SDK!!!!")
         return
+    } else {
+        println("Current Go version: ${output.stdout}")
     }
 
-    val goVersionOverride = when (ApplicationInfo.getInstance().build.baselineVersion) {
-        202 -> "1.14.15" // TODO: FIX_WHEN_MIN_IS_202
-        203 -> "1.15.14" // TODO: FIX_WHEN_MIN_IS_203
-        else -> null
-    }
-
+    val goVersionOverride = compatibleGoForIde()
     goVersionOverride?.let {
         val overrideLocation = this.tempDirPath
 

testdata/samProjects/image/go1.x/Dockerfile

@@ -1,10 +1,11 @@
-FROM golang:1.14 as build-image
+FROM golang:[GoVersion] as build-image
 
 ENV GOPROXY direct
 
 WORKDIR /go/src
 COPY go.mod main.go ./
 
+RUN go mod tidy
 RUN go build -o ../bin
 
 FROM public.ecr.aws/lambda/go:1

testdata/samProjects/image/go1.x/go.mod

@@ -1,5 +1,3 @@
 require github.com/aws/aws-lambda-go v1.13.3
 
 module hello-world
-
-go 1.16