`azurerm_orchestrated_virtual_machine_scale_set` - add `sku_profile` to support instance mix feature #27599

ms-zhenhua · 2024-10-09T07:57:18Z

Community Note

Please vote on this PR by adding a 👍 reaction to the original PR to help the community and maintainers prioritize for review
Please do not leave comments along the lines of "+1", "me too" or "any updates", they generate extra noise for PR followers and do not help prioritize for review

Description

MS-DOC

PR Checklist

I have followed the guidelines in our Contributing Documentation.
I have checked to ensure there aren't other open Pull Requests for the same update/change.
I have checked if my changes close any open issues. If so please include appropriate closing keywords below.
I have updated/added Documentation as required written in a helpful and kind way to assist users that may be unfamiliar with the resource / data source.
I have used a meaningful PR title to help maintainers and other users understand this change and help prevent duplicate work.
For example: “resource_name_here - description of change e.g. adding property new_property_name_here”

Changes to existing Resource / Data Source

I have added an explanation of what my changes do and why I'd like you to include them (This may be covered by linking to an issue above, but may benefit from additional explanation).
I have written new tests for my resource or datasource changes & updated any relevent documentation.
I have successfully run tests with my changes locally. If not, please provide details on testing challenges that prevented you running the tests.
(For changes that include a state migration only). I have manually tested the migration path between relevant versions of the provider.

Testing

My submission includes Test coverage as described in the Contribution Guide and the tests pass. (if this is not possible for any reason, please include details of why you did or could not add test coverage)

Change Log

Below please provide what should go into the changelog (if anything) conforming to the Changelog Format documented here.

azurerm_orchestrated_virtual_machine_scale_set - add sku_profile to support mix instance feature

This is a (please select all that apply):

Bug Fix
New Feature (ie adding a service, resource, or data source)
Enhancement
Breaking Change

Related Issue(s)

Fixes #0000

Note

If this PR changes meaningfully during the course of review please update the title and description as required.

jackofallops

Hi @ms-zhenhua - Thanks for this PR. A few things to take a look at below. It also looks like there's inconsistency between the schema and the code for the new block, can you take a look?

Thanks

jackofallops · 2024-10-25T09:28:12Z

internal/services/compute/orchestrated_virtual_machine_scale_set_resource_test.go

+	// currently only supported in EastUS, WestUS, EastUS2, and WestUS2
+	data.Locations.Primary = "eastus2"


Can we update this to be a TODO so we know it needs to be removed when the Preview is rolled out to our normal testing region(s).

Can we get an estimate from the Service team as to when this will be deployed to the normal regions?

Suggested change

// currently only supported in EastUS, WestUS, EastUS2, and WestUS2

data.Locations.Primary = "eastus2"

// TODO - Remove this override when Preview is rolled out to westeurope - currently only supported in EastUS, WestUS, EastUS2, and WestUS2

data.Locations.Primary = "eastus2"

Updated. I am still confirming with the service team when will westeurope be available.

the current rollout which will take approximately 2 weeks will enable the feature in all regions

jackofallops · 2024-10-25T09:28:41Z

internal/services/compute/orchestrated_virtual_machine_scale_set_resource_test.go

+	// currently only supported in EastUS, WestUS, EastUS2, and WestUS2
+	data.Locations.Primary = "eastus2"


As above

Suggested change

// currently only supported in EastUS, WestUS, EastUS2, and WestUS2

data.Locations.Primary = "eastus2"

// TODO - Remove this override when Preview is rolled out to westeurope - currently only supported in EastUS, WestUS, EastUS2, and WestUS2

data.Locations.Primary = "eastus2"

updated. thanks.

jackofallops · 2024-10-25T09:31:21Z

internal/services/compute/orchestrated_virtual_machine_scale_set_resource.go

