Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade Api Management from 2020-12-01 to 2021-08-01 #14312

Merged
merged 9 commits into from Dec 14, 2021
Merged

Upgrade Api Management from 2020-12-01 to 2021-08-01 #14312

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6582dc8
Update Go SDK to v59.3.0+incompatible
oWretch Nov 24, 2021
32c5bb7
Update apimanagment module to 2021-08-01
oWretch Dec 5, 2021
6c05256
Update constant names that changed
oWretch Dec 5, 2021
3034861
Remove workaround resolved in 2019-01-01
oWretch Nov 24, 2021
a73f458
Configure examples for operation representations
oWretch Nov 30, 2021
16ee06d
Handle error with nil references on properties
oWretch Dec 9, 2021
945f03e
Move to List instead of Set and correct parameter name
oWretch Dec 10, 2021
06e5633
Update tests to use examples instead of sample
oWretch Dec 10, 2021
8999887
Correct terraform formatting
oWretch Dec 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@ module github.com/hashicorp/terraform-provider-azurerm

require (
cloud.google.com/go/storage v1.16.0 // indirect
github.com/Azure/azure-sdk-for-go v59.2.0+incompatible
github.com/Azure/azure-sdk-for-go v59.3.0+incompatible
github.com/Azure/go-autorest/autorest v0.11.22
github.com/Azure/go-autorest/autorest/date v0.3.0
github.com/Azure/go-autorest/autorest/to v0.4.0
Expand Down
3 changes: 2 additions & 1 deletion go.sum
View file
Open in desktop
Expand Up @@ -44,8 +44,9 @@ cloud.google.com/go/storage v1.16.0/go.mod h1:ieKBmUyzcftN5tbxwnXClMKH00CfcQ+xL6
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v56.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v59.2.0+incompatible h1:mbxiZy1K820hQ+dI+YIO/+a0wQDYqOu18BAGe4lXjVk=
github.com/Azure/azure-sdk-for-go v59.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v59.3.0+incompatible h1:dPIm0BO4jsMXFcCI/sLTPkBtE7mk8WMuRHA0JeWhlcQ=
github.com/Azure/azure-sdk-for-go v59.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
github.com/Azure/go-autorest v14.2.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
github.com/Azure/go-autorest/autorest v0.11.3/go.mod h1:JFgpikqFJ/MleTTxwepExTKnFUKKszPS8UavbQYUMuw=
Expand Down
4 changes: 2 additions & 2 deletions internal/services/apimanagement/api_management_api_data_source.go
View file
Open in desktop
Expand Up @@ -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/apimanagement/mgmt/2021-08-01/apimanagement"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/apimanagement/schemaz"
Expand Down Expand Up @@ -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)
Expand Down
26 changes: 13 additions & 13 deletions internal/services/apimanagement/api_management_api_diagnostic_resource.go
View file
Open in desktop
Expand Up @@ -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/apimanagement/mgmt/2021-08-01/apimanagement"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down Expand Up @@ -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),
},

Expand Down Expand Up @@ -113,10 +113,10 @@ func resourceApiManagementApiDiagnostic() *pluginsdk.Resource {
"operation_name_format": {
Type: pluginsdk.TypeString,
Optional: true,
Default: string(apimanagement.Name),
Default: string(apimanagement.OperationNameFormatName),
ValidateFunc: validation.StringInSlice([]string{
string(apimanagement.Name),
string(apimanagement.URL),
string(apimanagement.OperationNameFormatName),
string(apimanagement.OperationNameFormatURL),
}, false),
},
},
Expand Down Expand Up @@ -193,15 +193,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 {
Expand Down Expand Up @@ -287,7 +287,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)
Expand All @@ -306,7 +306,7 @@ func resourceApiManagementApiDiagnosticRead(d *pluginsdk.ResourceData, meta inte
d.Set("backend_response", nil)
}

format := string(apimanagement.Name)
format := string(apimanagement.OperationNameFormatName)
if props.OperationNameFormat != "" {
format = string(props.OperationNameFormat)
}
Expand Down Expand Up @@ -397,8 +397,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),
},

