Skip to content

Commit

Permalink
linting
Browse files Browse the repository at this point in the history
  • Loading branch information
@drewmullen
drewmullen committed Aug 10, 2022
1 parent 54817eb commit 32a9e4b
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 66 deletions.
2 changes: 1 addition & 1 deletion internal/provider/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1744,7 +1744,7 @@ func New(_ context.Context) (*schema.Provider, error) {
"aws_networkmanager_site": networkmanager.ResourceSite(),
"aws_networkmanager_transit_gateway_connect_peer_association": networkmanager.ResourceTransitGatewayConnectPeerAssociation(),
"aws_networkmanager_transit_gateway_registration": networkmanager.ResourceTransitGatewayRegistration(),
"aws_networkmanager_vpc_attachment": networkmanager.ResourceVpcAttachment(),
"aws_networkmanager_vpc_attachment": networkmanager.ResourceVPCAttachment(),

"aws_opensearch_domain": opensearch.ResourceDomain(),
"aws_opensearch_domain_policy": opensearch.ResourceDomainPolicy(),
Expand Down
8 changes: 4 additions & 4 deletions internal/service/networkmanager/attachment_acceptor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
)

// AttachmentAcceptor is not specific to AttachmentType. However, querying attachments for status updates is
// To faciliate querying and waiters on specific attachment types, attachment_type required
// To facilitate querying and waiters on specific attachment types, attachment_type required

