Fix issue due to missing message bundle string (#3378)

rli · web-flow · commit 0e01d02e9de0 · 2022-11-22T20:46:34.000-08:00
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/ContainerActions.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/ContainerActions.kt
@@ -60,7 +60,7 @@ class ServiceContainerActions : SingleExplorerNodeActionGroup<EcsServiceNode>("C
         val containers = try {
             selected.nodeProject.getResourceNow(EcsResources.listContainers(selected.value.taskDefinition()))
         } catch (e: Exception) {
-            e.notifyError(message("cloud_debug.ecs.run_config.container.loading.error", e.localizedMessage), selected.nodeProject)
+            e.notifyError(message("ecs.run_config.container.loading.error", e.localizedMessage), selected.nodeProject)
             return emptyList()
         }
 
diff --git a/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/resources/EcsResources.kt b/jetbrains-core/src/software/aws/toolkits/jetbrains/services/ecs/resources/EcsResources.kt
@@ -27,7 +27,7 @@ object EcsResources {
     fun describeService(clusterArn: String, serviceArn: String): Resource.Cached<Service> =
         ClientBackedCachedResource(EcsClient::class, "ecs.describe_service.$clusterArn.$serviceArn") {
             describeServices { it.cluster(clusterArn).services(serviceArn) }.services().firstOrNull()
-                ?: throw ServiceNotFoundException.builder().message(message("cloud_debug.ecs.service.not_found", serviceArn, clusterArn)).build()
+                ?: throw ServiceNotFoundException.builder().message(message("ecs.service.not_found", serviceArn, clusterArn)).build()
         }
 
     fun describeTaskDefinition(familyName: String): Resource.Cached<TaskDefinition> =
diff --git a/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties b/resources/resources/software/aws/toolkits/resources/MessagesBundle.properties
@@ -507,13 +507,15 @@ ecs.execute_command_task_comboBox_empty=Task must be selected
 ecs.execute_command_task_role_invalid_warning=<html>You may not have the <a href= "https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ecs-exec.html#ecs-exec-enabling-and-using">Permissions Required for using the execute command</a><br/>Please set up a Task Role with the required permissions and retry...</html>
 ecs.execute_command_task_role_invalid_warning_title=Set up Valid Task Role with Permissions
 ecs.no_services_in_cluster=Cluster has no services
+ecs.run_config.container.loading.error=Error loading containers: {0}
 ecs.service.container_logs.action_label=View Logs
 ecs.service.logs.cannot_determine_log_stream=Cannot determine log streams for service {0}. Note: only AWSLOGS LogDriver is supported.
 ecs.service.logs.cannot_find_container_log_stream=Cannot determine log stream for container {0}.
 ecs.service.logs.empty=No events found in log stream: {0}
 ecs.service.logs.no_log_stream=Running task has not sent events to CloudWatch, opening Log Group instead.
 ecs.service.logs.no_running_tasks=Service has no running tasks, opening Log Group instead.
 ecs.service.logs.title=ECS Service Logs
+ecs.service.not_found=Service {0} not found in cluster {1}
 ecs.task_definition.json_schema_name=AWS ECS Task Definition
 ecs.task_definitions=Task Definitions
 environment.variables.dialog.title=Environment Variables

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class ServiceContainerActions : SingleExplorerNodeActionGroup<EcsServiceNode>("C`
`60`	`60`	`val containers = try {`
`61`	`61`	`selected.nodeProject.getResourceNow(EcsResources.listContainers(selected.value.taskDefinition()))`
`62`	`62`	`} catch (e: Exception) {`
`63`		`- e.notifyError(message("cloud_debug.ecs.run_config.container.loading.error", e.localizedMessage), selected.nodeProject)`
	`63`	`+ e.notifyError(message("ecs.run_config.container.loading.error", e.localizedMessage), selected.nodeProject)`
`64`	`64`	`return emptyList()`
`65`	`65`	`}`
`66`	`66`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ object EcsResources {`
`27`	`27`	`fun describeService(clusterArn: String, serviceArn: String): Resource.Cached<Service> =`
`28`	`28`	`ClientBackedCachedResource(EcsClient::class, "ecs.describe_service.$clusterArn.$serviceArn") {`
`29`	`29`	`describeServices { it.cluster(clusterArn).services(serviceArn) }.services().firstOrNull()`
`30`		`- ?: throw ServiceNotFoundException.builder().message(message("cloud_debug.ecs.service.not_found", serviceArn, clusterArn)).build()`
	`30`	`+ ?: throw ServiceNotFoundException.builder().message(message("ecs.service.not_found", serviceArn, clusterArn)).build()`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`fun describeTaskDefinition(familyName: String): Resource.Cached<TaskDefinition> =`