-
Notifications
You must be signed in to change notification settings - Fork 9.2k
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 #30429 from mattburgess/vpclattice-service
Add VPC Lattice Service resource
- Loading branch information
Showing
8 changed files
with
682 additions
and
2 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_vpclattice_service | ||
``` |
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,4 @@ | ||
//go:generate go run ../../generate/tags/main.go -AWSSDKVersion=2 -ServiceTagsMap -KVTValues -SkipTypesImp -ListTags -UpdateTags | ||
// ONLY generate directives and package declaration! Do not add anything else to this file. | ||
|
||
package vpclattice |
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,315 @@ | ||
package vpclattice | ||
|
||
import ( | ||
"context" | ||
"errors" | ||
"log" | ||
"time" | ||
|
||
"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/id" | ||
"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/validation" | ||
"github.com/hashicorp/terraform-provider-aws/internal/conns" | ||
"github.com/hashicorp/terraform-provider-aws/internal/create" | ||
"github.com/hashicorp/terraform-provider-aws/internal/enum" | ||
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_vpclattice_service", name="Service") | ||
// @Tags(identifierAttribute="arn") | ||
func ResourceService() *schema.Resource { | ||
return &schema.Resource{ | ||
CreateWithoutTimeout: resourceServiceCreate, | ||
ReadWithoutTimeout: resourceServiceRead, | ||
UpdateWithoutTimeout: resourceServiceUpdate, | ||
DeleteWithoutTimeout: resourceServiceDelete, | ||
|
||
Importer: &schema.ResourceImporter{ | ||
StateContext: schema.ImportStatePassthroughContext, | ||
}, | ||
|
||
Timeouts: &schema.ResourceTimeout{ | ||
Create: schema.DefaultTimeout(5 * time.Minute), | ||
Update: schema.DefaultTimeout(5 * time.Minute), | ||
Delete: schema.DefaultTimeout(5 * time.Minute), | ||
}, | ||
|
||
Schema: map[string]*schema.Schema{ | ||
names.AttrARN: { | ||
Type: schema.TypeString, | ||
Computed: true, | ||
}, | ||
"auth_type": { | ||
Type: schema.TypeString, | ||
Optional: true, | ||
Computed: true, | ||
ValidateDiagFunc: enum.Validate[types.AuthType](), | ||
}, | ||
"certificate_arn": { | ||
Type: schema.TypeString, | ||
Optional: true, | ||
ValidateFunc: verify.ValidARN, | ||
}, | ||
"custom_domain_name": { | ||
Type: schema.TypeString, | ||
Optional: true, | ||
ForceNew: true, | ||
ValidateFunc: validation.StringLenBetween(3, 255), | ||
}, | ||
"dns_entry": { | ||
Type: schema.TypeList, | ||
Computed: true, | ||
Elem: &schema.Resource{ | ||
Schema: map[string]*schema.Schema{ | ||
"domain_name": { | ||
Type: schema.TypeString, | ||
Computed: true, | ||
}, | ||
"hosted_zone_id": { | ||
Type: schema.TypeString, | ||
Computed: true, | ||
}, | ||
}, | ||
}, | ||
}, | ||
"name": { | ||
Type: schema.TypeString, | ||
Required: true, | ||
ForceNew: true, | ||
ValidateFunc: validation.StringLenBetween(3, 40), | ||
}, | ||
"status": { | ||
Type: schema.TypeString, | ||
Computed: true, | ||
}, | ||
names.AttrTags: tftags.TagsSchema(), | ||
names.AttrTagsAll: tftags.TagsSchemaComputed(), | ||
}, | ||
|
||
CustomizeDiff: verify.SetTagsDiff, | ||
} | ||
} | ||
|
||
const ( | ||
ResNameService = "Service" | ||
) | ||
|
||
func resourceServiceCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { | ||
conn := meta.(*conns.AWSClient).VPCLatticeClient() | ||
|
||
in := &vpclattice.CreateServiceInput{ | ||
ClientToken: aws.String(id.UniqueId()), | ||
Name: aws.String(d.Get("name").(string)), | ||
Tags: GetTagsIn(ctx), | ||
} | ||
|
||
if v, ok := d.GetOk("auth_type"); ok { | ||
in.AuthType = types.AuthType(v.(string)) | ||
} | ||
|
||
if v, ok := d.GetOk("certificate_arn"); ok { | ||
in.CertificateArn = aws.String(v.(string)) | ||
} | ||
|
||
if v, ok := d.GetOk("custom_domain_name"); ok { | ||
in.CustomDomainName = aws.String(v.(string)) | ||
} | ||
|
||
out, err := conn.CreateService(ctx, in) | ||
if err != nil { | ||
return create.DiagError(names.VPCLattice, create.ErrActionCreating, ResNameService, d.Get("name").(string), err) | ||
} | ||
|
||
if out == nil { | ||
return create.DiagError(names.VPCLattice, create.ErrActionCreating, ResNameService, d.Get("name").(string), errors.New("empty output")) | ||
} | ||
|
||
d.SetId(aws.ToString(out.Id)) | ||
|
||
if _, err := waitServiceCreated(ctx, conn, d.Id(), d.Timeout(schema.TimeoutCreate)); err != nil { | ||
return create.DiagError(names.VPCLattice, create.ErrActionWaitingForCreation, ResNameService, d.Id(), err) | ||
} | ||
|
||
return resourceServiceRead(ctx, d, meta) | ||
} | ||
|
||
func resourceServiceRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { | ||
conn := meta.(*conns.AWSClient).VPCLatticeClient() | ||
|
||
out, err := findServiceByID(ctx, conn, d.Id()) | ||
|
||
if !d.IsNewResource() && tfresource.NotFound(err) { | ||
log.Printf("[WARN] VPCLattice Service (%s) not found, removing from state", d.Id()) | ||
d.SetId("") | ||
return nil | ||
} | ||
|
||
if err != nil { | ||
return create.DiagError(names.VPCLattice, create.ErrActionReading, ResNameService, d.Id(), err) | ||
} | ||
|
||
d.Set("arn", out.Arn) | ||
d.Set("auth_type", out.AuthType) | ||
d.Set("certificate_arn", out.CertificateArn) | ||
d.Set("custom_domain_name", out.CustomDomainName) | ||
if out.DnsEntry != nil { | ||
if err := d.Set("dns_entry", []interface{}{flattenDNSEntry(out.DnsEntry)}); err != nil { | ||
return diag.Errorf("setting dns_entry: %s", err) | ||
} | ||
} else { | ||
d.Set("dns_entry", nil) | ||
} | ||
d.Set("name", out.Name) | ||
d.Set("status", out.Status) | ||
|
||
return nil | ||
} | ||
|
||
func resourceServiceUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { | ||
conn := meta.(*conns.AWSClient).VPCLatticeClient() | ||
|
||
if d.HasChangesExcept("tags", "tags_all") { | ||
in := &vpclattice.UpdateServiceInput{ | ||
ServiceIdentifier: aws.String(d.Id()), | ||
} | ||
|
||
if d.HasChanges("auth_type") { | ||
in.AuthType = types.AuthType(d.Get("auth_type").(string)) | ||
} | ||
|
||
if d.HasChanges("certificate_arn") { | ||
in.CertificateArn = aws.String(d.Get("certificate_arn").(string)) | ||
} | ||
|
||
log.Printf("[DEBUG] Updating VPCLattice Service (%s): %#v", d.Id(), in) | ||
_, err := conn.UpdateService(ctx, in) | ||
if err != nil { | ||
return create.DiagError(names.VPCLattice, create.ErrActionUpdating, ResNameService, d.Id(), err) | ||
} | ||
} | ||
|
||
return resourceServiceRead(ctx, d, meta) | ||
} | ||
|
||
func resourceServiceDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics { | ||
conn := meta.(*conns.AWSClient).VPCLatticeClient() | ||
|
||
log.Printf("[INFO] Deleting VPCLattice Service: %s", d.Id()) | ||
_, err := conn.DeleteService(ctx, &vpclattice.DeleteServiceInput{ | ||
ServiceIdentifier: 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, ResNameService, d.Id(), err) | ||
} | ||
|
||
if _, err := waitServiceDeleted(ctx, conn, d.Id(), d.Timeout(schema.TimeoutDelete)); err != nil { | ||
return create.DiagError(names.VPCLattice, create.ErrActionWaitingForDeletion, ResNameService, d.Id(), err) | ||
} | ||
|
||
return nil | ||
} | ||
|
||
func waitServiceCreated(ctx context.Context, conn *vpclattice.Client, id string, timeout time.Duration) (*vpclattice.GetServiceOutput, error) { | ||
stateConf := &retry.StateChangeConf{ | ||
Pending: enum.Slice(types.ServiceStatusCreateInProgress), | ||
Target: enum.Slice(types.ServiceStatusActive), | ||
Refresh: statusService(ctx, conn, id), | ||
Timeout: timeout, | ||
NotFoundChecks: 20, | ||
ContinuousTargetOccurence: 2, | ||
} | ||
|
||
outputRaw, err := stateConf.WaitForStateContext(ctx) | ||
if out, ok := outputRaw.(*vpclattice.GetServiceOutput); ok { | ||
return out, err | ||
} | ||
|
||
return nil, err | ||
} | ||
|
||
func waitServiceDeleted(ctx context.Context, conn *vpclattice.Client, id string, timeout time.Duration) (*vpclattice.GetServiceOutput, error) { | ||
stateConf := &retry.StateChangeConf{ | ||
Pending: enum.Slice(types.ServiceStatusDeleteInProgress, types.ServiceStatusActive), | ||
Target: []string{}, | ||
Refresh: statusService(ctx, conn, id), | ||
Timeout: timeout, | ||
} | ||
|
||
outputRaw, err := stateConf.WaitForStateContext(ctx) | ||
if out, ok := outputRaw.(*vpclattice.GetServiceOutput); ok { | ||
return out, err | ||
} | ||
|
||
return nil, err | ||
} | ||
|
||
func statusService(ctx context.Context, conn *vpclattice.Client, id string) retry.StateRefreshFunc { | ||
return func() (interface{}, string, error) { | ||
out, err := findServiceByID(ctx, conn, id) | ||
if tfresource.NotFound(err) { | ||
return nil, "", nil | ||
} | ||
|
||
if err != nil { | ||
return nil, "", err | ||
} | ||
|
||
return out, string(out.Status), nil | ||
} | ||
} | ||
|
||
func findServiceByID(ctx context.Context, conn *vpclattice.Client, id string) (*vpclattice.GetServiceOutput, error) { | ||
in := &vpclattice.GetServiceInput{ | ||
ServiceIdentifier: aws.String(id), | ||
} | ||
out, err := conn.GetService(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 | ||
} | ||
|
||
if out == nil { | ||
return nil, tfresource.NewEmptyResultError(in) | ||
} | ||
|
||
return out, nil | ||
} | ||
|
||
func flattenDNSEntry(apiObject *types.DnsEntry) map[string]interface{} { | ||
if apiObject == nil { | ||
return nil | ||
} | ||
|
||
tfMap := map[string]interface{}{} | ||
|
||
if v := apiObject.DomainName; v != nil { | ||
tfMap["domain_name"] = aws.ToString(v) | ||
} | ||
|
||
if v := apiObject.HostedZoneId; v != nil { | ||
tfMap["hosted_zone_id"] = aws.ToString(v) | ||
} | ||
|
||
return tfMap | ||
} |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.