+			"sku_profile": {
+				Type:     pluginsdk.TypeList,
+				Optional: true,
+				ForceNew: true,


Given this is ForceNew what is the default value here? Are we going to trigger replacements for existing resources?

sku_profile can be set only when sku_name="Mix" and it cannot be added/removed through update. However, its sub-properties allocation_strategy and vm_sizes can be changed through Update.

jackofallops · 2024-10-25T09:33:15Z

internal/services/compute/orchestrated_virtual_machine_scale_set_resource.go

@@ -351,6 +380,14 @@ func resourceOrchestratedVirtualMachineScaleSetCreate(d *pluginsdk.ResourceData,
 		props.Sku = sku
 	}

+	if v, ok := d.GetOk("sku_profile"); ok {
+		if props.Sku == nil || pointer.From(props.Sku.Name) != "Mix" {


Could this be implemented as a customiseDiff to catch this configuration issue at plan time rather than erroring out here?

moved the logic into customiseDiff . Thanks.

jackofallops · 2024-10-25T09:35:16Z

internal/services/compute/orchestrated_virtual_machine_scale_set_resource.go

@@ -351,6 +380,14 @@ func resourceOrchestratedVirtualMachineScaleSetCreate(d *pluginsdk.ResourceData,
 		props.Sku = sku
 	}

+	if v, ok := d.GetOk("sku_profile"); ok {
+		if props.Sku == nil || pointer.From(props.Sku.Name) != "Mix" {


Also, can we have this ("Mix") defined as a const rather than using magic string everywhere?
maybe:

Suggested change

if props.Sku == nil || pointer.From(props.Sku.Name) != "Mix" {

if props.Sku == nil || pointer.From(props.Sku.Name) != skuNameMix {

defined it in a const variable. Thanks.

jackofallops · 2024-10-25T09:36:22Z

internal/services/compute/orchestrated_virtual_machine_scale_set_resource.go

@@ -732,6 +769,11 @@ func resourceOrchestratedVirtualMachineScaleSetUpdate(d *pluginsdk.ResourceData,
 			}
 		}

+		if d.HasChange("sku_profile") {


This block is ForceNew in the schema, why are we checking for updates?

answered in the above comment. Though it's defined ForceNew, its sub-properties can be changed through Update as long as sku_profile is not removed.

…er-azurerm into flexible-vmss-instance-mix

ms-zhenhua · 2024-10-29T00:30:00Z

Hi @jackofallops, thank you for your review. I have resolved the comments. For testcases, I will create another PR to remove the region limitation once Azure supports it. Could you please help take another review?

--- PASS: TestAccOrchestratedVirtualMachineScaleSet_skuProfileErrorConfiguration (32.10s)
--- PASS: TestAccOrchestratedVirtualMachineScaleSet_skuProfile (440.99s)
PASS
ok github.com/hashicorp/terraform-provider-azurerm/internal/services/compute 445.475s

jackofallops

Hi @ms-zhenhua - Thanks for making those changes, this LGTM now 👍

jackofallops · 2024-10-29T15:53:13Z

Testing looks fine - failures are not related to change:

github-actions · 2024-11-29T02:17:25Z

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active contributions.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

add sku_profile to support mix instance

23cb065

github-actions bot added documentation size/XL labels Oct 9, 2024

ms-zhenhua changed the title ~~azurerm_orchestrated_virtual_machine_scale_set - add sku_profile to support mix instance feature~~ azurerm_orchestrated_virtual_machine_scale_set - add sku_profile to support instance mix feature Oct 9, 2024

ms-zhenhua marked this pull request as ready for review October 9, 2024 08:31

rcskosir added the enhancement label Oct 14, 2024

jackofallops requested changes Oct 25, 2024

View reviewed changes

github-actions bot added the waiting-response label Oct 25, 2024

resolve comments

e05d671

ms-zhenhua requested review from katbyte and a team as code owners October 28, 2024 05:59

github-actions bot removed the waiting-response label Oct 28, 2024

Merge branch 'main' of https://github.com/ms-zhenhua/terraform-provid…

a1a0c90

…er-azurerm into flexible-vmss-instance-mix

github-actions bot added the waiting-response label Oct 28, 2024

ms-zhenhua requested a review from jackofallops October 29, 2024 00:30

github-actions bot removed the waiting-response label Oct 29, 2024

jackofallops approved these changes Oct 29, 2024

View reviewed changes

jackofallops merged commit 0af5a37 into hashicorp:main Oct 29, 2024
40 checks passed

github-actions bot added this to the v4.8.0 milestone Oct 29, 2024

jackofallops added a commit that referenced this pull request Oct 29, 2024

Update CHANGELOG.md for #27599

163cb97

github-actions bot locked as resolved and limited conversation to collaborators Nov 29, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`azurerm_orchestrated_virtual_machine_scale_set` - add `sku_profile` to support instance mix feature #27599

`azurerm_orchestrated_virtual_machine_scale_set` - add `sku_profile` to support instance mix feature #27599

ms-zhenhua commented Oct 9, 2024 •

edited

Loading

jackofallops left a comment

jackofallops Oct 25, 2024

ms-zhenhua Oct 28, 2024

msdorahu Oct 28, 2024

jackofallops Oct 25, 2024

ms-zhenhua Oct 28, 2024

jackofallops Oct 25, 2024

ms-zhenhua Oct 28, 2024

jackofallops Oct 25, 2024

ms-zhenhua Oct 28, 2024

jackofallops Oct 25, 2024

ms-zhenhua Oct 28, 2024

jackofallops Oct 25, 2024

ms-zhenhua Oct 28, 2024 •

edited

Loading

ms-zhenhua commented Oct 29, 2024

jackofallops left a comment

jackofallops commented Oct 29, 2024

github-actions bot commented Nov 29, 2024

		// currently only supported in EastUS, WestUS, EastUS2, and WestUS2
		data.Locations.Primary = "eastus2"

	if props.Sku == nil \|\| pointer.From(props.Sku.Name) != "Mix" {
	if props.Sku == nil \|\| pointer.From(props.Sku.Name) != skuNameMix {

azurerm_orchestrated_virtual_machine_scale_set - add sku_profile to support instance mix feature #27599

azurerm_orchestrated_virtual_machine_scale_set - add sku_profile to support instance mix feature #27599

Conversation

ms-zhenhua commented Oct 9, 2024 • edited Loading

Community Note

Description

PR Checklist

Changes to existing Resource / Data Source

Testing

Change Log

Related Issue(s)

jackofallops left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ms-zhenhua Oct 28, 2024 • edited Loading

Choose a reason for hiding this comment

ms-zhenhua commented Oct 29, 2024

jackofallops left a comment

Choose a reason for hiding this comment

jackofallops commented Oct 29, 2024

github-actions bot commented Nov 29, 2024

`azurerm_orchestrated_virtual_machine_scale_set` - add `sku_profile` to support instance mix feature #27599

`azurerm_orchestrated_virtual_machine_scale_set` - add `sku_profile` to support instance mix feature #27599

ms-zhenhua commented Oct 9, 2024 •

edited

Loading

ms-zhenhua Oct 28, 2024 •

edited

Loading