Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New VPCLattice resource aws_vpclattice_resource_policy #30915

Merged
merged 12 commits into from
May 1, 2023
3 changes: 3 additions & 0 deletions .changelog/30900.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:new-resource
aws_vpclattice_resource_policy
```
158 changes: 158 additions & 0 deletions internal/service/vpclattice/resource_policy.go
Original file line number Diff line number Diff line change
@@ -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
}
171 changes: 171 additions & 0 deletions internal/service/vpclattice/resource_policy_test.go
Original file line number Diff line number Diff line change
@@ -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)
}
5 changes: 5 additions & 0 deletions internal/service/vpclattice/service_package_gen.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading