From 695633257e719718cef29bef0009d80926a4be90 Mon Sep 17 00:00:00 2001
From: Paul Stack <public@paulstack.co.uk>
Date: Thu, 2 Jun 2016 12:59:33 +0100
Subject: [PATCH] provider/azurerm: Fix up some small issues for a post SDK
 upgrade test (#6981)

issue
---
 .../providers/azurerm/resource_arm_availability_set.go   | 9 +++++----
 .../azurerm/resource_arm_template_deployment_test.go     | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/builtin/providers/azurerm/resource_arm_availability_set.go b/builtin/providers/azurerm/resource_arm_availability_set.go
index 3e37a0a3f..b9baaae2e 100644
--- a/builtin/providers/azurerm/resource_arm_availability_set.go
+++ b/builtin/providers/azurerm/resource_arm_availability_set.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/arm/compute"
 	"github.com/hashicorp/terraform/helper/schema"
+	"github.com/jen20/riviera/azure"
 )
 
 func resourceArmAvailabilitySet() *schema.Resource {
@@ -78,16 +79,16 @@ func resourceArmAvailabilitySetCreate(d *schema.ResourceData, meta interface{})
 	name := d.Get("name").(string)
 	location := d.Get("location").(string)
 	resGroup := d.Get("resource_group_name").(string)
-	updateDomainCount := d.Get("platform_update_domain_count").(int32)
-	faultDomainCount := d.Get("platform_fault_domain_count").(int32)
+	updateDomainCount := d.Get("platform_update_domain_count").(int)
+	faultDomainCount := d.Get("platform_fault_domain_count").(int)
 	tags := d.Get("tags").(map[string]interface{})
 
 	availSet := compute.AvailabilitySet{
 		Name:     &name,
 		Location: &location,
 		Properties: &compute.AvailabilitySetProperties{
-			PlatformFaultDomainCount:  &faultDomainCount,
-			PlatformUpdateDomainCount: &updateDomainCount,
+			PlatformFaultDomainCount:  azure.Int32(int32(faultDomainCount)),
+			PlatformUpdateDomainCount: azure.Int32(int32(updateDomainCount)),
 		},
 		Tags: expandTags(tags),
 	}
diff --git a/builtin/providers/azurerm/resource_arm_template_deployment_test.go b/builtin/providers/azurerm/resource_arm_template_deployment_test.go
index be23e9d60..99314628b 100644
--- a/builtin/providers/azurerm/resource_arm_template_deployment_test.go
+++ b/builtin/providers/azurerm/resource_arm_template_deployment_test.go
@@ -134,7 +134,7 @@ var testAccAzureRMTemplateDeployment_basicExample = `
     "publicIPAddressName": "[concat('myPublicIp', uniquestring(resourceGroup().id))]",
     "publicIPAddressType": "Dynamic",
     "apiVersion": "2015-06-15",
-    "dnsLabelPrefix": "terraform-acctest"
+    "dnsLabelPrefix": "terraform-tdacctest"
   },
   "resources": [
     {