From b3f52ee39f7ad412287afaa04060252e8f5fb3ca Mon Sep 17 00:00:00 2001
From: Ole Markus With <o.with@sportradar.com>
Date: Fri, 23 Apr 2021 16:38:30 +0200
Subject: [PATCH] Make warm pool no ASG found error retryable

---
 upup/pkg/fi/cloudup/awstasks/warmpool.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/upup/pkg/fi/cloudup/awstasks/warmpool.go b/upup/pkg/fi/cloudup/awstasks/warmpool.go
index a915e7beb0..d0eb976611 100644
--- a/upup/pkg/fi/cloudup/awstasks/warmpool.go
+++ b/upup/pkg/fi/cloudup/awstasks/warmpool.go
@@ -52,6 +52,9 @@ func (e *WarmPool) Find(c *fi.Context) (*WarmPool, error) {
 		AutoScalingGroupName: e.Name,
 	})
 	if err != nil {
+		if awsup.AWSErrorCode(err) == "ValidationError" {
+			return nil, nil
+		}
 		return nil, err
 	}
 	if warmPool.WarmPoolConfiguration == nil {
@@ -96,6 +99,9 @@ func (*WarmPool) RenderAWS(t *awsup.AWSAPITarget, a, e, changes *WarmPool) error
 
 			_, err := svc.PutWarmPool(request)
 			if err != nil {
+				if awsup.AWSErrorCode(err) == "ValidationError" {
+					return fi.NewTryAgainLaterError("waiting for ASG to become ready")
+				}
 				return fmt.Errorf("error modifying warm pool: %w", err)
 			}
 		} else {