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

provider/azurerm: create common schema for location field, add diff suppress (#10409)

This commit is contained in:
Peter McAtominey 2016-11-29 15:54:00 +00:00 committed by Paul Stack
parent 8cdafe0508
commit a4054c999e
32 changed files with 72 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
builtin/providers/azurerm/location.go Normal file
View File

@ -0,0 +1,30 @@
package azurerm
import (
"strings"
"github.com/hashicorp/terraform/helper/schema"
)
func locationSchema() *schema.Schema {
return &schema.Schema{
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
DiffSuppressFunc: azureRMSuppressLocationDiff,
}
}
// azureRMNormalizeLocation is a function which normalises human-readable region/location
// names (e.g. "West US") to the values used and returned by the Azure API (e.g. "westus").
// In state we track the API internal version as it is easier to go from the human form
// to the canonical form than the other way around.
func azureRMNormalizeLocation(location interface{}) string {
input := location.(string)
return strings.Replace(strings.ToLower(input), " ", "", -1)
}
func azureRMSuppressLocationDiff(k, old, new string, d *schema.ResourceData) bool {
return azureRMNormalizeLocation(old) == azureRMNormalizeLocation(new)
}

10
builtin/providers/azurerm/location_test.go Normal file
View File

@ -0,0 +1,10 @@
package azurerm
import "testing"
func TestAzureRMNormalizeLocation(t *testing.T) {
s := azureRMNormalizeLocation("West US")
if s != "westus" {
t.Fatalf("expected location to equal westus, actual %s", s)
}
}

9
builtin/providers/azurerm/provider.go
View File

@ -223,15 +223,6 @@ func registerAzureResourceProvidersWithSubscription(client *riviera.Client) erro
return err
}
// azureRMNormalizeLocation is a function which normalises human-readable region/location
// names (e.g. "West US") to the values used and returned by the Azure API (e.g. "westus").
// In state we track the API internal version as it is easier to go from the human form
// to the canonical form than the other way around.
func azureRMNormalizeLocation(location interface{}) string {
input := location.(string)
return strings.Replace(strings.ToLower(input), " ", "", -1)
}
// armMutexKV is the instance of MutexKV for ARM resources
var armMutexKV = mutexkv.NewMutexKV()

7
builtin/providers/azurerm/resource_arm_availability_set.go
View File

@ -33,12 +33,7 @@ func resourceArmAvailabilitySet() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"platform_update_domain_count": {
Type: schema.TypeInt,

7
builtin/providers/azurerm/resource_arm_cdn_endpoint.go
View File

@ -29,12 +29,7 @@ func resourceArmCdnEndpoint() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_cdn_profile.go
View File

@ -28,12 +28,7 @@ func resourceArmCdnProfile() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

6
builtin/providers/azurerm/resource_arm_eventhub.go
View File

@ -39,11 +39,7 @@ func resourceArmEventHub() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
},
"location": locationSchema(),
"partition_count": {
Type: schema.TypeInt,

10
builtin/providers/azurerm/resource_arm_eventhub_namespace.go
View File

@ -5,9 +5,10 @@ import (
"log"
"strings"
"net/http"
"github.com/Azure/azure-sdk-for-go/arm/eventhub"
"github.com/hashicorp/terraform/helper/schema"
"net/http"
)
// Default Authorization Rule/Policy created by Azure, used to populate the
@ -31,12 +32,7 @@ func resourceArmEventHubNamespace() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_key_vault.go
View File

@ -33,12 +33,7 @@ func resourceArmKeyVault() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_loadbalancer.go
View File

@ -26,12 +26,7 @@ func resourceArmLoadBalancer() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_loadbalancer_backend_address_pool.go
View File

@ -25,12 +25,7 @@ func resourceArmLoadBalancerBackendAddressPool() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_loadbalancer_nat_pool.go
View File

@ -26,12 +26,7 @@ func resourceArmLoadBalancerNatPool() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_loadbalancer_nat_rule.go
View File

@ -26,12 +26,7 @@ func resourceArmLoadBalancerNatRule() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_loadbalancer_probe.go
View File

@ -26,12 +26,7 @@ func resourceArmLoadBalancerProbe() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_loadbalancer_rule.go
View File

@ -28,12 +28,7 @@ func resourceArmLoadBalancerRule() *schema.Resource {
ValidateFunc: validateArmLoadBalancerRuleName,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_local_network_gateway.go
View File

@ -25,12 +25,7 @@ func resourceArmLocalNetworkGateway() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Optional: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_network_interface_card.go
View File

@ -26,12 +26,7 @@ func resourceArmNetworkInterface() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_network_security_group.go
View File

@ -30,12 +30,7 @@ func resourceArmNetworkSecurityGroup() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_public_ip.go
View File

@ -28,12 +28,7 @@ func resourceArmPublicIp() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

8
builtin/providers/azurerm/resource_arm_resource_group.go
View File

@ -28,12 +28,8 @@ func resourceArmResourceGroup() *schema.Resource {
ForceNew: true,
ValidateFunc: validateArmResourceGroupName,
},
"location": &schema.Schema{
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"tags": tagsSchema(),
},

7
builtin/providers/azurerm/resource_arm_route_table.go
View File

@ -29,12 +29,7 @@ func resourceArmRouteTable() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_search_service.go
View File

@ -24,12 +24,7 @@ func resourceArmSearchService() *schema.Resource {
ForceNew: true,
},
"location": &schema.Schema{
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": &schema.Schema{
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_servicebus_namespace.go
View File

@ -31,12 +31,7 @@ func resourceArmServiceBusNamespace() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_servicebus_subscription.go
View File

@ -38,12 +38,7 @@ func resourceArmServiceBusSubscription() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

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

@ -32,12 +32,7 @@ func resourceArmServiceBusTopic() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_sql_database.go
View File

@ -23,12 +23,7 @@ func resourceArmSqlDatabase() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_sql_server.go
View File

@ -26,12 +26,7 @@ func resourceArmSqlServer() *schema.Resource {
ForceNew: true,
},
"location": &schema.Schema{
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": &schema.Schema{
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_storage_account.go
View File

@ -46,12 +46,7 @@ func resourceArmStorageAccount() *schema.Resource {
DiffSuppressFunc: resourceAzurermResourceGroupNameDiffSuppress,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"account_kind": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_virtual_machine.go
View File

@ -31,12 +31,7 @@ func resourceArmVirtualMachine() *schema.Resource {
ForceNew: true,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_virtual_machine_extension.go
View File

@ -27,12 +27,7 @@ func resourceArmVirtualMachineExtensions() *schema.Resource {
ForceNew: true,
},
"location": &schema.Schema{
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": &schema.Schema{
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_virtual_machine_scale_set.go
View File

@ -26,12 +26,7 @@ func resourceArmVirtualMachineScaleSet() *schema.Resource {
ForceNew: true,
},
"location": &schema.Schema{
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": &schema.Schema{
Type: schema.TypeString,

7
builtin/providers/azurerm/resource_arm_virtual_network.go
View File

@ -67,12 +67,7 @@ func resourceArmVirtualNetwork() *schema.Resource {
Set: resourceAzureSubnetHash,
},
"location": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
StateFunc: azureRMNormalizeLocation,
},
"location": locationSchema(),
"resource_group_name": {
Type: schema.TypeString,