Merge pull request #32203 from meetreks/f-aws_transfer_as2_profile

Add new resources to support AS2

.changelog/32203.txt

@@ -0,0 +1,15 @@
+```release-note:new-resource
+aws_transfer_profile
+```
+
+```release-note:new-resource
+aws_transfer_certificate
+```
+
+```release-note:new-resource
+aws_transfer_agreement
+```
+
+```release-note:new-resource
+aws_transfer_connector
+```

internal/service/transfer/access.go

@@ -185,7 +185,7 @@ func resourceAccessRead(ctx context.Context, d *schema.ResourceData, meta interf
 		return sdkdiag.AppendErrorf(diags, "parsing Transfer Access ID: %s", err)
 	}
 
-	access, err := FindAccessByServerIDAndExternalID(ctx, conn, serverID, externalID)
+	access, err := FindAccessByTwoPartKey(ctx, conn, serverID, externalID)
 
 	if !d.IsNewResource() && tfresource.NotFound(err) {
 		log.Printf("[WARN] Transfer Access (%s) not found, removing from state", d.Id())

internal/service/transfer/access_test.go

@@ -184,7 +184,7 @@ func testAccCheckAccessExists(ctx context.Context, n string, v *transfer.Describ
 
 		conn := acctest.Provider.Meta().(*conns.AWSClient).TransferConn(ctx)
 
-		output, err := tftransfer.FindAccessByServerIDAndExternalID(ctx, conn, serverID, externalID)
+		output, err := tftransfer.FindAccessByTwoPartKey(ctx, conn, serverID, externalID)
 
 		if err != nil {
 			return err
@@ -210,7 +210,7 @@ func testAccCheckAccessDestroy(ctx context.Context) resource.TestCheckFunc {
 			if err != nil {
 				return fmt.Errorf("error parsing Transfer Access ID: %w", err)
 			}
-			_, err = tftransfer.FindAccessByServerIDAndExternalID(ctx, conn, serverID, externalID)
+			_, err = tftransfer.FindAccessByTwoPartKey(ctx, conn, serverID, externalID)
 
 			if tfresource.NotFound(err) {
 				continue

internal/service/transfer/agreement.go

@@ -0,0 +1,207 @@
+package transfer
+
+import (
+	"context"
+	"log"
+
+	"github.com/aws/aws-sdk-go/aws"
+	"github.com/aws/aws-sdk-go/service/transfer"
+	"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/hashicorp/terraform-provider-aws/internal/conns"
+	"github.com/hashicorp/terraform-provider-aws/internal/errs/sdkdiag"
+	tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
+	"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
+	"github.com/hashicorp/terraform-provider-aws/internal/verify"
+	"github.com/hashicorp/terraform-provider-aws/names"
+)
+
+// @SDKResource("aws_transfer_agreement", name="Agreement")
+// @Tags(identifierAttribute="agreement_id")
+func ResourceAgreement() *schema.Resource {
+	return &schema.Resource{
+		CreateWithoutTimeout: resourceAgreementCreate,
+		ReadWithoutTimeout:   resourceAgreementRead,
+		UpdateWithoutTimeout: resourceAgreementUpdate,
+		DeleteWithoutTimeout: resourceAgreementDelete,
+
+		Importer: &schema.ResourceImporter{
+			StateContext: schema.ImportStatePassthroughContext,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"access_role": {
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: verify.ValidARN,
+			},
+			"agreement_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"base_directory": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"description": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
+			"local_profile_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"partner_profile_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"server_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"status": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			names.AttrTags:    tftags.TagsSchema(),
+			names.AttrTagsAll: tftags.TagsSchemaComputed(),
+		},
+		CustomizeDiff: verify.SetTagsDiff,
+	}
+}
+
+func resourceAgreementCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	var diags diag.Diagnostics
+	conn := meta.(*conns.AWSClient).TransferConn(ctx)
+
+	serverID := d.Get("server_id").(string)
+	input := &transfer.CreateAgreementInput{
+		AccessRole:       aws.String(d.Get("access_role").(string)),
+		BaseDirectory:    aws.String(d.Get("base_directory").(string)),
+		LocalProfileId:   aws.String(d.Get("local_profile_id").(string)),
+		PartnerProfileId: aws.String(d.Get("partner_profile_id").(string)),
+		ServerId:         aws.String(serverID),
+		Tags:             getTagsIn(ctx),
+	}
+
+	if v, ok := d.GetOk("description"); ok {
+		input.Description = aws.String(v.(string))
+	}
+
+	output, err := conn.CreateAgreementWithContext(ctx, input)
+
+	if err != nil {
+		return sdkdiag.AppendErrorf(diags, "creating Transfer Agreement: %s", err)
+	}
+
+	d.SetId(AgreementCreateResourceID(serverID, aws.StringValue(output.AgreementId)))
+
+	return append(diags, resourceAgreementRead(ctx, d, meta)...)
+}
+
+func resourceAgreementRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	var diags diag.Diagnostics
+	conn := meta.(*conns.AWSClient).TransferConn(ctx)
+
+	serverID, agreementID, err := AgreementParseResourceID(d.Id())
+	if err != nil {
+		return sdkdiag.AppendFromErr(diags, err)
+	}
+
+	output, err := FindAgreementByTwoPartKey(ctx, conn, serverID, agreementID)
+
+	if !d.IsNewResource() && tfresource.NotFound(err) {
+		log.Printf("[WARN] Transfer Agreement (%s) not found, removing from state", d.Id())
+		d.SetId("")
+		return diags
+	}
+
+	if err != nil {
+		return sdkdiag.AppendErrorf(diags, "reading Transfer Agreement (%s): %s", d.Id(), err)
+	}
+
+	d.Set("access_role", output.AccessRole)
+	d.Set("agreement_id", output.AgreementId)
+	d.Set("base_directory", output.BaseDirectory)
+	d.Set("description", output.Description)
+	d.Set("local_profile_id", output.LocalProfileId)
+	d.Set("partner_profile_id", output.PartnerProfileId)
+	d.Set("server_id", output.ServerId)
+	d.Set("status", output.Status)
+	setTagsOut(ctx, output.Tags)
+
+	return diags
+}
+
+func resourceAgreementUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	var diags diag.Diagnostics
+	conn := meta.(*conns.AWSClient).TransferConn(ctx)
+
+	serverID, agreementID, err := AgreementParseResourceID(d.Id())
+	if err != nil {
+		return sdkdiag.AppendFromErr(diags, err)
+	}
+
+	if d.HasChangesExcept("tags", "tags_all") {
+		input := &transfer.UpdateAgreementInput{
+			AgreementId: aws.String(agreementID),
+			ServerId:    aws.String(serverID),
+		}
+
+		if d.HasChange("access_role") {
+			input.AccessRole = aws.String(d.Get("access_role").(string))
+		}
+
+		if d.HasChange("base_directory") {
+			input.BaseDirectory = aws.String(d.Get("base_directory").(string))
+		}
+
+		if d.HasChange("description") {
+			input.Description = aws.String(d.Get("description").(string))
+		}
+
+		if d.HasChange("local_profile_id") {
+			input.LocalProfileId = aws.String(d.Get("local_profile_id").(string))
+		}
+
+		if d.HasChange("partner_profile_id") {
+			input.PartnerProfileId = aws.String(d.Get("partner_profile_id").(string))
+		}
+
+		_, err := conn.UpdateAgreementWithContext(ctx, input)
+
+		if err != nil {
+			return sdkdiag.AppendErrorf(diags, "updating Transfer Agreement (%s): %s", d.Id(), err)
+		}
+	}
+
+	return append(diags, resourceAgreementRead(ctx, d, meta)...)
+}
+
+func resourceAgreementDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
+	var diags diag.Diagnostics
+	conn := meta.(*conns.AWSClient).TransferConn(ctx)
+
+	serverID, agreementID, err := AgreementParseResourceID(d.Id())
+
+	if err != nil {
+		return sdkdiag.AppendFromErr(diags, err)
+	}
+
+	log.Printf("[DEBUG] Deleting Transfer Agreement: %s", d.Id())
+	_, err = conn.DeleteAgreementWithContext(ctx, &transfer.DeleteAgreementInput{
+		AgreementId: aws.String(agreementID),
+		ServerId:    aws.String(serverID),
+	})
+
+	if tfawserr.ErrCodeEquals(err, transfer.ErrCodeResourceNotFoundException) {
+		return diags
+	}
+
+	if err != nil {
+		return sdkdiag.AppendErrorf(diags, "deleting Transfer Agreement (%s): %s", d.Id(), err)
+	}
+
+	return diags
+}