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 azure-sdk-for-go to v29.0.0 #3335

Merged
merged 7 commits into from
May 10, 2019
Merged

Upgrade azure-sdk-for-go to v29.0.0 #3335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ffffa64
go get github.com/Azure/azure-sdk-for-go@v28.0.0; go mod tidy; go mod…
katbyte Apr 29, 2019
15db09b
changes so build will pass
katbyte Apr 29, 2019
3b7621a
revert json test output
katbyte Apr 29, 2019
230a08f
upgrade to v28.1.0
katbyte Apr 30, 2019
5bcf40a
Merge branch 'master' into sdk/v28.0.0
katbyte May 7, 2019
95f0587
go get github.com/Azure/azure-sdk-for-go@v28.0.0; go mod tidy; go mod…
katbyte May 7, 2019
bdbd976
make build pass
katbyte May 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions azurerm/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
keyVault "github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault"
"github.com/Azure/azure-sdk-for-go/services/keyvault/mgmt/2018-02-14/keyvault"
"github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2016-06-01/logic"
"github.com/Azure/azure-sdk-for-go/services/mariadb/mgmt/2018-06-01/mariadb"
"github.com/Azure/azure-sdk-for-go/services/mediaservices/mgmt/2018-07-01/media"
"github.com/Azure/azure-sdk-for-go/services/mysql/mgmt/2017-12-01/mysql"
"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2018-12-01/network"
Expand All @@ -43,7 +44,6 @@ import (
"github.com/Azure/azure-sdk-for-go/services/preview/eventgrid/mgmt/2018-09-15-preview/eventgrid"
"github.com/Azure/azure-sdk-for-go/services/preview/hdinsight/mgmt/2018-06-01-preview/hdinsight"
"github.com/Azure/azure-sdk-for-go/services/preview/iothub/mgmt/2018-12-01-preview/devices"
"github.com/Azure/azure-sdk-for-go/services/preview/mariadb/mgmt/2018-06-01-preview/mariadb"
"github.com/Azure/azure-sdk-for-go/services/preview/monitor/mgmt/2018-03-01/insights"
"github.com/Azure/azure-sdk-for-go/services/preview/msi/mgmt/2015-08-31-preview/msi"
"github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights"
Expand Down Expand Up @@ -323,11 +323,11 @@ type ArmClient struct {

// Resources
managementLocksClient locks.ManagementLocksClient
deploymentsClient resources.DeploymentsClient
deploymentsClient resources.DeploymentsGroupClient
providersClient resourcesprofile.ProvidersClient
resourcesClient resources.Client
resourceGroupsClient resources.GroupsClient
subscriptionsClient subscriptions.Client
resourcesClient resources.GroupClient
resourceGroupsClient resources.GroupsGroupClient
subscriptionsClient subscriptions.GroupClient

// Scheduler
schedulerJobCollectionsClient scheduler.JobCollectionsClient //nolint: megacheck
Expand Down Expand Up @@ -1255,19 +1255,19 @@ func (c *ArmClient) registerResourcesClients(endpoint, subscriptionId string, au
c.configureClient(&locksClient.Client, auth)
c.managementLocksClient = locksClient

deploymentsClient := resources.NewDeploymentsClientWithBaseURI(endpoint, subscriptionId)
deploymentsClient := resources.NewDeploymentsGroupClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&deploymentsClient.Client, auth)
c.deploymentsClient = deploymentsClient

resourcesClient := resources.NewClientWithBaseURI(endpoint, subscriptionId)
resourcesClient := resources.NewGroupClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&resourcesClient.Client, auth)
c.resourcesClient = resourcesClient

resourceGroupsClient := resources.NewGroupsClientWithBaseURI(endpoint, subscriptionId)
resourceGroupsClient := resources.NewGroupsGroupClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&resourceGroupsClient.Client, auth)
c.resourceGroupsClient = resourceGroupsClient

subscriptionsClient := subscriptions.NewClientWithBaseURI(endpoint)
subscriptionsClient := subscriptions.NewGroupClientWithBaseURI(endpoint)
c.configureClient(&subscriptionsClient.Client, auth)
c.subscriptionsClient = subscriptionsClient

Expand Down
2 changes: 1 addition & 1 deletion azurerm/data_source_dns_zone.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ func dataSourceArmDnsZoneRead(d *schema.ResourceData, meta interface{}) error {
return nil
}

