deps: Update jen20/riviera

Author: stack72

Godeps/Godeps.json

@@ -129,7 +129,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 func registerAzureResourceProvidersWithSubscription(config *Config, client *ArmClient) error {
 	providerClient := client.providers
 
-	providers := []string{"Microsoft.Network", "Microsoft.Compute", "Microsoft.Cdn", "Microsoft.Storage"}
+	providers := []string{"Microsoft.Network", "Microsoft.Compute", "Microsoft.Cdn", "Microsoft.Storage", "Microsoft.Sql"}
 
 	for _, v := range providers {
 		res, err := providerClient.Register(v)

builtin/providers/azurerm/provider.go

@@ -66,6 +66,7 @@ func resourceArmSqlServerCreate(d *schema.ResourceData, meta interface{}) error
 	rivieraClient := client.rivieraClient
 
 	tags := d.Get("tags").(map[string]interface{})
+	expandedTags := expandTags(tags)
 
 	createRequest := rivieraClient.NewRequest()
 	createRequest.Command = &sql.CreateOrUpdateServer{
@@ -75,7 +76,7 @@ func resourceArmSqlServerCreate(d *schema.ResourceData, meta interface{}) error
 		AdministratorLogin:         azure.String(d.Get("administrator_login").(string)),
 		AdministratorLoginPassword: azure.String(d.Get("administrator_login_password").(string)),
 		Version:                    azure.String(d.Get("version").(string)),
-		Tags:                       expandTags(tags),
+		Tags:                       *expandedTags,
 	}
 
 	createResponse, err := createRequest.Execute()

builtin/providers/azurerm/resource_arm_sql_server.go

@@ -29,6 +29,37 @@ func TestAccAzureRMSqlServer_basic(t *testing.T) {
 	})
 }
 
+func TestAccAzureRMSqlServer_withTags(t *testing.T) {
+	ri := acctest.RandInt()
+	preConfig := fmt.Sprintf(testAccAzureRMSqlServer_withTags, ri, ri)
+	postConfig := fmt.Sprintf(testAccAzureRMSqlServer_withTagsUpdated, ri, ri)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMSqlServerDestroy,
+		Steps: []resource.TestStep{
+			resource.TestStep{
+				Config: preConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMSqlServerExists("azurerm_sql_server.test"),
+					resource.TestCheckResourceAttr(
+						"azurerm_sql_server.test", "tags.#", "2"),
+				),
+			},
+
+			resource.TestStep{
+				Config: postConfig,
+				Check: resource.ComposeTestCheckFunc(
+					testCheckAzureRMSqlServerExists("azurerm_sql_server.test"),
+					resource.TestCheckResourceAttr(
+						"azurerm_sql_server.test", "tags.#", "1"),
+				),
+			},
+		},
+	})
+}
+
 func testCheckAzureRMSqlServerExists(name string) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 
@@ -92,3 +123,42 @@ resource "azurerm_sql_server" "test" {
     administrator_login_password = "thisIsDog11"
 }
 `
+
+var testAccAzureRMSqlServer_withTags = `
+resource "azurerm_resource_group" "test" {
+    name = "acctest_rg_%d"
+    location = "West US"
+}
+resource "azurerm_sql_server" "test" {
+    name = "acctestsqlserver%d"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+    location = "West US"
+    version = "12.0"
+    administrator_login = "mradministrator"
+    administrator_login_password = "thisIsDog11"
+
+    tags {
+    	environment = "staging"
+    	database = "test"
+    }
+}
+`
+
+var testAccAzureRMSqlServer_withTagsUpdated = `
+resource "azurerm_resource_group" "test" {
+    name = "acctest_rg_%d"
+    location = "West US"
+}
+resource "azurerm_sql_server" "test" {
+    name = "acctestsqlserver%d"
+    resource_group_name = "${azurerm_resource_group.test.name}"
+    location = "West US"
+    version = "12.0"
+    administrator_login = "mradministrator"
+    administrator_login_password = "thisIsDog11"
+
+    tags {
+    	environment = "production"
+    }
+}
+`