Small cleanups to ECR push action (#2613)

Author: abrooksv

jetbrains-core/resources/META-INF/ext-docker.xml

@@ -2,11 +2,11 @@
 <!-- SPDX-License-Identifier: Apache-2.0 -->
 
 <idea-plugin>
+    <resource-bundle>software.aws.toolkits.resources.MessagesBundle</resource-bundle>
+
     <actions>
-        <group>
+        <action id="aws.toolkit.ecr.repository.push" class="software.aws.toolkits.jetbrains.services.ecr.actions.PushToRepositoryAction">
             <add-to-group group-id="ecr.repository.push.group"/>
-
-            <action id="ecr.repository.push" class="software.aws.toolkits.jetbrains.services.ecr.actions.PushToRepositoryAction"/>
-        </group>
+        </action>
     </actions>
 </idea-plugin>

jetbrains-core/resources/META-INF/plugin.xml

@@ -257,14 +257,12 @@ with what features/services are supported.
     </extensions>
 
     <actions>
-        <group id="ecr.repository.push.group"/>
-
         <group id="aws.toolkit.explorer.ecr" popup="true" compact="false">
             <action id="ecr.repository.create" class="software.aws.toolkits.jetbrains.services.ecr.actions.CreateRepositoryAction"/>
         </group>
 
         <group id="aws.toolkit.explorer.ecr.repository" popup="true" compact="false">
-            <reference id="ecr.repository.push.group"/>
+            <group id="ecr.repository.push.group"/>
             <action id="ecr.repository.copyUri" class="software.aws.toolkits.jetbrains.services.ecr.actions.CopyRepositoryUriAction"/>
             <separator/>
             <action id="ecr.repository.delete" class="software.aws.toolkits.jetbrains.services.ecr.actions.DeleteRepositoryAction"/>

jetbrains-core/src/software/aws/toolkits/jetbrains/core/explorer/actions/AbstractActions.kt

@@ -19,8 +19,10 @@ import javax.swing.Icon
  * @see ExplorerNodeAction
  * @see SingleExplorerNodeAction
  */
-abstract class SingleResourceNodeAction<in T : AwsExplorerResourceNode<*>>(text: String, description: String? = null, icon: Icon? = null) :
-    SingleExplorerNodeAction<T>(text, description, icon)
+abstract class SingleResourceNodeAction<in T : AwsExplorerResourceNode<*>> : SingleExplorerNodeAction<T> {
+    constructor() : super()
+    constructor(text: String, description: String? = null, icon: Icon? = null) : super(text, description, icon)
+}
 
 /**
  * An action from a [AwsExplorerNode] that only operates on a single resource.
@@ -29,8 +31,9 @@ abstract class SingleResourceNodeAction<in T : AwsExplorerResourceNode<*>>(text:
  *
  * @see ExplorerNodeAction
  */
-abstract class SingleExplorerNodeAction<in T : AwsExplorerNode<*>>(text: String, description: String? = null, icon: Icon? = null) :
-    ExplorerNodeAction<T>(text, description, icon) {
+abstract class SingleExplorerNodeAction<in T : AwsExplorerNode<*>> : ExplorerNodeAction<T> {
+    constructor() : super()
+    constructor(text: String, description: String? = null, icon: Icon? = null) : super(text, description, icon)
 
     /**
      * If only a single item is selected [update] will be invoked with that selection periodically.
@@ -61,8 +64,9 @@ abstract class SingleExplorerNodeAction<in T : AwsExplorerNode<*>>(text: String,
 /**
  * Converts generic [ExplorerNodeAction] list into [T] typed nodes
  */
-abstract class ExplorerNodeAction<in T : AwsExplorerNode<*>>(text: String, description: String? = null, icon: Icon? = null) :
-    AnAction(text, description, icon) {
+abstract class ExplorerNodeAction<in T : AwsExplorerNode<*>> : AnAction {
+    constructor() : super()
+    constructor(text: String, description: String? = null, icon: Icon? = null) : super(text, description, icon)
 
     /**
      * Invoked periodically with the selected items of type [T].

jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecr/actions/PushToRepositoryAction.kt

@@ -16,6 +16,7 @@ import com.intellij.openapi.actionSystem.LangDataKeys
 import com.intellij.openapi.application.ModalityState
 import com.intellij.openapi.application.runInEdt
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory
+import com.intellij.openapi.project.DumbAware
 import com.intellij.openapi.project.Project
 import com.intellij.openapi.project.guessProjectDir
 import com.intellij.openapi.ui.DialogWrapper
@@ -69,7 +70,8 @@ import javax.swing.JTextField
 import javax.swing.plaf.basic.BasicComboBoxEditor
 
 class PushToRepositoryAction :
-    SingleExplorerNodeAction<EcrRepositoryNode>(message("action.ecr.repository.push.text")),
+    SingleExplorerNodeAction<EcrRepositoryNode>(),
+    DumbAware,
     CoroutineScope by ApplicationThreadPoolScope("PushRepositoryAction") {
     private val dockerServerRuntime: Deferred<DockerServerRuntimeInstance> =
         async(start = CoroutineStart.LAZY) { EcrUtils.getDockerServerRuntimeInstance().runtimeInstance }
@@ -79,9 +81,7 @@ class PushToRepositoryAction :
         val client: EcrClient = project.awsClient()
 
         val dialog = PushToEcrDialog(project, selected.repository, dockerServerRuntime)
-        val result = dialog.showAndGet()
-
-        if (!result) {
+        if (!dialog.showAndGet()) {
             // user cancelled; noop
             EcrTelemetry.deployImage(project, Result.Cancelled)
             return
@@ -134,7 +134,7 @@ internal data class LocalImage(
 
 internal class PushToEcrDialog(
     private val project: Project,
-    selectedRepository: Repository?,
+    selectedRepository: Repository,
     private val dockerServerRuntime: Deferred<DockerServerRuntimeInstance>
 ) : DialogWrapper(project, null, false, IdeModalityType.PROJECT),
     CoroutineScope by ApplicationThreadPoolScope("PushRepositoryDialog") {
@@ -153,7 +153,7 @@ internal class PushToEcrDialog(
         .build()
 
     init {
-        selectedRepository?.let { repo -> remoteRepos.selectedItem { it == repo } }
+        remoteRepos.selectedItem { it == selectedRepository }
 
         title = message("ecr.push.title")
         setOKButtonText(message("ecr.push.confirm"))

resources/resources/software/aws/toolkits/resources/MessagesBundle.properties

@@ -1,7 +1,7 @@
 # Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: Apache-2.0
 action.aws.toolkit.dynamoViewer.changeMaxResults.text=Max Results
-action.ecr.repository.push.text=Push to Repository...
+action.aws.toolkit.ecr.repository.push.text=Push to Repository...
 apprunner.action.configure=Configure Service
 apprunner.action.copyServiceUrl=Copy Service URL
 apprunner.action.create.service=Create Service...