func findZone(client dns.ZonesClient, rgClient resources.GroupsClient, ctx context.Context, name string) (dns.Zone, string, error) {
func findZone(client dns.ZonesClient, rgClient resources.GroupsGroupClient, ctx context.Context, name string) (dns.Zone, string, error) {
groups, err := rgClient.List(ctx, "", nil)
if err != nil {
return dns.Zone{}, "", fmt.Errorf("Error listing Resource Groups: %+v", err)
Expand Down
2 changes: 1 addition & 1 deletion azurerm/resource_arm_function_app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func resourceArmFunctionApp() *schema.Resource {
Required: true,
DiffSuppressFunc: ignoreCaseDiffSuppressFunc,
ValidateFunc: validation.StringInSlice([]string{
string(web.SystemAssigned),
string(web.ManagedServiceIdentityTypeSystemAssigned),
}, true),
},
"principal_id": {
Expand Down
7 changes: 4 additions & 3 deletions azurerm/resource_arm_log_analytics_workspace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/Azure/azure-sdk-for-go/services/preview/operationalinsights/mgmt/2015-11-01-preview/operationalinsights"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/suppress"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
)
Expand Down Expand Up @@ -40,14 +41,14 @@ func resourceArmLogAnalyticsWorkspace() *schema.Resource {
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{
string(operationalinsights.Free),
string(operationalinsights.PerGB2018),
string(operationalinsights.PerNode),
string(operationalinsights.Premium),
string(operationalinsights.Standalone),
string(operationalinsights.Standard),
string(operationalinsights.Unlimited),
string(operationalinsights.PerGB2018),
string("Unlimited"), // TODO check if this is actually no longer valid, removed in v28.0.0 of the SDK
}, true),
DiffSuppressFunc: ignoreCaseDiffSuppressFunc,
DiffSuppressFunc: suppress.CaseDifference,
},

"retention_in_days": {
Expand Down
2 changes: 1 addition & 1 deletion azurerm/resource_arm_mariadb_database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"regexp"

"github.com/Azure/azure-sdk-for-go/services/preview/mariadb/mgmt/2018-06-01-preview/mariadb"
"github.com/Azure/azure-sdk-for-go/services/mariadb/mgmt/2018-06-01/mariadb"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/resource_arm_mariadb_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"

"github.com/Azure/azure-sdk-for-go/services/preview/mariadb/mgmt/2018-06-01-preview/mariadb"
"github.com/Azure/azure-sdk-for-go/services/mariadb/mgmt/2018-06-01/mariadb"
"github.com/hashicorp/terraform/helper/schema"
"github.com/hashicorp/terraform/helper/validation"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response"
Expand Down
4 changes: 2 additions & 2 deletions azurerm/resource_arm_template_deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ func normalizeJson(jsonString interface{}) string {
return string(b[:])
}

func waitForTemplateDeploymentToBeDeleted(ctx context.Context, client resources.DeploymentsClient, resourceGroup, name string) error {
func waitForTemplateDeploymentToBeDeleted(ctx context.Context, client resources.DeploymentsGroupClient, resourceGroup, name string) error {
// we can't use the Waiter here since the API returns a 200 once it's deleted which is considered a polling status code..
log.Printf("[DEBUG] Waiting for Template Deployment (%q in Resource Group %q) to be deleted", name, resourceGroup)
stateConf := &resource.StateChangeConf{
Expand All @@ -292,7 +292,7 @@ func waitForTemplateDeploymentToBeDeleted(ctx context.Context, client resources.
return nil
}

func templateDeploymentStateStatusCodeRefreshFunc(ctx context.Context, client resources.DeploymentsClient, resourceGroup, name string) resource.StateRefreshFunc {
func templateDeploymentStateStatusCodeRefreshFunc(ctx context.Context, client resources.DeploymentsGroupClient, resourceGroup, name string) resource.StateRefreshFunc {
return func() (interface{}, string, error) {
res, err := client.Get(ctx, resourceGroup, name)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/terraform-providers/terraform-provider-azurerm

require (
contrib.go.opencensus.io/exporter/ocagent v0.4.1 // indirect
github.com/Azure/azure-sdk-for-go v26.7.0+incompatible
github.com/Azure/azure-sdk-for-go v29.0.0+incompatible
github.com/Azure/go-autorest v11.7.0+incompatible
github.com/davecgh/go-spew v1.1.1
github.com/dnaeon/go-vcr v1.0.1 // indirect
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1
dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
github.com/Azure/azure-sdk-for-go v21.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v26.7.0+incompatible h1:movJyZXzP/fsGdOyEaDfkcw9GhAOar7z4AQoqeMQigw=
github.com/Azure/azure-sdk-for-go v26.7.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v29.0.0+incompatible h1:CYPU39ULbGjQBo3gXIqiWouK0C4F+Pt2Zx5CqGvqknE=
github.com/Azure/azure-sdk-for-go v29.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/go-autorest v10.15.4+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
github.com/Azure/go-autorest v11.7.0+incompatible h1:gzma19dc9ejB75D90E5S+/wXouzpZyA+CV+/MJPSD/k=
github.com/Azure/go-autorest v11.7.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
Expand Down
Loading