func ResourceAttachmentAcceptor() *schema.Resource {
return &schema.Resource{
Expand Down Expand Up @@ -45,7 +45,7 @@ func ResourceAttachmentAcceptor() *schema.Resource {
Required: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{networkmanager.AttachmentTypeVpc}, false),
// Implement Values() function for validation as mroe types are onboarded to provider
// Implement Values() function for validation as more types are onboarded to provider
// networkmanager.AttachmentType_Values(), false),
},

Expand Down Expand Up @@ -97,7 +97,7 @@ func ResourceAttachmentAcceptorCreate(ctx context.Context, d *schema.ResourceDat
var state string

if attachmentType == networkmanager.AttachmentTypeVpc {
output, err := FindVpcAttachmentByID(ctx, conn, attachmentId)
output, err := FindVPCAttachmentByID(ctx, conn, attachmentId)

if err != nil {
return diag.Errorf("error finding Network Manager VPC Attachment: %s", err)
Expand Down Expand Up @@ -130,7 +130,7 @@ func ResourceAttachmentAcceptorCreate(ctx context.Context, d *schema.ResourceDat
d.SetId(attachmentId)

if attachmentType == networkmanager.AttachmentTypeVpc {
if _, err := WaitVpcAttachmentCreated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutCreate)); err != nil {
if _, err := WaitVPCAttachmentCreated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutCreate)); err != nil {
d.SetId("")
return diag.Errorf("error waiting for Network Manager VPC Attachment (%s) create: %s", d.Id(), err)
}
Expand Down
30 changes: 15 additions & 15 deletions internal/service/networkmanager/attachment_acceptor_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func TestAccNetworkManagerAttachmentAcceptor_vpcAttachmentBasic(t *testing.T) {
ErrorCheck: acctest.ErrorCheck(t, networkmanager.EndpointsID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
ExternalProviders: testExternalProviders,
CheckDestroy: testAccCheckVpcAttachmentDestroy,
CheckDestroy: testAccCheckVPCAttachmentDestroy,
Steps: []resource.TestStep{
{
Config: testAccCoreNetworkConfig_basic("*", false),
Expand Down Expand Up @@ -84,7 +84,7 @@ func TestAccNetworkManagerAttachmentAcceptor_vpcAttachmentTags(t *testing.T) {
ErrorCheck: acctest.ErrorCheck(t, networkmanager.EndpointsID),
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
ExternalProviders: testExternalProviders,
CheckDestroy: testAccCheckVpcAttachmentDestroy,
CheckDestroy: testAccCheckVPCAttachmentDestroy,
Steps: []resource.TestStep{
{
Config: testAccCoreNetworkConfig_oneTag("segment", "shared"),
Expand Down Expand Up @@ -117,15 +117,15 @@ func TestAccNetworkManagerAttachmentAcceptor_vpcAttachmentTags(t *testing.T) {
})
}

func testAccCheckVpcAttachmentDestroy(s *terraform.State) error {
func testAccCheckVPCAttachmentDestroy(s *terraform.State) error {
conn := acctest.Provider.Meta().(*conns.AWSClient).NetworkManagerConn

for _, rs := range s.RootModule().Resources {
if rs.Type != "aws_networkmanager_vpc_attachment" {
continue
}

_, err := tfnetworkmanager.FindVpcAttachmentByID(context.Background(), conn, rs.Primary.ID)
_, err := tfnetworkmanager.FindVPCAttachmentByID(context.Background(), conn, rs.Primary.ID)

if tfawserr.ErrCodeEquals(err, networkmanager.ErrCodeResourceNotFoundException) {
continue
Expand All @@ -141,7 +141,7 @@ func testAccCheckVpcAttachmentDestroy(s *terraform.State) error {
return nil
}

const TestAccVpcConfig_multipleSubnets = `
const TestAccVPCConfig_multipleSubnets = `
data "aws_availability_zones" "test" {}
resource "aws_vpc" "test" {
Expand All @@ -157,11 +157,11 @@ resource "aws_subnet" "test" {
vpc_id = aws_vpc.test.id
cidr_block = element(var.subnets, count.index)
availability_zone = "${data.aws_availability_zones.test.names[count.index]}"
availability_zone = data.aws_availability_zones.test.names[count.index]
}
`

const TestAccNetworkManagerCoreNetworkConfig = `
const TestAccCoreNetworkConfig = `
resource "awscc_networkmanager_global_network" "test" {}
resource "awscc_networkmanager_core_network" "test" {
Expand Down Expand Up @@ -212,8 +212,8 @@ data "aws_networkmanager_core_network_policy_document" "test" {
`

func testAccCoreNetworkConfig_basic(azs string, ipv6Support bool) string {
return TestAccVpcConfig_multipleSubnets +
TestAccNetworkManagerCoreNetworkConfig + fmt.Sprintf(`
return TestAccVPCConfig_multipleSubnets +
TestAccCoreNetworkConfig + fmt.Sprintf(`
resource "aws_networkmanager_vpc_attachment" "test" {
subnet_arns = flatten([aws_subnet.test.%[1]s.arn])
core_network_id = awscc_networkmanager_core_network.test.id
Expand All @@ -232,10 +232,10 @@ resource "aws_networkmanager_attachment_acceptor" "test" {
}

func testAccCoreNetworkConfig_oneTag(tagKey1, tagValue1 string) string {
return TestAccVpcConfig_multipleSubnets +
TestAccNetworkManagerCoreNetworkConfig + fmt.Sprintf(`
return TestAccVPCConfig_multipleSubnets +
TestAccCoreNetworkConfig + fmt.Sprintf(`
resource "aws_networkmanager_vpc_attachment" "test" {
subnet_arns = [aws_subnet.test.0.arn]
subnet_arns = [aws_subnet.test[0].arn]
core_network_id = awscc_networkmanager_core_network.test.id
vpc_arn = aws_vpc.test.arn
Expand All @@ -256,10 +256,10 @@ resource "aws_networkmanager_attachment_acceptor" "test" {
}

func testAccCoreNetworkConfig_twoTag(tagKey1, tagValue1, tagKey2, tagValue2 string) string {
return TestAccVpcConfig_multipleSubnets +
TestAccNetworkManagerCoreNetworkConfig + fmt.Sprintf(`
return TestAccVPCConfig_multipleSubnets +
TestAccCoreNetworkConfig + fmt.Sprintf(`
resource "aws_networkmanager_vpc_attachment" "test" {
subnet_arns = [aws_subnet.test.0.arn]
subnet_arns = [aws_subnet.test[0].arn]
core_network_id = awscc_networkmanager_core_network.test.id
vpc_arn = aws_vpc.test.arn
Expand Down
56 changes: 26 additions & 30 deletions internal/service/networkmanager/vpc_attachment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ import (
"github.com/hashicorp/terraform-provider-aws/internal/verify"
)

func ResourceVpcAttachment() *schema.Resource {
func ResourceVPCAttachment() *schema.Resource {
return &schema.Resource{
CreateWithoutTimeout: resourceVpcAttachmentCreate,
ReadWithoutTimeout: resourceVpcAttachmentRead,
UpdateWithoutTimeout: resourceVpcAttachmentUpdate,
DeleteWithoutTimeout: resourceVpcAttachmentDelete,
CreateWithoutTimeout: resourceVPCAttachmentCreate,
ReadWithoutTimeout: resourceVPCAttachmentRead,
UpdateWithoutTimeout: resourceVPCAttachmentUpdate,
DeleteWithoutTimeout: resourceVPCAttachmentDelete,

Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
Expand Down Expand Up @@ -121,7 +121,7 @@ func ResourceVpcAttachment() *schema.Resource {
}
}

func resourceVpcAttachmentCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
func resourceVPCAttachmentCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
conn := meta.(*conns.AWSClient).NetworkManagerConn
defaultTagsConfig := meta.(*conns.AWSClient).DefaultTagsConfig
tags := defaultTagsConfig.MergeTags(tftags.New(d.Get("tags").(map[string]interface{})))
Expand Down Expand Up @@ -152,14 +152,14 @@ func resourceVpcAttachmentCreate(ctx context.Context, d *schema.ResourceData, me

d.SetId(aws.StringValue(output.VpcAttachment.Attachment.AttachmentId))

if _, err := WaitVpcAttachmentCreated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutCreate)); err != nil {
if _, err := WaitVPCAttachmentCreated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutCreate)); err != nil {
return diag.Errorf("error waiting for Network Manager VPC Attachment (%s) create: %s", d.Id(), err)
}

return resourceVpcAttachmentRead(ctx, d, meta)
return resourceVPCAttachmentRead(ctx, d, meta)
}

func resourceVpcAttachmentRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
func resourceVPCAttachmentRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
conn := meta.(*conns.AWSClient).NetworkManagerConn
defaultTagsConfig := meta.(*conns.AWSClient).DefaultTagsConfig
ignoreTagsConfig := meta.(*conns.AWSClient).IgnoreTagsConfig
Expand Down Expand Up @@ -217,7 +217,7 @@ func resourceVpcAttachmentRead(ctx context.Context, d *schema.ResourceData, meta
return nil
}

func resourceVpcAttachmentUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
func resourceVPCAttachmentUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
conn := meta.(*conns.AWSClient).NetworkManagerConn

if d.HasChange("tags_all") {
Expand All @@ -236,7 +236,7 @@ func resourceVpcAttachmentUpdate(ctx context.Context, d *schema.ResourceData, me
}

if d.HasChange("options") {
input.Options = expandVpcAttachmentOptions(d.Get("options").([]interface{}))
input.Options = expandVPCAttachmentOptions(d.Get("options").([]interface{}))
}

if d.HasChange("subnet_arns") {
Expand Down Expand Up @@ -267,15 +267,15 @@ func resourceVpcAttachmentUpdate(ctx context.Context, d *schema.ResourceData, me
return diag.Errorf("error updating vpc attachment (%s): %s", d.Id(), err)
}

if _, err := waitVpcAttachmentUpdated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil {
if _, err := waitVPCAttachmentUpdated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutUpdate)); err != nil {
return diag.Errorf("error waiting for Network Manager VPC Attachment (%s) update: %s", d.Id(), err)
}
}

return resourceVpcAttachmentRead(ctx, d, meta)
return resourceVPCAttachmentRead(ctx, d, meta)
}

func expandVpcAttachmentOptions(l []interface{}) *networkmanager.VpcOptions {
func expandVPCAttachmentOptions(l []interface{}) *networkmanager.VpcOptions {
if len(l) == 0 || l[0] == nil {
return nil
}
Expand All @@ -289,7 +289,7 @@ func expandVpcAttachmentOptions(l []interface{}) *networkmanager.VpcOptions {
return opts
}

func resourceVpcAttachmentDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
func resourceVPCAttachmentDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
conn := meta.(*conns.AWSClient).NetworkManagerConn

log.Printf("[DEBUG] Deleting Network Manager VPC Attachment: %s", d.Id())
Expand All @@ -312,7 +312,7 @@ func resourceVpcAttachmentDelete(ctx context.Context, d *schema.ResourceData, me
return diag.Errorf("error deleting Network Manager VPC Attachment (%s): %s", d.Id(), err)
}

if _, err := waitVpcAttachmentDeleted(ctx, conn, d.Id(), d.Timeout(schema.TimeoutDelete)); err != nil {
if _, err := waitVPCAttachmentDeleted(ctx, conn, d.Id(), d.Timeout(schema.TimeoutDelete)); err != nil {
if tfawserr.ErrCodeEquals(err, networkmanager.ErrCodeResourceNotFoundException) {
return nil
}
Expand All @@ -322,11 +322,11 @@ func resourceVpcAttachmentDelete(ctx context.Context, d *schema.ResourceData, me
return nil
}

func VpcAttachmentIDNotFoundError(err error) bool {
func VPCAttachmentIDNotFoundError(err error) bool {
return validationExceptionMessageContains(err, networkmanager.ValidationExceptionReasonFieldValidationFailed, "VPC Attachment not found")
}

func FindVpcAttachmentByID(ctx context.Context, conn *networkmanager.NetworkManager, id string) (*networkmanager.VpcAttachment, error) {
func FindVPCAttachmentByID(ctx context.Context, conn *networkmanager.NetworkManager, id string) (*networkmanager.VpcAttachment, error) {

output, err := conn.GetVpcAttachment(&networkmanager.GetVpcAttachmentInput{
AttachmentId: aws.String(id),
Expand All @@ -339,9 +339,9 @@ func FindVpcAttachmentByID(ctx context.Context, conn *networkmanager.NetworkMana
return output.VpcAttachment, nil
}

func StatusVpcAttachmentState(ctx context.Context, conn *networkmanager.NetworkManager, id string) resource.StateRefreshFunc {
func StatusVPCAttachmentState(ctx context.Context, conn *networkmanager.NetworkManager, id string) resource.StateRefreshFunc {
return func() (interface{}, string, error) {
output, err := FindVpcAttachmentByID(ctx, conn, id)
output, err := FindVPCAttachmentByID(ctx, conn, id)

if tfresource.NotFound(err) {
return nil, "", nil
Expand All @@ -355,12 +355,12 @@ func StatusVpcAttachmentState(ctx context.Context, conn *networkmanager.NetworkM
}
}

func WaitVpcAttachmentCreated(ctx context.Context, conn *networkmanager.NetworkManager, id string, timeout time.Duration) (*networkmanager.VpcAttachment, error) {
func WaitVPCAttachmentCreated(ctx context.Context, conn *networkmanager.NetworkManager, id string, timeout time.Duration) (*networkmanager.VpcAttachment, error) {
stateConf := &resource.StateChangeConf{
Pending: []string{networkmanager.AttachmentStateCreating, networkmanager.AttachmentStatePendingNetworkUpdate},
Target: []string{networkmanager.AttachmentStateAvailable, networkmanager.AttachmentStatePendingAttachmentAcceptance},
Timeout: timeout,
Refresh: StatusVpcAttachmentState(ctx, conn, id),
Refresh: StatusVPCAttachmentState(ctx, conn, id),
}

outputRaw, err := stateConf.WaitForStateContext(ctx)
Expand All @@ -372,12 +372,12 @@ func WaitVpcAttachmentCreated(ctx context.Context, conn *networkmanager.NetworkM
return nil, err
}

func waitVpcAttachmentDeleted(ctx context.Context, conn *networkmanager.NetworkManager, id string, timeout time.Duration) (*networkmanager.VpcAttachment, error) {
func waitVPCAttachmentDeleted(ctx context.Context, conn *networkmanager.NetworkManager, id string, timeout time.Duration) (*networkmanager.VpcAttachment, error) {
stateConf := &resource.StateChangeConf{
Pending: []string{networkmanager.AttachmentStateDeleting},
Target: []string{},
Timeout: timeout,
Refresh: StatusVpcAttachmentState(ctx, conn, id),
Refresh: StatusVPCAttachmentState(ctx, conn, id),
NotFoundChecks: 1,
}

Expand All @@ -390,12 +390,12 @@ func waitVpcAttachmentDeleted(ctx context.Context, conn *networkmanager.NetworkM
return nil, err
}

func waitVpcAttachmentUpdated(ctx context.Context, conn *networkmanager.NetworkManager, id string, timeout time.Duration) (*networkmanager.VpcAttachment, error) {
func waitVPCAttachmentUpdated(ctx context.Context, conn *networkmanager.NetworkManager, id string, timeout time.Duration) (*networkmanager.VpcAttachment, error) {
stateConf := &resource.StateChangeConf{
Pending: []string{networkmanager.AttachmentStateUpdating},
Target: []string{networkmanager.AttachmentStateAvailable, networkmanager.AttachmentStatePendingTagAcceptance},
Timeout: timeout,
Refresh: StatusVpcAttachmentState(ctx, conn, id),
Refresh: StatusVPCAttachmentState(ctx, conn, id),
}

outputRaw, err := stateConf.WaitForStateContext(ctx)
Expand All @@ -406,7 +406,3 @@ func waitVpcAttachmentUpdated(ctx context.Context, conn *networkmanager.NetworkM

return nil, err
}

const (
VpcAttachmentValidationExceptionTimeout = 2 * time.Minute
)
6 changes: 3 additions & 3 deletions website/docs/r/networkmanager_attachment_acceptor.html.markdown
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
subcategory: "NetworkManager"
subcategory: "Network Manager"
layout: "aws"
page_title: "AWS: aws_networkmanager_attachment_acceptor"
description: |-
Expand All @@ -16,8 +16,8 @@ Terraform resource for managing an AWS NetworkManager Attachment Acceptor.

```terraform
resource "aws_networkmanager_attachment_acceptor" "test" {
attachment_id = aws_networkmanager_vpc_attachment.vpc.id
attachment_type = aws_networkmanager_vpc_attachment.vpc.attachment_type
attachment_id = aws_networkmanager_vpc_attachment.vpc.id
attachment_type = aws_networkmanager_vpc_attachment.vpc.attachment_type
}
```

Expand Down
17 changes: 4 additions & 13 deletions website/docs/r/networkmanager_vpc_attachment.html.markdown
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
subcategory: "NetworkManager"
subcategory: "Network Manager"
layout: "aws"
page_title: "AWS: aws_networkmanager_vpc_attachment"
description: |-
Expand All @@ -16,18 +16,9 @@ Terraform resource for managing an AWS NetworkManager VpcAttachment.

```terraform
resource "aws_networkmanager_vpc_attachment" "example" {
subnet_arns = [aws_subnet.example.arn]
core_network_id = awscc_networkmanager_core_network.example.id
vpc_arn = aws_vpc.example.arn
options {
ipv6_support = false
}
tags = {
"Name" : "my-vpc",
"segment": "example"
}
subnet_arns = [aws_subnet.example.arn]
core_network_id = awscc_networkmanager_core_network.example.id
vpc_arn = aws_vpc.example.arn
}
```

Expand Down

0 comments on commit 32a9e4b

Please sign in to comment.