Merge pull request #42708 from tabito-hara/f-aws_transfer_web_app

[New Resources]`aws_transfer_web_app` and `aws_transfer_web_app_customization`

Author: ewbankkit

.changelog/42708.txt

@@ -0,0 +1,7 @@
+```release-note:new-resource
+aws_transfer_web_app
+```
+
+```release-note:new-resource
+aws_transfer_web_app_customization
+```

internal/service/transfer/exports_test.go

@@ -5,16 +5,18 @@ package transfer
 
 // Exports for use in tests only.
 var (
-	ResourceAccess      = resourceAccess
-	ResourceAgreement   = resourceAgreement
-	ResourceCertificate = resourceCertificate
-	ResourceConnector   = resourceConnector
-	ResourceProfile     = resourceProfile
-	ResourceServer      = resourceServer
-	ResourceSSHKey      = resourceSSHKey
-	ResourceTag         = resourceTag
-	ResourceUser        = resourceUser
-	ResourceWorkflow    = resourceWorkflow
+	ResourceAccess              = resourceAccess
+	ResourceAgreement           = resourceAgreement
+	ResourceCertificate         = resourceCertificate
+	ResourceConnector           = resourceConnector
+	ResourceProfile             = resourceProfile
+	ResourceServer              = resourceServer
+	ResourceSSHKey              = resourceSSHKey
+	ResourceTag                 = resourceTag
+	ResourceUser                = resourceUser
+	ResourceWebApp              = newWebAppResource
+	ResourceWebAppCustomization = newWebAppCustomizationResource
+	ResourceWorkflow            = resourceWorkflow
 
 	FindAccessByTwoPartKey       = findAccessByTwoPartKey
 	FindAgreementByTwoPartKey    = findAgreementByTwoPartKey
@@ -26,4 +28,6 @@ var (
 	FindUserByTwoPartKey         = findUserByTwoPartKey
 	FindUserSSHKeyByThreePartKey = findUserSSHKeyByThreePartKey
 	FindWorkflowByID             = findWorkflowByID
+	FindWebAppByID               = findWebAppByID
+	FindWebAppCustomizationByID  = findWebAppCustomizationByID
 )

internal/service/transfer/service_package_gen.go

@@ -4,112 +4,166 @@
 package transfer
 
 import (
-	"fmt"
-	"log"
+	"context"
 
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/transfer"
-	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
+	"github.com/hashicorp/terraform-provider-aws/internal/conns"
 	"github.com/hashicorp/terraform-provider-aws/internal/sweep"
 	"github.com/hashicorp/terraform-provider-aws/internal/sweep/awsv2"
+	"github.com/hashicorp/terraform-provider-aws/internal/sweep/framework"
 	"github.com/hashicorp/terraform-provider-aws/names"
 )
 
 func RegisterSweepers() {
-	resource.AddTestSweepers("aws_transfer_server", &resource.Sweeper{
-		Name: "aws_transfer_server",
-		F:    sweepServers,
-	})
-
-	resource.AddTestSweepers("aws_transfer_workflow", &resource.Sweeper{
-		Name: "aws_transfer_workflow",
-		F:    sweepWorkflows,
-		Dependencies: []string{
-			"aws_transfer_server",
-		},
-	})
+	awsv2.Register("aws_transfer_certificate", sweepCertificates)
+	awsv2.Register("aws_transfer_connector", sweepConnectors)
+	awsv2.Register("aws_transfer_profile", sweepProfiles)
+	awsv2.Register("aws_transfer_server", sweepServers)
+	awsv2.Register("aws_transfer_web_app", sweepWebApps)
+	awsv2.Register("aws_transfer_workflow", sweepWorkflows, "aws_transfer_server")
 }
 
-func sweepServers(region string) error {
-	ctx := sweep.Context(region)
-	client, err := sweep.SharedRegionalSweepClient(ctx, region)
-	if err != nil {
-		return fmt.Errorf("getting client: %w", err)
-	}
+func sweepCertificates(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) {
 	conn := client.TransferClient(ctx)
-	input := &transfer.ListServersInput{}
+	var input transfer.ListCertificatesInput
 	sweepResources := make([]sweep.Sweepable, 0)
 
-	pages := transfer.NewListServersPaginator(conn, input)
+	pages := transfer.NewListCertificatesPaginator(conn, &input)
 	for pages.HasMorePages() {
 		page, err := pages.NextPage(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		for _, v := range page.Certificates {
+			r := resourceCertificate()
+			d := r.Data(nil)
+			d.SetId(aws.ToString(v.CertificateId))
 
-		if awsv2.SkipSweepError(err) {
-			log.Printf("[WARN] Skipping Transfer Server sweep for %s: %s", region, err)
-			return nil
+			sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client))
 		}
+	}
 
+	return sweepResources, nil
+}
+
+func sweepConnectors(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) {
+	conn := client.TransferClient(ctx)
+	var input transfer.ListConnectorsInput
+	sweepResources := make([]sweep.Sweepable, 0)
+
+	pages := transfer.NewListConnectorsPaginator(conn, &input)
+	for pages.HasMorePages() {
+		page, err := pages.NextPage(ctx)
 		if err != nil {
-			return fmt.Errorf("error listing Transfer Servers (%s): %w", region, err)
+			return nil, err
 		}
 
-		for _, server := range page.Servers {
-			r := resourceServer()
+		for _, v := range page.Connectors {
+			r := resourceConnector()
 			d := r.Data(nil)
-			d.SetId(aws.ToString(server.ServerId))
-			d.Set(names.AttrForceDestroy, true) // In lieu of an aws_transfer_user sweeper.
-			d.Set("identity_provider_type", server.IdentityProviderType)
+			d.SetId(aws.ToString(v.ConnectorId))
 
 			sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client))
 		}
 	}
 
-	err = sweep.SweepOrchestrator(ctx, sweepResources)
+	return sweepResources, nil
+}
+
+func sweepProfiles(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) {
+	conn := client.TransferClient(ctx)
+	var input transfer.ListProfilesInput
+	sweepResources := make([]sweep.Sweepable, 0)
 
-	if err != nil {
-		return fmt.Errorf("error sweeping Transfer Servers (%s): %w", region, err)
+	pages := transfer.NewListProfilesPaginator(conn, &input)
+	for pages.HasMorePages() {
+		page, err := pages.NextPage(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		for _, v := range page.Profiles {
+			r := resourceProfile()
+			d := r.Data(nil)
+			d.SetId(aws.ToString(v.ProfileId))
+
+			sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client))
+		}
 	}
 
-	return nil
+	return sweepResources, nil
 }
 
-func sweepWorkflows(region string) error {
-	ctx := sweep.Context(region)
-	client, err := sweep.SharedRegionalSweepClient(ctx, region)
-	if err != nil {
-		return fmt.Errorf("getting client: %w", err)
+func sweepServers(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) {
+	conn := client.TransferClient(ctx)
+	var input transfer.ListServersInput
+	sweepResources := make([]sweep.Sweepable, 0)
+
+	pages := transfer.NewListServersPaginator(conn, &input)
+	for pages.HasMorePages() {
+		page, err := pages.NextPage(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		for _, v := range page.Servers {
+			r := resourceServer()
+			d := r.Data(nil)
+			d.SetId(aws.ToString(v.ServerId))
+			d.Set(names.AttrForceDestroy, true) // In lieu of an aws_transfer_user sweeper.
+			d.Set("identity_provider_type", v.IdentityProviderType)
+
+			sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client))
+		}
 	}
+
+	return sweepResources, nil
+}
+
+func sweepWebApps(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) {
 	conn := client.TransferClient(ctx)
-	input := &transfer.ListWorkflowsInput{}
+	var input transfer.ListWebAppsInput
 	sweepResources := make([]sweep.Sweepable, 0)
 
-	pages := transfer.NewListWorkflowsPaginator(conn, input)
+	pages := transfer.NewListWebAppsPaginator(conn, &input)
 	for pages.HasMorePages() {
 		page, err := pages.NextPage(ctx)
+		if err != nil {
+			return nil, err
+		}
 
-		if awsv2.SkipSweepError(err) {
-			log.Printf("[WARN] Skipping Transfer Workflow sweep for %s: %s", region, err)
-			return nil
+		for _, v := range page.WebApps {
+			sweepResources = append(sweepResources, framework.NewSweepResource(newWebAppResource, client,
+				framework.NewAttribute("web_app_id", aws.ToString(v.WebAppId))),
+			)
 		}
+	}
+
+	return sweepResources, nil
+}
+
+func sweepWorkflows(ctx context.Context, client *conns.AWSClient) ([]sweep.Sweepable, error) {
+	conn := client.TransferClient(ctx)
+	var input transfer.ListWorkflowsInput
+	sweepResources := make([]sweep.Sweepable, 0)
 
+	pages := transfer.NewListWorkflowsPaginator(conn, &input)
+	for pages.HasMorePages() {
+		page, err := pages.NextPage(ctx)
 		if err != nil {
-			return fmt.Errorf("error listing Transfer Workflows (%s): %w", region, err)
+			return nil, err
 		}
 
-		for _, server := range page.Workflows {
+		for _, v := range page.Workflows {
 			r := resourceWorkflow()
 			d := r.Data(nil)
-			d.SetId(aws.ToString(server.WorkflowId))
+			d.SetId(aws.ToString(v.WorkflowId))
 
 			sweepResources = append(sweepResources, sweep.NewSweepResource(r, d, client))
 		}
 	}
 
-	err = sweep.SweepOrchestrator(ctx, sweepResources)
-
-	if err != nil {
-		return fmt.Errorf("error sweeping Transfer Workflows (%s): %w", region, err)
-	}
-
-	return nil
+	return sweepResources, nil
 }