Expand Down
6 changes: 3 additions & 3 deletions internal/services/apimanagement/api_management_api_operation_policy_resource.go
View file
Open in desktop
Expand Up @@ -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/apimanagement/mgmt/2021-08-01/apimanagement"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down Expand Up @@ -91,14 +91,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),
}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/services/apimanagement/api_management_api_operation_policy_resource_test.go
View file
Open in desktop
Expand Up @@ -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/apimanagement/mgmt/2021-08-01/apimanagement"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/apimanagement/api_management_api_operation_resource.go
View file
Open in desktop
Expand Up @@ -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/apimanagement/mgmt/2021-08-01/apimanagement"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
20 changes: 16 additions & 4 deletions internal/services/apimanagement/api_management_api_operation_resource_test.go
View file
Open in desktop
Expand Up @@ -279,7 +279,9 @@ resource "azurerm_api_management_api_operation" "test" {
representation {
content_type = "application/xml"

sample = <<SAMPLE
example {
name = "sample"
value = <<SAMPLE
<response>
<user name="bravo24">
<groups>
Expand All @@ -290,6 +292,7 @@ resource "azurerm_api_management_api_operation" "test" {
</response>
SAMPLE

}
}
}
}
Expand Down Expand Up @@ -326,7 +329,9 @@ resource "azurerm_api_management_api_operation" "test" {
representation {
content_type = "application/xml"

sample = <<SAMPLE
example {
name = "sample"
value = <<SAMPLE
<response>
<user name="bravo24">
<groups>
Expand All @@ -337,6 +342,7 @@ resource "azurerm_api_management_api_operation" "test" {
</response>
SAMPLE

}
}
}
}
Expand Down Expand Up @@ -373,7 +379,9 @@ resource "azurerm_api_management_api_operation" "test" {
representation {
content_type = "application/xml"

sample = <<SAMPLE
example {
name = "sample"
value = <<SAMPLE
<response>
<user name="bravo24">
<groups>
Expand All @@ -384,12 +392,15 @@ resource "azurerm_api_management_api_operation" "test" {
</response>
SAMPLE

}
}

representation {
content_type = "application/json"

sample = <<SAMPLE
example {
name = "sample"
value = <<SAMPLE
{
"user": {
"groups": [
Expand All @@ -406,6 +417,7 @@ SAMPLE
}
SAMPLE

}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/services/apimanagement/api_management_api_operation_tag_resource.go
View file
Open in desktop
Expand Up @@ -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/apimanagement/mgmt/2021-08-01/apimanagement"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/apimanagement/parse"
Expand Down
6 changes: 3 additions & 3 deletions internal/services/apimanagement/api_management_api_policy_resource.go
View file
Open in desktop
Expand Up @@ -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/apimanagement/mgmt/2021-08-01/apimanagement"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down Expand Up @@ -88,7 +88,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 != "" {
Expand All @@ -100,7 +100,7 @@ func resourceApiManagementAPIPolicyCreateUpdate(d *pluginsdk.ResourceData, meta
}

parameters.PolicyContractProperties = &apimanagement.PolicyContractProperties{
Format: apimanagement.Rawxml,
Format: apimanagement.PolicyContentFormatRawxml,
Value: utils.String(xmlContent),
}
}
Expand Down
2 changes: 1 addition & 1 deletion internal/services/apimanagement/api_management_api_policy_resource_test.go
View file
Open in desktop
Expand Up @@ -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/apimanagement/mgmt/2021-08-01/apimanagement"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance"
"github.com/hashicorp/terraform-provider-azurerm/internal/acceptance/check"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/apimanagement/api_management_api_release.go
View file
Open in desktop
Expand Up @@ -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/apimanagement/mgmt/2021-08-01/apimanagement"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/apimanagement/parse"
Expand Down
34 changes: 17 additions & 17 deletions internal/services/apimanagement/api_management_api_resource.go
View file
Open in desktop
Expand Up @@ -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/apimanagement/mgmt/2021-08-01/apimanagement"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down Expand Up @@ -106,16 +106,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),
},

Expand Down Expand Up @@ -310,11 +310,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.
Expand All @@ -339,7 +339,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", id.Name)
}

Expand Down Expand Up @@ -467,7 +467,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)
Expand Down
2 changes: 1 addition & 1 deletion internal/services/apimanagement/api_management_api_schema_resource.go
View file
Open in desktop
Expand Up @@ -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/apimanagement/mgmt/2021-08-01/apimanagement"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/apimanagement/api_management_api_version_set_resource.go
View file
Open in desktop
Expand Up @@ -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/apimanagement/mgmt/2021-08-01/apimanagement"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
Expand Down