Merge pull request #20562 from hashicorp/t-aws_eks_addon-version

r/aws_eks_addon: Update addon versions for `TestAccAWSEksAddon_AddonVersion`
hashicorp · Aug 18, 2021 · 0c74f25 · 0c74f25
2 parents 29338bf + 25e1b6e
commit 0c74f25
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.changelog/20562.txt b/.changelog/20562.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+resource/aws_eks_addon: Treat `DEGRADED` as a pending state during creation
+```
diff --git a/aws/internal/service/eks/waiter/waiter.go b/aws/internal/service/eks/waiter/waiter.go
@@ -19,7 +19,7 @@ const (
 
 func AddonCreated(ctx context.Context, conn *eks.EKS, clusterName, addonName string) (*eks.Addon, error) {
 	stateConf := resource.StateChangeConf{
-		Pending: []string{eks.AddonStatusCreating},
+		Pending: []string{eks.AddonStatusCreating, eks.AddonStatusDegraded},
 		Target:  []string{eks.AddonStatusActive},
 		Refresh: AddonStatus(ctx, conn, clusterName, addonName),
 		Timeout: AddonCreatedTimeout,

diff --git a/aws/resource_aws_eks_addon_test.go b/aws/resource_aws_eks_addon_test.go
@@ -180,8 +180,8 @@ func TestAccAWSEksAddon_AddonVersion(t *testing.T) {
 	rName := acctest.RandomWithPrefix("tf-acc-test")
 	resourceName := "aws_eks_addon.test"
 	addonName := "vpc-cni"
-	addonVersion1 := "v1.6.3-eksbuild.1"
-	addonVersion2 := "v1.7.5-eksbuild.1"
+	addonVersion1 := "v1.8.0-eksbuild.1"
+	addonVersion2 := "v1.9.0-eksbuild.1"
 	ctx := context.TODO()
 
 	resource.ParallelTest(t, resource.TestCase{