Apply changes from 7d7a15b.

Author: ewbankkit

internal/service/ecs/express_gateway_service.go

@@ -463,6 +463,7 @@ func (r *expressGatewayServiceResource) Delete(ctx context.Context, req resource
 			errs.IsAErrorMessageContains[*awstypes.ServiceNotActiveException](err, "Cannot perform this operation on a service in INACTIVE status") ||
 			errs.IsAErrorMessageContains[*awstypes.ServiceNotActiveException](err, "Service is in DRAINING status") {
 			// Service was already deleted/inactive/draining - deletion is already in progress or complete
+			return
 		} else {
 			// Real error occurred
 			smerr.AddError(ctx, &resp.Diagnostics, err, smerr.ID, serviceARN)

internal/service/ecs/express_gateway_service_test.go

@@ -238,6 +238,45 @@ func TestAccECSExpressGatewayService_update(t *testing.T) {
 	})
 }
 
+func TestAccECSExpressGatewayService_waitForSteadyState(t *testing.T) {
+	acctest.Skip(t, "Times out when running with full suite")
+	ctx := acctest.Context(t)
+	if testing.Short() {
+		t.Skip("skipping long-running test in short mode")
+	}
+
+	var service awstypes.ECSExpressGatewayService
+	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+	resourceName := "aws_ecs_express_gateway_service.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck: func() {
+			acctest.PreCheck(ctx, t)
+			acctest.PreCheckPartitionHasService(t, names.ECSEndpointID)
+		},
+		ErrorCheck:               acctest.ErrorCheck(t, names.ECSServiceID),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
+		CheckDestroy:             testAccCheckExpressGatewayServiceDestroy(ctx),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccExpressGatewayServiceConfig_basic(rName, true),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckExpressGatewayServiceExists(ctx, resourceName, &service),
+					resource.TestCheckResourceAttr(resourceName, "wait_for_steady_state", acctest.CtTrue),
+					resource.TestCheckResourceAttr(resourceName, "primary_container.0.image", "public.ecr.aws/nginx/nginx:1.28-alpine3.21-slim"),
+				),
+			},
+			{
+				Config: testAccExpressGatewayServiceConfig_updated(rName, true),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckExpressGatewayServiceExists(ctx, resourceName, &service),
+					resource.TestCheckResourceAttr(resourceName, "primary_container.0.image", "public.ecr.aws/nginx/nginx:latest"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccECSExpressGatewayService_networkConfiguration(t *testing.T) {
 	ctx := acctest.Context(t)
 	if testing.Short() {