From cd78141c513e484fb7e17174187a034e316ec07f Mon Sep 17 00:00:00 2001 From: Gareth Oakley Date: Sat, 29 Dec 2018 11:20:31 +0000 Subject: [PATCH 1/4] r/aws_globalaccelerator_accelerator: Add aws_globalaccelerator_accelerator resource --- aws/config.go | 3 + aws/provider.go | 1 + ...ource_aws_globalaccelerator_accelerator.go | 343 ++++++++++++++++++ website/aws.erb | 9 + .../r/globalaccelerator_accelerator.markdown | 57 +++ 5 files changed, 413 insertions(+) create mode 100644 aws/resource_aws_globalaccelerator_accelerator.go create mode 100644 website/docs/r/globalaccelerator_accelerator.markdown diff --git a/aws/config.go b/aws/config.go index 03a1b69d2b6..b8f1c123e16 100644 --- a/aws/config.go +++ b/aws/config.go @@ -64,6 +64,7 @@ import ( "github.com/aws/aws-sdk-go/service/fms" "github.com/aws/aws-sdk-go/service/gamelift" "github.com/aws/aws-sdk-go/service/glacier" + "github.com/aws/aws-sdk-go/service/globalaccelerator" "github.com/aws/aws-sdk-go/service/glue" "github.com/aws/aws-sdk-go/service/guardduty" "github.com/aws/aws-sdk-go/service/iam" @@ -263,6 +264,7 @@ type AWSClient struct { workspacesconn *workspaces.WorkSpaces appmeshconn *appmesh.AppMesh transferconn *transfer.Transfer + globalacceleratorconn *globalaccelerator.GlobalAccelerator } func (c *AWSClient) S3() *s3.S3 { @@ -555,6 +557,7 @@ func (c *Config) Client() (interface{}, error) { client.inspectorconn = inspector.New(sess) client.gameliftconn = gamelift.New(sess) client.glacierconn = glacier.New(sess) + client.globalacceleratorconn = globalaccelerator.New(sess) client.guarddutyconn = guardduty.New(sess) client.iotconn = iot.New(sess) client.kinesisconn = kinesis.New(awsKinesisSess) diff --git a/aws/provider.go b/aws/provider.go index 074aa98995a..b5122b2b8a2 100644 --- a/aws/provider.go +++ b/aws/provider.go @@ -469,6 +469,7 @@ func Provider() terraform.ResourceProvider { "aws_gamelift_game_session_queue": resourceAwsGameliftGameSessionQueue(), "aws_glacier_vault": resourceAwsGlacierVault(), "aws_glacier_vault_lock": resourceAwsGlacierVaultLock(), + "aws_globalaccelerator_accelerator": resourceAwsGlobalAcceleratorAccelerator(), "aws_glue_catalog_database": resourceAwsGlueCatalogDatabase(), "aws_glue_catalog_table": resourceAwsGlueCatalogTable(), "aws_glue_classifier": resourceAwsGlueClassifier(), diff --git a/aws/resource_aws_globalaccelerator_accelerator.go b/aws/resource_aws_globalaccelerator_accelerator.go new file mode 100644 index 00000000000..5577b83e303 --- /dev/null +++ b/aws/resource_aws_globalaccelerator_accelerator.go @@ -0,0 +1,343 @@ +package aws + +import ( + "fmt" + "log" + "time" + + "github.com/aws/aws-sdk-go/aws" + "github.com/aws/aws-sdk-go/service/globalaccelerator" + + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/helper/schema" + "github.com/hashicorp/terraform/helper/validation" +) + +func resourceAwsGlobalAcceleratorAccelerator() *schema.Resource { + return &schema.Resource{ + Create: resourceAwsGlobalAcceleratorAcceleratorCreate, + Read: resourceAwsGlobalAcceleratorAcceleratorRead, + Update: resourceAwsGlobalAcceleratorAcceleratorUpdate, + Delete: resourceAwsGlobalAcceleratorAcceleratorDelete, + + Importer: &schema.ResourceImporter{ + State: schema.ImportStatePassthrough, + }, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(5 * time.Minute), + Update: schema.DefaultTimeout(5 * time.Minute), + }, + + Schema: map[string]*schema.Schema{ + "name": { + Type: schema.TypeString, + Required: true, + }, + "ip_address_type": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ValidateFunc: validation.StringInSlice([]string{ + globalaccelerator.IpAddressTypeIpv4, + }, false), + }, + "enabled": { + Type: schema.TypeBool, + Optional: true, + Computed: true, + }, + "ip_sets": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "ip_addresses": { + Type: schema.TypeList, + Computed: true, + Elem: &schema.Schema{Type: schema.TypeString}, + }, + "ip_family": { + Type: schema.TypeString, + Computed: true, + }, + }, + }, + }, + "attributes": { + Type: schema.TypeList, + Optional: true, + Computed: true, + MaxItems: 1, + DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool { + if old == "1" && new == "0" { + return true + } + return false + }, + Elem: &schema.Resource{ + Schema: map[string]*schema.Schema{ + "flow_logs_enabled": { + Type: schema.TypeBool, + Optional: true, + Computed: true, + }, + "flow_logs_s3_bucket": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + "flow_logs_s3_prefix": { + Type: schema.TypeString, + Optional: true, + Computed: true, + }, + }, + }, + }, + }, + } +} + +func resourceAwsGlobalAcceleratorAcceleratorCreate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).globalacceleratorconn + + opts := &globalaccelerator.CreateAcceleratorInput{ + Name: aws.String(d.Get("name").(string)), + IdempotencyToken: aws.String(resource.UniqueId()), + Enabled: aws.Bool(d.Get("enabled").(bool)), + } + + if v, ok := d.GetOk("ip_address_type"); ok { + opts.IpAddressType = aws.String(v.(string)) + } + + log.Printf("[DEBUG] Create Global Accelerator accelerator: %s", opts) + + resp, err := conn.CreateAccelerator(opts) + if err != nil { + return fmt.Errorf("Error creating Global Accelerator accelerator: %s", err) + } + + d.SetId(*resp.Accelerator.AcceleratorArn) + + stateConf := &resource.StateChangeConf{ + Pending: []string{globalaccelerator.AcceleratorStatusInProgress}, + Target: []string{globalaccelerator.AcceleratorStatusDeployed}, + Refresh: resourceAwsGlobalAcceleratorAcceleratorStateRefreshFunc(conn, d.Id()), + Timeout: d.Timeout(schema.TimeoutCreate), + } + + log.Printf("[DEBUG] Waiting for Global Accelerator accelerator (%s) availability", d.Id()) + _, err = stateConf.WaitForState() + if err != nil { + return fmt.Errorf("Error waiting for Global Accelerator accelerator (%s) availability: %s", d.Id(), err) + } + + if v := d.Get("attributes").([]interface{}); len(v) > 0 { + err = resourceAwsGlobalAcceleratorAcceleratorUpdateAttributes(conn, d.Id(), v[0].(map[string]interface{})) + if err != nil { + return err + } + } + + return resourceAwsGlobalAcceleratorAcceleratorRead(d, meta) +} + +func resourceAwsGlobalAcceleratorAcceleratorRead(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).globalacceleratorconn + + accelerator, err := resourceAwsGlobalAcceleratorAcceleratorRetrieve(conn, d.Id()) + + if err != nil { + if isAWSErr(err, globalaccelerator.ErrCodeAcceleratorNotFoundException, "") { + log.Printf("[WARN] Global Accelerator accelerator (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + return fmt.Errorf("Error reading Global Accelerator accelerator: %s", err) + } + + d.Set("name", accelerator.Name) + d.Set("ip_address_type", accelerator.IpAddressType) + d.Set("enabled", accelerator.Enabled) + d.Set("ip_sets", resourceAwsGlobalAcceleratorAcceleratorFlattenIpSets(accelerator.IpSets)) + + resp, err := conn.DescribeAcceleratorAttributes(&globalaccelerator.DescribeAcceleratorAttributesInput{ + AcceleratorArn: aws.String(d.Id()), + }) + + if err != nil { + return fmt.Errorf("Error reading Global Accelerator accelerator attributes: %s", err) + } + + d.Set("attributes", resourceAwsGlobalAcceleratorAcceleratorFlattenAttributes(resp.AcceleratorAttributes)) + + return nil +} + +func resourceAwsGlobalAcceleratorAcceleratorFlattenIpSets(ipsets []*globalaccelerator.IpSet) []interface{} { + out := make([]interface{}, len(ipsets)) + + for i, ipset := range ipsets { + m := make(map[string]interface{}) + + m["ip_addresses"] = flattenStringList(ipset.IpAddresses) + m["ip_family"] = aws.StringValue(ipset.IpFamily) + + out[i] = m + } + + return out +} + +func resourceAwsGlobalAcceleratorAcceleratorFlattenAttributes(attributes *globalaccelerator.AcceleratorAttributes) []interface{} { + if attributes == nil { + return nil + } + + out := make([]interface{}, 1) + m := make(map[string]interface{}) + m["flow_logs_enabled"] = aws.BoolValue(attributes.FlowLogsEnabled) + m["flow_logs_s3_bucket"] = aws.StringValue(attributes.FlowLogsS3Bucket) + m["flow_logs_s3_prefix"] = aws.StringValue(attributes.FlowLogsS3Prefix) + out[0] = m + + return out +} + +func resourceAwsGlobalAcceleratorAcceleratorStateRefreshFunc(conn *globalaccelerator.GlobalAccelerator, acceleratorArn string) resource.StateRefreshFunc { + return func() (interface{}, string, error) { + accelerator, err := resourceAwsGlobalAcceleratorAcceleratorRetrieve(conn, acceleratorArn) + + if err != nil { + log.Printf("Error retrieving Global Accelerator accelerator when waiting: %s", err) + return nil, "", err + } + + if accelerator == nil { + return nil, "", nil + } + + if accelerator.Status != nil { + log.Printf("[DEBUG] Global Accelerator accelerator (%s) status : %s", acceleratorArn, aws.StringValue(accelerator.Status)) + } + + return accelerator, aws.StringValue(accelerator.Status), nil + } +} + +func resourceAwsGlobalAcceleratorAcceleratorRetrieve(conn *globalaccelerator.GlobalAccelerator, acceleratorArn string) (*globalaccelerator.Accelerator, error) { + resp, err := conn.DescribeAccelerator(&globalaccelerator.DescribeAcceleratorInput{ + AcceleratorArn: aws.String(acceleratorArn), + }) + + if err != nil { + if isAWSErr(err, globalaccelerator.ErrCodeAcceleratorNotFoundException, "") { + return nil, nil + } + return nil, err + } + + return resp.Accelerator, nil +} + +func resourceAwsGlobalAcceleratorAcceleratorUpdate(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).globalacceleratorconn + + d.Partial(true) + + if d.HasChange("name") || d.HasChange("ip_address_type") || d.HasChange("enabled") { + opts := &globalaccelerator.UpdateAcceleratorInput{ + AcceleratorArn: aws.String(d.Id()), + Name: aws.String(d.Get("name").(string)), + Enabled: aws.Bool(d.Get("enabled").(bool)), + } + + if v, ok := d.GetOk("ip_address_type"); ok { + opts.IpAddressType = aws.String(v.(string)) + } + + log.Printf("[DEBUG] Update Global Accelerator accelerator: %s", opts) + + _, err := conn.UpdateAccelerator(opts) + if err != nil { + return fmt.Errorf("Error updating Global Accelerator accelerator: %s", err) + } + + d.SetPartial("name") + d.SetPartial("ip_address_type") + d.SetPartial("enabled") + + stateConf := &resource.StateChangeConf{ + Pending: []string{globalaccelerator.AcceleratorStatusInProgress}, + Target: []string{globalaccelerator.AcceleratorStatusDeployed}, + Refresh: resourceAwsGlobalAcceleratorAcceleratorStateRefreshFunc(conn, d.Id()), + Timeout: d.Timeout(schema.TimeoutUpdate), + } + + log.Printf("[DEBUG] Waiting for Global Accelerator accelerator (%s) availability", d.Id()) + _, err = stateConf.WaitForState() + if err != nil { + return fmt.Errorf("Error waiting for Global Accelerator accelerator (%s) availability: %s", d.Id(), err) + } + } + + if d.HasChange("attributes") { + if v := d.Get("attributes").([]interface{}); len(v) > 0 { + err := resourceAwsGlobalAcceleratorAcceleratorUpdateAttributes(conn, d.Id(), v[0].(map[string]interface{})) + if err != nil { + return err + } + + } + + d.SetPartial("attributes") + } + + d.Partial(false) + + return resourceAwsGlobalAcceleratorAcceleratorRead(d, meta) +} + +func resourceAwsGlobalAcceleratorAcceleratorUpdateAttributes(conn *globalaccelerator.GlobalAccelerator, acceleratorArn string, attributes map[string]interface{}) error { + opts := &globalaccelerator.UpdateAcceleratorAttributesInput{ + AcceleratorArn: aws.String(acceleratorArn), + FlowLogsEnabled: aws.Bool(attributes["flow_logs_enabled"].(bool)), + } + + if v := attributes["flow_logs_s3_bucket"]; v != nil { + opts.FlowLogsS3Bucket = aws.String(v.(string)) + } + + if v := attributes["flow_logs_s3_prefix"]; v != nil { + opts.FlowLogsS3Prefix = aws.String(v.(string)) + } + + log.Printf("[DEBUG] Update Global Accelerator accelerator attributes: %s", opts) + + _, err := conn.UpdateAcceleratorAttributes(opts) + if err != nil { + return fmt.Errorf("Error updating Global Accelerator accelerator attributes: %s", err) + } + + return nil +} + +func resourceAwsGlobalAcceleratorAcceleratorDelete(d *schema.ResourceData, meta interface{}) error { + conn := meta.(*AWSClient).globalacceleratorconn + + opts := &globalaccelerator.DeleteAcceleratorInput{ + AcceleratorArn: aws.String(d.Id()), + } + + _, err := conn.DeleteAccelerator(opts) + if err != nil { + if isAWSErr(err, globalaccelerator.ErrCodeAcceleratorNotFoundException, "") { + return nil + } + return fmt.Errorf("Error deleting Global Accelerator accelerator: %s", err) + } + + return nil +} diff --git a/website/aws.erb b/website/aws.erb index d16a7f690d7..8a3597b0f53 100644 --- a/website/aws.erb +++ b/website/aws.erb @@ -1396,6 +1396,15 @@ + > + Global Accelerator Resources + + + > Glue Resources
    diff --git a/website/docs/r/globalaccelerator_accelerator.markdown b/website/docs/r/globalaccelerator_accelerator.markdown new file mode 100644 index 00000000000..c55ba463786 --- /dev/null +++ b/website/docs/r/globalaccelerator_accelerator.markdown @@ -0,0 +1,57 @@ +--- +layout: "aws" +page_title: "AWS: aws_globalaccelerator_accelerator" +sidebar_current: "docs-aws-resource-globalaccelerator-accelerator" +description: |- + Provides a Global Accelerator accelerator. +--- + +# aws_globalaccelerator_accelerator + +Provides a Global Accelerator accelerator. + +## Example Usage + +```hcl +resource "aws_globalaccelerator_accelerator" "example" { + name = "Example" + ip_address_type = "IPV4" + enabled = true + + attributes { + flow_logs_enabled = true + flow_logs_s3_bucket = "example-bucket" + flow_logs_s3_prefix = "flow-logs/" + } +} +``` + +## Argument Reference + +The following arguments are supported: + +* `name` - (Required) The name of the accelerator. +* `ip_address_type` - (Optional) The value for the address type must be `IPV4`. +* `enabled` - (Optional) Indicates whether the accelerator is enabled. The value is true or false. The default value is true. +* `attributes` - (Optional) The attributes of the accelerator. Fields documented below. + +**attributes** supports the following attributes: + +* `flow_logs_enabled` - (Optional) Indicates whether flow logs are enabled. +* `flow_logs_s3_bucket` - (Optional) The name of the Amazon S3 bucket for the flow logs. +* `flow_logs_s3_prefix` - (Optional) The prefix for the location in the Amazon S3 bucket for the flow logs. + +## Attributes Reference + +In addition to all arguments above, the following attributes are exported: + +* `id` - The Amazon Resource Name (ARN) of the accelerator. +* `ip_sets` - IP address set associated with the accelerator. + +## Import + +Global Accelerator accelerators can be imported using the `id`, e.g. + +``` +$ terraform import aws_globalaccelerator_accelerator.example arn:aws:globalaccelerator::111111111111:accelerator/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx +``` From b3b03394cb0c73634883f56c429fbb702f4a4a51 Mon Sep 17 00:00:00 2001 From: Gareth Oakley Date: Sat, 29 Dec 2018 12:27:05 +0000 Subject: [PATCH 2/4] r/aws_globalaccelerator_accelerator: Initial tests --- ..._aws_globalaccelerator_accelerator_test.go | 180 ++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 aws/resource_aws_globalaccelerator_accelerator_test.go diff --git a/aws/resource_aws_globalaccelerator_accelerator_test.go b/aws/resource_aws_globalaccelerator_accelerator_test.go new file mode 100644 index 00000000000..30d97252b2a --- /dev/null +++ b/aws/resource_aws_globalaccelerator_accelerator_test.go @@ -0,0 +1,180 @@ +package aws + +import ( + "fmt" + "regexp" + "testing" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestAccAwsGlobalAcceleratorAccelerator_basic(t *testing.T) { + resourceName := "aws_globalaccelerator_accelerator.example" + rInt := acctest.RandInt() + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckGlobalAcceleratorAcceleratorDestroy, + Steps: []resource.TestStep{ + { + Config: testAccGlobalAcceleratorAccelerator_basic(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckGlobalAcceleratorAcceleratorExists(resourceName), + resource.TestMatchResourceAttr(resourceName, "name", regexp.MustCompile("tf-.*")), + resource.TestCheckResourceAttr(resourceName, "enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "ip_address_type", "IPV4"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAwsGlobalAcceleratorAccelerator_update(t *testing.T) { + resourceName := "aws_globalaccelerator_accelerator.example" + rInt := acctest.RandInt() + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckGlobalAcceleratorAcceleratorDestroy, + Steps: []resource.TestStep{ + { + Config: testAccGlobalAcceleratorAccelerator_basic(rInt), + }, + { + Config: testAccGlobalAcceleratorAccelerator_update(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckGlobalAcceleratorAcceleratorExists(resourceName), + resource.TestMatchResourceAttr(resourceName, "name", regexp.MustCompile("tfx-.*")), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func TestAccAwsGlobalAcceleratorAccelerator_attributes(t *testing.T) { + resourceName := "aws_globalaccelerator_accelerator.example" + rInt := acctest.RandInt() + + resource.ParallelTest(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckGlobalAcceleratorAcceleratorDestroy, + Steps: []resource.TestStep{ + { + Config: testAccGlobalAcceleratorAccelerator_attributes(rInt), + Check: resource.ComposeTestCheckFunc( + testAccCheckGlobalAcceleratorAcceleratorExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "attributes.#", "1"), + resource.TestCheckResourceAttr(resourceName, "attributes.0.flow_logs_enabled", "true"), + resource.TestMatchResourceAttr(resourceName, "attributes.0.flow_logs_s3_bucket", regexp.MustCompile("tf-.*")), + resource.TestCheckResourceAttr(resourceName, "attributes.0.flow_logs_s3_prefix", "flow-logs/"), + ), + }, + { + ResourceName: resourceName, + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccCheckGlobalAcceleratorAcceleratorExists(name string) resource.TestCheckFunc { + return func(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).globalacceleratorconn + + rs, ok := s.RootModule().Resources[name] + if !ok { + return fmt.Errorf("Not found: %s", name) + } + + if rs.Primary.ID == "" { + return fmt.Errorf("No ID is set") + } + + accelerator, err := resourceAwsGlobalAcceleratorAcceleratorRetrieve(conn, rs.Primary.ID) + if err != nil { + return err + } + + if accelerator == nil { + return fmt.Errorf("Global Accelerator accelerator not found") + } + + return nil + } +} + +func testAccCheckGlobalAcceleratorAcceleratorDestroy(s *terraform.State) error { + conn := testAccProvider.Meta().(*AWSClient).globalacceleratorconn + + for _, rs := range s.RootModule().Resources { + if rs.Type != "aws_globalaccelerator_accelerator" { + continue + } + + accelerator, err := resourceAwsGlobalAcceleratorAcceleratorRetrieve(conn, rs.Primary.ID) + if err != nil { + return err + } + + if accelerator != nil { + return fmt.Errorf("Global Accelerator accelerator still exists") + } + } + return nil +} + +func testAccGlobalAcceleratorAccelerator_basic(rInt int) string { + return fmt.Sprintf(` +resource "aws_globalaccelerator_accelerator" "example" { + name = "tf-%d" + ip_address_type = "IPV4" + enabled = false +} +`, rInt) +} + +func testAccGlobalAcceleratorAccelerator_update(rInt int) string { + return fmt.Sprintf(` +resource "aws_globalaccelerator_accelerator" "example" { + name = "tfx-%d" + ip_address_type = "IPV4" + enabled = false +} +`, rInt) +} + +func testAccGlobalAcceleratorAccelerator_attributes(rInt int) string { + return fmt.Sprintf(` +resource "aws_s3_bucket" "example" { + bucket_prefix = "tf-globalaccelerator-accelerator-" +} + +resource "aws_globalaccelerator_accelerator" "example" { + name = "tf-%d" + ip_address_type = "IPV4" + enabled = false + + attributes { + flow_logs_enabled = true + flow_logs_s3_bucket = "${aws_s3_bucket.example.bucket}" + flow_logs_s3_prefix = "flow-logs/" + } +} +`, rInt) +} From 275d1198ca30b3c5146f5a689d177906d2e9a87f Mon Sep 17 00:00:00 2001 From: Gareth Oakley Date: Sat, 29 Dec 2018 16:57:12 +0000 Subject: [PATCH 3/4] r/aws_globalaccelerator_accelerator: Fix check for existance --- aws/resource_aws_globalaccelerator_accelerator.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/aws/resource_aws_globalaccelerator_accelerator.go b/aws/resource_aws_globalaccelerator_accelerator.go index 5577b83e303..ebc1ccb77c9 100644 --- a/aws/resource_aws_globalaccelerator_accelerator.go +++ b/aws/resource_aws_globalaccelerator_accelerator.go @@ -150,14 +150,15 @@ func resourceAwsGlobalAcceleratorAcceleratorRead(d *schema.ResourceData, meta in accelerator, err := resourceAwsGlobalAcceleratorAcceleratorRetrieve(conn, d.Id()) if err != nil { - if isAWSErr(err, globalaccelerator.ErrCodeAcceleratorNotFoundException, "") { - log.Printf("[WARN] Global Accelerator accelerator (%s) not found, removing from state", d.Id()) - d.SetId("") - return nil - } return fmt.Errorf("Error reading Global Accelerator accelerator: %s", err) } + if accelerator == nil { + log.Printf("[WARN] Global Accelerator accelerator (%s) not found, removing from state", d.Id()) + d.SetId("") + return nil + } + d.Set("name", accelerator.Name) d.Set("ip_address_type", accelerator.IpAddressType) d.Set("enabled", accelerator.Enabled) From 71dc8bbfc7ec24fa07b34b4218bc344098d7ae2e Mon Sep 17 00:00:00 2001 From: Gareth Oakley Date: Wed, 9 Jan 2019 17:29:29 +0000 Subject: [PATCH 4/4] r/aws_globalaccelerator_accelerator: Addressing review comments I --- ...ource_aws_globalaccelerator_accelerator.go | 97 +++++++++++-------- ..._aws_globalaccelerator_accelerator_test.go | 62 ++++++------ .../r/globalaccelerator_accelerator.markdown | 5 + 3 files changed, 98 insertions(+), 66 deletions(-) diff --git a/aws/resource_aws_globalaccelerator_accelerator.go b/aws/resource_aws_globalaccelerator_accelerator.go index ebc1ccb77c9..38123633c4a 100644 --- a/aws/resource_aws_globalaccelerator_accelerator.go +++ b/aws/resource_aws_globalaccelerator_accelerator.go @@ -24,11 +24,6 @@ func resourceAwsGlobalAcceleratorAccelerator() *schema.Resource { State: schema.ImportStatePassthrough, }, - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(5 * time.Minute), - }, - Schema: map[string]*schema.Schema{ "name": { Type: schema.TypeString, @@ -37,7 +32,7 @@ func resourceAwsGlobalAcceleratorAccelerator() *schema.Resource { "ip_address_type": { Type: schema.TypeString, Optional: true, - Computed: true, + Default: globalaccelerator.IpAddressTypeIpv4, ValidateFunc: validation.StringInSlice([]string{ globalaccelerator.IpAddressTypeIpv4, }, false), @@ -45,7 +40,7 @@ func resourceAwsGlobalAcceleratorAccelerator() *schema.Resource { "enabled": { Type: schema.TypeBool, Optional: true, - Computed: true, + Default: true, }, "ip_sets": { Type: schema.TypeList, @@ -80,17 +75,15 @@ func resourceAwsGlobalAcceleratorAccelerator() *schema.Resource { "flow_logs_enabled": { Type: schema.TypeBool, Optional: true, - Computed: true, + Default: false, }, "flow_logs_s3_bucket": { Type: schema.TypeString, Optional: true, - Computed: true, }, "flow_logs_s3_prefix": { Type: schema.TypeString, Optional: true, - Computed: true, }, }, }, @@ -121,17 +114,9 @@ func resourceAwsGlobalAcceleratorAcceleratorCreate(d *schema.ResourceData, meta d.SetId(*resp.Accelerator.AcceleratorArn) - stateConf := &resource.StateChangeConf{ - Pending: []string{globalaccelerator.AcceleratorStatusInProgress}, - Target: []string{globalaccelerator.AcceleratorStatusDeployed}, - Refresh: resourceAwsGlobalAcceleratorAcceleratorStateRefreshFunc(conn, d.Id()), - Timeout: d.Timeout(schema.TimeoutCreate), - } - - log.Printf("[DEBUG] Waiting for Global Accelerator accelerator (%s) availability", d.Id()) - _, err = stateConf.WaitForState() + err = resourceAwsGlobalAcceleratorAcceleratorWaitForState(conn, d.Id()) if err != nil { - return fmt.Errorf("Error waiting for Global Accelerator accelerator (%s) availability: %s", d.Id(), err) + return err } if v := d.Get("attributes").([]interface{}); len(v) > 0 { @@ -162,7 +147,9 @@ func resourceAwsGlobalAcceleratorAcceleratorRead(d *schema.ResourceData, meta in d.Set("name", accelerator.Name) d.Set("ip_address_type", accelerator.IpAddressType) d.Set("enabled", accelerator.Enabled) - d.Set("ip_sets", resourceAwsGlobalAcceleratorAcceleratorFlattenIpSets(accelerator.IpSets)) + if err := d.Set("ip_sets", resourceAwsGlobalAcceleratorAcceleratorFlattenIpSets(accelerator.IpSets)); err != nil { + return fmt.Errorf("Error setting Global Accelerator accelerator ip_sets: %s", err) + } resp, err := conn.DescribeAcceleratorAttributes(&globalaccelerator.DescribeAcceleratorAttributesInput{ AcceleratorArn: aws.String(d.Id()), @@ -172,7 +159,9 @@ func resourceAwsGlobalAcceleratorAcceleratorRead(d *schema.ResourceData, meta in return fmt.Errorf("Error reading Global Accelerator accelerator attributes: %s", err) } - d.Set("attributes", resourceAwsGlobalAcceleratorAcceleratorFlattenAttributes(resp.AcceleratorAttributes)) + if err := d.Set("attributes", resourceAwsGlobalAcceleratorAcceleratorFlattenAttributes(resp.AcceleratorAttributes)); err != nil { + return fmt.Errorf("Error setting Global Accelerator accelerator attributes: %s", err) + } return nil } @@ -270,17 +259,9 @@ func resourceAwsGlobalAcceleratorAcceleratorUpdate(d *schema.ResourceData, meta d.SetPartial("ip_address_type") d.SetPartial("enabled") - stateConf := &resource.StateChangeConf{ - Pending: []string{globalaccelerator.AcceleratorStatusInProgress}, - Target: []string{globalaccelerator.AcceleratorStatusDeployed}, - Refresh: resourceAwsGlobalAcceleratorAcceleratorStateRefreshFunc(conn, d.Id()), - Timeout: d.Timeout(schema.TimeoutUpdate), - } - - log.Printf("[DEBUG] Waiting for Global Accelerator accelerator (%s) availability", d.Id()) - _, err = stateConf.WaitForState() + err = resourceAwsGlobalAcceleratorAcceleratorWaitForState(conn, d.Id()) if err != nil { - return fmt.Errorf("Error waiting for Global Accelerator accelerator (%s) availability: %s", d.Id(), err) + return err } } @@ -301,6 +282,23 @@ func resourceAwsGlobalAcceleratorAcceleratorUpdate(d *schema.ResourceData, meta return resourceAwsGlobalAcceleratorAcceleratorRead(d, meta) } +func resourceAwsGlobalAcceleratorAcceleratorWaitForState(conn *globalaccelerator.GlobalAccelerator, acceleratorArn string) error { + stateConf := &resource.StateChangeConf{ + Pending: []string{globalaccelerator.AcceleratorStatusInProgress}, + Target: []string{globalaccelerator.AcceleratorStatusDeployed}, + Refresh: resourceAwsGlobalAcceleratorAcceleratorStateRefreshFunc(conn, acceleratorArn), + Timeout: 5 * time.Minute, + } + + log.Printf("[DEBUG] Waiting for Global Accelerator accelerator (%s) availability", acceleratorArn) + _, err := stateConf.WaitForState() + if err != nil { + return fmt.Errorf("Error waiting for Global Accelerator accelerator (%s) availability: %s", acceleratorArn, err) + } + + return nil +} + func resourceAwsGlobalAcceleratorAcceleratorUpdateAttributes(conn *globalaccelerator.GlobalAccelerator, acceleratorArn string, attributes map[string]interface{}) error { opts := &globalaccelerator.UpdateAcceleratorAttributesInput{ AcceleratorArn: aws.String(acceleratorArn), @@ -328,16 +326,37 @@ func resourceAwsGlobalAcceleratorAcceleratorUpdateAttributes(conn *globalacceler func resourceAwsGlobalAcceleratorAcceleratorDelete(d *schema.ResourceData, meta interface{}) error { conn := meta.(*AWSClient).globalacceleratorconn - opts := &globalaccelerator.DeleteAcceleratorInput{ - AcceleratorArn: aws.String(d.Id()), + { + opts := &globalaccelerator.UpdateAcceleratorInput{ + AcceleratorArn: aws.String(d.Id()), + Enabled: aws.Bool(false), + } + + log.Printf("[DEBUG] Disabling Global Accelerator accelerator: %s", opts) + + _, err := conn.UpdateAccelerator(opts) + if err != nil { + return fmt.Errorf("Error disabling Global Accelerator accelerator: %s", err) + } + + err = resourceAwsGlobalAcceleratorAcceleratorWaitForState(conn, d.Id()) + if err != nil { + return err + } } - _, err := conn.DeleteAccelerator(opts) - if err != nil { - if isAWSErr(err, globalaccelerator.ErrCodeAcceleratorNotFoundException, "") { - return nil + { + opts := &globalaccelerator.DeleteAcceleratorInput{ + AcceleratorArn: aws.String(d.Id()), + } + + _, err := conn.DeleteAccelerator(opts) + if err != nil { + if isAWSErr(err, globalaccelerator.ErrCodeAcceleratorNotFoundException, "") { + return nil + } + return fmt.Errorf("Error deleting Global Accelerator accelerator: %s", err) } - return fmt.Errorf("Error deleting Global Accelerator accelerator: %s", err) } return nil diff --git a/aws/resource_aws_globalaccelerator_accelerator_test.go b/aws/resource_aws_globalaccelerator_accelerator_test.go index 30d97252b2a..bba57088446 100644 --- a/aws/resource_aws_globalaccelerator_accelerator_test.go +++ b/aws/resource_aws_globalaccelerator_accelerator_test.go @@ -12,7 +12,8 @@ import ( func TestAccAwsGlobalAcceleratorAccelerator_basic(t *testing.T) { resourceName := "aws_globalaccelerator_accelerator.example" - rInt := acctest.RandInt() + rName := acctest.RandomWithPrefix("tf-acc-test") + ipRegex := regexp.MustCompile("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -20,12 +21,21 @@ func TestAccAwsGlobalAcceleratorAccelerator_basic(t *testing.T) { CheckDestroy: testAccCheckGlobalAcceleratorAcceleratorDestroy, Steps: []resource.TestStep{ { - Config: testAccGlobalAcceleratorAccelerator_basic(rInt), + Config: testAccGlobalAcceleratorAccelerator_basic(rName, false), Check: resource.ComposeTestCheckFunc( testAccCheckGlobalAcceleratorAcceleratorExists(resourceName), - resource.TestMatchResourceAttr(resourceName, "name", regexp.MustCompile("tf-.*")), + resource.TestCheckResourceAttr(resourceName, "name", rName), resource.TestCheckResourceAttr(resourceName, "enabled", "false"), resource.TestCheckResourceAttr(resourceName, "ip_address_type", "IPV4"), + resource.TestCheckResourceAttr(resourceName, "attributes.#", "1"), + resource.TestCheckResourceAttr(resourceName, "attributes.0.flow_logs_enabled", "false"), + resource.TestCheckResourceAttr(resourceName, "attributes.0.flow_logs_s3_bucket", ""), + resource.TestCheckResourceAttr(resourceName, "attributes.0.flow_logs_s3_prefix", ""), + resource.TestCheckResourceAttr(resourceName, "ip_sets.#", "1"), + resource.TestCheckResourceAttr(resourceName, "ip_sets.0.ip_addresses.#", "2"), + resource.TestMatchResourceAttr(resourceName, "ip_sets.0.ip_addresses.0", ipRegex), + resource.TestMatchResourceAttr(resourceName, "ip_sets.0.ip_addresses.1", ipRegex), + resource.TestCheckResourceAttr(resourceName, "ip_sets.0.ip_family", "IPv4"), ), }, { @@ -39,7 +49,8 @@ func TestAccAwsGlobalAcceleratorAccelerator_basic(t *testing.T) { func TestAccAwsGlobalAcceleratorAccelerator_update(t *testing.T) { resourceName := "aws_globalaccelerator_accelerator.example" - rInt := acctest.RandInt() + rName := acctest.RandomWithPrefix("tf-acc-test") + newName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -47,13 +58,19 @@ func TestAccAwsGlobalAcceleratorAccelerator_update(t *testing.T) { CheckDestroy: testAccCheckGlobalAcceleratorAcceleratorDestroy, Steps: []resource.TestStep{ { - Config: testAccGlobalAcceleratorAccelerator_basic(rInt), + Config: testAccGlobalAcceleratorAccelerator_basic(rName, true), + Check: resource.ComposeTestCheckFunc( + testAccCheckGlobalAcceleratorAcceleratorExists(resourceName), + resource.TestCheckResourceAttr(resourceName, "name", newName), + resource.TestCheckResourceAttr(resourceName, "enabled", "true"), + ), }, { - Config: testAccGlobalAcceleratorAccelerator_update(rInt), + Config: testAccGlobalAcceleratorAccelerator_basic(newName, false), Check: resource.ComposeTestCheckFunc( testAccCheckGlobalAcceleratorAcceleratorExists(resourceName), - resource.TestMatchResourceAttr(resourceName, "name", regexp.MustCompile("tfx-.*")), + resource.TestCheckResourceAttr(resourceName, "name", newName), + resource.TestCheckResourceAttr(resourceName, "enabled", "false"), ), }, { @@ -67,7 +84,8 @@ func TestAccAwsGlobalAcceleratorAccelerator_update(t *testing.T) { func TestAccAwsGlobalAcceleratorAccelerator_attributes(t *testing.T) { resourceName := "aws_globalaccelerator_accelerator.example" - rInt := acctest.RandInt() + s3BucketResourceName := "aws_s3_bucket.example" + rName := acctest.RandomWithPrefix("tf-acc-test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { testAccPreCheck(t) }, @@ -75,12 +93,12 @@ func TestAccAwsGlobalAcceleratorAccelerator_attributes(t *testing.T) { CheckDestroy: testAccCheckGlobalAcceleratorAcceleratorDestroy, Steps: []resource.TestStep{ { - Config: testAccGlobalAcceleratorAccelerator_attributes(rInt), + Config: testAccGlobalAcceleratorAccelerator_attributes(rName), Check: resource.ComposeTestCheckFunc( testAccCheckGlobalAcceleratorAcceleratorExists(resourceName), resource.TestCheckResourceAttr(resourceName, "attributes.#", "1"), resource.TestCheckResourceAttr(resourceName, "attributes.0.flow_logs_enabled", "true"), - resource.TestMatchResourceAttr(resourceName, "attributes.0.flow_logs_s3_bucket", regexp.MustCompile("tf-.*")), + resource.TestCheckResourceAttrPair(resourceName, "attributes.0.flow_logs_s3_bucket", s3BucketResourceName, "bucket"), resource.TestCheckResourceAttr(resourceName, "attributes.0.flow_logs_s3_prefix", "flow-logs/"), ), }, @@ -139,34 +157,24 @@ func testAccCheckGlobalAcceleratorAcceleratorDestroy(s *terraform.State) error { return nil } -func testAccGlobalAcceleratorAccelerator_basic(rInt int) string { +func testAccGlobalAcceleratorAccelerator_basic(rName string, enabled bool) string { return fmt.Sprintf(` resource "aws_globalaccelerator_accelerator" "example" { - name = "tf-%d" + name = "%s" ip_address_type = "IPV4" - enabled = false -} -`, rInt) -} - -func testAccGlobalAcceleratorAccelerator_update(rInt int) string { - return fmt.Sprintf(` -resource "aws_globalaccelerator_accelerator" "example" { - name = "tfx-%d" - ip_address_type = "IPV4" - enabled = false + enabled = %t } -`, rInt) +`, rName, enabled) } -func testAccGlobalAcceleratorAccelerator_attributes(rInt int) string { +func testAccGlobalAcceleratorAccelerator_attributes(rName string) string { return fmt.Sprintf(` resource "aws_s3_bucket" "example" { bucket_prefix = "tf-globalaccelerator-accelerator-" } resource "aws_globalaccelerator_accelerator" "example" { - name = "tf-%d" + name = "%s" ip_address_type = "IPV4" enabled = false @@ -176,5 +184,5 @@ resource "aws_globalaccelerator_accelerator" "example" { flow_logs_s3_prefix = "flow-logs/" } } -`, rInt) +`, rName) } diff --git a/website/docs/r/globalaccelerator_accelerator.markdown b/website/docs/r/globalaccelerator_accelerator.markdown index c55ba463786..1cce716b321 100644 --- a/website/docs/r/globalaccelerator_accelerator.markdown +++ b/website/docs/r/globalaccelerator_accelerator.markdown @@ -48,6 +48,11 @@ In addition to all arguments above, the following attributes are exported: * `id` - The Amazon Resource Name (ARN) of the accelerator. * `ip_sets` - IP address set associated with the accelerator. +**ip_sets** exports the following attributes: + +* `ip_addresses` - The array of IP addresses in the IP address set. +* `ip_family` - The types of IP addresses included in this IP set. + ## Import Global Accelerator accelerators can be imported using the `id`, e.g.