-
Notifications
You must be signed in to change notification settings - Fork 9.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #19083 from shedimon/f-aws_vpc_endpoint_connection…
…_accepter New resource/aws_vpc_endpoint_connection_accepter
- Loading branch information
Showing
8 changed files
with
557 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
```release-note:new-resource | ||
aws_vpc_endpoint_connection_accepter | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
146 changes: 146 additions & 0 deletions
146
internal/service/ec2/vpc_endpoint_connection_accepter.go
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,146 @@ | ||
package ec2 | ||
|
||
import ( | ||
"fmt" | ||
"log" | ||
"strings" | ||
|
||
"github.com/aws/aws-sdk-go/aws" | ||
"github.com/aws/aws-sdk-go/service/ec2" | ||
"github.com/hashicorp/aws-sdk-go-base/tfawserr" | ||
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" | ||
"github.com/hashicorp/terraform-provider-aws/internal/conns" | ||
"github.com/hashicorp/terraform-provider-aws/internal/tfresource" | ||
) | ||
|
||
func ResourceVPCEndpointConnectionAccepter() *schema.Resource { | ||
return &schema.Resource{ | ||
Create: resourceVPCEndpointConnectionAccepterCreate, | ||
Read: resourceVPCEndpointConnectionAccepterRead, | ||
Delete: resourceVPCEndpointConnectionAccepterDelete, | ||
|
||
Importer: &schema.ResourceImporter{ | ||
State: schema.ImportStatePassthrough, | ||
}, | ||
|
||
Schema: map[string]*schema.Schema{ | ||
"vpc_endpoint_id": { | ||
Type: schema.TypeString, | ||
Required: true, | ||
ForceNew: true, | ||
}, | ||
"vpc_endpoint_service_id": { | ||
Type: schema.TypeString, | ||
Required: true, | ||
ForceNew: true, | ||
}, | ||
"vpc_endpoint_state": { | ||
Type: schema.TypeString, | ||
Computed: true, | ||
}, | ||
}, | ||
} | ||
} | ||
|
||
func resourceVPCEndpointConnectionAccepterCreate(d *schema.ResourceData, meta interface{}) error { | ||
conn := meta.(*conns.AWSClient).EC2Conn | ||
|
||
serviceID := d.Get("vpc_endpoint_service_id").(string) | ||
vpcEndpointID := d.Get("vpc_endpoint_id").(string) | ||
id := VPCEndpointConnectionAccepterCreateResourceID(serviceID, vpcEndpointID) | ||
input := &ec2.AcceptVpcEndpointConnectionsInput{ | ||
ServiceId: aws.String(serviceID), | ||
VpcEndpointIds: aws.StringSlice([]string{vpcEndpointID}), | ||
} | ||
|
||
log.Printf("[DEBUG] Accepting VPC Endpoint Connection: %s", input) | ||
_, err := conn.AcceptVpcEndpointConnections(input) | ||
|
||
if err != nil { | ||
return fmt.Errorf("error accepting VPC Endpoint Connection (%s): %w", id, err) | ||
} | ||
|
||
d.SetId(id) | ||
|
||
_, err = waitVPCEndpointConnectionAccepted(conn, serviceID, vpcEndpointID, d.Timeout(schema.TimeoutCreate)) | ||
|
||
if err != nil { | ||
return fmt.Errorf("error waiting for VPC Endpoint Connection (%s) to be accepted: %w", d.Id(), err) | ||
} | ||
|
||
return resourceVPCEndpointConnectionAccepterRead(d, meta) | ||
} | ||
|
||
func resourceVPCEndpointConnectionAccepterRead(d *schema.ResourceData, meta interface{}) error { | ||
conn := meta.(*conns.AWSClient).EC2Conn | ||
|
||
serviceID, vpcEndpointID, err := VPCEndpointConnectionAccepterParseResourceID(d.Id()) | ||
|
||
if err != nil { | ||
return err | ||
} | ||
|
||
vpcEndpointConnection, err := FindVPCEndpointConnectionByServiceIDAndVPCEndpointID(conn, serviceID, vpcEndpointID) | ||
|
||
if !d.IsNewResource() && tfresource.NotFound(err) { | ||
log.Printf("[WARN] VPC Endpoint Connection %s not found, removing from state", d.Id()) | ||
d.SetId("") | ||
return nil | ||
} | ||
|
||
if err != nil { | ||
return fmt.Errorf("error reading VPC Endpoint Connection (%s): %w", d.Id(), err) | ||
} | ||
|
||
d.Set("vpc_endpoint_id", vpcEndpointConnection.VpcEndpointId) | ||
d.Set("vpc_endpoint_service_id", vpcEndpointConnection.ServiceId) | ||
d.Set("vpc_endpoint_state", vpcEndpointConnection.VpcEndpointState) | ||
|
||
return nil | ||
} | ||
|
||
func resourceVPCEndpointConnectionAccepterDelete(d *schema.ResourceData, meta interface{}) error { | ||
conn := meta.(*conns.AWSClient).EC2Conn | ||
|
||
serviceID, vpcEndpointID, err := VPCEndpointConnectionAccepterParseResourceID(d.Id()) | ||
|
||
if err != nil { | ||
return err | ||
} | ||
|
||
input := &ec2.RejectVpcEndpointConnectionsInput{ | ||
ServiceId: aws.String(serviceID), | ||
VpcEndpointIds: aws.StringSlice([]string{vpcEndpointID}), | ||
} | ||
|
||
_, err = conn.RejectVpcEndpointConnections(input) | ||
|
||
if tfawserr.ErrCodeEquals(err, ErrCodeInvalidVPCEndpointServiceIdNotFound) { | ||
return nil | ||
} | ||
|
||
if err != nil { | ||
return fmt.Errorf("error rejecting VPC Endpoint Connection (%s): %w", d.Id(), err) | ||
} | ||
|
||
return nil | ||
} | ||
|
||
const vpcEndpointConnectionAccepterResourceIDSeparator = "_" | ||
|
||
func VPCEndpointConnectionAccepterCreateResourceID(serviceID, vpcEndpointID string) string { | ||
parts := []string{serviceID, vpcEndpointID} | ||
id := strings.Join(parts, vpcEndpointConnectionAccepterResourceIDSeparator) | ||
|
||
return id | ||
} | ||
|
||
func VPCEndpointConnectionAccepterParseResourceID(id string) (string, string, error) { | ||
parts := strings.Split(id, vpcEndpointConnectionAccepterResourceIDSeparator) | ||
|
||
if len(parts) == 2 && parts[0] != "" && parts[1] != "" { | ||
return parts[0], parts[1], nil | ||
} | ||
|
||
return "", "", fmt.Errorf("unexpected format for ID (%[1]s), expected VPCEndpointServiceID%[2]sVPCEndpointID", id, vpcEndpointConnectionAccepterResourceIDSeparator) | ||
} |
Oops, something went wrong.