`azurerm_machine_learning_compute_cluster` - `subnet_resource_id` does not have to be specified when `node_public_ip_enabled` is `false` #28673

mbfrahry · 2025-02-04T00:17:13Z

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

This PR makes it possible so that subnet_resource_id does not have to be specified when node_public_ip_enabled is false.

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_machine_learning_compute_cluster - subnet_resource_id does not have to be specified when node_public_ip_enabled is false [GH-00000]

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 #27506

Note

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

…t have to be specified when node_public_ip_enabled is false

stephybun · 2025-02-04T07:27:13Z

internal/services/machinelearning/machine_learning_compute_cluster_resource.go

@@ -155,8 +155,10 @@ func resourceComputeCluster() *pluginsdk.Resource {
 			},

 			"subnet_resource_id": {
-				Type:     pluginsdk.TypeString,
+				Type: pluginsdk.TypeString,
+				// O + C as you don't have to specify it for Azure to assign one to the cluster


Suggested change

// O + C as you don't have to specify it for Azure to assign one to the cluster

// NOTE: O+C as you don't have to specify it for Azure to assign one to the cluster

stephybun · 2025-02-05T09:24:35Z

internal/services/machinelearning/machine_learning_compute_cluster_resource.go

-	workspaceInManagedVnet := false
-
-	if workspaceModel.Properties != nil &&
-		workspaceModel.Properties.ManagedNetwork != nil &&
-		workspaceModel.Properties.ManagedNetwork.Status != nil &&
-		workspaceModel.Properties.ManagedNetwork.Status.Status != nil {
-		workspaceInManagedVnet = *workspaceModel.Properties.ManagedNetwork.Status.Status == workspaces.ManagedNetworkStatusActive
-	}


Are you able to confirm that this check isn't still required? Do we have an acceptance test for this?

I believe my acceptance test covered this check not being needed because nodePublicIPEnabled was false, the subnetResourceID was not specified and the workspace was not in a managed vnet and that test passes

--- PASS: TestAccComputeCluster_subnetResourceId (670.21s)

stephybun

Thanks @mbfrahry! One last comment regarding the docs, but once that's been updated this will be good to go!

stephybun · 2025-02-06T07:09:05Z

internal/services/machinelearning/machine_learning_compute_cluster_resource.go

-	}
-
-	if !nodePublicIPEnabled && subnetResourceID == "" && !workspaceInManagedVnet {
-		return fmt.Errorf("`subnet_resource_id` must be set if `node_public_ip_enabled` is set to `false` or the workspace is not in a managed network")


Last comment, the docs mention this validation for the node_public_ip_enabled property, we should remove it.

Good shout and done! Thanks @stephybun

stephybun

Thanks @mbfrahry LGTM 🦄

* CHANGELOG.md for v4.18.0 * Update CHANGELOG.md for #28308 * Update for #28447 * Update for #28532 * Update for #28537 * Update CHANGELOG.md for #28674 * Update for #28363 * Update for #28536 * Update for #28416 * Update CHANGELOG.md #28700 * Update for #28673 * Update for #28308 Co-authored-by: Wodans Son <[email protected]> * Update for #27533 * prep for release --------- Co-authored-by: stephybun <[email protected]> Co-authored-by: sreallymatt <[email protected]> Co-authored-by: Wodans Son <[email protected]>

…s not have to be specified when `node_public_ip_enabled` is `false` (hashicorp#28673) * azurerm_machine_learning_compute_cluster - subnet_resource_id does not have to be specified when node_public_ip_enabled is false * Address review * Fix O+C message * address doc fix

* CHANGELOG.md for v4.18.0 * Update CHANGELOG.md for hashicorp#28308 * Update for hashicorp#28447 * Update for hashicorp#28532 * Update for hashicorp#28537 * Update CHANGELOG.md for hashicorp#28674 * Update for hashicorp#28363 * Update for hashicorp#28536 * Update for hashicorp#28416 * Update CHANGELOG.md hashicorp#28700 * Update for hashicorp#28673 * Update for hashicorp#28308 Co-authored-by: Wodans Son <[email protected]> * Update for hashicorp#27533 * prep for release --------- Co-authored-by: stephybun <[email protected]> Co-authored-by: sreallymatt <[email protected]> Co-authored-by: Wodans Son <[email protected]>

azurerm_machine_learning_compute_cluster - subnet_resource_id does no…

c4b823f

…t have to be specified when node_public_ip_enabled is false

mbfrahry requested a review from a team as a code owner February 4, 2025 00:17

mbfrahry added this to the v4.18.0 milestone Feb 4, 2025

github-actions bot added bug service/machine-learning size/M waiting-response labels Feb 4, 2025

stephybun reviewed Feb 4, 2025

View reviewed changes

Address review

7bd7e57

github-actions bot removed the waiting-response label Feb 4, 2025

Fix O+C message

c02b3c3

stephybun reviewed Feb 5, 2025

View reviewed changes

github-actions bot added the waiting-response label Feb 5, 2025

stephybun reviewed Feb 6, 2025

View reviewed changes

address doc fix

517407d

github-actions bot added documentation and removed waiting-response labels Feb 6, 2025

stephybun approved these changes Feb 6, 2025

View reviewed changes

stephybun merged commit 63d83f5 into main Feb 6, 2025
34 checks passed

stephybun deleted the b-mlcc-subnet-resource-id branch February 6, 2025 15:46

stephybun added a commit that referenced this pull request Feb 6, 2025

Update for #28673

71abb80

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`azurerm_machine_learning_compute_cluster` - `subnet_resource_id` does not have to be specified when `node_public_ip_enabled` is `false` #28673

`azurerm_machine_learning_compute_cluster` - `subnet_resource_id` does not have to be specified when `node_public_ip_enabled` is `false` #28673

mbfrahry commented Feb 4, 2025

stephybun Feb 4, 2025

stephybun Feb 5, 2025

mbfrahry Feb 6, 2025

stephybun left a comment

stephybun Feb 6, 2025

mbfrahry Feb 6, 2025

stephybun left a comment

	// O + C as you don't have to specify it for Azure to assign one to the cluster
	// NOTE: O+C as you don't have to specify it for Azure to assign one to the cluster

azurerm_machine_learning_compute_cluster - subnet_resource_id does not have to be specified when node_public_ip_enabled is false #28673

azurerm_machine_learning_compute_cluster - subnet_resource_id does not have to be specified when node_public_ip_enabled is false #28673

Conversation

mbfrahry commented Feb 4, 2025

Community Note

Description

PR Checklist

Changes to existing Resource / Data Source

Testing

Change Log

Related Issue(s)

stephybun Feb 4, 2025

Choose a reason for hiding this comment

stephybun Feb 5, 2025

Choose a reason for hiding this comment

mbfrahry Feb 6, 2025

Choose a reason for hiding this comment

stephybun left a comment

Choose a reason for hiding this comment

stephybun Feb 6, 2025

Choose a reason for hiding this comment

mbfrahry Feb 6, 2025

Choose a reason for hiding this comment

stephybun left a comment

Choose a reason for hiding this comment

`azurerm_machine_learning_compute_cluster` - `subnet_resource_id` does not have to be specified when `node_public_ip_enabled` is `false` #28673

`azurerm_machine_learning_compute_cluster` - `subnet_resource_id` does not have to be specified when `node_public_ip_enabled` is `false` #28673