Upgrade Api Management Version from 2020-12-01 to 2021-01-01-preview

azurerm/internal/services/apimanagement/api_management_api_data_source.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
+	"github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2021-01-01-preview/apimanagement"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz"
@@ -152,7 +152,7 @@ func dataSourceApiManagementApiRead(d *pluginsdk.ResourceData, meta interface{})
 		d.Set("path", props.Path)
 		d.Set("revision", props.APIRevision)
 		d.Set("service_url", props.ServiceURL)
-		d.Set("soap_pass_through", string(props.APIType) == string(apimanagement.SoapPassThrough))
+		d.Set("soap_pass_through", string(props.APIType) == string(apimanagement.SoapAPITypeSoapPassThrough))
 		d.Set("subscription_required", props.SubscriptionRequired)
 		d.Set("version", props.APIVersion)
 		d.Set("version_set_id", props.APIVersionSetID)

azurerm/internal/services/apimanagement/api_management_api_diagnostic_resource.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
+	"github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2021-01-01-preview/apimanagement"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
@@ -79,9 +79,9 @@ func resourceApiManagementApiDiagnostic() *pluginsdk.Resource {
 				Optional: true,
 				Computed: true,
 				ValidateFunc: validation.StringInSlice([]string{
-					string(apimanagement.Verbose),
-					string(apimanagement.Information),
-					string(apimanagement.Error),
+					string(apimanagement.VerbosityVerbose),
+					string(apimanagement.VerbosityInformation),
+					string(apimanagement.VerbosityError),
 				}, false),
 			},
 
