Hiding ECS Execute Command, deprecate ECS Cloud Debug experiment (#2994)

kiiadi · web-flow · commit 21328744cbe2 · 2021-12-10T13:18:34.000-08:00
* Hiding ECS Execute Command and ECS Cloud Debug items from experiments menu

* Changed from removed to deprecated

* Ensuring that Disable Cloud Debug action remains visible even if the experiment is deactivated
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/actions/DeinstrumentResourceAction.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/clouddebug/actions/DeinstrumentResourceAction.kt
@@ -7,10 +7,8 @@ import com.intellij.execution.configurations.GeneralCommandLine
 import com.intellij.openapi.actionSystem.AnActionEvent
 import com.intellij.openapi.actionSystem.PlatformDataKeys
 import com.intellij.openapi.project.Project
-import software.aws.toolkits.jetbrains.core.experiments.isEnabled
 import software.aws.toolkits.jetbrains.core.explorer.actions.SingleResourceNodeAction
 import software.aws.toolkits.jetbrains.services.clouddebug.DebuggerSupport
-import software.aws.toolkits.jetbrains.services.ecs.EcsCloudDebugExperiment
 import software.aws.toolkits.jetbrains.services.ecs.EcsServiceNode
 import software.aws.toolkits.jetbrains.services.ecs.EcsUtils
 import software.aws.toolkits.resources.message
@@ -34,7 +32,7 @@ class DeinstrumentResourceFromExplorerAction : SingleResourceNodeAction<EcsServi
 
     override fun update(selected: EcsServiceNode, e: AnActionEvent) {
         // If there are no supported debuggers, showing this will just be confusing
-        e.presentation.isVisible = if (!EcsCloudDebugExperiment.isEnabled() || DebuggerSupport.debuggers().isEmpty()) {
+        e.presentation.isVisible = if (DebuggerSupport.debuggers().isEmpty()) {
             false
         } else {
             EcsUtils.isInstrumented(selected.resourceArn())
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/EcsExperiments.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/EcsExperiments.kt
@@ -5,16 +5,18 @@ package software.aws.toolkits.jetbrains.services.ecs
 
 import software.aws.toolkits.jetbrains.core.experiments.ToolkitExperiment
 import software.aws.toolkits.resources.message
+import java.util.Date
 
 object EcsExecExperiment : ToolkitExperiment(
     "ecsExec",
     { message("ecs.execute_command.experiment.title") },
     { message("ecs.execute_command.experiment.description") },
-    default = true
+    default = true,
+    hidden = true
 )
 
 object EcsCloudDebugExperiment : ToolkitExperiment(
     "ecsCloudDebug",
     { message("cloud_debug.experiment.title") },
-    { message("cloud_debug.experiment.description") }
+    { message("cloud_debug.experiment.description", Date()) }
 )
diff --git a/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -174,9 +174,9 @@ cloud_debug.execution.logs.title=Logs
 cloud_debug.execution.running=running...
 cloud_debug.execution.success=completed successfully
 cloud_debug.execution.title=Remote Debugging
-cloud_debug.experiment.description=Features and actions associated with instrumenting an ECS Service to enable fast artifact syncing and step-through debugging.
-cloud_debug.experiment.title=ECS Cloud Debugging
-cloud_debug.instrument=Enable Cloud Debugging (Beta)
+cloud_debug.experiment.description=(deprecated: scheduled for removal 2022-06-30, replaced by ECS Execute Command) Enable fast artifact syncing and step-through debugging an ECS Service. 
+cloud_debug.experiment.title=ECS Cloud Debugging (deprecated)
+cloud_debug.instrument=Enable Cloud Debugging (deprecated)
 cloud_debug.instrument.production_warning.checkbox_label=I confirm {0} is not a production service and wish to continue
 cloud_debug.instrument.production_warning.text=<html><strong>Do not use Cloud Debugging in a production environment.</strong><p>Cloud Debugging will change the state of resources in your AWS account, including but not limited to stopping the service.<p>Altering the state of resources while Cloud Debugging is enabled can lead to unpredictable results.</html>
 cloud_debug.instrument.production_warning.title=Warning!
