Skip to content

Commit

Permalink
Upgrade to v58.0.0 of Azure/azure-sdk-for-go (#13613)
Browse files Browse the repository at this point in the history
  • Loading branch information
@aristosvo
aristosvo authored Oct 15, 2021
1 parent 6f4d6df commit afd0610
Show file tree
Hide file tree
Showing 719 changed files with 4,795 additions and 4,148 deletions.
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
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 v57.4.0+incompatible
github.com/Azure/azure-sdk-for-go v58.0.0+incompatible
github.com/Azure/go-autorest/autorest v0.11.19
github.com/Azure/go-autorest/autorest/date v0.3.0
github.com/Azure/go-autorest/autorest/to v0.4.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7
github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v51.2.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 v57.4.0+incompatible h1:uzhy/mTwu4rq6Be/fJJnE82PRx2A2vjGjzsA3aQ6Qu0=
github.com/Azure/azure-sdk-for-go v57.4.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/azure-sdk-for-go v58.0.0+incompatible h1:Cw16jiP4dI+CK761aq44ol4RV5dUiIIXky1+EKpoiVM=
github.com/Azure/azure-sdk-for-go v58.0.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
12 changes: 6 additions & 6 deletions internal/services/compute/image_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ func resourceImage() *pluginsdk.Resource {
Optional: true,
DiffSuppressFunc: suppress.CaseDifference,
ValidateFunc: validation.StringInSlice([]string{
string(compute.Linux),
string(compute.Windows),
string(compute.OperatingSystemTypesLinux),
string(compute.OperatingSystemTypesWindows),
}, true),
},

Expand All @@ -93,8 +93,8 @@ func resourceImage() *pluginsdk.Resource {
Optional: true,
DiffSuppressFunc: suppress.CaseDifference,
ValidateFunc: validation.StringInSlice([]string{
string(compute.Generalized),
string(compute.Specialized),
string(compute.OperatingSystemStateTypesGeneralized),
string(compute.OperatingSystemStateTypesSpecialized),
}, true),
},

Expand All @@ -117,7 +117,7 @@ func resourceImage() *pluginsdk.Resource {
"caching": {
Type: pluginsdk.TypeString,
Optional: true,
Default: string(compute.None),
Default: string(compute.CachingTypesNone),
DiffSuppressFunc: suppress.CaseDifference,
ValidateFunc: validation.StringInSlice([]string{
string(compute.CachingTypesNone),
Expand Down Expand Up @@ -164,7 +164,7 @@ func resourceImage() *pluginsdk.Resource {
"caching": {
Type: pluginsdk.TypeString,
Optional: true,
Default: string(compute.None),
Default: string(compute.CachingTypesNone),
ValidateFunc: validation.StringInSlice([]string{
string(compute.CachingTypesNone),
string(compute.CachingTypesReadOnly),
Expand Down
24 changes: 12 additions & 12 deletions internal/services/compute/linux_virtual_machine_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ func resourceLinuxVirtualMachine() *pluginsdk.Resource {
Importer: pluginsdk.ImporterValidatingResourceIdThen(func(id string) error {
_, err := parse.VirtualMachineID(id)
return err
}, importVirtualMachine(compute.Linux, "azurerm_linux_virtual_machine")),
}, importVirtualMachine(compute.OperatingSystemTypesLinux, "azurerm_linux_virtual_machine")),

Timeouts: &pluginsdk.ResourceTimeout{
Create: pluginsdk.DefaultTimeout(45 * time.Minute),
Expand Down Expand Up @@ -162,7 +162,7 @@ func resourceLinuxVirtualMachine() *pluginsdk.Resource {
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{
// NOTE: whilst Delete is an option here, it's only applicable for VMSS
string(compute.Deallocate),
string(compute.VirtualMachineEvictionPolicyTypesDeallocate),
}, false),
},

Expand Down Expand Up @@ -197,10 +197,10 @@ func resourceLinuxVirtualMachine() *pluginsdk.Resource {
Type: pluginsdk.TypeString,
Optional: true,
ForceNew: true,
Default: string(compute.Regular),
Default: string(compute.VirtualMachinePriorityTypesRegular),
ValidateFunc: validation.StringInSlice([]string{
string(compute.Regular),
string(compute.Spot),
string(compute.VirtualMachinePriorityTypesRegular),
string(compute.VirtualMachinePriorityTypesSpot),
}, false),
},

Expand Down Expand Up @@ -358,7 +358,7 @@ func resourceLinuxVirtualMachineCreate(d *pluginsdk.ResourceData, meta interface
networkInterfaceIds := expandVirtualMachineNetworkInterfaceIDs(networkInterfaceIdsRaw)

osDiskRaw := d.Get("os_disk").([]interface{})
osDisk := expandVirtualMachineOSDisk(osDiskRaw, compute.Linux)
osDisk := expandVirtualMachineOSDisk(osDiskRaw, compute.OperatingSystemTypesLinux)

secretsRaw := d.Get("secret").([]interface{})
secrets := expandLinuxSecrets(secretsRaw)
Expand Down Expand Up @@ -447,17 +447,17 @@ func resourceLinuxVirtualMachineCreate(d *pluginsdk.ResourceData, meta interface
}

if evictionPolicyRaw, ok := d.GetOk("eviction_policy"); ok {
if params.Priority != compute.Spot {
if params.Priority != compute.VirtualMachinePriorityTypesSpot {
return fmt.Errorf("An `eviction_policy` can only be specified when `priority` is set to `Spot`")
}

params.EvictionPolicy = compute.VirtualMachineEvictionPolicyTypes(evictionPolicyRaw.(string))
} else if priority == compute.Spot {
} else if priority == compute.VirtualMachinePriorityTypesSpot {
return fmt.Errorf("An `eviction_policy` must be specified when `priority` is set to `Spot`")
}

if v, ok := d.Get("max_bid_price").(float64); ok && v > 0 {
if priority != compute.Spot {
if priority != compute.VirtualMachinePriorityTypesSpot {
return fmt.Errorf("`max_bid_price` can only be configured when `priority` is set to `Spot`")
}

Expand Down Expand Up @@ -655,7 +655,7 @@ func resourceLinuxVirtualMachineRead(d *pluginsdk.ResourceData, meta interface{}
}
// Resources created with azurerm_virtual_machine have priority set to ""
// We need to treat "" as equal to "Regular" to allow migration azurerm_virtual_machine -> azurerm_linux_virtual_machine
priority := string(compute.Regular)
priority := string(compute.VirtualMachinePriorityTypesRegular)
if props.Priority != "" {
priority = string(props.Priority)
}
Expand Down Expand Up @@ -749,7 +749,7 @@ func resourceLinuxVirtualMachineUpdate(d *pluginsdk.ResourceData, meta interface
if storage := props.StorageProfile; storage != nil {
if disk := storage.OsDisk; disk != nil {
if settings := disk.DiffDiskSettings; settings != nil {
hasEphemeralOSDisk = settings.Option == compute.Local
hasEphemeralOSDisk = settings.Option == compute.DiffDiskOptionsLocal
}
}
}
Expand Down Expand Up @@ -865,7 +865,7 @@ func resourceLinuxVirtualMachineUpdate(d *pluginsdk.ResourceData, meta interface
shouldDeallocate = true

osDiskRaw := d.Get("os_disk").([]interface{})
osDisk := expandVirtualMachineOSDisk(osDiskRaw, compute.Linux)
osDisk := expandVirtualMachineOSDisk(osDiskRaw, compute.OperatingSystemTypesLinux)
update.VirtualMachineProperties.StorageProfile = &compute.StorageProfile{
OsDisk: osDisk,
}
Expand Down
52 changes: 26 additions & 26 deletions internal/services/compute/linux_virtual_machine_scale_set_resource.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func resourceLinuxVirtualMachineScaleSet() *pluginsdk.Resource {
Importer: pluginsdk.ImporterValidatingResourceIdThen(func(id string) error {
_, err := parse.VirtualMachineScaleSetID(id)
return err
}, importVirtualMachineScaleSet(compute.Linux, "azurerm_linux_virtual_machine_scale_set")),
}, importVirtualMachineScaleSet(compute.OperatingSystemTypesLinux, "azurerm_linux_virtual_machine_scale_set")),

Timeouts: &pluginsdk.ResourceTimeout{
Create: pluginsdk.DefaultTimeout(time.Minute * 30),
Expand Down Expand Up @@ -136,8 +136,8 @@ func resourceLinuxVirtualMachineScaleSet() *pluginsdk.Resource {
Optional: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{
string(compute.Deallocate),
string(compute.Delete),
string(compute.VirtualMachineEvictionPolicyTypesDeallocate),
string(compute.VirtualMachineEvictionPolicyTypesDelete),
}, false),
},

Expand Down Expand Up @@ -184,10 +184,10 @@ func resourceLinuxVirtualMachineScaleSet() *pluginsdk.Resource {
Type: pluginsdk.TypeString,
Optional: true,
ForceNew: true,
Default: string(compute.Regular),
Default: string(compute.VirtualMachinePriorityTypesRegular),
ValidateFunc: validation.StringInSlice([]string{
string(compute.Regular),
string(compute.Spot),
string(compute.VirtualMachinePriorityTypesRegular),
string(compute.VirtualMachinePriorityTypesSpot),
}, false),
},

Expand Down Expand Up @@ -235,11 +235,11 @@ func resourceLinuxVirtualMachineScaleSet() *pluginsdk.Resource {
Type: pluginsdk.TypeString,
Optional: true,
ForceNew: true,
Default: string(compute.Manual),
Default: string(compute.UpgradeModeManual),
ValidateFunc: validation.StringInSlice([]string{
string(compute.Automatic),
string(compute.Manual),
string(compute.Rolling),
string(compute.UpgradeModeAutomatic),
string(compute.UpgradeModeManual),
string(compute.UpgradeModeRolling),
}, false),
},

Expand All @@ -253,11 +253,11 @@ func resourceLinuxVirtualMachineScaleSet() *pluginsdk.Resource {
"scale_in_policy": {
Type: pluginsdk.TypeString,
Optional: true,
Default: string(compute.Default),
Default: string(compute.VirtualMachineScaleSetScaleInRulesDefault),
ValidateFunc: validation.StringInSlice([]string{
string(compute.Default),
string(compute.NewestVM),
string(compute.OldestVM),
string(compute.VirtualMachineScaleSetScaleInRulesDefault),
string(compute.VirtualMachineScaleSetScaleInRulesNewestVM),
string(compute.VirtualMachineScaleSetScaleInRulesOldestVM),
}, false),
},

Expand Down Expand Up @@ -322,7 +322,7 @@ func resourceLinuxVirtualMachineScaleSetCreate(d *pluginsdk.ResourceData, meta i
}

osDiskRaw := d.Get("os_disk").([]interface{})
osDisk := ExpandVirtualMachineScaleSetOSDisk(osDiskRaw, compute.Linux)
osDisk := ExpandVirtualMachineScaleSetOSDisk(osDiskRaw, compute.OperatingSystemTypesLinux)

planRaw := d.Get("plan").([]interface{})
plan := expandPlan(planRaw)
Expand All @@ -344,15 +344,15 @@ func resourceLinuxVirtualMachineScaleSetCreate(d *pluginsdk.ResourceData, meta i
rollingUpgradePolicyRaw := d.Get("rolling_upgrade_policy").([]interface{})
rollingUpgradePolicy := ExpandVirtualMachineScaleSetRollingUpgradePolicy(rollingUpgradePolicyRaw)

if upgradeMode != compute.Automatic && len(automaticOSUpgradePolicyRaw) > 0 {
if upgradeMode != compute.UpgradeModeAutomatic && len(automaticOSUpgradePolicyRaw) > 0 {
return fmt.Errorf("An `automatic_os_upgrade_policy` block cannot be specified when `upgrade_mode` is not set to `Automatic`")
}

shouldHaveRollingUpgradePolicy := upgradeMode == compute.Automatic || upgradeMode == compute.Rolling
shouldHaveRollingUpgradePolicy := upgradeMode == compute.UpgradeModeAutomatic || upgradeMode == compute.UpgradeModeRolling
if !shouldHaveRollingUpgradePolicy && len(rollingUpgradePolicyRaw) > 0 {
return fmt.Errorf("A `rolling_upgrade_policy` block cannot be specified when `upgrade_mode` is set to %q", string(upgradeMode))
}
shouldHaveRollingUpgradePolicy = upgradeMode == compute.Rolling
shouldHaveRollingUpgradePolicy = upgradeMode == compute.UpgradeModeRolling
if shouldHaveRollingUpgradePolicy && len(rollingUpgradePolicyRaw) == 0 {
return fmt.Errorf("A `rolling_upgrade_policy` block must be specified when `upgrade_mode` is set to %q", string(upgradeMode))
}
Expand Down Expand Up @@ -431,7 +431,7 @@ func resourceLinuxVirtualMachineScaleSetCreate(d *pluginsdk.ResourceData, meta i

// otherwise the service return the error:
// Rolling Upgrade mode is not supported for this Virtual Machine Scale Set because a health probe or health extension was not provided.
if upgradeMode == compute.Rolling && (healthProbeId == "" && !hasHealthExtension) {
if upgradeMode == compute.UpgradeModeRolling && (healthProbeId == "" && !hasHealthExtension) {
return fmt.Errorf("`health_probe_id` must be set or a health extension must be specified when `upgrade_mode` is set to %q", string(upgradeMode))
}

Expand All @@ -440,7 +440,7 @@ func resourceLinuxVirtualMachineScaleSetCreate(d *pluginsdk.ResourceData, meta i
}

if v, ok := d.Get("max_bid_price").(float64); ok && v > 0 {
if priority != compute.Spot {
if priority != compute.VirtualMachinePriorityTypesSpot {
return fmt.Errorf("`max_bid_price` can only be configured when `priority` is set to `Spot`")
}

Expand All @@ -465,11 +465,11 @@ func resourceLinuxVirtualMachineScaleSetCreate(d *pluginsdk.ResourceData, meta i
}

if evictionPolicyRaw, ok := d.GetOk("eviction_policy"); ok {
if virtualMachineProfile.Priority != compute.Spot {
if virtualMachineProfile.Priority != compute.VirtualMachinePriorityTypesSpot {
return fmt.Errorf("An `eviction_policy` can only be specified when `priority` is set to `Spot`")
}
virtualMachineProfile.EvictionPolicy = compute.VirtualMachineEvictionPolicyTypes(evictionPolicyRaw.(string))
} else if priority == compute.Spot {
} else if priority == compute.VirtualMachinePriorityTypesSpot {
return fmt.Errorf("An `eviction_policy` must be specified when `priority` is set to `Spot`")
}

Expand Down Expand Up @@ -632,7 +632,7 @@ func resourceLinuxVirtualMachineScaleSetUpdate(d *pluginsdk.ResourceData, meta i

priority := compute.VirtualMachinePriorityTypes(d.Get("priority").(string))
if d.HasChange("max_bid_price") {
if priority != compute.Spot {
if priority != compute.VirtualMachinePriorityTypesSpot {
return fmt.Errorf("`max_bid_price` can only be configured when `priority` is set to `Spot`")
}

Expand Down Expand Up @@ -847,7 +847,7 @@ func resourceLinuxVirtualMachineScaleSetUpdate(d *pluginsdk.ResourceData, meta i
Client: meta.(*clients.Client).Compute,
Existing: existing,
ID: id,
OSType: compute.Linux,
OSType: compute.OperatingSystemTypesLinux,
}

if err := metaData.performUpdate(ctx, update); err != nil {
Expand Down Expand Up @@ -932,7 +932,7 @@ func resourceLinuxVirtualMachineScaleSetRead(d *pluginsdk.ResourceData, meta int
d.Set("unique_id", props.UniqueID)
d.Set("zone_balance", props.ZoneBalance)

rule := string(compute.Default)
rule := string(compute.VirtualMachineScaleSetScaleInRulesDefault)
if props.ScaleInPolicy != nil {
if rules := props.ScaleInPolicy.Rules; rules != nil && len(*rules) > 0 {
rule = string((*rules)[0])
Expand All @@ -956,7 +956,7 @@ func resourceLinuxVirtualMachineScaleSetRead(d *pluginsdk.ResourceData, meta int

// the service just return empty when this is not assigned when provisioned
// See discussion on https://github.com/Azure/azure-rest-api-specs/issues/10971
priority := compute.Regular
priority := compute.VirtualMachinePriorityTypesRegular
if profile.Priority != "" {
priority = profile.Priority
}
Expand Down
Loading

0 comments on commit afd0610

Please sign in to comment.