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

azurerm_orchestrated_virtual_machine_scale_set - Support new VMSS Flex functionality #14003

Merged
merged 24 commits into from
Nov 13, 2021
Merged
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
ef2237b
Initial check-in
WodansSon Nov 3, 2021
119d9c8
Add ovmss sku spilt func
WodansSon Nov 3, 2021
722f212
update recoveryservices and add documentation
WodansSon Nov 3, 2021
8344890
update vendor
WodansSon Nov 3, 2021
eda58c2
Merge branch 'main' of https://github.com/hashicorp/terraform-provide…
WodansSon Nov 3, 2021
ee7d802
go mod vendor
katbyte Nov 3, 2021
79cbcf9
Merge branch 'main' into f-ovmss
katbyte Nov 3, 2021
98addee
update test case to remove depricated field
WodansSon Nov 3, 2021
8246e4d
Merge branch 'main' into f-ovmss
WodansSon Nov 9, 2021
d5fd020
Remove support for extensions
WodansSon Nov 10, 2021
cca11c7
Add note to documentation about extension support
WodansSon Nov 10, 2021
5d9576f
Split Capacity out of sku_name
WodansSon Nov 11, 2021
0e2d689
Update sku parsing due to spliting out capacity
WodansSon Nov 11, 2021
7071fcb
Fix comment format
WodansSon Nov 11, 2021
f107578
Add retry logic
WodansSon Nov 11, 2021
2f31be8
Update error message for create retry
WodansSon Nov 11, 2021
02b582c
Added case for unretryable in retry else case
WodansSon Nov 11, 2021
ecd3632
Update website/docs/r/orchestrated_virtual_machine_scale_set.html.mar…
WodansSon Nov 11, 2021
cb4f89d
Update website/docs/r/orchestrated_virtual_machine_scale_set.html.mar…
WodansSon Nov 11, 2021
9ced15a
Make instances optional and computed
WodansSon Nov 11, 2021
88e066a
Merge branch 'main' of https://github.com/hashicorp/terraform-provide…
WodansSon Nov 12, 2021
0e66018
Update err msg to match main
WodansSon Nov 12, 2021
7ee00df
Change field name to termination_notification
WodansSon Nov 13, 2021
ad90800
Add TODO note for 3.0
WodansSon Nov 13, 2021
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
Prev Previous commit
Next Next commit
Added case for unretryable in retry else case
  • Loading branch information
WodansSon committed Nov 11, 2021
commit 02b582ce2a9079b8d2752dd6619aee9f7a4ca50a
Original file line number Diff line number Diff line change
Expand Up @@ -452,14 +452,19 @@ func resourceOrchestratedVirtualMachineScaleSetCreate(d *pluginsdk.ResourceData,
}

err = future.WaitForCompletionRef(ctx, client.Client)
if err != nil {
if err != nil && strings.Contains(err.Error(), "RetryableError") {
if errCount == 10 {
return fmt.Errorf("waiting for creation of Orchestrated Virtual Machine Scale Set %q (Resource Group %q) after %d retries: %+v", name, resourceGroup, err, errCount)
}
errCount++
} else {
// err came back nil and finally succeeded continue with the rest of the create function...
break
if err != nil {
// Hit an error while retying that is not retryable anymore...
return fmt.Errorf("hit unretryable error waiting for creation of Orchestrated Virtual Machine Scale Set %q (Resource Group %q) after %d retries: %+v", name, resourceGroup, err, errCount)
} else {
// err is nil and finally succeeded continue with the rest of the create function...
break
}
}
}
} else {
Expand Down