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

new resource azurerm_stack_hci_deployment_setting #25646

Merged
merged 19 commits into from
Sep 20, 2024

Conversation

teowa
Copy link
Contributor

@teowa teowa commented Apr 17, 2024

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 "+1" or "me too" comments, they generate extra noise for PR followers and do not help prioritize for review

Description

Azure Doc: https://learn.microsoft.com/en-us/azure-stack/hci/deploy/deployment-azure-resource-manager-template
REST API: https://github.com/Azure/azure-rest-api-specs/blob/c4e661cdf92c8f579574008d0cd11874cc303da0/specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2024-01-01/deploymentSettings.json

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)

The test can only run on Windows Administrator PowerShell, and can only run based on a VM image customized to simulate Azure VM as a HCI host, since real Azure Stack HCI needs hardware to deploy.

test env:

$env:ARM_TEST_HCI_IMAGE_ID='/subscriptions/xxxx/resourceGroups/xxxx/providers/Microsoft.Compute/galleries/xxxx/images/xxxx/versions/xxxx'
$env:ARM_TEST_HCI_LOCAL_ADMIN_USER='xxxx'
$env:ARM_TEST_HCI_LOCAL_ADMIN_USER_PASSWORD='xxxx'
$env:ARM_TEST_HCI_DOMAIN_ADMIN_USER='xxxx'
$env:ARM_TEST_HCI_DOMAIN_ADMIN_USER_PASSWORD='xxxx'
$env:ARM_TEST_HCI_DEPLOYMENT_USER='xxxx'
$env:ARM_TEST_HCI_DEPLOYMENT_USER_PASSWORD=xxxx'

My local test:

>> go test -v .\internal\services\azurestackhci -run TestAccStackHCIDeploymentSetting_basic -timeout 24h
=== RUN   TestAccStackHCIDeploymentSetting_basic
=== PAUSE TestAccStackHCIDeploymentSetting_basic
=== CONT  TestAccStackHCIDeploymentSetting_basic
--- PASS: TestAccStackHCIDeploymentSetting_basic (11582.30s)
PASS
ok      github.com/hashicorp/terraform-provider-azurerm/internal/services/azurestackhci 18322.985s

Change Log

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

  • new resource azurerm_stack_hci_deployment_setting [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 #0000

Note

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

@teowa teowa force-pushed the stackhci_deployment_setting branch from cfbabcf to 8538e65 Compare April 18, 2024 10:33
@teowa teowa mentioned this pull request Apr 22, 2024
14 tasks
Copy link
Contributor

@ms-zhenhua ms-zhenhua left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @teowa, Thanks for this PR - I've taken a look through and left some comments inline. If we can fix those up, this should be good to go 👍

},
},

"override_adapter_property_enabled": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please provide the default value

