Fix DataGrip UI in 2022.1 (#3127)

Author: rli

.changes/next-release/bugfix-7183192b-bd29-4e0d-ae2c-4c54d98419bb.json

@@ -0,0 +1,4 @@
+{
+  "type" : "bugfix",
+  "description" : "Fix regression in DataGrip 2022.1 caused by new APIs in the platform (#3125)"
+}

jetbrains-ultimate/detekt-baseline-main.xml

@@ -0,0 +1,6 @@
+// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.ui
+
+abstract class AwsAuthWidget(userFieldEnabled: Boolean = true) : @Suppress("DEPRECATION") AwsAuthWidgetBase(userFieldEnabled)

jetbrains-ultimate/src-211-213/software/aws/toolkits/jetbrains/ui/AwsAuthWidget.kt

@@ -0,0 +1,19 @@
+// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+
+package software.aws.toolkits.jetbrains.ui
+
+import com.intellij.database.dataSource.DatabaseConnectionConfig
+import com.intellij.database.dataSource.DatabaseConnectionPoint
+
+abstract class AwsAuthWidget(userFieldEnabled: Boolean = true) : @Suppress("DEPRECATION") AwsAuthWidgetBase(userFieldEnabled) {
+    override fun save(config: DatabaseConnectionConfig, copyCredentials: Boolean) {
+        super.save(config, copyCredentials)
+        save(config.dataSource, copyCredentials)
+    }
+
+    override fun reset(point: DatabaseConnectionPoint, resetCredentials: Boolean) {
+        super.reset(point, resetCredentials)
+        reset(point.dataSource, resetCredentials)
+    }
+}

jetbrains-ultimate/src-221+/software/aws/toolkits/jetbrains/ui/AwsAuthWidget.kt

@@ -21,7 +21,8 @@ import software.aws.toolkits.jetbrains.utils.ui.selected
 import software.aws.toolkits.resources.message
 import javax.swing.JPanel
 
-abstract class AwsAuthWidget(private val userFieldEnabled: Boolean = true) : JBDBCredsAuthProviderUserWidget() {
+@Deprecated("Use AwsAuthWidget shim instead") // FIX_WHEN_MIN_IS_221
+abstract class AwsAuthWidgetBase(private val userFieldEnabled: Boolean) : JBDBCredsAuthProviderUserWidget() {
     private val credentialSelector = CredentialProviderSelector()
     private val regionSelector = RegionSelector()
 
@@ -75,8 +76,8 @@ abstract class AwsAuthWidget(private val userFieldEnabled: Boolean = true) : JBD
         regionSelector.setRegions(allRegions.values.toMutableList())
         val regionId = dataSource.additionalProperties[REGION_ID_PROPERTY]?.nullize()
         regionId?.let {
-            allRegions[regionId]?.let {
-                regionSelector.selectedRegion = it
+            allRegions[regionId]?.let { region ->
+                regionSelector.selectedRegion = region
             }
         }