Skip to content

Commit 23c7a25

Browse files
committed
Some update to conform 2.0
1 parent 79ae328 commit 23c7a25

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

azurerm/internal/services/compute/resource_arm_linux_virtual_machine_scale_set.go

+6-3
Original file line numberDiff line numberDiff line change
@@ -802,10 +802,13 @@ func resourceArmLinuxVirtualMachineScaleSetRead(d *schema.ResourceData, meta int
802802
d.Set("unique_id", props.UniqueID)
803803
d.Set("zone_balance", props.ZoneBalance)
804804

805-
if props.ScaleInPolicy != nil && len(*props.ScaleInPolicy.Rules) > 0 {
806-
rules := *props.ScaleInPolicy.Rules
807-
d.Set("scale_in_policy", string(rules[0]))
805+
rule := string(compute.Default)
806+
if props.ScaleInPolicy != nil {
807+
if rules := props.ScaleInPolicy.Rules; rules != nil && len(*rules) > 0 {
808+
rule = string((*rules)[0])
809+
}
808810
}
811+
d.Set("scale_in_policy", rule)
809812

810813
if profile := props.VirtualMachineProfile; profile != nil {
811814
if err := d.Set("boot_diagnostics", flattenBootDiagnostics(profile.DiagnosticsProfile)); err != nil {

azurerm/internal/services/compute/resource_arm_windows_virtual_machine_scale_set.go

+6-3
Original file line numberDiff line numberDiff line change
@@ -848,10 +848,13 @@ func resourceArmWindowsVirtualMachineScaleSetRead(d *schema.ResourceData, meta i
848848
}
849849
}
850850

851-
if props.ScaleInPolicy != nil && len(*props.ScaleInPolicy.Rules) > 0 {
852-
rules := *props.ScaleInPolicy.Rules
853-
d.Set("scale_in_policy", string(rules[0]))
851+
rule := string(compute.Default)
852+
if props.ScaleInPolicy != nil {
853+
if rules := props.ScaleInPolicy.Rules; rules != nil && len(*rules) > 0 {
854+
rule = string((*rules)[0])
855+
}
854856
}
857+
d.Set("scale_in_policy", rule)
855858

856859
if profile := props.VirtualMachineProfile; profile != nil {
857860
if err := d.Set("boot_diagnostics", flattenBootDiagnostics(profile.DiagnosticsProfile)); err != nil {

0 commit comments

Comments
 (0)