ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:hashicorp/terraform

This commit is contained in:
stack72 2016-10-27 12:14:02 +01:00
parent 6335ab179a fa00a86f80
commit d262ccec1f
No known key found for this signature in database
GPG Key ID: 8619A619B085CB16
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -58,6 +58,7 @@ BUG FIXES:
* provider/aws: Bug fix for NoSuckBucket on Destroy of aws_s3_bucket_policy [GH-9641] * provider/aws: Bug fix for NoSuckBucket on Destroy of aws_s3_bucket_policy [GH-9641]
* provider/azurerm: Fix Azure RM loadbalancer rules validation [GH-9468] * provider/azurerm: Fix Azure RM loadbalancer rules validation [GH-9468]
* provider/azurerm: Fix servicebus_topic values when using the Update func to stop perpetual diff [GH-9323] * provider/azurerm: Fix servicebus_topic values when using the Update func to stop perpetual diff [GH-9323]
* provider/azurerm: lower servicebus_topic max size to Azure limit [GH-9649]
* provider/consul: Change to consul_service resource to introduce a `service_id` parameter [GH-9366] * provider/consul: Change to consul_service resource to introduce a `service_id` parameter [GH-9366]
* provider/datadog: Ignore float/int diffs on thresholds [GH-9466] * provider/datadog: Ignore float/int diffs on thresholds [GH-9466]
* provider/docker: Fixes for docker_container host object and documentation [GH-9367] * provider/docker: Fixes for docker_container host object and documentation [GH-9367]

4
builtin/providers/azurerm/resource_arm_servicebus_topic.go
View File

@ -235,8 +235,8 @@ func resourceArmServiceBusTopicDelete(d *schema.ResourceData, meta interface{})
func validateArmServiceBusTopicMaxSize(i interface{}, k string) (s []string, es []error) { func validateArmServiceBusTopicMaxSize(i interface{}, k string) (s []string, es []error) {
v := i.(int) v := i.(int)
if v%1024 != 0 || v < 0 || v > 10240 { if v%1024 != 0 || v < 0 || v > 5120 {
es = append(es, fmt.Errorf("%q must be a multiple of 1024 up to and including 10240", k)) es = append(es, fmt.Errorf("%q must be a multiple of 1024 up to and including 5120", k))
} }
return return

4
builtin/providers/azurerm/resource_arm_servicebus_topic_test.go
View File

@ -81,7 +81,7 @@ func TestAccAzureRMServiceBusTopic_enablePartitioning(t *testing.T) {
"azurerm_servicebus_topic.test", "enable_partitioning", "true"), "azurerm_servicebus_topic.test", "enable_partitioning", "true"),
// Ensure size is read back in it's original value and not the x16 value returned by Azure // Ensure size is read back in it's original value and not the x16 value returned by Azure
resource.TestCheckResourceAttr( resource.TestCheckResourceAttr(
"azurerm_servicebus_topic.test", "max_size_in_megabytes", "10240"), "azurerm_servicebus_topic.test", "max_size_in_megabytes", "5120"),
), ),
}, },
}, },
@ -236,7 +236,7 @@ resource "azurerm_servicebus_topic" "test" {
namespace_name = "${azurerm_servicebus_namespace.test.name}" namespace_name = "${azurerm_servicebus_namespace.test.name}"
resource_group_name = "${azurerm_resource_group.test.name}" resource_group_name = "${azurerm_resource_group.test.name}"
enable_partitioning = true enable_partitioning = true
max_size_in_megabytes = 10240 max_size_in_megabytes = 5120
} }
` `

4
website/source/docs/providers/azurerm/r/servicebus_topic.html.markdown
View File

@ -86,8 +86,8 @@ The following arguments are supported:
* `max_size_in_megabytes` - (Optional) Integer value which controls the size of * `max_size_in_megabytes` - (Optional) Integer value which controls the size of
memory allocated for the topic. Supported values are multiples of 1024 up to memory allocated for the topic. Supported values are multiples of 1024 up to
10240, if `enable_partitioning` is enabled then 16 partitions will be created 5120, if `enable_partitioning` is enabled then 16 partitions will be created
per GB, making the maximum possible topic size 163840 (10240 * 16). per GB, making the maximum possible topic size 81920 (5120 * 16).
* `requires_duplicate_detection` - (Optional) Boolean flag which controls whether * `requires_duplicate_detection` - (Optional) Boolean flag which controls whether
the Topic requires duplicate detection. Defaults to false. Changing this forces the Topic requires duplicate detection. Defaults to false. Changing this forces