diff --git a/azurerm/import_arm_policy_definition_test.go b/azurerm/import_arm_policy_definition_test.go
new file mode 100644
index 000000000000..347b20f3d649
--- /dev/null
+++ b/azurerm/import_arm_policy_definition_test.go
@@ -0,0 +1,29 @@
+package azurerm
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAccAzureRMPolicyDefinition_importBasic(t *testing.T) {
+	rInt := acctest.RandInt()
+	resourceName := "azurerm_policy_definition.test"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMPolicyDefinitionDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: testAzureRMPolicyDefinition_basic(rInt),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}
diff --git a/azurerm/resource_arm_policy_definition.go b/azurerm/resource_arm_policy_definition.go
index d7c315926e7b..bb8dccd1397a 100644
--- a/azurerm/resource_arm_policy_definition.go
+++ b/azurerm/resource_arm_policy_definition.go
@@ -67,7 +67,7 @@ func resourceArmPolicyDefinition() *schema.Resource {
 				DiffSuppressFunc: structure.SuppressJsonDiff,
 			},
 
-			"meta_data": {
+			"metadata": {
 				Type:             schema.TypeString,
 				Optional:         true,
 				ValidateFunc:     validation.ValidateJsonString,
@@ -109,10 +109,10 @@ func resourceArmPolicyDefinitionCreateUpdate(d *schema.ResourceData, meta interf
 		properties.PolicyRule = &policyRule
 	}
 
-	if metaDataString := d.Get("meta_data").(string); metaDataString != "" {
+	if metaDataString := d.Get("metadata").(string); metaDataString != "" {
 		metaData, err := structure.ExpandJsonFromString(metaDataString)
 		if err != nil {
-			return fmt.Errorf("unable to parse meta_data: %s", err)
+			return fmt.Errorf("unable to parse metadata: %s", err)
 		}
 		properties.Metadata = &metaData
 	}
@@ -166,14 +166,39 @@ func resourceArmPolicyDefinitionRead(d *schema.ResourceData, meta interface{}) e
 	}
 
 	d.Set("name", resp.Name)
+
 	if props := resp.DefinitionProperties; props != nil {
 		d.Set("policy_type", props.PolicyType)
 		d.Set("mode", props.Mode)
 		d.Set("display_name", props.DisplayName)
 		d.Set("description", props.Description)
-		d.Set("policy_rule", props.PolicyRule)
-		d.Set("meta_data", props.Metadata)
-		d.Set("parameters", props.Parameters)
+
+		if policyRule := props.PolicyRule; policyRule != nil {
+			policyRuleStr, err := structure.FlattenJsonToString(*policyRule)
+			if err != nil {
+				return fmt.Errorf("unable to flatten JSON for `policy_rule`: %s", err)
+			}
+
+			d.Set("policy_rule", policyRuleStr)
+		}
+
+		if metadata := props.Metadata; metadata != nil {
+			metadataStr, err := structure.FlattenJsonToString(*metadata)
+			if err != nil {
+				return fmt.Errorf("unable to flatten JSON for `metadata`: %s", err)
+			}
+
+			d.Set("metadata", metadataStr)
+		}
+
+		if parameters := props.Parameters; parameters != nil {
+			parametersStr, err := structure.FlattenJsonToString(*props.Parameters)
+			if err != nil {
+				return fmt.Errorf("unable to flatten JSON for `parameters`: %s", err)
+			}
+
+			d.Set("parameters", parametersStr)
+		}
 	}
 
 	return nil
diff --git a/azurerm/resource_arm_policy_definition_test.go b/azurerm/resource_arm_policy_definition_test.go
index 44b873279dd7..3e4f970b3977 100644
--- a/azurerm/resource_arm_policy_definition_test.go
+++ b/azurerm/resource_arm_policy_definition_test.go
@@ -14,7 +14,6 @@ func TestAccAzureRMPolicyDefinition_basic(t *testing.T) {
 	resourceName := "azurerm_policy_definition.test"
 
 	ri := acctest.RandInt()
-	config := testAzureRMPolicyDefinition(ri)
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -22,9 +21,10 @@ func TestAccAzureRMPolicyDefinition_basic(t *testing.T) {
 		CheckDestroy: testCheckAzureRMPolicyDefinitionDestroy,
 		Steps: []resource.TestStep{
 			{
-				Config: config,
+				Config: testAzureRMPolicyDefinition_basic(ri),
 				Check: resource.ComposeTestCheckFunc(
-					testCheckAzureRMPolicyDefinitionExists(resourceName)),
+					testCheckAzureRMPolicyDefinitionExists(resourceName),
+				),
 			},
 		},
 	})
@@ -80,14 +80,14 @@ func testCheckAzureRMPolicyDefinitionDestroy(s *terraform.State) error {
 	return nil
 }
 
-func testAzureRMPolicyDefinition(ri int) string {
+func testAzureRMPolicyDefinition_basic(ri int) string {
 	return fmt.Sprintf(`
 resource "azurerm_policy_definition" "test" {
-  name                = "acctestpol-%d"
-  policy_type            = "Custom"
-  mode                 = "All"
-  display_name       = "acctestpol-%d"
-  policy_rule =<<POLICY_RULE
+  name         = "acctestpol-%d"
+  policy_type  = "Custom"
+  mode         = "All"
+  display_name = "acctestpol-%d"
+  policy_rule  = <<POLICY_RULE
 	{
     "if": {
       "not": {
@@ -99,9 +99,9 @@ resource "azurerm_policy_definition" "test" {
       "effect": "audit"
     }
   }
-	POLICY_RULE
+POLICY_RULE
 
-  parameters =<<PARAMETERS
+  parameters = <<PARAMETERS
 	{
     "allowedLocations": {
       "type": "Array",
@@ -112,6 +112,7 @@ resource "azurerm_policy_definition" "test" {
       }
     }
   }
-	PARAMETERS
-}`, ri, ri)
+PARAMETERS
+}
+`, ri, ri)
 }
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/assignments.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/assignments.go
index 691984d96f65..807ba2b0bdf0 100644
--- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/assignments.go
+++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/assignments.go
@@ -44,8 +44,8 @@ func NewAssignmentsClientWithBaseURI(baseURI string, subscriptionID string) Assi
 // Create policy assignments are inherited by child resources. For example, when you apply a policy to a resource group
 // that policy is assigned to all resources in the group.
 //
-// scope is the scope of the policy assignment. policyAssignmentName is the name of the policy assignment.
-// parameters is parameters for the policy assignment.
+// scope is the scope of the policy assignment. policyAssignmentName is the name of the policy assignment. parameters
+// is parameters for the policy assignment.
 func (client AssignmentsClient) Create(ctx context.Context, scope string, policyAssignmentName string, parameters Assignment) (result Assignment, err error) {
 	req, err := client.CreatePreparer(ctx, scope, policyAssignmentName, parameters)
 	if err != nil {
@@ -118,8 +118,8 @@ func (client AssignmentsClient) CreateResponder(resp *http.Response) (result Ass
 // for resources.
 //
 // policyAssignmentID is the ID of the policy assignment to create. Use the format
-// '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'. parameters is
-// parameters for policy assignment.
+// '/{scope}/providers/Microsoft.Authorization/policyAssignments/{policy-assignment-name}'. parameters is parameters
+// for policy assignment.
 func (client AssignmentsClient) CreateByID(ctx context.Context, policyAssignmentID string, parameters Assignment) (result Assignment, err error) {
 	req, err := client.CreateByIDPreparer(ctx, policyAssignmentID, parameters)
 	if err != nil {
@@ -185,8 +185,7 @@ func (client AssignmentsClient) CreateByIDResponder(resp *http.Response) (result
 
 // Delete deletes a policy assignment.
 //
-// scope is the scope of the policy assignment. policyAssignmentName is the name of the policy assignment to
-// delete.
+// scope is the scope of the policy assignment. policyAssignmentName is the name of the policy assignment to delete.
 func (client AssignmentsClient) Delete(ctx context.Context, scope string, policyAssignmentName string) (result Assignment, err error) {
 	req, err := client.DeletePreparer(ctx, scope, policyAssignmentName)
 	if err != nil {
@@ -548,16 +547,16 @@ func (client AssignmentsClient) ListComplete(ctx context.Context, filter string)
 // ListForResource gets policy assignments for a resource.
 //
 // resourceGroupName is the name of the resource group containing the resource. The name is case insensitive.
-// resourceProviderNamespace is the namespace of the resource provider. parentResourcePath is the parent resource
-// path. resourceType is the resource type. resourceName is the name of the resource with policy assignments.
-// filter is the filter to apply on the operation.
+// resourceProviderNamespace is the namespace of the resource provider. parentResourcePath is the parent resource path.
+// resourceType is the resource type. resourceName is the name of the resource with policy assignments. filter is the
+// filter to apply on the operation.
 func (client AssignmentsClient) ListForResource(ctx context.Context, resourceGroupName string, resourceProviderNamespace string, parentResourcePath string, resourceType string, resourceName string, filter string) (result AssignmentListResultPage, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: resourceGroupName,
 			Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil},
 				{Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil},
 				{Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("policy.AssignmentsClient", "ListForResource", err.Error())
+		return result, validation.NewErrorWithValidationError(err, "policy.AssignmentsClient", "ListForResource")
 	}
 
 	result.fn = client.listForResourceNextResults
@@ -658,15 +657,15 @@ func (client AssignmentsClient) ListForResourceComplete(ctx context.Context, res
 
 // ListForResourceGroup gets policy assignments for the resource group.
 //
-// resourceGroupName is the name of the resource group that contains policy assignments. filter is the filter to
-// apply on the operation.
+// resourceGroupName is the name of the resource group that contains policy assignments. filter is the filter to apply
+// on the operation.
 func (client AssignmentsClient) ListForResourceGroup(ctx context.Context, resourceGroupName string, filter string) (result AssignmentListResultPage, err error) {
 	if err := validation.Validate([]validation.Validation{
 		{TargetValue: resourceGroupName,
 			Constraints: []validation.Constraint{{Target: "resourceGroupName", Name: validation.MaxLength, Rule: 90, Chain: nil},
 				{Target: "resourceGroupName", Name: validation.MinLength, Rule: 1, Chain: nil},
 				{Target: "resourceGroupName", Name: validation.Pattern, Rule: `^[-\w\._\(\)]+$`, Chain: nil}}}}); err != nil {
-		return result, validation.NewError("policy.AssignmentsClient", "ListForResourceGroup", err.Error())
+		return result, validation.NewErrorWithValidationError(err, "policy.AssignmentsClient", "ListForResourceGroup")
 	}
 
 	result.fn = client.listForResourceGroupNextResults
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/definitions.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/definitions.go
index ef3b25c306ca..6f362d187996 100644
--- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/definitions.go
+++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/definitions.go
@@ -42,8 +42,7 @@ func NewDefinitionsClientWithBaseURI(baseURI string, subscriptionID string) Defi
 
 // CreateOrUpdate creates or updates a policy definition.
 //
-// policyDefinitionName is the name of the policy definition to create. parameters is the policy definition
-// properties.
+// policyDefinitionName is the name of the policy definition to create. parameters is the policy definition properties.
 func (client DefinitionsClient) CreateOrUpdate(ctx context.Context, policyDefinitionName string, parameters Definition) (result Definition, err error) {
 	req, err := client.CreateOrUpdatePreparer(ctx, policyDefinitionName, parameters)
 	if err != nil {
@@ -110,8 +109,8 @@ func (client DefinitionsClient) CreateOrUpdateResponder(resp *http.Response) (re
 
 // CreateOrUpdateAtManagementGroup creates or updates a policy definition at management group level.
 //
-// policyDefinitionName is the name of the policy definition to create. parameters is the policy definition
-// properties. managementGroupID is the ID of the management group.
+// policyDefinitionName is the name of the policy definition to create. parameters is the policy definition properties.
+// managementGroupID is the ID of the management group.
 func (client DefinitionsClient) CreateOrUpdateAtManagementGroup(ctx context.Context, policyDefinitionName string, parameters Definition, managementGroupID string) (result Definition, err error) {
 	req, err := client.CreateOrUpdateAtManagementGroupPreparer(ctx, policyDefinitionName, parameters, managementGroupID)
 	if err != nil {
@@ -242,8 +241,8 @@ func (client DefinitionsClient) DeleteResponder(resp *http.Response) (result aut
 
 // DeleteAtManagementGroup deletes a policy definition at management group level.
 //
-// policyDefinitionName is the name of the policy definition to delete. managementGroupID is the ID of the
-// management group.
+// policyDefinitionName is the name of the policy definition to delete. managementGroupID is the ID of the management
+// group.
 func (client DefinitionsClient) DeleteAtManagementGroup(ctx context.Context, policyDefinitionName string, managementGroupID string) (result autorest.Response, err error) {
 	req, err := client.DeleteAtManagementGroupPreparer(ctx, policyDefinitionName, managementGroupID)
 	if err != nil {
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/models.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/models.go
index 9084b0ba1162..38b2d8900207 100644
--- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/models.go
+++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/models.go
@@ -68,45 +68,46 @@ func (a *Assignment) UnmarshalJSON(body []byte) error {
 	if err != nil {
 		return err
 	}
-	for k, v := range m {
-		switch k {
-		case "properties":
-			if v != nil {
-				var assignmentProperties AssignmentProperties
-				err = json.Unmarshal(*v, &assignmentProperties)
-				if err != nil {
-					return err
-				}
-				a.AssignmentProperties = &assignmentProperties
-			}
-		case "id":
-			if v != nil {
-				var ID string
-				err = json.Unmarshal(*v, &ID)
-				if err != nil {
-					return err
-				}
-				a.ID = &ID
-			}
-		case "type":
-			if v != nil {
-				var typeVar string
-				err = json.Unmarshal(*v, &typeVar)
-				if err != nil {
-					return err
-				}
-				a.Type = &typeVar
-			}
-		case "name":
-			if v != nil {
-				var name string
-				err = json.Unmarshal(*v, &name)
-				if err != nil {
-					return err
-				}
-				a.Name = &name
-			}
+	var v *json.RawMessage
+
+	v = m["properties"]
+	if v != nil {
+		var properties AssignmentProperties
+		err = json.Unmarshal(*m["properties"], &properties)
+		if err != nil {
+			return err
 		}
+		a.AssignmentProperties = &properties
+	}
+
+	v = m["id"]
+	if v != nil {
+		var ID string
+		err = json.Unmarshal(*m["id"], &ID)
+		if err != nil {
+			return err
+		}
+		a.ID = &ID
+	}
+
+	v = m["type"]
+	if v != nil {
+		var typeVar string
+		err = json.Unmarshal(*m["type"], &typeVar)
+		if err != nil {
+			return err
+		}
+		a.Type = &typeVar
+	}
+
+	v = m["name"]
+	if v != nil {
+		var name string
+		err = json.Unmarshal(*m["name"], &name)
+		if err != nil {
+			return err
+		}
+		a.Name = &name
 	}
 
 	return nil
@@ -223,7 +224,7 @@ type AssignmentProperties struct {
 	// Scope - The scope for the policy assignment.
 	Scope *string `json:"scope,omitempty"`
 	// Parameters - Required if a parameter is used in policy rule.
-	Parameters interface{} `json:"parameters,omitempty"`
+	Parameters *map[string]interface{} `json:"parameters,omitempty"`
 	// Description - This message will be part of response in case of policy violation.
 	Description *string `json:"description,omitempty"`
 }
@@ -246,36 +247,36 @@ func (d *Definition) UnmarshalJSON(body []byte) error {
 	if err != nil {
 		return err
 	}
-	for k, v := range m {
-		switch k {
-		case "properties":
-			if v != nil {
-				var definitionProperties DefinitionProperties
-				err = json.Unmarshal(*v, &definitionProperties)
-				if err != nil {
-					return err
-				}
-				d.DefinitionProperties = &definitionProperties
-			}
-		case "id":
-			if v != nil {
-				var ID string
-				err = json.Unmarshal(*v, &ID)
-				if err != nil {
-					return err
-				}
-				d.ID = &ID
-			}
-		case "name":
-			if v != nil {
-				var name string
-				err = json.Unmarshal(*v, &name)
-				if err != nil {
-					return err
-				}
-				d.Name = &name
-			}
+	var v *json.RawMessage
+
+	v = m["properties"]
+	if v != nil {
+		var properties DefinitionProperties
+		err = json.Unmarshal(*m["properties"], &properties)
+		if err != nil {
+			return err
+		}
+		d.DefinitionProperties = &properties
+	}
+
+	v = m["id"]
+	if v != nil {
+		var ID string
+		err = json.Unmarshal(*m["id"], &ID)
+		if err != nil {
+			return err
+		}
+		d.ID = &ID
+	}
+
+	v = m["name"]
+	if v != nil {
+		var name string
+		err = json.Unmarshal(*m["name"], &name)
+		if err != nil {
+			return err
 		}
+		d.Name = &name
 	}
 
 	return nil
@@ -394,9 +395,9 @@ type DefinitionProperties struct {
 	// Description - The policy definition description.
 	Description *string `json:"description,omitempty"`
 	// PolicyRule - The policy rule.
-	PolicyRule interface{} `json:"policyRule,omitempty"`
+	PolicyRule *map[string]interface{} `json:"policyRule,omitempty"`
 	// Metadata - The policy definition metadata.
-	Metadata interface{} `json:"metadata,omitempty"`
+	Metadata *map[string]interface{} `json:"metadata,omitempty"`
 	// Parameters - Required if a parameter is used in policy rule.
-	Parameters interface{} `json:"parameters,omitempty"`
+	Parameters *map[string]interface{} `json:"parameters,omitempty"`
 }
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/version.go b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/version.go
index a7f47e4d482c..f76547fffde2 100644
--- a/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/version.go
+++ b/vendor/github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy/version.go
@@ -1,7 +1,5 @@
 package policy
 
-import "github.com/Azure/azure-sdk-for-go/version"
-
 // Copyright (c) Microsoft and contributors.  All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -21,10 +19,10 @@ import "github.com/Azure/azure-sdk-for-go/version"
 
 // UserAgent returns the UserAgent string to use when sending http.Requests.
 func UserAgent() string {
-	return "Azure-SDK-For-Go/" + version.Number + " policy/2016-12-01"
+	return "Azure-SDK-For-Go/v12.5.0-beta services"
 }
 
 // Version returns the semantic version (see http://semver.org) of the client.
 func Version() string {
-	return version.Number
+	return "v12.5.0-beta"
 }
diff --git a/vendor/github.com/Azure/go-autorest/autorest/validation/error.go b/vendor/github.com/Azure/go-autorest/autorest/validation/error.go
deleted file mode 100644
index fed156dbf6e6..000000000000
--- a/vendor/github.com/Azure/go-autorest/autorest/validation/error.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package validation
-
-// Copyright 2017 Microsoft Corporation
-//
-//  Licensed under the Apache License, Version 2.0 (the "License");
-//  you may not use this file except in compliance with the License.
-//  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-
-import (
-	"fmt"
-)
-
-// Error is the type that's returned when the validation of an APIs arguments constraints fails.
-type Error struct {
-	// PackageType is the package type of the object emitting the error. For types, the value
-	// matches that produced the the '%T' format specifier of the fmt package. For other elements,
-	// such as functions, it is just the package name (e.g., "autorest").
-	PackageType string
-
-	// Method is the name of the method raising the error.
-	Method string
-
-	// Message is the error message.
-	Message string
-}
-
-// Error returns a string containing the details of the validation failure.
-func (e Error) Error() string {
-	return fmt.Sprintf("%s#%s: Invalid input: %s", e.PackageType, e.Method, e.Message)
-}
-
-// NewError creates a new Error object with the specified parameters.
-// message is treated as a format string to which the optional args apply.
-func NewError(packageType string, method string, message string, args ...interface{}) Error {
-	return Error{
-		PackageType: packageType,
-		Method:      method,
-		Message:     fmt.Sprintf(message, args...),
-	}
-}
diff --git a/vendor/github.com/Azure/go-autorest/autorest/validation/validation.go b/vendor/github.com/Azure/go-autorest/autorest/validation/validation.go
index d886e0b3fbfc..3fe62c93056d 100644
--- a/vendor/github.com/Azure/go-autorest/autorest/validation/validation.go
+++ b/vendor/github.com/Azure/go-autorest/autorest/validation/validation.go
@@ -390,8 +390,6 @@ func createError(x reflect.Value, v Constraint, err string) error {
 
 // NewErrorWithValidationError appends package type and method name in
 // validation error.
-//
-// Deprecated: Please use validation.NewError() instead.
 func NewErrorWithValidationError(err error, packageType, method string) error {
-	return NewError(packageType, method, err.Error())
+	return fmt.Errorf("%s#%s: Invalid input: %v", packageType, method, err)
 }
diff --git a/vendor/vendor.json b/vendor/vendor.json
index dd300f70abf8..10b85d548bc7 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -203,10 +203,12 @@
 			"versionExact": "v12.5.0-beta"
 		},
 		{
-			"checksumSHA1": "uiqNCbLggCPjMdYZ8cB5vNeeDmw=",
+			"checksumSHA1": "7LPSrzoSsTmNDBTltCsrJKJUhyc=",
 			"path": "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2016-12-01/policy",
-			"revision": "e67cd39e942c417ae5e9ae1165f778d9fe8996e0",
-			"revisionTime": "2018-03-16T20:43:19Z"
+			"revision": "21b68149ccf7c16b3f028bb4c7fd0ab458fe308f",
+			"revisionTime": "2018-02-12T16:31:56Z",
+			"version": "v12.5.0-beta",
+			"versionExact": "v12.5.0-beta"
 		},
 		{
 			"checksumSHA1": "oNSB5LmmOu68djMmeORcCDYn/3o=",
@@ -341,10 +343,12 @@
 			"versionExact": "v9.7.0"
 		},
 		{
-			"checksumSHA1": "5UH4IFIB/98iowPCzzVs4M4MXiQ=",
+			"checksumSHA1": "HfqZyKllcHQDvTwgCaYL1jUPmW0=",
 			"path": "github.com/Azure/go-autorest/autorest/validation",
-			"revision": "05cc91b23cb791df3737aa915d76c76d216ea732",
-			"revisionTime": "2018-03-09T19:05:52Z"
+			"revision": "8c58b4788dedd95779efe0ac2055bb6a1b9b8e01",
+			"revisionTime": "2018-01-06T16:29:27Z",
+			"version": "v9.7.0",
+			"versionExact": "v9.7.0"
 		},
 		{
 			"checksumSHA1": "jQh1fnoKPKMURvKkpdRjN695nAQ=",
diff --git a/website/docs/r/policy_definition.html.markdown b/website/docs/r/policy_definition.html.markdown
index b2bbe69d2c84..ffa102473857 100644
--- a/website/docs/r/policy_definition.html.markdown
+++ b/website/docs/r/policy_definition.html.markdown
@@ -14,11 +14,11 @@ Creates a policy for all of the resource groups under the subscription.
 
 ```hcl
 resource "azurerm_policy_definition" "policy" {
-  name                = "accTestPolicy"
-  policy_type            = "BuiltIn"
-  mode                 = "Indexed"
-  display_name       = "acceptance test policy definition"
-  policy_rule =<<POLICY_RULE
+  name         = "accTestPolicy"
+  policy_type  = "BuiltIn"
+  mode         = "Indexed"
+  display_name = "acceptance test policy definition"
+  policy_rule  = <<POLICY_RULE
 	{
     "if": {
       "not": {
@@ -30,9 +30,9 @@ resource "azurerm_policy_definition" "policy" {
       "effect": "audit"
     }
   }
-	POLICY_RULE
+POLICY_RULE
 
-  parameters =<<PARAMETERS
+  parameters = <<PARAMETERS
 	{
     "allowedLocations": {
       "type": "Array",
@@ -43,7 +43,7 @@ resource "azurerm_policy_definition" "policy" {
       }
     }
   }
-  	PARAMETERS
+PARAMETERS
 
 }
 ```
@@ -55,7 +55,7 @@ The following arguments are supported:
 * `name` - (Required) The name of the policy definition. Changing this forces a
     new resource to be created.
 
-* `policy_type` - (Required) The policy type.  The value can be "BuiltIn", "Custom" 
+* `policy_type` - (Required) The policy type.  The value can be "BuiltIn", "Custom"
     or "NotSpecified". Changing this forces a new resource to be created.
 
 * `mode` - (Required) The policy mode that allows you to specify which resource
@@ -68,7 +68,11 @@ The following arguments are supported:
 * `description` - (Optional) The description of the policy definition.
 
 * `policy_rule` - (Optional) The policy rule for the policy definition. This
-    is a json object representing the rule that contains an if and 
+    is a json object representing the rule that contains an if and
+    a then block.
+
+* `metadata` - (Optional) The metadata for the policy definition. This
+    is a json object representing the rule that contains an if and
     a then block.
 
 * `parameters` - (Optional) Parameters for the policy definition. This field