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_arc_machine - support identity and tags properties #27987

Merged
merged 3 commits into from
Nov 19, 2024

Conversation

teowa
Copy link
Contributor

@teowa teowa commented Nov 12, 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 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

swagger:https://github.com/Azure/azure-rest-api-specs/blob/20f765ef6dfb1b649a69b808bc0053e3e91150f1/specification/hybridcompute/resource-manager/Microsoft.HybridCompute/stable/2024-07-10/HybridCompute.json#L2314

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)
-> % make acctests SERVICE="hybridcompute" TESTARGS="-parallel 5 -run TestAccArcMachineResource_" TESTTIMEOUT='2h'
==> Checking that code complies with gofmt requirements...
==> Checking that Custom Timeouts are used...
==> Checking that acceptance test packages are used...
TF_ACC=1 go test -v ./internal/services/hybridcompute -parallel 5 -run TestAccArcMachineResource_ -timeout 2h -ldflags="-X=github.com/hashicorp/terraform-provider-azurerm/version.ProviderVersion=acc"
=== RUN   TestAccArcMachineResource_basic
--- PASS: TestAccArcMachineResource_basic (62.11s)
=== RUN   TestAccArcMachineResource_requiresImport
--- PASS: TestAccArcMachineResource_requiresImport (57.97s)
=== RUN   TestAccArcMachineResource_identity
--- PASS: TestAccArcMachineResource_identity (58.90s)
=== RUN   TestAccArcMachineResource_update
--- PASS: TestAccArcMachineResource_update (99.18s)
PASS
ok      github.com/hashicorp/terraform-provider-azurerm/internal/services/hybridcompute 278.181s

Change Log

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

  • azurerm_arc_machine - support for identity and tags properties

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.

if resp.Model == nil {
return fmt.Errorf("retrieving %s: `model` was nil", *id)
}
existing := resp.Model
Copy link
Member

Choose a reason for hiding this comment

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

Minor, but for consistency can we please call this

Suggested change
existing := resp.Model
payload := resp.Model

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

Comment on lines 164 to 184
func (r ArcMachineResource) identity(data acceptance.TestData) string {
return fmt.Sprintf(`
%s

provider "azurerm" {
features {}
}

resource "azurerm_arc_machine" "test" {
name = "acctest-hcm-%d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
kind = "SCVMM"

identity {
type = "SystemAssigned"
}
}
`, r.template(data), data.RandomInteger)
}

Copy link
Member

Choose a reason for hiding this comment

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

Given only one identity type is available here, we can omit this specific identity config and rely on the complete config to test identity

Suggested change
func (r ArcMachineResource) identity(data acceptance.TestData) string {
return fmt.Sprintf(`
%s
provider "azurerm" {
features {}
}
resource "azurerm_arc_machine" "test" {
name = "acctest-hcm-%d"
resource_group_name = azurerm_resource_group.test.name
location = azurerm_resource_group.test.location
kind = "SCVMM"
identity {
type = "SystemAssigned"
}
}
`, r.template(data), data.RandomInteger)
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed

Comment on lines 51 to 64
func TestAccArcMachineResource_identity(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_arc_machine", "test")
r := ArcMachineResource{}

data.ResourceSequentialTest(t, r, []acceptance.TestStep{
{
Config: r.identity(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
func TestAccArcMachineResource_identity(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_arc_machine", "test")
r := ArcMachineResource{}
data.ResourceSequentialTest(t, r, []acceptance.TestStep{
{
Config: r.identity(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}
func TestAccArcMachineResource_complete(t *testing.T) {
data := acceptance.BuildTestData(t, "azurerm_arc_machine", "test")
r := ArcMachineResource{}
data.ResourceSequentialTest(t, r, []acceptance.TestStep{
{
Config: r.complete(data),
Check: acceptance.ComposeTestCheckFunc(
check.That(data.ResourceName).ExistsInAzure(r),
),
},
data.ImportStep(),
})
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

removed

Copy link
Member

@stephybun stephybun 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 LGTM 💯

@stephybun stephybun merged commit 04d4eed into hashicorp:main Nov 19, 2024
36 checks passed
@github-actions github-actions bot added this to the v4.11.0 milestone Nov 19, 2024
stephybun added a commit that referenced this pull request Nov 19, 2024
Copy link

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.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Dec 20, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants