Remove project from ResourceSelector (#2122)

Author: abrooksv

jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/actions/InstrumentDialog.kt

@@ -16,7 +16,6 @@ import software.amazon.awssdk.services.iam.model.PolicyEvaluationDecisionType
 import software.aws.toolkits.core.utils.getLogger
 import software.aws.toolkits.core.utils.warn
 import software.aws.toolkits.jetbrains.core.awsClient
-import software.aws.toolkits.jetbrains.core.credentials.AwsConnectionManager
 import software.aws.toolkits.jetbrains.core.help.HelpIds
 import software.aws.toolkits.jetbrains.services.RoleValidation
 import software.aws.toolkits.jetbrains.services.iam.IamResources
@@ -40,12 +39,9 @@ class InstrumentDialog(private val project: Project, val clusterArn: String, val
     }
 
     private fun createUIComponents() {
-        val credentials = AwsConnectionManager.getInstance(project).activeCredentialProvider
-        val region = AwsConnectionManager.getInstance(project).activeRegion
-
-        iamRole = ResourceSelector.builder(project)
+        iamRole = ResourceSelector.builder()
             .resource { IamResources.LIST_ALL }
-            .awsConnection { Pair(region, credentials) }
+            .awsConnection(project)
             .build()
 
         iamRole.addItemListener {

jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/execution/EcsCloudDebugSettingsEditorPanel.kt

@@ -29,10 +29,10 @@ import com.intellij.util.ui.JBUI
 import com.intellij.util.ui.JBUI.CurrentTheme.Validator.errorBackgroundColor
 import com.intellij.util.ui.JBUI.CurrentTheme.Validator.errorBorderColor
 import software.amazon.awssdk.services.ecs.model.ContainerDefinition
-import software.aws.toolkits.core.credentials.ToolkitCredentialsProvider
 import software.aws.toolkits.core.region.AwsRegion
 import software.aws.toolkits.core.utils.tryOrNull
 import software.aws.toolkits.jetbrains.core.AwsResourceCache
+import software.aws.toolkits.jetbrains.core.credentials.ConnectionSettings
 import software.aws.toolkits.jetbrains.core.credentials.CredentialManager
 import software.aws.toolkits.jetbrains.core.filter
 import software.aws.toolkits.jetbrains.core.region.AwsRegionProvider
@@ -67,7 +67,7 @@ class EcsCloudDebugSettingsEditorPanel(private val project: Project) : Disposabl
     private val toolbar = createToolbar()
     private var containerNames: Set<String> = emptySet()
     private val credentialManager = CredentialManager.getInstance()
-    private val credentialSettings = AtomicReference<Pair<AwsRegion, ToolkitCredentialsProvider>>()
+    private val credentialSettingsRef = AtomicReference<ConnectionSettings>()
 
     val component: JComponent
         get() = panel
@@ -82,16 +82,16 @@ class EcsCloudDebugSettingsEditorPanel(private val project: Project) : Disposabl
         containerLoadingIndicator.setLoadingText(message("cloud_debug.ecs.run_config.container.loading"))
         containerLoadingIndicator.border = JBUI.Borders.empty()
 
-        clusterSelector = ResourceSelector.builder(project)
+        clusterSelector = ResourceSelector.builder()
             .resource(EcsResources.LIST_CLUSTER_ARNS)
             .customRenderer { value, component -> component.append(EcsUtils.clusterArnToName(value)); component }
             .disableAutomaticLoading()
-            .awsConnection { credentialSettings.get() ?: throw IllegalStateException("clusterSelector.reload() called before region/credentials set") }
+            .awsConnection { credentialSettingsRef.get() ?: throw IllegalStateException("clusterSelector.reload() called before region/credentials set") }
             .build()
 
         clusterSelector.addActionListener { this.onClusterSelectionChange() }
 
-        serviceSelector = ResourceSelector.builder(project).resource {
+        serviceSelector = ResourceSelector.builder().resource {
             val selectedCluster = selectedCluster
             if (selectedCluster != null) {
                 EcsResources.listServiceArns(selectedCluster).filter { EcsUtils.isInstrumented(it) }
@@ -100,7 +100,7 @@ class EcsCloudDebugSettingsEditorPanel(private val project: Project) : Disposabl
             }
         }.customRenderer { value, component -> component.append(EcsUtils.serviceArnToName(value)); component }
             .disableAutomaticLoading()
-            .awsConnection { credentialSettings.get() ?: throw IllegalStateException("serviceSelector.reload() called before region/credentials set") }
+            .awsConnection { credentialSettingsRef.get() ?: throw IllegalStateException("serviceSelector.reload() called before region/credentials set") }
             .build()
 
         serviceSelector.isEnabled = false
@@ -190,18 +190,16 @@ class EcsCloudDebugSettingsEditorPanel(private val project: Project) : Disposabl
             emptyList()
         }
 
-        val (awsRegion, credentialProvider) = credentialSettings.get()
+        val credentialSettings = credentialSettingsRef.get()
 
         val resourceCache = AwsResourceCache.getInstance()
         resourceCache.getResource(
             EcsResources.describeService(clusterArn, serviceArn),
-            awsRegion,
-            credentialProvider
+            credentialSettings
         ).thenCompose { service ->
             resourceCache.getResource(
                 EcsResources.listContainers(service.taskDefinition()),
-                awsRegion,
-                credentialProvider
+                credentialSettings
             )
         }.whenComplete { containers, error ->
             runInEdt(ModalityState.any()) {
@@ -286,7 +284,7 @@ class EcsCloudDebugSettingsEditorPanel(private val project: Project) : Disposabl
         val credentialProvider = credentialManager.getAwsCredentialProvider(credentialIdentifier, region)
 
         // Set initial state before telling UI to update
-        credentialSettings.set(region to credentialProvider)
+        credentialSettingsRef.set(ConnectionSettings(credentialProvider, region))
         selectedCluster = clusterArn
         selectedService = serviceArn
 
@@ -315,9 +313,9 @@ class EcsCloudDebugSettingsEditorPanel(private val project: Project) : Disposabl
     }
 
     fun applyTo(configuration: EcsCloudDebugRunConfiguration) {
-        val (region, credentialsProvider) = credentialSettings.get() ?: return
-        configuration.regionId(region.id)
-        configuration.credentialProviderId(credentialsProvider.id)
+        val connectionSettings = credentialSettingsRef.get() ?: return
+        configuration.regionId(connectionSettings.region.id)
+        configuration.credentialProviderId(connectionSettings.credentials.id)
         configuration.clusterArn(selectedCluster)
         configuration.serviceArn(selectedService)
 
@@ -393,8 +391,9 @@ class EcsCloudDebugSettingsEditorPanel(private val project: Project) : Disposabl
         val credentialIdentifier = credentialManager.getCredentialIdentifierById(credentialProviderId) ?: return
         val credentialProvider = tryOrNull { credentialManager.getAwsCredentialProvider(credentialIdentifier, region) } ?: return
 
-        val oldSettings = credentialSettings.getAndUpdate { region to credentialProvider }
-        if (oldSettings?.first == region && oldSettings.second == credentialProvider) return
+        val newSettings = ConnectionSettings(credentialProvider, region)
+        val oldSettings = credentialSettingsRef.getAndUpdate { newSettings }
+        if (oldSettings == newSettings) return
 
         // Clear out settings on region change
         containerNames = emptySet()

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/deploy/DeployServerlessApplicationPanel.java

@@ -30,7 +30,6 @@
 import software.aws.toolkits.jetbrains.services.s3.resources.S3Resources;
 import software.aws.toolkits.jetbrains.ui.ResourceSelector;
 
-@SuppressWarnings("NullableProblems")
 public class DeployServerlessApplicationPanel {
     @NotNull JTextField newStackName;
     @NotNull JButton createS3BucketButton;
@@ -92,8 +91,8 @@ public Map<String, String> getTemplateParameters() {
     private void createUIComponents() {
         environmentVariablesTable = new EnvVariablesTable();
         stackParameters = new Wrapper();
-        stacks = ResourceSelector.builder(project).resource(ACTIVE_STACKS).build();
-        s3Bucket = ResourceSelector.builder(project).resource(S3Resources.listBucketNamesByActiveRegion(project)).build();
+        stacks = ResourceSelector.builder().resource(ACTIVE_STACKS).awsConnection(project).build();
+        s3Bucket = ResourceSelector.builder().resource(S3Resources.listBucketNamesByActiveRegion(project)).awsConnection(project).build();
 
         if (!ApplicationManager.getApplication().isUnitTestMode()) {
             JComponent tableComponent = environmentVariablesTable.getComponent();

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/execution/remote/RemoteLambdaRunSettingsEditor.kt

@@ -5,9 +5,9 @@ package software.aws.toolkits.jetbrains.services.lambda.execution.remote
 
 import com.intellij.openapi.options.SettingsEditor
 import com.intellij.openapi.project.Project
-import software.aws.toolkits.core.credentials.ToolkitCredentialsProvider
 import software.aws.toolkits.core.region.AwsRegion
 import software.aws.toolkits.core.utils.tryOrNull
+import software.aws.toolkits.jetbrains.core.credentials.ConnectionSettings
 import software.aws.toolkits.jetbrains.core.credentials.CredentialManager
 import software.aws.toolkits.jetbrains.core.map
 import software.aws.toolkits.jetbrains.services.lambda.resources.LambdaResources
@@ -16,12 +16,12 @@ import java.util.concurrent.atomic.AtomicReference
 import javax.swing.JPanel
 
 class RemoteLambdaRunSettingsEditor(project: Project) : SettingsEditor<RemoteLambdaRunConfiguration>() {
-    private val settings = AtomicReference<Pair<AwsRegion, ToolkitCredentialsProvider>>()
+    private val credentialSettingsRef = AtomicReference<ConnectionSettings>()
     private val functionSelector = ResourceSelector
-        .builder(project)
+        .builder()
         .resource(LambdaResources.LIST_FUNCTIONS.map { it.functionName() })
         .disableAutomaticLoading()
-        .awsConnection { settings.get() ?: throw IllegalStateException("functionSelector.reload() called before region/credentials set") }
+        .awsConnection { credentialSettingsRef.get() ?: throw IllegalStateException("functionSelector.reload() called before region/credentials set") }
         .build()
     private val view = RemoteLambdaRunSettingsEditorPanel(project, functionSelector)
     private val credentialManager = CredentialManager.getInstance()
@@ -33,8 +33,9 @@ class RemoteLambdaRunSettingsEditor(project: Project) : SettingsEditor<RemoteLam
         val credentialIdentifier = credentialManager.getCredentialIdentifierById(credentialProviderId) ?: return
         val credentialProvider = tryOrNull { credentialManager.getAwsCredentialProvider(credentialIdentifier, region) } ?: return
 
-        val oldSettings = settings.getAndUpdate { region to credentialProvider }
-        if (oldSettings?.first == region && oldSettings.second == credentialProvider) return
+        val newSettings = ConnectionSettings(credentialProvider, region)
+        val oldSettings = credentialSettingsRef.getAndUpdate { newSettings }
+        if (oldSettings == newSettings) return
         functionSelector.reload()
     }
 

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/upload/EditFunctionPanel.java

@@ -87,8 +87,8 @@ private void createUIComponents() {
         envVars = new EnvironmentVariablesTextField();
         memorySlider = LambdaWidgets.lambdaMemory();
         timeoutSlider = LambdaWidgets.lambdaTimeout();
-        iamRole = ResourceSelector.builder(project).resource(IamResources.LIST_LAMBDA_ROLES).build();
-        sourceBucket = ResourceSelector.builder(project).resource(S3Resources.listBucketNamesByActiveRegion(project)).build();
+        iamRole = ResourceSelector.builder().resource(IamResources.LIST_LAMBDA_ROLES).awsConnection(project).build();
+        sourceBucket = ResourceSelector.builder().resource(S3Resources.listBucketNamesByActiveRegion(project)).awsConnection(project).build();
     }
 
     public void setRuntimes(Collection<Runtime> runtimes) {

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamInitProjectBuilderCommon.kt

@@ -9,7 +9,6 @@ import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.options.ShowSettingsUtil
 import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.project.DefaultProjectFactory
-import com.intellij.openapi.ui.ValidationInfo
 import software.aws.toolkits.jetbrains.core.executables.ExecutableInstance
 import software.aws.toolkits.jetbrains.core.executables.ExecutableManager
 import software.aws.toolkits.jetbrains.core.executables.getExecutable
@@ -21,10 +20,6 @@ import javax.swing.JButton
 import javax.swing.JComponent
 import javax.swing.JTextField
 
-interface ValidatablePanel {
-    fun validate(): ValidationInfo? = null
-}
-
 @JvmOverloads
 fun setupSamSelectionElements(samExecutableField: JTextField, editButton: JButton, label: JComponent, postEditCallback: Runnable? = null) {
     fun getSamExecutable(): ExecutableInstance.ExecutableWithPath? =

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SamInitSelectionPanel.java

@@ -8,6 +8,7 @@
 import com.intellij.ui.ColoredListCellRenderer;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.uiDesigner.core.GridConstraints;
+import com.intellij.util.text.SemVer;
 import java.awt.Dimension;
 import java.awt.event.ItemEvent;
 import java.util.List;
@@ -20,17 +21,16 @@
 import javax.swing.JList;
 import javax.swing.JPanel;
 import javax.swing.JTextField;
-import com.intellij.util.text.SemVer;
-import kotlin.Pair;
 import kotlin.Unit;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import software.amazon.awssdk.services.lambda.model.Runtime;
 import software.aws.toolkits.core.credentials.CredentialIdentifier;
 import software.aws.toolkits.core.credentials.ToolkitCredentialsProvider;
 import software.aws.toolkits.core.region.AwsRegion;
-import software.aws.toolkits.jetbrains.core.credentials.CredentialManager;
 import software.aws.toolkits.jetbrains.core.credentials.AwsConnectionManager;
+import software.aws.toolkits.jetbrains.core.credentials.ConnectionSettings;
+import software.aws.toolkits.jetbrains.core.credentials.CredentialManager;
 import software.aws.toolkits.jetbrains.core.executables.ExecutableInstance;
 import software.aws.toolkits.jetbrains.core.executables.ExecutableManager;
 import software.aws.toolkits.jetbrains.core.executables.ExecutableType;
@@ -39,7 +39,7 @@
 import software.aws.toolkits.jetbrains.services.lambda.RuntimeGroupUtil;
 import software.aws.toolkits.jetbrains.services.lambda.sam.SamExecutable;
 
-public class SamInitSelectionPanel implements ValidatablePanel {
+public class SamInitSelectionPanel {
     @NotNull
     public JPanel mainPanel;
     @NotNull
@@ -225,7 +225,7 @@ private Unit initSchemaSelectionPanel(AwsRegion awsRegion, CredentialIdentifier
 
         ToolkitCredentialsProvider credentialProvider = CredentialManager.getInstance().getAwsCredentialProvider(credentialIdentifier, awsRegion);
 
-        this.schemaSelectionUi.reloadSchemas(new Pair<>(awsRegion, credentialProvider));
+        this.schemaSelectionUi.reloadSchemas(new ConnectionSettings(credentialProvider, awsRegion));
 
         mainPanel.revalidate();
 
@@ -332,7 +332,6 @@ private void addOptionalSelectorPanel(JLabel newLabel, JComponent newSelector, i
     }
 
     @Nullable
-    @Override
     public ValidationInfo validate() {
         ExecutableInstance samExecutable = ExecutableManager.getInstance().getExecutableIfPresent(ExecutableType.getExecutable(SamExecutable.class));
         if (samExecutable instanceof ExecutableInstance.BadExecutable) {

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SchemaResourceSelectorSelectionPanel.kt

@@ -7,8 +7,8 @@ import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.ValidationInfo
 import com.intellij.ui.ComboboxSpeedSearch
 import software.aws.toolkits.jetbrains.core.credentials.AwsConnectionManager
+import software.aws.toolkits.jetbrains.core.credentials.ConnectionSettings
 import software.aws.toolkits.jetbrains.services.schemas.resources.SchemasResources
-import software.aws.toolkits.jetbrains.ui.AwsConnection
 import software.aws.toolkits.jetbrains.ui.ResourceSelector
 import software.aws.toolkits.resources.message
 import java.awt.BorderLayout
@@ -20,7 +20,7 @@ class SchemaResourceSelectorSelectionPanel(
     val builder: SamProjectBuilder,
     val project: Project,
     // Subsequent parameters injectable for unit tests to enable mocking because ResourceSelector has inconsistent unit test behaviour
-    val resourceSelectorBuilder: ResourceSelector.ResourceBuilder = ResourceSelector.builder(project),
+    val resourceSelectorBuilder: ResourceSelector.ResourceBuilder = ResourceSelector.builder(),
     useSpeedSearch: Boolean = true,
     rootPanelBuilder: () -> JPanel = { JPanel(BorderLayout()) }
 ) : SchemaSelectionPanelBase(project) {
@@ -29,7 +29,7 @@ class SchemaResourceSelectorSelectionPanel(
 
     private val schemaPanel: JPanel
 
-    private var currentAwsConnection: AwsConnection?
+    private var currentAwsConnection: ConnectionSettings?
 
     private val schemasSelector: ResourceSelector<SchemaSelectionItem>
 
@@ -50,10 +50,10 @@ class SchemaResourceSelectorSelectionPanel(
 
     override val schemaSelectionPanel: JComponent = schemaPanel
 
-    private fun initializeAwsConnection(): AwsConnection? {
+    private fun initializeAwsConnection(): ConnectionSettings? {
         val settings = AwsConnectionManager.getInstance(project)
         return if (settings.isValidConnectionSettings()) {
-            settings.activeRegion to settings.activeCredentialProvider
+            settings.connectionSettings()
         } else {
             null
         }
@@ -68,7 +68,7 @@ class SchemaResourceSelectorSelectionPanel(
         .awsConnection { currentAwsConnection ?: throw IllegalStateException(message("credentials.profile.not_configured")) } // Must be inline function as it gets updated and re-evaluated
         .build()
 
-    override fun reloadSchemas(awsConnection: AwsConnection?) {
+    override fun reloadSchemas(awsConnection: ConnectionSettings?) {
         if (awsConnection != null) {
             currentAwsConnection = awsConnection
         }

jetbrains-core/src/software/aws/toolkits/jetbrains/services/lambda/wizard/SchemaSelectionPanel.kt

@@ -7,12 +7,12 @@ import com.fasterxml.jackson.databind.JsonNode
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.ui.ValidationInfo
 import software.amazon.awssdk.services.lambda.model.Runtime
+import software.aws.toolkits.jetbrains.core.credentials.ConnectionSettings
 import software.aws.toolkits.jetbrains.services.lambda.runtimeGroup
 import software.aws.toolkits.jetbrains.services.schemas.SchemaDownloader
 import software.aws.toolkits.jetbrains.services.schemas.SchemaSummary
 import software.aws.toolkits.jetbrains.services.schemas.SchemaTemplateExtraContext
 import software.aws.toolkits.jetbrains.services.schemas.SchemaTemplateParameters
-import software.aws.toolkits.jetbrains.ui.AwsConnection
 import javax.swing.JComponent
 import javax.swing.JLabel
 import javax.swing.JPanel
@@ -27,7 +27,7 @@ interface SchemaSelectionPanel {
 
     fun schemaName(): String? = null
 
-    fun reloadSchemas(awsConnection: AwsConnection? = null) {}
+    fun reloadSchemas(awsConnection: ConnectionSettings? = null) {}
 
     fun buildSchemaTemplateParameters(): SchemaTemplateParameters?
 

jetbrains-core/src/software/aws/toolkits/jetbrains/services/sqs/ConfigureLambdaPanel.kt

@@ -28,9 +28,10 @@ class ConfigureLambdaPanel(private val project: Project) {
     }
 
     private fun createUIComponents() {
-        lambdaFunction = ResourceSelector.builder(project)
+        lambdaFunction = ResourceSelector.builder()
             .resource(LambdaResources.LIST_FUNCTIONS)
             .customRenderer { value, component -> component.append(value.functionName()); component }
+            .awsConnection(project)
             .build()
     }
 }