Merge pull request #1 from DenheenJ/update-fields

add _id to fields for clarity

azurerm/resource_arm_service_fabric_cluster.go

@@ -89,12 +89,12 @@ func resourceArmServiceFabricCluster() *schema.Resource {
 							Required: true,
 							ForceNew: true,
 						},
-						"cluster_application": {
+						"cluster_application_id": {
 							Type:     schema.TypeString,
 							Required: true,
 							ForceNew: true,
 						},
-						"client_application": {
+						"client_application_id": {
 							Type:     schema.TypeString,
 							Required: true,
 							ForceNew: true,
@@ -551,8 +551,8 @@ func expandServiceFabricClusterAzureActiveDirectory(input []interface{}) *servic
 	v := input[0].(map[string]interface{})
 
 	tenantId := v["tenant_id"].(string)
-	clusterApplication := v["cluster_application"].(string)
-	clientApplication := v["client_application"].(string)
+	clusterApplication := v["cluster_application_id"].(string)
+	clientApplication := v["client_application_id"].(string)
 
 	config := servicefabric.AzureActiveDirectory{
 		TenantID:           utils.String(tenantId),
@@ -573,11 +573,11 @@ func flattenServiceFabricClusterAzureActiveDirectory(input *servicefabric.AzureA
 		}
 
 		if name := v.ClusterApplication; name != nil {
-			output["cluster_application"] = *name
+			output["cluster_application_id"] = *name
 		}
 
 		if endpoint := v.ClientApplication; endpoint != nil {
-			output["client_application"] = *endpoint
+			output["client_application_id"] = *endpoint
 		}
 
 		results = append(results, output)

azurerm/resource_arm_service_fabric_cluster_test.go

@@ -251,8 +251,8 @@ func TestAccAzureRMServiceFabricCluster_azureActiveDirectory(t *testing.T) {
 					testCheckAzureRMServiceFabricClusterExists(resourceName),
 					resource.TestCheckResourceAttr(resourceName, "azure_active_directory.#", "1"),
 					resource.TestCheckResourceAttr(resourceName, "azure_active_directory.tenant_id", "00000000-0000-0000-0000-00000000000"),
-					resource.TestCheckResourceAttr(resourceName, "azure_active_directory.cluster_application", "00000000-0000-0000-0000-000000000000"),
-					resource.TestCheckResourceAttr(resourceName, "azure_active_directory.client_application", "00000000-0000-0000-0000-000000000000"),
+					resource.TestCheckResourceAttr(resourceName, "azure_active_directory.cluster_application_id", "00000000-0000-0000-0000-000000000000"),
+					resource.TestCheckResourceAttr(resourceName, "azure_active_directory.client_application_id", "00000000-0000-0000-0000-000000000000"),
 					resource.TestCheckResourceAttr(resourceName, "fabric_settings.0.name", "Security"),
 					resource.TestCheckResourceAttr(resourceName, "fabric_settings.0.parameters.ClusterProtectionLevel", "EncryptAndSign"),
 					resource.TestCheckResourceAttr(resourceName, "management_endpoint", "https://example:80"),
@@ -771,9 +771,9 @@ resource "azurerm_service_fabric_cluster" "test" {
   management_endpoint = "https://example:80"
 	
 	azure_active_directory {
-		tenant_id           = "00000000-0000-0000-0000-000000000000"
-		cluster_application = "00000000-0000-0000-0000-000000000000"
-		client_application  = "00000000-0000-0000-0000-000000000000"
+		tenant_id              = "00000000-0000-0000-0000-000000000000"
+		cluster_application_id = "00000000-0000-0000-0000-000000000000"
+		client_application_id  = "00000000-0000-0000-0000-000000000000"
 	}
 
   fabric_settings {

website/docs/r/service_fabric_cluster.html.markdown

@@ -85,9 +85,9 @@ A `azure_active_directory` block supports the following:
 
 * `tenant_id` - (Required) The TenantID of the Azure Active Directory resource.
 
-* `cluster_application` - (Required) The GUID of the cluster application.
+* `cluster_application_id` - (Required) The GUID of the cluster application.
 
-* `client_application` - (Required) The GUID of the client application.
+* `client_application_id` - (Required) The GUID of the client application.
 
 ---