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.

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

dependancies - upgrade Azure/azure-sdk-for-go to v41.2.0 #6419

Merged
merged 4 commits into from
Apr 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions azurerm/helpers/azure/eventhub.go
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func ExpandEventHubAuthorizationRuleRights(d *schema.ResourceData) *[]eventhub.A
}

if d.Get("send").(bool) {
rights = append(rights, eventhub.Send)
rights = append(rights, eventhub.SendEnumValue)
}

if d.Get("manage").(bool) {
Expand All @@ -67,7 +67,7 @@ func FlattenEventHubAuthorizationRuleRights(rights *[]eventhub.AccessRights) (li
switch right {
case eventhub.Listen:
listen = true
case eventhub.Send:
case eventhub.SendEnumValue:
send = true
case eventhub.Manage:
manage = true
Expand Down
4 changes: 2 additions & 2 deletions azurerm/helpers/azure/servicebus.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func ExpandServiceBusAuthorizationRuleRights(d *schema.ResourceData) *[]serviceb
}

if d.Get("send").(bool) {
rights = append(rights, servicebus.Send)
rights = append(rights, servicebus.SendEnumValue)
}

if d.Get("manage").(bool) {
Expand All @@ -73,7 +73,7 @@ func FlattenServiceBusAuthorizationRuleRights(rights *[]servicebus.AccessRights)
switch right {
case servicebus.Listen:
listen = true
case servicebus.Send:
case servicebus.SendEnumValue:
send = true
case servicebus.Manage:
manage = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@ func resourceArmMonitorMetricAlert() *schema.Resource {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringInSlice([]string{
"Equals",
"NotEquals",
"GreaterThan",
"GreaterThanOrEqual",
"LessThan",
"LessThanOrEqual",
string(insights.OperatorEquals),
string(insights.OperatorGreaterThan),
string(insights.OperatorGreaterThanOrEqual),
string(insights.OperatorLessThan),
string(insights.OperatorLessThanOrEqual),
string(insights.OperatorNotEquals),
}, false),
},
"threshold": {
Expand Down Expand Up @@ -372,7 +372,7 @@ func expandMonitorMetricAlertCriteria(input []interface{}) *insights.MetricAlert
MetricNamespace: utils.String(v["metric_namespace"].(string)),
MetricName: utils.String(v["metric_name"].(string)),
TimeAggregation: v["aggregation"].(string),
Operator: v["operator"].(string),
Operator: insights.Operator(v["operator"].(string)),
Threshold: utils.Float(v["threshold"].(float64)),
Dimensions: &dimensions,
})
Expand Down Expand Up @@ -425,9 +425,9 @@ func flattenMonitorMetricAlertCriteria(input insights.BasicMetricAlertCriteria)
if aggr, ok := metric.TimeAggregation.(string); ok {
v["aggregation"] = aggr
}
if op, ok := metric.Operator.(string); ok {
v["operator"] = op
}

v["operator"] = string(metric.Operator)

if metric.Threshold != nil {
v["threshold"] = *metric.Threshold
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ func expandNotificationHubAuthorizationRuleRights(manage bool, send bool, listen
}

if send {
rights = append(rights, notificationhubs.Send)
rights = append(rights, notificationhubs.SendEnumValue)
}

if listen {
Expand All @@ -248,7 +248,7 @@ func flattenNotificationHubAuthorizationRuleRights(input *[]notificationhubs.Acc
case notificationhubs.Manage:
manage = true
continue
case notificationhubs.Send:
case notificationhubs.SendEnumValue:
send = true
continue
case notificationhubs.Listen:
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module github.com/terraform-providers/terraform-provider-azurerm

require (
github.com/Azure/azure-sdk-for-go v40.3.0+incompatible
github.com/Azure/azure-sdk-for-go v41.2.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
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ github.com/Azure/azure-sdk-for-go v32.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9mo
github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v40.3.0+incompatible h1:NthZg3psrLxvQLN6rVm07pZ9mv2wvGNaBNGQ3fnPvLE=
github.com/Azure/azure-sdk-for-go v40.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v41.2.0+incompatible h1:JOlv1wDuxcJi1ExJpQLNfEj6znsTFt2TiwQMow2YaXI=
github.com/Azure/azure-sdk-for-go v41.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/go-autorest/autorest/adal v0.5.0/go.mod h1:8Z9fGy2MpX0PvDjB1pEgQTmVqjGhiHBW7RJJEciWzS0=
github.com/Azure/go-autorest/autorest/adal v0.6.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc=
github.com/Azure/go-autorest/autorest/adal v0.8.0/go.mod h1:Z6vX6WXXuyieHAXwMj0S6HY6e6wcHn37qQMBQlvY3lc=
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading