Cleanup tests

Author: goruha

test/component_test.go

@@ -15,9 +15,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/aws/aws-sdk-go-v2/aws"
-	"github.com/aws/aws-sdk-go-v2/service/route53"
-	"github.com/aws/aws-sdk-go-v2/service/route53/types"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -144,23 +141,27 @@ func (s *ComponentSuite) TestBasic() {
 				return
 			}
 
-			observedGeneration, found, err := unstructured.NestedInt64(newDNS.Object, "status", "observedGeneration")
+			name, found, err := unstructured.NestedString(newDNS.Object, "metadata", "name")
 			if err != nil {
-				fmt.Printf("Error getting status: %v\n", err)
+				fmt.Printf("Error getting name: %v\n", err)
 				return
 			}
 			if !found {
-				fmt.Printf("Status not found\n")
+				fmt.Printf("Name not found\n")
+				return
+			}
+			if name != dnsEndpointName {
+				fmt.Printf("DNS record is not %s\n", dnsEndpointName)
 				return
 			}
 
-			name, found, err := unstructured.NestedString(newDNS.Object, "metadata", "name")
+			observedGeneration, found, err := unstructured.NestedInt64(newDNS.Object, "status", "observedGeneration")
 			if err != nil {
-				fmt.Printf("Error getting name: %v\n", err)
+				fmt.Printf("Error getting status: %v\n", err)
 				return
 			}
 			if !found {
-				fmt.Printf("Name not found\n")
+				fmt.Printf("Status not found\n")
 				return
 			}
 
@@ -186,54 +187,10 @@ func (s *ComponentSuite) TestBasic() {
 	delegatedNSRecord := awsTerratest.GetRoute53Record(s.T(), defaultDNSZoneId, dnsRecordHostName, "A", awsRegion)
 	assert.Equal(s.T(), fmt.Sprintf("%s.", dnsRecordHostName), *delegatedNSRecord.Name)
 
-
 	defer func() {
-		route53Client, err := awsTerratest.NewRoute53ClientE(s.T(), awsRegion)
-		if err != nil {
-			return
+		if err := awsHelper.CleanDNSZoneID(s.T(), context.Background(), defaultDNSZoneId, awsRegion); err != nil {
+			fmt.Printf("Error cleaning DNS zone %s: %v\n", defaultDNSZoneId, err)
 		}
-
-		o, err := route53Client.ListResourceRecordSets(context.Background(), &route53.ListResourceRecordSetsInput{
-			HostedZoneId:    &defaultDNSZoneId,
-			MaxItems:        aws.Int32(100),
-		})
-		if err != nil {
-			return
-		}
-
-		var changes []types.Change
-
-		for _, record := range o.ResourceRecordSets {
-
-			if record.Type == types.RRTypeNs || record.Type == types.RRTypeSoa {
-				continue
-			}
-			// Build a deletion change for each record
-			changes = append(changes, types.Change{
-				Action:            types.ChangeActionDelete,
-				ResourceRecordSet: &record,
-			})
-		}
-
-		if len(changes) == 0 {
-			fmt.Println("No deletable records found.")
-			return
-		}
-
-		// Prepare the change batch
-		changeBatch := &types.ChangeBatch{
-			Changes: changes,
-		}
-
-		// Call ChangeResourceRecordSets to delete the records
-		changeInput := &route53.ChangeResourceRecordSetsInput{
-			HostedZoneId: aws.String(defaultDNSZoneId),
-			ChangeBatch:  changeBatch,
-		}
-
-		_, err = route53Client.ChangeResourceRecordSets(context.Background(), changeInput)
-		assert.NoError(s.T(), err)
-
 	}()
 
 	s.DriftTest(component, stack, &inputs)

test/go.mod

@@ -5,7 +5,7 @@ go 1.24.0
 toolchain go1.24.1
 
 require (
-	github.com/cloudposse/test-helpers v0.22.1-0.20250325083919-2452aea08a23
+	github.com/cloudposse/test-helpers v0.22.1-0.20250326115004-9e5a8774b3c1
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/gruntwork-io/terratest v0.48.2
 	github.com/mattn/go-zglob v0.0.6 // indirect

test/go.sum

@@ -127,6 +127,8 @@ github.com/cloudposse/test-helpers v0.22.1-0.20250324180101-e380ecb769de h1:xxaJ
 github.com/cloudposse/test-helpers v0.22.1-0.20250324180101-e380ecb769de/go.mod h1:UmmPgiLL44aJe9E98xXFn+y5aybGsU4l6pJ3iQZvmJ0=
 github.com/cloudposse/test-helpers v0.22.1-0.20250325083919-2452aea08a23 h1:mI+w8PJX2ryIzh5HvUBac0N1JLRjeH/Zc6l/wcbn7OQ=
 github.com/cloudposse/test-helpers v0.22.1-0.20250325083919-2452aea08a23/go.mod h1:UmmPgiLL44aJe9E98xXFn+y5aybGsU4l6pJ3iQZvmJ0=
+github.com/cloudposse/test-helpers v0.22.1-0.20250326115004-9e5a8774b3c1 h1:Pp00IP/ERAO4+Awj43LVNiNXuS+K0ljhe7W501352FM=
+github.com/cloudposse/test-helpers v0.22.1-0.20250326115004-9e5a8774b3c1/go.mod h1:UmmPgiLL44aJe9E98xXFn+y5aybGsU4l6pJ3iQZvmJ0=
 github.com/cpuguy83/go-md2man/v2 v2.0.6 h1:XJtiaUW6dEEqVuZiMTn1ldk455QWwEIsMIJlo5vtkx0=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=