From 0e6ff774337cec484b465e117f5ab34fb8b6ebfa Mon Sep 17 00:00:00 2001 From: clint shryock Date: Tue, 26 Jul 2016 10:30:52 -0500 Subject: [PATCH 1/4] provider/aws: Restore Defaults to SQS Queues --- builtin/providers/aws/resource_aws_sqs_queue.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/providers/aws/resource_aws_sqs_queue.go b/builtin/providers/aws/resource_aws_sqs_queue.go index 15c85ba013..02eab6d586 100644 --- a/builtin/providers/aws/resource_aws_sqs_queue.go +++ b/builtin/providers/aws/resource_aws_sqs_queue.go @@ -70,7 +70,7 @@ func resourceAwsSqsQueue() *schema.Resource { "visibility_timeout_seconds": &schema.Schema{ Type: schema.TypeInt, Optional: true, - Computed: true, + Default: 30, }, "policy": &schema.Schema{ Type: schema.TypeString, From 6a42717f55c17e5d62506f8c8e545f580c3d183f Mon Sep 17 00:00:00 2001 From: clint shryock Date: Tue, 26 Jul 2016 14:41:54 -0500 Subject: [PATCH 2/4] update sqs test to fail on reverting to defaults --- .../aws/resource_aws_sqs_queue_test.go | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/builtin/providers/aws/resource_aws_sqs_queue_test.go b/builtin/providers/aws/resource_aws_sqs_queue_test.go index 5fa2b5b724..a5e06ae14b 100644 --- a/builtin/providers/aws/resource_aws_sqs_queue_test.go +++ b/builtin/providers/aws/resource_aws_sqs_queue_test.go @@ -22,13 +22,19 @@ func TestAccAWSSQSQueue_basic(t *testing.T) { resource.TestStep{ Config: testAccAWSSQSConfigWithDefaults(queueName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSSQSExistsWithDefaults("aws_sqs_queue.queue-with-defaults"), + testAccCheckAWSSQSExistsWithDefaults("aws_sqs_queue.queue"), ), }, resource.TestStep{ - Config: testAccAWSSQSConfigWithOverrides, + Config: testAccAWSSQSConfigWithOverrides(queueName), Check: resource.ComposeTestCheckFunc( - testAccCheckAWSSQSExistsWithOverrides("aws_sqs_queue.queue-with-overrides"), + testAccCheckAWSSQSExistsWithOverrides("aws_sqs_queue.queue"), + ), + }, + resource.TestStep{ + Config: testAccAWSSQSConfigWithDefaults(queueName), + Check: resource.ComposeTestCheckFunc( + testAccCheckAWSSQSExistsWithDefaults("aws_sqs_queue.queue"), ), }, }, @@ -197,22 +203,23 @@ func testAccCheckAWSSQSExistsWithOverrides(n string) resource.TestCheckFunc { func testAccAWSSQSConfigWithDefaults(r string) string { return fmt.Sprintf(` -resource "aws_sqs_queue" "queue-with-defaults" { +resource "aws_sqs_queue" "queue" { name = "%s" } `, r) } -const testAccAWSSQSConfigWithOverrides = ` -resource "aws_sqs_queue" "queue-with-overrides" { - name = "test-sqs-queue-with-overrides" +func testAccAWSSQSConfigWithOverrides(r string) string { + return fmt.Sprintf(` +resource "aws_sqs_queue" "queue" { + name = "%s" delay_seconds = 90 max_message_size = 2048 message_retention_seconds = 86400 receive_wait_time_seconds = 10 visibility_timeout_seconds = 60 +}`, r) } -` func testAccAWSSQSConfigWithRedrive(name string) string { return fmt.Sprintf(` From 348f6bad50a67e9411e1034d9e96232d7349f571 Mon Sep 17 00:00:00 2001 From: clint shryock Date: Tue, 26 Jul 2016 14:53:45 -0500 Subject: [PATCH 3/4] provider/aws: Apply defaults to SQS Queues --- builtin/providers/aws/resource_aws_sqs_queue.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/providers/aws/resource_aws_sqs_queue.go b/builtin/providers/aws/resource_aws_sqs_queue.go index 02eab6d586..cb76fbb459 100644 --- a/builtin/providers/aws/resource_aws_sqs_queue.go +++ b/builtin/providers/aws/resource_aws_sqs_queue.go @@ -50,22 +50,22 @@ func resourceAwsSqsQueue() *schema.Resource { "delay_seconds": &schema.Schema{ Type: schema.TypeInt, Optional: true, - Computed: true, + Default: 0, }, "max_message_size": &schema.Schema{ Type: schema.TypeInt, Optional: true, - Computed: true, + Default: 262144, }, "message_retention_seconds": &schema.Schema{ Type: schema.TypeInt, Optional: true, - Computed: true, + Default: 345600, }, "receive_wait_time_seconds": &schema.Schema{ Type: schema.TypeInt, Optional: true, - Computed: true, + Default: 0, }, "visibility_timeout_seconds": &schema.Schema{ Type: schema.TypeInt, From 4e1d54ad511525fe04df9e6b352450237a2539f8 Mon Sep 17 00:00:00 2001 From: stack72 Date: Tue, 26 Jul 2016 21:59:21 +0100 Subject: [PATCH 4/4] provider/aws: Change the resource name expected as part of sqs queue import test --- builtin/providers/aws/import_aws_sqs_queue_test.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/builtin/providers/aws/import_aws_sqs_queue_test.go b/builtin/providers/aws/import_aws_sqs_queue_test.go index 45787eb6b3..d3e9028d56 100644 --- a/builtin/providers/aws/import_aws_sqs_queue_test.go +++ b/builtin/providers/aws/import_aws_sqs_queue_test.go @@ -10,7 +10,7 @@ import ( ) func TestAccAWSSQSQueue_importBasic(t *testing.T) { - resourceName := "aws_sqs_queue.queue-with-defaults" + resourceName := "aws_sqs_queue.queue" queueName := fmt.Sprintf("sqs-queue-%s", acctest.RandString(5)) resource.Test(t, resource.TestCase{ @@ -26,9 +26,6 @@ func TestAccAWSSQSQueue_importBasic(t *testing.T) { ResourceName: resourceName, ImportState: true, ImportStateVerify: true, - //The name is never returned after the initial create of the queue. - //It is part of the URL and can be split down if needed - //ImportStateVerifyIgnore: []string{"name"}, }, }, })