diff --git a/.changelog/30900.txt b/.changelog/30900.txt new file mode 100644 index 000000000000..de37ee443985 --- /dev/null +++ b/.changelog/30900.txt @@ -0,0 +1,3 @@ +```release-note:new-resource +aws_vpclattice_resource_policy +``` \ No newline at end of file diff --git a/internal/service/vpclattice/resource_policy.go b/internal/service/vpclattice/resource_policy.go new file mode 100644 index 000000000000..8f467aab3fa0 --- /dev/null +++ b/internal/service/vpclattice/resource_policy.go @@ -0,0 +1,158 @@ +package vpclattice + +import ( + "context" + "errors" + "log" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/vpclattice" + "github.com/aws/aws-sdk-go-v2/service/vpclattice/types" + "github.com/hashicorp/terraform-plugin-sdk/v2/diag" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/retry" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/structure" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/create" + "github.com/hashicorp/terraform-provider-aws/internal/tfresource" + "github.com/hashicorp/terraform-provider-aws/internal/verify" + "github.com/hashicorp/terraform-provider-aws/names" +) + +// Function annotations are used for resource registration to the Provider. DO NOT EDIT. +// @SDKResource("aws_vpclattice_resource_policy", name="Resource Policy") +func ResourceResourcePolicy() *schema.Resource { + return &schema.Resource{ + CreateWithoutTimeout: resourceResourcePolicyPut, + ReadWithoutTimeout: resourceResourcePolicyRead, + UpdateWithoutTimeout: resourceResourcePolicyPut, + DeleteWithoutTimeout: resourceResourcePolicyDelete, + + Importer: &schema.ResourceImporter{ + StateContext: schema.ImportStatePassthroughContext, + }, + + Schema: map[string]*schema.Schema{ + "policy": { + Type: schema.TypeString, + Required: true, + ValidateFunc: validation.StringIsJSON, + DiffSuppressFunc: verify.SuppressEquivalentPolicyDiffs, + StateFunc: func(v interface{}) string { + json, _ := structure.NormalizeJsonString(v) + return json + }, + }, + "resource_arn": { + Type: schema.TypeString, + Required: true, + ForceNew: true, + ValidateFunc: verify.ValidARN, + }, + }, + } +} + +const ( + ResNameResourcePolicy = "Resource Policy" +) + +func resourceResourcePolicyPut(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + conn := meta.(*conns.AWSClient).VPCLatticeClient() + resourceArn := d.Get("resource_arn").(string) + + policy, err := structure.NormalizeJsonString(d.Get("policy").(string)) + + if err != nil { + return diag.Errorf("policy (%s) is invalid JSON: %s", policy, err) + } + + in := &vpclattice.PutResourcePolicyInput{ + ResourceArn: aws.String(resourceArn), + Policy: aws.String(policy), + } + + _, err = conn.PutResourcePolicy(ctx, in) + + if err != nil { + return create.DiagError(names.VPCLattice, create.ErrActionCreating, ResNameResourcePolicy, d.Get("policy").(string), err) + } + + d.SetId(resourceArn) + + return resourceResourcePolicyRead(ctx, d, meta) +} + +func resourceResourcePolicyRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + conn := meta.(*conns.AWSClient).VPCLatticeClient() + + resourceArn := d.Id() + + policy, err := findResourcePolicyByID(ctx, conn, resourceArn) + if !d.IsNewResource() && tfresource.NotFound(err) { + log.Printf("[WARN] VPCLattice ResourcePolicy (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + + if err != nil { + return create.DiagError(names.VPCLattice, create.ErrActionReading, ResNameResourcePolicy, d.Id(), err) + } + + if policy == nil { + return create.DiagError(names.VPCLattice, create.ErrActionReading, ResNameResourcePolicy, d.Id(), err) + } + + d.Set("resource_arn", resourceArn) + + policyToSet, err := verify.PolicyToSet(d.Get("policy").(string), aws.ToString(policy.Policy)) + + if err != nil { + return diag.Errorf("setting policy %s: %s", aws.ToString(policy.Policy), err) + } + + d.Set("policy", policyToSet) + + return nil +} + +func resourceResourcePolicyDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { + conn := meta.(*conns.AWSClient).VPCLatticeClient() + + log.Printf("[INFO] Deleting VPCLattice ResourcePolicy: %s", d.Id()) + _, err := conn.DeleteResourcePolicy(ctx, &vpclattice.DeleteResourcePolicyInput{ + ResourceArn: aws.String(d.Id()), + }) + + if err != nil { + var nfe *types.ResourceNotFoundException + if errors.As(err, &nfe) { + return nil + } + + return create.DiagError(names.VPCLattice, create.ErrActionDeleting, ResNameResourcePolicy, d.Id(), err) + } + + return nil +} + +func findResourcePolicyByID(ctx context.Context, conn *vpclattice.Client, id string) (*vpclattice.GetResourcePolicyOutput, error) { + in := &vpclattice.GetResourcePolicyInput{ + ResourceArn: aws.String(id), + } + out, err := conn.GetResourcePolicy(ctx, in) + if err != nil { + var nfe *types.ResourceNotFoundException + if errors.As(err, &nfe) { + return nil, &retry.NotFoundError{ + LastError: err, + LastRequest: in, + } + } + + return nil, err + } + + return out, nil +} diff --git a/internal/service/vpclattice/resource_policy_test.go b/internal/service/vpclattice/resource_policy_test.go new file mode 100644 index 000000000000..5344d5e906f3 --- /dev/null +++ b/internal/service/vpclattice/resource_policy_test.go @@ -0,0 +1,171 @@ +package vpclattice_test + +import ( + "context" + "errors" + "fmt" + "regexp" + "testing" + + "github.com/aws/aws-sdk-go-v2/aws" + "github.com/aws/aws-sdk-go-v2/service/vpclattice" + "github.com/aws/aws-sdk-go-v2/service/vpclattice/types" + sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest" + "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" + "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" + "github.com/hashicorp/terraform-provider-aws/internal/acctest" + "github.com/hashicorp/terraform-provider-aws/internal/conns" + "github.com/hashicorp/terraform-provider-aws/internal/create" + tfvpclattice "github.com/hashicorp/terraform-provider-aws/internal/service/vpclattice" + "github.com/hashicorp/terraform-provider-aws/names" +) + +func TestAccVPCLatticeResourcePolicy_basic(t *testing.T) { + ctx := acctest.Context(t) + + var resourcepolicy vpclattice.GetResourcePolicyOutput + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_vpclattice_resource_policy.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.VPCLatticeEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.VPCLatticeEndpointID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckResourcePolicyDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccResourcePolicyConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckResourcePolicyExists(ctx, resourceName, &resourcepolicy), + resource.TestMatchResourceAttr(resourceName, "policy", regexp.MustCompile(`"vpc-lattice:CreateServiceNetworkVpcAssociation","vpc-lattice:CreateServiceNetworkServiceAssociation","vpc-lattice:GetServiceNetwork"`)), + resource.TestCheckResourceAttrPair(resourceName, "resource_arn", "aws_vpclattice_service_network.test", "arn"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccVPCLatticeResourcePolicy_disappears(t *testing.T) { + ctx := acctest.Context(t) + + var resourcepolicy vpclattice.GetResourcePolicyOutput + rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) + resourceName := "aws_vpclattice_resource_policy.test" + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { + acctest.PreCheck(ctx, t) + acctest.PreCheckPartitionHasService(t, names.VPCLatticeEndpointID) + testAccPreCheck(ctx, t) + }, + ErrorCheck: acctest.ErrorCheck(t, names.VPCLatticeEndpointID), + ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, + CheckDestroy: testAccCheckResourcePolicyDestroy(ctx), + Steps: []resource.TestStep{ + { + Config: testAccResourcePolicyConfig_basic(rName), + Check: resource.ComposeTestCheckFunc( + testAccCheckResourcePolicyExists(ctx, resourceName, &resourcepolicy), + acctest.CheckResourceDisappears(ctx, acctest.Provider, tfvpclattice.ResourceResourcePolicy(), resourceName), + ), + ExpectNonEmptyPlan: true, + }, + }, + }) +} + +func testAccCheckResourcePolicyDestroy(ctx context.Context) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := acctest.Provider.Meta().(*conns.AWSClient).VPCLatticeClient() + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_vpclattice_resource_policy" { + continue + } + + policy, err := conn.GetResourcePolicy(ctx, &vpclattice.GetResourcePolicyInput{ + ResourceArn: aws.String(rs.Primary.ID), + }) + if err != nil { + var nfe *types.ResourceNotFoundException + if errors.As(err, &nfe) { + return nil + } + return err + } + + if policy != nil { + return create.Error(names.VPCLattice, create.ErrActionCheckingDestroyed, tfvpclattice.ResNameResourcePolicy, rs.Primary.ID, errors.New("Resource Policy not destroyed")) + } + } + + return nil + } +} + +func testAccCheckResourcePolicyExists(ctx context.Context, name string, resourcepolicy *vpclattice.GetResourcePolicyOutput) resource.TestCheckFunc { + return func(s *terraform.State) error { + rs, ok := s.RootModule().Resources[name] + if !ok { + return create.Error(names.VPCLattice, create.ErrActionCheckingExistence, tfvpclattice.ResNameResourcePolicy, name, errors.New("not found")) + } + + if rs.Primary.ID == "" { + return create.Error(names.VPCLattice, create.ErrActionCheckingExistence, tfvpclattice.ResNameResourcePolicy, name, errors.New("not set")) + } + + conn := acctest.Provider.Meta().(*conns.AWSClient).VPCLatticeClient() + resp, err := conn.GetResourcePolicy(ctx, &vpclattice.GetResourcePolicyInput{ + ResourceArn: aws.String(rs.Primary.ID), + }) + + if err != nil { + return create.Error(names.VPCLattice, create.ErrActionCheckingExistence, tfvpclattice.ResNameResourcePolicy, rs.Primary.ID, err) + } + + *resourcepolicy = *resp + + return nil + } +} + +func testAccResourcePolicyConfig_basic(rName string) string { + return fmt.Sprintf(` +data "aws_caller_identity" "current" {} +data "aws_partition" "current" {} + +resource "aws_vpclattice_service_network" "test" { + name = %[1]q +} + +resource "aws_vpclattice_resource_policy" "test" { + resource_arn = aws_vpclattice_service_network.test.arn + + policy = jsonencode({ + Version = "2012-10-17", + Statement = [{ + Sid = "test-pol-principals-6" + Effect = "Allow" + Principal = { + "AWS" = "arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:root" + } + Action = [ + "vpc-lattice:CreateServiceNetworkVpcAssociation", + "vpc-lattice:CreateServiceNetworkServiceAssociation", + "vpc-lattice:GetServiceNetwork" + ] + Resource = aws_vpclattice_service_network.test.arn + }] + }) +} +`, rName) +} diff --git a/internal/service/vpclattice/service_package_gen.go b/internal/service/vpclattice/service_package_gen.go index 0d9120d7ba51..f544be2e64a3 100644 --- a/internal/service/vpclattice/service_package_gen.go +++ b/internal/service/vpclattice/service_package_gen.go @@ -72,6 +72,11 @@ func (p *servicePackage) SDKResources(ctx context.Context) []*types.ServicePacka IdentifierAttribute: "arn", }, }, + { + Factory: ResourceResourcePolicy, + TypeName: "aws_vpclattice_resource_policy", + Name: "Resource Policy", + }, { Factory: ResourceService, TypeName: "aws_vpclattice_service", diff --git a/website/docs/r/vpclattice_resource_policy.html.markdown b/website/docs/r/vpclattice_resource_policy.html.markdown new file mode 100644 index 000000000000..e50e9ad31616 --- /dev/null +++ b/website/docs/r/vpclattice_resource_policy.html.markdown @@ -0,0 +1,64 @@ +--- +subcategory: "VPC Lattice" +layout: "aws" +page_title: "AWS: aws_vpclattice_resource_policy" +description: |- + Terraform resource for managing an AWS VPC Lattice Resource Policy. +--- + +# Resource: aws_vpclattice_resource_policy + +Terraform resource for managing an AWS VPC Lattice Resource Policy. + +## Example Usage + +### Basic Usage + +```terraform +data "aws_caller_identity" "current" {} +data "aws_partition" "current" {} + +resource "aws_vpclattice_service_network" "example" { + name = "example-vpclattice-service-network" +} + +resource "aws_vpclattice_resource_policy" "example" { + resource_arn = aws_vpclattice_service_network.example.arn + + policy = jsonencode({ + Version = "2012-10-17", + Statement = [{ + Sid = "test-pol-principals-6" + Effect = "Allow" + Principal = { + "AWS" = "arn:${data.aws_partition.current.partition}:iam::${data.aws_caller_identity.current.account_id}:root" + } + Action = [ + "vpc-lattice:CreateServiceNetworkVpcAssociation", + "vpc-lattice:CreateServiceNetworkServiceAssociation", + "vpc-lattice:GetServiceNetwork" + ] + Resource = aws_vpclattice_service_network.example.arn + }] + }) +} +``` + +## Argument Reference + +The following arguments are required: + +* `resource_arn` - (Required) The ID or Amazon Resource Name (ARN) of the service network or service for which the policy is created. +* `policy` - (Required) An IAM policy. The policy string in JSON must not contain newlines or blank lines. + +## Attributes Reference + +No additional attributes are exported. + +## Import + +VPC Lattice Resource Policy can be imported using the `resource_arn`, e.g., + +``` +$ terraform import aws_vpclattice_resource_policy.example rft-8012925589 +```