r/media_service_account: removing the media_service_account_id field

azurerm/resource_arm_media_services_account.go

@@ -59,11 +59,6 @@ func resourceArmMediaServicesAccount() *schema.Resource {
 			},
 
 			"tags": tagsSchema(),
-
-			"media_service_account_id": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 		},
 	}
 }
@@ -91,11 +86,14 @@ func resourceArmMediaServicesAccountCreateUpdate(d *schema.ResourceData, meta in
 		Tags:     expandTags(tags),
 	}
 
-	service, err := client.CreateOrUpdate(ctx, resourceGroup, accountName, parameters)
-	if err != nil {
-		return fmt.Errorf("Error creating Media Service Account %q (Resource Group %q): %+v", accountName, resourceGroup, err)
+	if _, e := client.CreateOrUpdate(ctx, resourceGroup, accountName, parameters); e != nil {
+		return fmt.Errorf("Error creating Media Service Account %q (Resource Group %q): %+v", accountName, resourceGroup, e)
 	}
 
+	service, err := client.Get(ctx, resourceGroup, accountName)
+	if err != nil {
+		return fmt.Errorf("Error retrieving Media Service Account %q (Resource Group %q): %+v", accountName, resourceGroup, err)
+	}
 	d.SetId(*service.ID)
 
 	return nil
@@ -125,12 +123,12 @@ func resourceArmMediaServicesAccountRead(d *schema.ResourceData, meta interface{
 	}
 
 	d.Set("name", resp.Name)
+	d.Set("resource_group_name", resourceGroup)
 	if location := resp.Location; location != nil {
 		d.Set("location", azureRMNormalizeLocation(*location))
 	}
 
 	if props := resp.ServiceProperties; props != nil {
-		d.Set("media_service_account_id", props.MediaServiceID.String())
 		accounts := flattenMediaServicesAccountStorageAccounts(props.StorageAccounts)
 		if e := d.Set("storage_account", accounts); e != nil {
 			return fmt.Errorf("Error flattening `storage_account`: %s", e)
@@ -202,7 +200,7 @@ func flattenMediaServicesAccountStorageAccounts(input *[]media.StorageAccount) [
 
 	results := make([]interface{}, 0)
 	for _, storageAccount := range *input {
-		output := make(map[string]interface{}, 0)
+		output := make(map[string]interface{})
 
 		if storageAccount.ID != nil {
 			output["id"] = *storageAccount.ID

azurerm/resource_arm_media_services_account_test.go

@@ -52,8 +52,7 @@ func TestAccAzureRMMediaServicesAccount_complete(t *testing.T) {
 				Config: testAccAzureRMMediaServicesAccount_complete(ri, rs, testLocation()),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(resourceName, "storage_account.#", "1"),
-					resource.TestCheckResourceAttr(resourceName, "tags.#", "1"),
-					resource.TestCheckResourceAttrSet(resourceName, "media_service_account_id"),
+					resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
 				),
 			},
 			{
@@ -81,7 +80,7 @@ func TestAccAzureRMMediaServicesAccount_multipleAccounts(t *testing.T) {
 				Check: resource.ComposeAggregateTestCheckFunc(
 					testCheckAzureRMMediaServicesAccountExists(resourceName),
 					resource.TestCheckResourceAttr(resourceName, "storage_account.#", "2"),
-					resource.TestCheckResourceAttrSet(resourceName, "media_service_account_id"),
+					resource.TestCheckResourceAttr(resourceName, "tags.%", "1"),
 				),
 			},
 			{
@@ -237,6 +236,10 @@ resource "azurerm_media_services_account" "test" {
     id         = "${azurerm_storage_account.second.id}"
     is_primary = false
   }
+
+  tags {
+    "Hello" = "World"
+  }
 }
 `, template, rString, rString)
 }
@@ -268,6 +271,10 @@ resource "azurerm_media_services_account" "test" {
     id         = "${azurerm_storage_account.first.id}"
     is_primary = true
   }
+
+  tags {
+    "Hello" = "World"
+  }
 }
 `, template, rString, rString)
 }

website/docs/r/media_services_account.html.markdown

@@ -66,7 +66,7 @@ A `storage_account` block supports the following:
 
 The following attributes are exported:
 
-* `id` - The `resource id` of the Media Services account.
+* `id` - The Resource ID of the Media Services Account.
 
 ## Import