New resource for Route53 Traffic Policy and Traffic Policy Instance, datasource for Route53 Traffic Policy

.changelog/23602.txt

@@ -0,0 +1,11 @@
+```release-note:new-resource
+aws_route53_traffic_policy
+```
+
+```release-note:new-data-source
+aws_route53_traffic_policy_document
+```
+
+```release-note:new-resource
+aws_route53_traffic_policy_instance
+```

internal/generate/listpages/README.md

@@ -7,10 +7,11 @@ For example, the EC2 API defines both [`DescribeInstancesPages`](https://docs.aw
 The `listpages` executable is called as follows:
 
 ```console
-$ go run main.go -ListOps <function-name>[,<function-name>]
+$ go run main.go -ListOps <function-name>[,<function-name>] [<generated-lister-file>]
 ```
 
 * `<function-name>`: Name of a function to wrap
+* `<generated-lister-file>`: Name of the generated lister source file, defaults to `list_pages_gen.go`
 
 Optional Flags:
 

internal/generate/listpages/main.go

@@ -20,7 +20,7 @@ import (
 )
 
 const (
-	filename = "list_pages_gen.go"
+	defaultFilename = "list_pages_gen.go"
 )
 
 var (
@@ -31,7 +31,7 @@ var (
 
 func usage() {
 	fmt.Fprintf(os.Stderr, "Usage:\n")
-	fmt.Fprintf(os.Stderr, "\tmain.go [flags]\n\n")
+	fmt.Fprintf(os.Stderr, "\tmain.go [flags] [<generated-lister-file>]\n\n")
 	fmt.Fprintf(os.Stderr, "Flags:\n")
 	flag.PrintDefaults()
 }
@@ -49,6 +49,11 @@ func main() {
 	flag.Usage = usage
 	flag.Parse()
 
+	filename := defaultFilename
+	if args := flag.Args(); len(args) > 0 {
+		filename = args[0]
+	}
+
 	wd, err := os.Getwd()
 
 	if err != nil {

internal/provider/provider.go

@@ -754,8 +754,9 @@ func Provider() *schema.Provider {
 
 			"aws_resourcegroupstaggingapi_resources": resourcegroupstaggingapi.DataSourceResources(),
 
-			"aws_route53_delegation_set": route53.DataSourceDelegationSet(),
-			"aws_route53_zone":           route53.DataSourceZone(),
+			"aws_route53_delegation_set":          route53.DataSourceDelegationSet(),
+			"aws_route53_traffic_policy_document": route53.DataSourceTrafficPolicyDocument(),
+			"aws_route53_zone":                    route53.DataSourceZone(),
 
 			"aws_route53_resolver_endpoint": route53resolver.DataSourceEndpoint(),
 			"aws_route53_resolver_rule":     route53resolver.DataSourceRule(),
@@ -1669,6 +1670,8 @@ func Provider() *schema.Provider {
 			"aws_route53_key_signing_key":               route53.ResourceKeySigningKey(),
 			"aws_route53_query_log":                     route53.ResourceQueryLog(),
 			"aws_route53_record":                        route53.ResourceRecord(),
+			"aws_route53_traffic_policy":                route53.ResourceTrafficPolicy(),
+			"aws_route53_traffic_policy_instance":       route53.ResourceTrafficPolicyInstance(),
 			"aws_route53_vpc_association_authorization": route53.ResourceVPCAssociationAuthorization(),
 			"aws_route53_zone":                          route53.ResourceZone(),
 			"aws_route53_zone_association":              route53.ResourceZoneAssociation(),

internal/service/route53/enum.go

@@ -12,4 +12,10 @@ const (
 	ServeSignatureInternalFailure = "INTERNAL_FAILURE"
 	ServeSignatureNotSigning      = "NOT_SIGNING"
 	ServeSignatureSigning         = "SIGNING"
+
+	TrafficPolicyInstanceStateApplied  = "Applied"
+	TrafficPolicyInstanceStateCreating = "Creating"
+	TrafficPolicyInstanceStateDeleting = "Deleting"
+	TrafficPolicyInstanceStateFailed   = "Failed"
+	TrafficPolicyInstanceStateUpdating = "Updating"
 )

internal/service/route53/find.go

@@ -1,6 +1,7 @@
 package route53
 
 import (
+	"context"
 	"fmt"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -85,3 +86,80 @@ func FindKeySigningKeyByResourceID(conn *route53.Route53, resourceID string) (*r
 
 	return FindKeySigningKey(conn, hostedZoneID, name)
 }
+
+func FindTrafficPolicyByID(ctx context.Context, conn *route53.Route53, id string) (*route53.TrafficPolicy, error) {
+	var latestVersion int64
+
+	err := listTrafficPoliciesPagesWithContext(ctx, conn, &route53.ListTrafficPoliciesInput{}, func(page *route53.ListTrafficPoliciesOutput, lastPage bool) bool {
+		if page == nil {
+			return !lastPage
+		}
+
+		for _, v := range page.TrafficPolicySummaries {
+			if aws.StringValue(v.Id) == id {
+				latestVersion = aws.Int64Value(v.LatestVersion)
+
+				return false
+			}
+		}
+
+		return !lastPage
+	})
+
+	if err != nil {
+		return nil, err
+	}
+
+	if latestVersion == 0 {
+		return nil, tfresource.NewEmptyResultError(id)
+	}
+
+	input := &route53.GetTrafficPolicyInput{
+		Id:      aws.String(id),
+		Version: aws.Int64(latestVersion),
+	}
+
+	output, err := conn.GetTrafficPolicyWithContext(ctx, input)
+
+	if tfawserr.ErrCodeEquals(err, route53.ErrCodeNoSuchTrafficPolicy) {
+		return nil, &resource.NotFoundError{
+			LastError:   err,
+			LastRequest: input,
+		}
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	if output == nil || output.TrafficPolicy == nil {
+		return nil, tfresource.NewEmptyResultError(input)
+	}
+
+	return output.TrafficPolicy, nil
+}
+
+func FindTrafficPolicyInstanceByID(ctx context.Context, conn *route53.Route53, id string) (*route53.TrafficPolicyInstance, error) {
+	input := &route53.GetTrafficPolicyInstanceInput{
+		Id: aws.String(id),
+	}
+
+	output, err := conn.GetTrafficPolicyInstanceWithContext(ctx, input)
+
+	if tfawserr.ErrCodeEquals(err, route53.ErrCodeNoSuchTrafficPolicyInstance) {
+		return nil, &resource.NotFoundError{
+			LastError:   err,
+			LastRequest: input,
+		}
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
+	if output == nil || output.TrafficPolicyInstance == nil {
+		return nil, tfresource.NewEmptyResultError(input)
+	}
+
+	return output.TrafficPolicyInstance, nil
+}

internal/service/route53/generate.go

@@ -1,3 +1,5 @@
+//go:generate go run ../../generate/listpages/main.go -ListOps=ListTrafficPolicies -Paginator=TrafficPolicyIdMarker list_traffic_policies_pages_gen.go
+//go:generate go run ../../generate/listpages/main.go -ListOps=ListTrafficPolicyVersions -Paginator=TrafficPolicyVersionMarker list_traffic_policy_versions_pages_gen.go
 //go:generate go run ../../generate/tags/main.go -ListTags -ListTagsInIDElem=ResourceId -ListTagsOutTagsElem=ResourceTagSet.Tags -ServiceTagsSlice -TagOp=ChangeTagsForResource -TagInIDElem=ResourceId -TagInTagsElem=AddTags -TagResTypeElem=ResourceType -UntagOp=ChangeTagsForResource -UntagInTagsElem=RemoveTagKeys -UpdateTags
 // ONLY generate directives and package declaration! Do not add anything else to this file.
 

internal/service/route53/list_pages.go

@@ -0,0 +1,36 @@
+//go:build !generate
+// +build !generate
+
+package route53
+
+import (
+	"context"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/route53"
+)
+
+// Custom Route 53 service lister functions using the same format as generated code.
+
+func listTrafficPolicyInstancesPages(conn *route53.Route53, input *route53.ListTrafficPolicyInstancesInput, fn func(*route53.ListTrafficPolicyInstancesOutput, bool) bool) error { //nolint:deadcode // This function is called from a sweeper.
+	return listTrafficPolicyInstancesPagesWithContext(context.Background(), conn, input, fn)
+}
+
+func listTrafficPolicyInstancesPagesWithContext(ctx context.Context, conn *route53.Route53, input *route53.ListTrafficPolicyInstancesInput, fn func(*route53.ListTrafficPolicyInstancesOutput, bool) bool) error {
+	for {
+		output, err := conn.ListTrafficPolicyInstancesWithContext(ctx, input)
+		if err != nil {
+			return err
+		}
+
+		lastPage := !aws.BoolValue(output.IsTruncated)
+		if !fn(output, lastPage) || lastPage {
+			break
+		}
+
+		input.HostedZoneIdMarker = output.HostedZoneIdMarker
+		input.TrafficPolicyInstanceNameMarker = output.TrafficPolicyInstanceNameMarker
+		input.TrafficPolicyInstanceTypeMarker = output.TrafficPolicyInstanceTypeMarker
+	}
+	return nil
+}

internal/service/route53/status.go

@@ -1,9 +1,12 @@
 package route53
 
 import (
+	"context"
+
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/route53"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
 )
 
 func statusChangeInfo(conn *route53.Route53, changeID string) resource.StateRefreshFunc {
@@ -57,3 +60,19 @@ func statusKeySigningKey(conn *route53.Route53, hostedZoneID string, name string
 		return keySigningKey, aws.StringValue(keySigningKey.Status), nil
 	}
 }
+
+func statusTrafficPolicyInstanceState(ctx context.Context, conn *route53.Route53, id string) resource.StateRefreshFunc {
+	return func() (interface{}, string, error) {
+		output, err := FindTrafficPolicyInstanceByID(ctx, conn, id)
+
+		if tfresource.NotFound(err) {
+			return nil, "", nil
+		}
+
+		if err != nil {
+			return nil, "", err
+		}
+
+		return output, aws.StringValue(output.State), nil
+	}
+}