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

[Enhance] -azurerm_machine_learning_datastore_datalake_gen2 - Support crosse sub storage account #28123

Merged
merged 3 commits into from
Dec 4, 2024

Conversation

xuzhang3
Copy link
Contributor

@xuzhang3 xuzhang3 commented Nov 27, 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

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_resource - support for the thing1 property [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 #27254
Relate PR: #27256

This PR will add the subscription ID and resource group to the service so we know where the storage account located, also works for cross subscription. For the existing resource managed by AzureRM the subscription ID and resource group are null, AzureRM cannot find the storage account if it's not in the same sub as MLW, this PR will fix this.

=== RUN   TestAccMachineLearningDataStoreDataLakeGen2_crossSubStorageAccount
=== PAUSE TestAccMachineLearningDataStoreDataLakeGen2_crossSubStorageAccount
=== CONT  TestAccMachineLearningDataStoreDataLakeGen2_crossSubStorageAccount
--- PASS: TestAccMachineLearningDataStoreDataLakeGen2_crossSubStorageAccount (552.71s)
PASS
ok      github.com/hashicorp/terraform-provider-azurerm/internal/services/machinelearning       570.226s

Note

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

@xuzhang3
Copy link
Contributor Author

image

@xuzhang3 xuzhang3 marked this pull request as ready for review November 27, 2024 08:46
@xuzhang3 xuzhang3 requested a review from a team as a code owner November 27, 2024 08:46
Copy link
Member

@catriona-m catriona-m left a comment

Choose a reason for hiding this comment

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

Thanks for this @xuzhang3 - I have just left one comment to note that we currently have an env var for an alternative subscription id. Could we update the tests to use this instead and re-run them and then we can take another look at this? Thanks!

Comment on lines 54 to 56
if os.Getenv("ARM_TEST_ACC_DATASTORE_GEN2_CROSS_SUB_SA_CONTAINER") == "" {
t.Skip("ARM_TEST_ACC_DATASTORE_GEN2_CROSS_SUB_SA_CONTAINER not set")
}
Copy link
Member

Choose a reason for hiding this comment

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

Could we remove this and use ARM_SUBSCRIPTION_ID_ALT instead for an alternative subscription id?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@catriona-m test case updated.

Copy link
Member

@catriona-m catriona-m left a comment

Choose a reason for hiding this comment

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

Thanks for updating this @xuzhang3, I've just left two minor suggestions regarding resource names for the tests, but otherwise this is looking good. Thanks!

Copy link
Member

@catriona-m catriona-m left a comment

Choose a reason for hiding this comment

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

Thanks @xuzhang3 LGTM!

@catriona-m catriona-m merged commit f536cac into hashicorp:main Dec 4, 2024
32 checks passed
@github-actions github-actions bot added this to the v4.13.0 milestone Dec 4, 2024
catriona-m added a commit that referenced this pull request Dec 4, 2024
katbyte added a commit that referenced this pull request Dec 6, 2024
* update for #28158, #28025

* Update CHANGELOG.md #28123

* Update CHANGELOG.md #28105

* Update for #28177

* Update for #28171

* Update for #28178

* Update CHANGELOG.md

---------

Co-authored-by: catriona-m <86247157+catriona-m@users.noreply.github.com>
Co-authored-by: kt <kt@katbyte.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants