Merge pull request #3260 from terraform-providers/b/batch-resource-group

r/batch_account & r/batch_pool: temporarily treating the resource group name as case insensitive
hashicorp · Apr 16, 2019 · 205d9a4 · 205d9a4
2 parents b61d46f + 88fe380
commit 205d9a4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/azurerm/resource_arm_batch_account.go b/azurerm/resource_arm_batch_account.go
@@ -31,8 +31,12 @@ func resourceArmBatchAccount() *schema.Resource {
 				ForceNew:     true,
 				ValidateFunc: validateAzureRMBatchAccountName,
 			},
-			"resource_group_name": resourceGroupNameSchema(),
-			"location":            locationSchema(),
+
+			// TODO: make this case sensitive once this API bug has been fixed:
+			// https://github.com/Azure/azure-rest-api-specs/issues/5574
+			"resource_group_name": resourceGroupNameDiffSuppressSchema(),
+
+			"location": locationSchema(),
 			"storage_account_id": {
 				Type:         schema.TypeString,
 				Optional:     true,

diff --git a/azurerm/resource_arm_batch_pool.go b/azurerm/resource_arm_batch_pool.go
@@ -37,7 +37,11 @@ func resourceArmBatchPool() *schema.Resource {
 				ForceNew:     true,
 				ValidateFunc: azure.ValidateAzureRMBatchPoolName,
 			},
-			"resource_group_name": resourceGroupNameSchema(),
+
+			// TODO: make this case sensitive once this API bug has been fixed:
+			// https://github.com/Azure/azure-rest-api-specs/issues/5574
+			"resource_group_name": resourceGroupNameDiffSuppressSchema(),
+
 			"account_name": {
 				Type:         schema.TypeString,
 				Required:     true,

diff --git a/website/docs/r/batch_account.html.markdown b/website/docs/r/batch_account.html.markdown
@@ -48,6 +48,8 @@ The following arguments are supported:
 
 * `resource_group_name` - (Required) The name of the resource group in which to create the Batch account. Changing this forces a new resource to be created.
 
+~> **NOTE:** To work around [a bug in the Azure API](https://github.com/Azure/azure-rest-api-specs/issues/5574) this property is currently treated as case-insensitive. A future version of Terraform will require that the casing is correct.
+
 * `location` - (Required) Specifies the supported Azure location where the resource exists. Changing this forces a new resource to be created.
 
 * `pool_allocation_mode` - (Optional) Specifies the mode to use for pool allocation. Possible values are `BatchService` or `UserSubscription`. Defaults to `BatchService`.

diff --git a/website/docs/r/batch_pool.html.markdown b/website/docs/r/batch_pool.html.markdown
@@ -106,6 +106,8 @@ The following arguments are supported:
 
 * `resource_group_name` - (Required) The name of the resource group in which to create the Batch pool. Changing this forces a new resource to be created.
 
+~> **NOTE:** To work around [a bug in the Azure API](https://github.com/Azure/azure-rest-api-specs/issues/5574) this property is currently treated as case-insensitive. A future version of Terraform will require that the casing is correct.
+
 * `account_name` - (Required) Specifies the name of the Batch account in which the pool will be created. Changing this forces a new resource to be created.
 
 * `node_agent_sku_id` - (Required) Specifies the Sku of the node agents that will be created in the Batch pool.