ECS Express: Retry deletion when service is draining

Author: djglaser

internal/service/ecs/express_gateway_service.go

@@ -453,7 +453,8 @@ func (r *resourceExpressGatewayService) Read(ctx context.Context, req resource.R
 		return
 	}
 
-	if out.Status != nil && out.Status.StatusCode == awstypes.ExpressGatewayServiceStatusCodeInactive {
+	if out.Status != nil && (out.Status.StatusCode == awstypes.ExpressGatewayServiceStatusCodeInactive ||
+		out.Status.StatusCode == awstypes.ExpressGatewayServiceStatusCodeDraining) {
 		resp.State.RemoveResource(ctx)
 		return
 	}
@@ -641,6 +642,11 @@ func (r *resourceExpressGatewayService) Delete(ctx context.Context, req resource
 			return conn.DeleteExpressGatewayService(ctx, &input)
 		},
 		func(err error) (bool, error) {
+			// Retry when service is in DRAINING status - it's not yet ready for deletion
+			if errs.IsAErrorMessageContains[*awstypes.ServiceNotActiveException](err, "Service is in DRAINING status") {
+				return true, err
+			}
+			// Don't retry for other errors
 			if errs.IsA[*awstypes.InvalidParameterException](err) || errs.IsA[*awstypes.ServiceNotActiveException](err) {
 				return false, err
 			}