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

provider/azurerm: Fix up some small issues for a post SDK upgrade test (#6981) 

issue
This commit is contained in:
Paul Stack 2016-06-02 12:59:33 +01:00
parent 2a9f47aa70
commit 695633257e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import (
"github.com/Azure/azure-sdk-for-go/arm/compute" "github.com/Azure/azure-sdk-for-go/arm/compute"
"github.com/hashicorp/terraform/helper/schema" "github.com/hashicorp/terraform/helper/schema"
"github.com/jen20/riviera/azure"
) )
func resourceArmAvailabilitySet() *schema.Resource { func resourceArmAvailabilitySet() *schema.Resource {
@ -78,16 +79,16 @@ func resourceArmAvailabilitySetCreate(d *schema.ResourceData, meta interface{})
name := d.Get("name").(string) name := d.Get("name").(string)
location := d.Get("location").(string) location := d.Get("location").(string)
resGroup := d.Get("resource_group_name").(string) resGroup := d.Get("resource_group_name").(string)
updateDomainCount := d.Get("platform_update_domain_count").(int32) updateDomainCount := d.Get("platform_update_domain_count").(int)
faultDomainCount := d.Get("platform_fault_domain_count").(int32) faultDomainCount := d.Get("platform_fault_domain_count").(int)
tags := d.Get("tags").(map[string]interface{}) tags := d.Get("tags").(map[string]interface{})
availSet := compute.AvailabilitySet{ availSet := compute.AvailabilitySet{
Name: &name, Name: &name,
Location: &location, Location: &location,
Properties: &compute.AvailabilitySetProperties{ Properties: &compute.AvailabilitySetProperties{
PlatformFaultDomainCount: &faultDomainCount, PlatformFaultDomainCount: azure.Int32(int32(faultDomainCount)),
PlatformUpdateDomainCount: &updateDomainCount, PlatformUpdateDomainCount: azure.Int32(int32(updateDomainCount)),
}, },
Tags: expandTags(tags), Tags: expandTags(tags),
} }

2
builtin/providers/azurerm/resource_arm_template_deployment_test.go
View File

@ -134,7 +134,7 @@ var testAccAzureRMTemplateDeployment_basicExample = `
"publicIPAddressName": "[concat('myPublicIp', uniquestring(resourceGroup().id))]", "publicIPAddressName": "[concat('myPublicIp', uniquestring(resourceGroup().id))]",
"publicIPAddressType": "Dynamic", "publicIPAddressType": "Dynamic",
"apiVersion": "2015-06-15", "apiVersion": "2015-06-15",
"dnsLabelPrefix": "terraform-acctest" "dnsLabelPrefix": "terraform-tdacctest"
}, },
"resources": [ "resources": [
{ {