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

Updating the Azure SDK to v40.3.0 / AzureAD to v0.8.0 #6134

Merged
merged 7 commits into from Mar 19, 2020
Merged

Updating the Azure SDK to v40.3.0 / AzureAD to v0.8.0 #6134

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
104213c
dependencies: updating github.com/Azure/azure-sdk-for-go to v40.3.0
tombuildsstuff Mar 17, 2020
ddea299
dependencies: updating to use the latest fork of github.com/Azure/go-…
tombuildsstuff Mar 17, 2020
20fa114
code changes needed to update go-autorest
tombuildsstuff Mar 17, 2020
024f5d3
dependencies: updating to v0.8.0 of github.com/terraform-providers/te…
tombuildsstuff Mar 17, 2020
a4c7bc3
cleanup: go mod tidy
tombuildsstuff Mar 17, 2020
b0c29f6
git merge origin
katbyte Mar 19, 2020
3286448
updated logic apps to for new package location
katbyte Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions azurerm/internal/clients/client.go
View file
Open in desktop
Expand Up @@ -3,6 +3,7 @@ package clients
import (
"context"

"github.com/Azure/go-autorest/autorest"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features"
analysisServices "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/analysisservices/client"
Expand Down Expand Up @@ -147,6 +148,8 @@ type Client struct {
// NOTE: it should be possible for this method to become Private once the top level Client's removed

func (client *Client) Build(ctx context.Context, o *common.ClientOptions) error {
autorest.Count429AsRetry = false

client.Features = o.Features
client.StopContext = ctx

Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/logic/client/client.go
View file
Open in desktop
@@ -1,7 +1,7 @@
package client

import (
"github.com/Azure/azure-sdk-for-go/services/preview/logic/mgmt/2019-05-01/logic"
"github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/common"
)

Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/logic/data_source_logic_app_workflow.go
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/preview/logic/mgmt/2019-05-01/logic"
"github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/logic/logic_apps.go
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"log"

"github.com/Azure/azure-sdk-for-go/services/preview/logic/mgmt/2019-05-01/logic"
"github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
Expand Down
2 changes: 1 addition & 1 deletion azurerm/internal/services/logic/resource_arm_logic_app_workflow.go
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/preview/logic/mgmt/2019-05-01/logic"
"github.com/Azure/azure-sdk-for-go/services/logic/mgmt/2019-05-01/logic"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
Expand Down
4 changes: 2 additions & 2 deletions azurerm/internal/services/monitor/resource_arm_monitor_metric_alert.go
View file
Open in desktop
Expand Up @@ -397,7 +397,7 @@ func expandMonitorMetricAlertAction(input []interface{}) *[]insights.MetricAlert

actions = append(actions, insights.MetricAlertAction{
ActionGroupID: utils.String(agID),
WebhookProperties: props,
WebHookProperties: props,
})
}
}
Expand Down Expand Up @@ -466,7 +466,7 @@ func flattenMonitorMetricAlertAction(input *[]insights.MetricAlertAction) (resul
}

props := make(map[string]string)
for pk, pv := range action.WebhookProperties {
for pk, pv := range action.WebHookProperties {
if pv != nil {
props[pk] = *pv
}
Expand Down
12 changes: 6 additions & 6 deletions go.mod
View file
Open in desktop
@@ -1,8 +1,8 @@
module github.com/terraform-providers/terraform-provider-azurerm

require (
github.com/Azure/azure-sdk-for-go v38.1.0+incompatible
github.com/Azure/go-autorest/autorest v0.9.3
github.com/Azure/azure-sdk-for-go v40.3.0+incompatible
github.com/Azure/go-autorest/autorest v0.10.0
github.com/Azure/go-autorest/autorest/date v0.2.0
github.com/btubbs/datetime v0.1.0
github.com/davecgh/go-spew v1.1.1
Expand All @@ -16,17 +16,17 @@ require (
github.com/hashicorp/terraform-plugin-sdk v1.6.0
github.com/satori/go.uuid v1.2.0
github.com/satori/uuid v0.0.0-20160927100844-b061729afc07
github.com/terraform-providers/terraform-provider-azuread v0.6.1-0.20191007035844-361c0a206ad4
github.com/terraform-providers/terraform-provider-azuread v0.8.0
github.com/tombuildsstuff/giovanni v0.9.0
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413
golang.org/x/net v0.0.0-20191009170851-d66e71096ffb
gopkg.in/yaml.v2 v2.2.2
)

replace github.com/Azure/go-autorest => github.com/tombuildsstuff/go-autorest v0.9.3-hashi-auth
replace github.com/Azure/go-autorest => github.com/tombuildsstuff/go-autorest v14.0.1-0.20200317095413-f2d2d0252c3c+incompatible

replace github.com/Azure/go-autorest/autorest => github.com/tombuildsstuff/go-autorest/autorest v0.9.3-hashi-auth
replace github.com/Azure/go-autorest/autorest => github.com/tombuildsstuff/go-autorest/autorest v0.10.1-0.20200317095413-f2d2d0252c3c

replace github.com/Azure/go-autorest/autorest/azure/auth => github.com/tombuildsstuff/go-autorest/autorest/azure/auth v0.9.3-hashi-auth-subm
replace github.com/Azure/go-autorest/autorest/azure/auth => github.com/tombuildsstuff/go-autorest/autorest/azure/auth v0.4.3-0.20200317095413-f2d2d0252c3c

go 1.13