Skip to content

Commit

Permalink
servicebus: Update SDK to 2021-06-01-preview (#13701)
Browse files Browse the repository at this point in the history 
Required for at least #13514 and #9740

 Builds on Upgrade to v58.0.0 of Azure/azure-sdk-for-go #13613
  • Loading branch information
@aristosvo
aristosvo authored Oct 15, 2021
1 parent 3678e1e commit 5692cde
Show file tree
Hide file tree
Showing 34 changed files with 1,570 additions and 1,346 deletions.
2 changes: 1 addition & 1 deletion internal/services/servicebus/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package client

import (
servicebusPreview "github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2018-01-01-preview/servicebus"
"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
"github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2021-06-01-preview/servicebus"
"github.com/hashicorp/terraform-provider-azurerm/internal/common"
)

Expand Down
20 changes: 10 additions & 10 deletions internal/services/servicebus/internal.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"time"

"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
"github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2021-06-01-preview/servicebus"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/tf/pluginsdk"
Expand All @@ -17,15 +17,15 @@ func expandAuthorizationRuleRights(d *pluginsdk.ResourceData) *[]servicebus.Acce
rights := make([]servicebus.AccessRights, 0)

if d.Get("listen").(bool) {
rights = append(rights, servicebus.Listen)
rights = append(rights, servicebus.AccessRightsListen)
}

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

if d.Get("manage").(bool) {
rights = append(rights, servicebus.Manage)
rights = append(rights, servicebus.AccessRightsManage)
}

return &rights
Expand All @@ -37,11 +37,11 @@ func flattenAuthorizationRuleRights(rights *[]servicebus.AccessRights) (listen,
if rights != nil {
for _, right := range *rights {
switch right {
case servicebus.Listen:
case servicebus.AccessRightsListen:
listen = true
case servicebus.SendEnumValue:
case servicebus.AccessRightsSend:
send = true
case servicebus.Manage:
case servicebus.AccessRightsManage:
manage = true
default:
log.Printf("[DEBUG] Unknown Authorization Rule Right '%s'", right)
Expand Down Expand Up @@ -148,8 +148,8 @@ func waitForPairedNamespaceReplication(ctx context.Context, meta interface{}, re
aliasName := *disasterRecoveryResponse.Values()[0].Name

stateConf := &pluginsdk.StateChangeConf{
Pending: []string{string(servicebus.Accepted)},
Target: []string{string(servicebus.Succeeded)},
Pending: []string{string(servicebus.ProvisioningStateDRAccepted)},
Target: []string{string(servicebus.ProvisioningStateDRSucceeded)},
MinTimeout: 30 * time.Second,
Timeout: timeout,
Refresh: func() (interface{}, string, error) {
Expand All @@ -159,7 +159,7 @@ func waitForPairedNamespaceReplication(ctx context.Context, meta interface{}, re
}

if props := read.ArmDisasterRecoveryProperties; props != nil {
if props.ProvisioningState == servicebus.Failed {
if props.ProvisioningState == servicebus.ProvisioningStateDRFailed {
return read, "failed", fmt.Errorf("replication for Service Bus Namespace Disaster Recovery Configs %q (Namespace %q / Resource Group %q) failed", aliasName, namespaceName, resourceGroup)
}
return read, string(props.ProvisioningState), nil
Expand Down
2 changes: 1 addition & 1 deletion internal/services/servicebus/servicebus_namespace_authorization_rule_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
"github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2021-06-01-preview/servicebus"
"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
8 changes: 4 additions & 4 deletions internal/services/servicebus/servicebus_namespace_disaster_recovery_config_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"strconv"
"time"

"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
"github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2021-06-01-preview/servicebus"
"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 @@ -300,8 +300,8 @@ func resourceServiceBusNamespaceDisasterRecoveryConfigDelete(d *pluginsdk.Resour

func resourceServiceBusNamespaceDisasterRecoveryConfigWaitForState(ctx context.Context, client *servicebus.DisasterRecoveryConfigsClient, resourceGroup, namespaceName, name string, timeout time.Duration) error {
stateConf := &pluginsdk.StateChangeConf{
Pending: []string{string(servicebus.Accepted)},
Target: []string{string(servicebus.Succeeded)},
Pending: []string{string(servicebus.ProvisioningStateDRAccepted)},
Target: []string{string(servicebus.ProvisioningStateDRSucceeded)},
MinTimeout: 30 * time.Second,
Timeout: timeout,
Refresh: func() (interface{}, string, error) {
Expand All @@ -311,7 +311,7 @@ func resourceServiceBusNamespaceDisasterRecoveryConfigWaitForState(ctx context.C
}

if props := read.ArmDisasterRecoveryProperties; props != nil {
if props.ProvisioningState == servicebus.Failed {
if props.ProvisioningState == servicebus.ProvisioningStateDRFailed {
return read, "failed", fmt.Errorf("replication for Service Bus Namespace Disaster Recovery Configs %q (Namespace %q / Resource Group %q) failed", name, namespaceName, resourceGroup)
}
return read, string(props.ProvisioningState), nil
Expand Down
2 changes: 1 addition & 1 deletion internal/services/servicebus/servicebus_queue_authorization_rule_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
"github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2021-06-01-preview/servicebus"
"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
4 changes: 2 additions & 2 deletions internal/services/servicebus/servicebus_queue_data_source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
"github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2021-06-01-preview/servicebus"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/servicebus/parse"
Expand Down Expand Up @@ -164,7 +164,7 @@ func dataSourceServiceBusQueueRead(d *pluginsdk.ResourceData, meta interface{})
return err
}

if namespace.Sku.Name != servicebus.Premium {
if namespace.Sku.Name != servicebus.SkuNamePremium {
const partitionCount = 16
maxSizeInMegabytes = int(*apiMaxSizeInMegabytes / partitionCount)
}
Expand Down
24 changes: 12 additions & 12 deletions internal/services/servicebus/servicebus_queue_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
"github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2021-06-01-preview/servicebus"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/helpers/validate"
Expand Down Expand Up @@ -151,16 +151,16 @@ func resourceServiceBusQueue() *pluginsdk.Resource {
"status": {
Type: pluginsdk.TypeString,
Optional: true,
Default: string(servicebus.Active),
Default: string(servicebus.EntityStatusActive),
ValidateFunc: validation.StringInSlice([]string{
string(servicebus.Active),
string(servicebus.Creating),
string(servicebus.Deleting),
string(servicebus.Disabled),
string(servicebus.ReceiveDisabled),
string(servicebus.Renaming),
string(servicebus.SendDisabled),
string(servicebus.Unknown),
string(servicebus.EntityStatusActive),
string(servicebus.EntityStatusCreating),
string(servicebus.EntityStatusDeleting),
string(servicebus.EntityStatusDisabled),
string(servicebus.EntityStatusReceiveDisabled),
string(servicebus.EntityStatusRenaming),
string(servicebus.EntityStatusSendDisabled),
string(servicebus.EntityStatusUnknown),
}, false),
},
},
Expand Down Expand Up @@ -247,7 +247,7 @@ func resourceServiceBusQueueCreateUpdate(d *pluginsdk.ResourceData, meta interfa

// Enforce Premium namespace to have Express Entities disabled in Terraform since they are not supported for
// Premium SKU.
if namespace.Sku.Name == servicebus.Premium && d.Get("enable_express").(bool) {
if namespace.Sku.Name == servicebus.SkuNamePremium && d.Get("enable_express").(bool) {
return fmt.Errorf("ServiceBus Queue %q does not support Express Entities in Premium SKU and must be disabled", resourceId.Name)
}

Expand Down Expand Up @@ -310,7 +310,7 @@ func resourceServiceBusQueueRead(d *pluginsdk.ResourceData, meta interface{}) er
return err
}

if namespace.Sku.Name != servicebus.Premium {
if namespace.Sku.Name != servicebus.SkuNamePremium {
const partitionCount = 16
maxSizeInMegabytes = int(*apiMaxSizeInMegabytes / partitionCount)
}
Expand Down
10 changes: 5 additions & 5 deletions internal/services/servicebus/servicebus_subscription_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
"github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2021-06-01-preview/servicebus"
"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 @@ -119,11 +119,11 @@ func resourceServiceBusSubscription() *pluginsdk.Resource {
"status": {
Type: pluginsdk.TypeString,
Optional: true,
Default: string(servicebus.Active),
Default: string(servicebus.EntityStatusActive),
ValidateFunc: validation.StringInSlice([]string{
string(servicebus.Active),
string(servicebus.Disabled),
string(servicebus.ReceiveDisabled),
string(servicebus.EntityStatusActive),
string(servicebus.EntityStatusDisabled),
string(servicebus.EntityStatusReceiveDisabled),
}, false),
},
},
Expand Down
2 changes: 1 addition & 1 deletion internal/services/servicebus/servicebus_subscription_rule_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
"github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2021-06-01-preview/servicebus"
"github.com/hashicorp/go-azure-helpers/response"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
Expand Down
2 changes: 1 addition & 1 deletion internal/services/servicebus/servicebus_topic_authorization_rule_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
"github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2021-06-01-preview/servicebus"
"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
4 changes: 2 additions & 2 deletions internal/services/servicebus/servicebus_topic_data_source.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
"github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2021-06-01-preview/servicebus"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/internal/clients"
"github.com/hashicorp/terraform-provider-azurerm/internal/services/servicebus/parse"
Expand Down Expand Up @@ -138,7 +138,7 @@ func dataSourceServiceBusTopicRead(d *pluginsdk.ResourceData, meta interface{})
return err
}

if namespace.Sku.Name != servicebus.Premium {
if namespace.Sku.Name != servicebus.SkuNamePremium {
const partitionCount = 16
maxSize = int(*props.MaxSizeInMegabytes / partitionCount)
}
Expand Down
10 changes: 5 additions & 5 deletions internal/services/servicebus/servicebus_topic_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"log"
"time"

"github.com/Azure/azure-sdk-for-go/services/servicebus/mgmt/2017-04-01/servicebus"
"github.com/Azure/azure-sdk-for-go/services/preview/servicebus/mgmt/2021-06-01-preview/servicebus"
"github.com/hashicorp/terraform-provider-azurerm/helpers/azure"
"github.com/hashicorp/terraform-provider-azurerm/helpers/tf"
"github.com/hashicorp/terraform-provider-azurerm/helpers/validate"
Expand Down Expand Up @@ -58,10 +58,10 @@ func resourceServiceBusTopic() *pluginsdk.Resource {
"status": {
Type: pluginsdk.TypeString,
Optional: true,
Default: string(servicebus.Active),
Default: string(servicebus.EntityStatusActive),
ValidateFunc: validation.StringInSlice([]string{
string(servicebus.Active),
string(servicebus.Disabled),
string(servicebus.EntityStatusActive),
string(servicebus.EntityStatusDisabled),
}, true),
DiffSuppressFunc: suppress.CaseDifference,
},
Expand Down Expand Up @@ -237,7 +237,7 @@ func resourceServiceBusTopicRead(d *pluginsdk.ResourceData, meta interface{}) er
return err
}

if namespace.Sku.Name != servicebus.Premium {
if namespace.Sku.Name != servicebus.SkuNamePremium {
const partitionCount = 16
maxSize = int(*props.MaxSizeInMegabytes / partitionCount)
}
Expand Down
0 ...s/mgmt/2017-04-01/servicebus/CHANGELOG.md → ...021-06-01-preview/servicebus/CHANGELOG.md
View file
File renamed without changes.
11 changes: 11 additions & 0 deletions ...zure-sdk-for-go/services/preview/servicebus/mgmt/2021-06-01-preview/servicebus/_meta.json
View file

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

4 changes: 2 additions & 2 deletions ...ebus/mgmt/2017-04-01/servicebus/client.go → ...t/2021-06-01-preview/servicebus/client.go
View file

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

Loading

0 comments on commit 5692cde

Please sign in to comment.