Suggested change
"override_adapter_property_enabled": {
"adapter_property_overriding_enabled": {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we keep it as override_adapter_property_enabled, so it is consistent with above override_adapter_property block?

default: false added

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed to adapter_property_override_enabled

website/docs/r/stack_hci_deployment_setting.html.markdown Outdated Show resolved Hide resolved
website/docs/r/stack_hci_deployment_setting.html.markdown Outdated Show resolved Hide resolved
website/docs/r/stack_hci_deployment_setting.html.markdown Outdated Show resolved Hide resolved

* `infrastructure_network` - (Required) One or more `infrastructure_network` blocks as defined above. Changing this forces a new Stack HCI Deployment Setting to be created.

* `naming_prefix` - (Required) Specifies the naming prefix to deploy cluster. It must be 1-8 characters long and contain only letters, numbers and hyphens Changing this forces a new Stack HCI Deployment Setting to be created.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it the name prefix of the cluster or something else?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is not the cluster naming prefix, it is used in naming somthing produced during deployment.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed to name_prefix

website/docs/r/stack_hci_deployment_setting.html.markdown Outdated Show resolved Hide resolved
@teowa teowa force-pushed the stackhci_deployment_setting branch from b3e0542 to 1f59032 Compare May 11, 2024 02:36
@teowa
Copy link
Contributor Author

teowa commented May 29, 2024

local test result:

image

@teowa
Copy link
Contributor Author

teowa commented Jun 19, 2024

image

@katbyte
Copy link
Collaborator

katbyte commented Jun 21, 2024

@ms-zhenhua is this pr ready for review or still being worked on and is a draft?

@teowa teowa marked this pull request as ready for review June 24, 2024 07:51
@jackofallops jackofallops self-assigned this Jul 30, 2024
Copy link
Member

@jackofallops jackofallops left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @teowa - I've added a few minor comments below for error messages / documentation. I believe it's otherwise looking OK. If you can re-post the test results including these and previous changes since the PR was opened, I think we should be OK to merge 👍


applianceClient := metadata.Client.ArcResourceBridge.AppliancesClient
if err := applianceClient.DeleteThenPoll(ctx, applianceId); err != nil {
return fmt.Errorf("deleting %s: %+v", applianceId, err)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we add some contextual information to the wrapped text here, since the user isn't managing this resource directly, it may be ver confusing to have this message presented for a resource they may be unaware of?

}

if err := storageContainerClient.DeleteThenPoll(ctx, *storageContainerId); err != nil {
return err
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we have this error wrapped, as above with context for the user to understand what is happening?


# azurerm_stack_hci_deployment_setting

Manages a Stack HCI Deployment Setting.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we also get a note added about the additional resources created on behalf of the user in their resource group to help ensure they are aware of their existence and importance, and that Terraform will attempt to remove these on deletion or recreation of this resource?

@teowa
Copy link
Contributor Author

teowa commented Aug 9, 2024

latest test results:
image
image

MinItems: 1,
Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"adou_path": {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

adou? what does this mean? google doesn't come up with anything

please make the property name more clear if it is an acronym,

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

changed to active_directory_organizational_unit_path

Type: pluginsdk.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringIsNotEmpty,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we validate this? should it be a uri?

Copy link
Contributor Author

@teowa teowa Sep 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

validation added, it's a domain name like core.windows.net

Type: pluginsdk.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringIsNotEmpty,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and here

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be storage account name, validation added.

Type: pluginsdk.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringIsNotEmpty,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we validate this is a FQDN?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

validation added, it's a domain name like jumpstart.local

MaxItems: 1,
Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"jumbo_packet": {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be an int? and validated?

Copy link
Contributor Author

@teowa teowa Sep 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's plain string format and related to specific OEM setting. And by test, empty string should be sent if user does not specify the property. https://github.com/Azure/azure-rest-api-specs/blob/c41b76298becce0a8cfac4e682773d5d0c78dcb2/specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2024-01-01/deploymentSettings.json#L784-L786

MaxItems: 1,
Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"bandwidth_percentage_smb": {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is a percentage so why is it a string?

Copy link
Contributor Author

@teowa teowa Sep 14, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's plain string format and related to specific OEM setting. And by test, empty string should be sent if user does not specify the property. https://github.com/Azure/azure-rest-api-specs/blob/c41b76298becce0a8cfac4e682773d5d0c78dcb2/specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2024-01-01/deploymentSettings.json#L784-L786

Elem: &pluginsdk.Resource{
Schema: map[string]*pluginsdk.Schema{
"enable_iov": {
Type: pluginsdk.TypeString,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is an "enable" so true or false but is a string? shoiuld it not be a boolean ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's plain string format and related to specific OEM setting. And by test, empty string should be sent if user does not specify the property. https://github.com/Azure/azure-rest-api-specs/blob/c41b76298becce0a8cfac4e682773d5d0c78dcb2/specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2024-01-01/deploymentSettings.json#L784-L786

Comment on lines 736 to 737
// the resource may exist even validation error
metadata.SetID(id)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm not sure what this means, we should not be setting the ID until after the resource is created?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated, SetID is moved after resource is created.

Copy link
Collaborator

@katbyte katbyte left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🎩

@katbyte katbyte merged commit ee0b793 into hashicorp:main Sep 20, 2024
34 checks passed
katbyte added a commit that referenced this pull request Sep 20, 2024
@github-actions github-actions bot added this to the v4.3.0 milestone Sep 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants