check invalid TG ARN when deleting TGB

gmerlin-claranet · Jan 11, 2022 · 6f665fd · 6f665fd
1 parent e211bfc
commit 6f665fd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/apis/elbv2/v1alpha1/zz_generated.deepcopy.go b/apis/elbv2/v1alpha1/zz_generated.deepcopy.go
diff --git a/apis/elbv2/v1beta1/zz_generated.deepcopy.go b/apis/elbv2/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/targetgroupbinding/resource_manager.go b/pkg/targetgroupbinding/resource_manager.go
@@ -214,12 +214,16 @@ func (m *defaultResourceManager) cleanupTargets(ctx context.Context, tgb *elbv2a
 	if err != nil {
 		if isELBV2TargetGroupNotFoundError(err) {
 			return nil
+		} else if isELBV2TargetGroupARNInvalidError(err) {
+			return nil
 		}
 		return err
 	}
 	if err := m.deregisterTargets(ctx, tgb.Spec.TargetGroupARN, targets); err != nil {
 		if isELBV2TargetGroupNotFoundError(err) {
 			return nil
+		} else if isELBV2TargetGroupARNInvalidError(err) {
+			return nil
 		}
 		return err
 	}
@@ -506,3 +510,11 @@ func isELBV2TargetGroupNotFoundError(err error) bool {
 	}
 	return false
 }
+
+func isELBV2TargetGroupARNInvalidError(err error) bool {
+	var awsErr awserr.Error
+	if errors.As(err, &awsErr) {
+		return awsErr.Code() == "ValidationError"
+	}
+	return false
+}