@@ -182,15 +182,15 @@ func resourceApiManagementApiDiagnosticCreateUpdate(d *pluginsdk.ResourceData, m
 
 	if samplingPercentage, ok := d.GetOk("sampling_percentage"); ok {
 		parameters.Sampling = &apimanagement.SamplingSettings{
-			SamplingType: apimanagement.Fixed,
+			SamplingType: apimanagement.SamplingTypeFixed,
 			Percentage:   utils.Float(samplingPercentage.(float64)),
 		}
 	} else {
 		parameters.Sampling = nil
 	}
 
 	if alwaysLogErrors, ok := d.GetOk("always_log_errors"); ok && alwaysLogErrors.(bool) {
-		parameters.AlwaysLog = apimanagement.AllErrors
+		parameters.AlwaysLog = apimanagement.AlwaysLogAllErrors
 	}
 
 	if verbosity, ok := d.GetOk("verbosity"); ok {
@@ -275,7 +275,7 @@ func resourceApiManagementApiDiagnosticRead(d *pluginsdk.ResourceData, meta inte
 		if props.Sampling != nil && props.Sampling.Percentage != nil {
 			d.Set("sampling_percentage", props.Sampling.Percentage)
 		}
-		d.Set("always_log_errors", props.AlwaysLog == apimanagement.AllErrors)
+		d.Set("always_log_errors", props.AlwaysLog == apimanagement.AlwaysLogAllErrors)
 		d.Set("verbosity", props.Verbosity)
 		d.Set("log_client_ip", props.LogClientIP)
 		d.Set("http_correlation_protocol", props.HTTPCorrelationProtocol)
@@ -379,8 +379,8 @@ func schemaApiManagementDataMaskingEntityList() *pluginsdk.Schema {
 					Type:     pluginsdk.TypeString,
 					Required: true,
 					ValidateFunc: validation.StringInSlice([]string{
-						string(apimanagement.Hide),
-						string(apimanagement.Mask),
+						string(apimanagement.DataMaskingModeHide),
+						string(apimanagement.DataMaskingModeMask),
 					}, false),
 				},
 

azurerm/internal/services/apimanagement/api_management_api_operation_policy_resource.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
+	"github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2021-01-01-preview/apimanagement"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
@@ -89,14 +89,14 @@ func resourceApiManagementAPIOperationPolicyCreateUpdate(d *pluginsdk.ResourceDa
 
 	if xmlContent != "" {
 		parameters.PolicyContractProperties = &apimanagement.PolicyContractProperties{
-			Format: apimanagement.Rawxml,
+			Format: apimanagement.PolicyContentFormatRawxml,
 			Value:  utils.String(xmlContent),
 		}
 	}
 
 	if xmlLink != "" {
 		parameters.PolicyContractProperties = &apimanagement.PolicyContractProperties{
-			Format: apimanagement.RawxmlLink,
+			Format: apimanagement.PolicyContentFormatRawxmlLink,
 			Value:  utils.String(xmlLink),
 		}
 	}

azurerm/internal/services/apimanagement/api_management_api_operation_policy_resource_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
+	"github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2021-01-01-preview/apimanagement"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check"

azurerm/internal/services/apimanagement/api_management_api_operation_resource.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
+	"github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2021-01-01-preview/apimanagement"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"

azurerm/internal/services/apimanagement/api_management_api_operation_tag_resource.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
+	"github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2021-01-01-preview/apimanagement"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse"

azurerm/internal/services/apimanagement/api_management_api_policy_resource.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
+	"github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2021-01-01-preview/apimanagement"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
@@ -86,7 +86,7 @@ func resourceApiManagementAPIPolicyCreateUpdate(d *pluginsdk.ResourceData, meta
 
 	if xmlLink != "" {
 		parameters.PolicyContractProperties = &apimanagement.PolicyContractProperties{
-			Format: apimanagement.RawxmlLink,
+			Format: apimanagement.PolicyContentFormatRawxmlLink,
 			Value:  utils.String(xmlLink),
 		}
 	} else if xmlContent != "" {
@@ -98,7 +98,7 @@ func resourceApiManagementAPIPolicyCreateUpdate(d *pluginsdk.ResourceData, meta
 		}
 
 		parameters.PolicyContractProperties = &apimanagement.PolicyContractProperties{
-			Format: apimanagement.Rawxml,
+			Format: apimanagement.PolicyContentFormatRawxml,
 			Value:  utils.String(xmlContent),
 		}
 	}

azurerm/internal/services/apimanagement/api_management_api_policy_resource_test.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
+	"github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2021-01-01-preview/apimanagement"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check"

azurerm/internal/services/apimanagement/api_management_api_resource.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
+	"github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2021-01-01-preview/apimanagement"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
@@ -104,16 +104,16 @@ func resourceApiManagementApi() *pluginsdk.Resource {
 							Type:     pluginsdk.TypeString,
 							Required: true,
 							ValidateFunc: validation.StringInSlice([]string{
-								string(apimanagement.Openapi),
-								string(apimanagement.Openapijson),
-								string(apimanagement.OpenapijsonLink),
-								string(apimanagement.OpenapiLink),
-								string(apimanagement.SwaggerJSON),
-								string(apimanagement.SwaggerLinkJSON),
-								string(apimanagement.WadlLinkJSON),
-								string(apimanagement.WadlXML),
-								string(apimanagement.Wsdl),
-								string(apimanagement.WsdlLink),
+								string(apimanagement.ContentFormatOpenapi),
+								string(apimanagement.ContentFormatOpenapijson),
+								string(apimanagement.ContentFormatOpenapijsonLink),
+								string(apimanagement.ContentFormatOpenapiLink),
+								string(apimanagement.ContentFormatSwaggerJSON),
+								string(apimanagement.ContentFormatSwaggerLinkJSON),
+								string(apimanagement.ContentFormatWadlLinkJSON),
+								string(apimanagement.ContentFormatWadlXML),
+								string(apimanagement.ContentFormatWsdl),
+								string(apimanagement.ContentFormatWsdlLink),
 							}, false),
 						},
 
@@ -308,11 +308,11 @@ func resourceApiManagementApiCreateUpdate(d *pluginsdk.ResourceData, meta interf
 
 	soapPassThrough := d.Get("soap_pass_through").(bool)
 	if soapPassThrough {
-		apiType = apimanagement.Soap
-		soapApiType = apimanagement.SoapPassThrough
+		apiType = apimanagement.APITypeSoap
+		soapApiType = apimanagement.SoapAPITypeSoapPassThrough
 	} else {
-		apiType = apimanagement.HTTP
-		soapApiType = apimanagement.SoapToRest
+		apiType = apimanagement.APITypeHTTP
+		soapApiType = apimanagement.SoapAPITypeSoapToRest
 	}
 
 	// If import is used, we need to send properties to Azure API in two operations.
@@ -337,7 +337,7 @@ func resourceApiManagementApiCreateUpdate(d *pluginsdk.ResourceData, meta interf
 		wsdlSelectorVs := importV["wsdl_selector"].([]interface{})
 
 		// `wsdl_selector` is necessary under format `wsdl`
-		if len(wsdlSelectorVs) == 0 && contentFormat == string(apimanagement.Wsdl) {
+		if len(wsdlSelectorVs) == 0 && contentFormat == string(apimanagement.ContentFormatWsdl) {
 			return fmt.Errorf("`wsdl_selector` is required when content format is `wsdl` in API Management API %q", name)
 		}
 
@@ -478,7 +478,7 @@ func resourceApiManagementApiRead(d *pluginsdk.ResourceData, meta interface{}) e
 		d.Set("path", props.Path)
 		d.Set("service_url", props.ServiceURL)
 		d.Set("revision", props.APIRevision)
-		d.Set("soap_pass_through", string(props.APIType) == string(apimanagement.SoapPassThrough))
+		d.Set("soap_pass_through", string(props.APIType) == string(apimanagement.SoapAPITypeSoapPassThrough))
 		d.Set("subscription_required", props.SubscriptionRequired)
 		d.Set("version", props.APIVersion)
 		d.Set("version_set_id", props.APIVersionSetID)

azurerm/internal/services/apimanagement/api_management_api_schema_resource.go

@@ -6,7 +6,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
+	"github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2021-01-01-preview/apimanagement"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
@@ -92,8 +92,8 @@ func resourceApiManagementApiSchemaCreateUpdate(d *pluginsdk.ResourceData, meta
 	parameters := apimanagement.SchemaContract{
 		SchemaContractProperties: &apimanagement.SchemaContractProperties{
 			ContentType: &contentType,
-			SchemaDocumentProperties: &apimanagement.SchemaDocumentProperties{
-				Value: &value,
+			Document: map[string]string{
+				"value": value,
 			},
 		},
 	}
@@ -155,7 +155,7 @@ func resourceApiManagementApiSchemaRead(d *pluginsdk.ResourceData, meta interfac
 
 	if properties := resp.SchemaContractProperties; properties != nil {
 		d.Set("content_type", properties.ContentType)
-		if documentProperties := properties.SchemaDocumentProperties; documentProperties != nil {
+		if properties.Document != nil {
 			/*
 				As per https://docs.microsoft.com/en-us/rest/api/apimanagement/2019-12-01/api-schema/get#schemacontract
 
@@ -166,20 +166,21 @@ func resourceApiManagementApiSchemaRead(d *pluginsdk.ResourceData, meta interfac
 
 				Definitions used for Swagger/OpenAPI schemas only, otherwise Value is used
 			*/
+			document := properties.Document.(map[string]interface{})
 			switch *properties.ContentType {
 			case "application/vnd.ms-azure-apim.swagger.definitions+json", "application/vnd.oai.openapi.components+json":
-				if documentProperties.Definitions != nil {
-					value, err := json.Marshal(documentProperties.Definitions)
+				if v, ok := document["definitions"]; ok {
+					value, err := json.Marshal(v)
 					if err != nil {
-						return fmt.Errorf("[FATAL] Unable to serialize schema to json. Error: %+v. Schema struct: %+v", err, documentProperties.Definitions)
+						return fmt.Errorf("[FATAL] Unable to serialize schema to json. Error: %+v. Schema struct: %+v", err, v)
 					}
 					d.Set("value", string(value))
 				}
 			case "application/vnd.ms-azure-apim.xsd+xml", "application/vnd.ms-azure-apim.wadl.grammars+xml":
-				d.Set("value", documentProperties.Value)
+				d.Set("value", document["value"])
 			default:
 				log.Printf("[WARN] Unknown content type %q for schema %q (API Management Service %q / API %q / Resource Group %q)", *properties.ContentType, schemaID, serviceName, apiName, resourceGroup)
-				d.Set("value", documentProperties.Value)
+				d.Set("value", document["value"])
 			}
 		}
 	}

azurerm/internal/services/apimanagement/api_management_api_version_set_resource.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
+	"github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2021-01-01-preview/apimanagement"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"

azurerm/internal/services/apimanagement/api_management_authorization_server_resource.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
+	"github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2021-01-01-preview/apimanagement"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
@@ -52,14 +52,14 @@ func resourceApiManagementAuthorizationServer() *pluginsdk.Resource {
 				Elem: &pluginsdk.Schema{
 					Type: pluginsdk.TypeString,
 					ValidateFunc: validation.StringInSlice([]string{
-						string(apimanagement.DELETE),
-						string(apimanagement.GET),
-						string(apimanagement.HEAD),
-						string(apimanagement.OPTIONS),
-						string(apimanagement.PATCH),
-						string(apimanagement.POST),
-						string(apimanagement.PUT),
-						string(apimanagement.TRACE),
+						string(apimanagement.AuthorizationMethodDELETE),
+						string(apimanagement.AuthorizationMethodGET),
+						string(apimanagement.AuthorizationMethodHEAD),
+						string(apimanagement.AuthorizationMethodOPTIONS),
+						string(apimanagement.AuthorizationMethodPATCH),
+						string(apimanagement.AuthorizationMethodPOST),
+						string(apimanagement.AuthorizationMethodPUT),
+						string(apimanagement.AuthorizationMethodTRACE),
 					}, false),
 				},
 				Set: pluginsdk.HashString,
@@ -89,10 +89,10 @@ func resourceApiManagementAuthorizationServer() *pluginsdk.Resource {
 				Elem: &pluginsdk.Schema{
 					Type: pluginsdk.TypeString,
 					ValidateFunc: validation.StringInSlice([]string{
-						string(apimanagement.AuthorizationCode),
-						string(apimanagement.ClientCredentials),
-						string(apimanagement.Implicit),
-						string(apimanagement.ResourceOwnerPassword),
+						string(apimanagement.GrantTypeAuthorizationCode),
+						string(apimanagement.GrantTypeClientCredentials),
+						string(apimanagement.GrantTypeImplicit),
+						string(apimanagement.GrantTypeResourceOwnerPassword),
 					}, false),
 				},
 				Set: pluginsdk.HashString,
@@ -105,8 +105,8 @@ func resourceApiManagementAuthorizationServer() *pluginsdk.Resource {
 				Elem: &pluginsdk.Schema{
 					Type: pluginsdk.TypeString,
 					ValidateFunc: validation.StringInSlice([]string{
-						string(apimanagement.AuthorizationHeader),
-						string(apimanagement.Query),
+						string(apimanagement.BearerTokenSendingMethodAuthorizationHeader),
+						string(apimanagement.BearerTokenSendingMethodQuery),
 					}, false),
 				},
 				Set: pluginsdk.HashString,
@@ -118,8 +118,8 @@ func resourceApiManagementAuthorizationServer() *pluginsdk.Resource {
 				Elem: &pluginsdk.Schema{
 					Type: pluginsdk.TypeString,
 					ValidateFunc: validation.StringInSlice([]string{
-						string(apimanagement.Basic),
-						string(apimanagement.Body),
+						string(apimanagement.ClientAuthenticationMethodBasic),
+						string(apimanagement.ClientAuthenticationMethodBody),
 					}, false),
 				},
 				Set: pluginsdk.HashString,

azurerm/internal/services/apimanagement/api_management_backend_resource.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
+	"github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2021-01-01-preview/apimanagement"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"

azurerm/internal/services/apimanagement/api_management_certificate_resource.go

@@ -5,7 +5,7 @@ import (
 	"log"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
+	"github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2021-01-01-preview/apimanagement"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"

azurerm/internal/services/apimanagement/api_management_custom_domain_resource.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement"
+	"github.com/Azure/azure-sdk-for-go/services/preview/apimanagement/mgmt/2021-01-01-preview/apimanagement"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"