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

sagemaker_domain add docker_settings & fix domain_settings update #35416

Merged

Conversation

deepakbshetty
Copy link
Contributor

@deepakbshetty deepakbshetty commented Jan 21, 2024

Description

Adds docker_settings to domain_settings under aws_sagemaker_domain resource.
Add/Fix r_studio_server_pro_domain_settings update under domain_settings update to avoid drift.

Relations

Closes #35115
Fixes #31912

References

Create Domain API
Update Domain API

Output from Acceptance Testing

$ make testacc TESTS=TestAccSageMaker_serial/Domain/domainSettingsDockerSettingsUpdated PKG=sagemaker
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/sagemaker/... -v -count 1 -parallel 20 -run='TestAccSageMaker_serial/Domain/domainSettingsDockerSettingsUpdated'  -timeout 360m
=== RUN   TestAccSageMaker_serial
=== PAUSE TestAccSageMaker_serial
=== CONT  TestAccSageMaker_serial
=== RUN   TestAccSageMaker_serial/Domain
=== RUN   TestAccSageMaker_serial/Domain/domainSettingsDockerSettingsUpdated
--- PASS: TestAccSageMaker_serial (381.56s)
    --- PASS: TestAccSageMaker_serial/Domain (381.56s)
        --- PASS: TestAccSageMaker_serial/Domain/domainSettingsDockerSettingsUpdated (381.55s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/sagemaker  404.668s



 make testacc TESTS=TestAccSageMaker_serial/Domain/rStudioServerProAppSettings PKG=sagemaker
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/sagemaker/... -v -count 1 -parallel 20 -run='TestAccSageMaker_serial/Domain/rStudioServerProAppSettings'  -timeout 360m
=== RUN   TestAccSageMaker_serial
=== PAUSE TestAccSageMaker_serial
=== CONT  TestAccSageMaker_serial
=== RUN   TestAccSageMaker_serial/Domain
=== RUN   TestAccSageMaker_serial/Domain/rStudioServerProAppSettings
--- PASS: TestAccSageMaker_serial (456.54s)
    --- PASS: TestAccSageMaker_serial/Domain (456.54s)
        --- PASS: TestAccSageMaker_serial/Domain/rStudioServerProAppSettings (456.54s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/sagemaker  479.221s


Copy link

Community Note

Voting for Prioritization

  • Please vote on this pull request by adding a 👍 reaction to the original post to help the community and maintainers prioritize this pull request.
  • Please see our prioritization guide for information on how we prioritize.
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.

For Submitters

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added size/L Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/sagemaker Issues and PRs that pertain to the sagemaker service. labels Jan 21, 2024
@terraform-aws-provider terraform-aws-provider bot added the needs-triage Waiting for first response or review from a maintainer. label Jan 21, 2024
@deepakbshetty
Copy link
Contributor Author

Hi @DrFaust92, appreciate if you can review the PR and provide feedback.

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Welcome @deepakbshetty 👋

It looks like this is your first Pull Request submission to the Terraform AWS Provider! If you haven’t already done so please make sure you have checked out our CONTRIBUTOR guide and FAQ to make sure your contribution is adhering to best practice and has all the necessary elements in place for a successful approval.

Also take a look at our FAQ which details how we prioritize Pull Requests for inclusion.

Thanks again, and welcome to the community! 😃

@deepakbshetty deepakbshetty force-pushed the f-aws_sagemaker_domain-docker-settings branch 5 times, most recently from 8fa6223 to d4b6a66 Compare January 21, 2024 20:00
@github-actions github-actions bot added size/XL Managed by automation to categorize the size of a PR. and removed size/L Managed by automation to categorize the size of a PR. labels Jan 21, 2024
@deepakbshetty deepakbshetty force-pushed the f-aws_sagemaker_domain-docker-settings branch 2 times, most recently from c3d4c88 to 08f6b90 Compare January 21, 2024 22:13
@deepakbshetty deepakbshetty changed the title Add docker_settings to domain_settings sagemaker_domain add docker_settings & sagemaker_endpoint_configuration add managed_instance_scaling Jan 21, 2024
@justinretzolk justinretzolk added enhancement Requests to existing resources that expand the functionality or scope. and removed needs-triage Waiting for first response or review from a maintainer. labels Jan 22, 2024
@deepakbshetty deepakbshetty force-pushed the f-aws_sagemaker_domain-docker-settings branch 3 times, most recently from 99c168f to 60c92fc Compare January 25, 2024 00:20
@DrFaust92
Copy link
Collaborator

deepakbshetty looks great. lets split to a PR per resource please

@deepakbshetty deepakbshetty changed the title sagemaker_domain add docker_settings & sagemaker_endpoint_configuration add managed_instance_scaling sagemaker_domain add docker_settings & fix domain_settings update Jan 25, 2024
@github-actions github-actions bot added size/L Managed by automation to categorize the size of a PR. and removed size/XL Managed by automation to categorize the size of a PR. labels Jan 25, 2024
@deepakbshetty deepakbshetty force-pushed the f-aws_sagemaker_domain-docker-settings branch from 93ce950 to 3937519 Compare January 25, 2024 08:40
@deepakbshetty
Copy link
Contributor Author

Dear @DrFaust92 , Thanks for the speedy review. Split PRs to 3 - #35477 & #35479

@deepakbshetty deepakbshetty force-pushed the f-aws_sagemaker_domain-docker-settings branch from a347f44 to eb4db26 Compare January 25, 2024 09:29
Copy link

Thank you for your contribution! 🚀

Please note that typically Go dependency changes are handled in this repository by dependabot or the maintainers. This is to prevent pull request merge conflicts and further delay reviews of contributions. Remove any changes to the go.mod or go.sum files and commit them into this pull request.

Additional details:

  • Check open pull requests with the dependencies label to view other dependency updates.
  • If this pull request includes an update the AWS Go SDK (or any other dependency) version, only updates submitted via dependabot will be merged. This pull request will need to remove these changes and will need to be rebased after the existing dependency update via dependabot has been merged for this pull request to be reviewed.
  • If this pull request is for supporting a new AWS service:
    • Ensure the new AWS service changes are following the Contributing Guide section on new services, in particular that the dependency addition and initial provider support are in a separate pull request from other changes (e.g. new resources). Contributions not following this item will not be reviewed until the changes are split.
    • If this pull request is already a separate pull request from the above item, you can ignore this message.

Copy link
Collaborator

@DrFaust92 DrFaust92 left a comment

Choose a reason for hiding this comment

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

LGTM (didnt validate tests)

@deepakbshetty deepakbshetty force-pushed the f-aws_sagemaker_domain-docker-settings branch from 42c09b1 to 3bac519 Compare July 23, 2024 21:29
@deepakbshetty
Copy link
Contributor Author

Hi @ewbankkit, If I may request this for merge. There is considerable upvote to include this feature

Copy link
Collaborator

@DrFaust92 DrFaust92 left a comment

Choose a reason for hiding this comment

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

LGTM

@deepakbshetty
Copy link
Contributor Author

Dear @ewbankkit, Any chance if you consider these sagemaker domain requests that have passed checks #35416 and #38457 and clears multiple issues

@deepakbshetty deepakbshetty force-pushed the f-aws_sagemaker_domain-docker-settings branch from 33c8b9d to 1479d8f Compare August 2, 2024 21:07
@deepakbshetty
Copy link
Contributor Author

Dear @ewbankkit, Any chance if you consider these sagemaker domain requests that have passed checks #35416 and #38457 and clears multiple issues

@ewbankkit For your kind consideration of both PRs for sagemaker domain.

@jmeisele
Copy link
Contributor

Hello @deepakbshetty , any ideas on resolving these conflicts so we can get this PR merged? Same with web portal settings PR

@deepakbshetty
Copy link
Contributor Author

Hello @deepakbshetty , any ideas on resolving these conflicts so we can get this PR merged? Same with web portal settings PR

Hi 👋 @jmeisele, These seem to have appeared due to PR aws sdk go v2 migration for sagemaker. I have a look this in the weekend. Would have been simpler if this code was merged prior.

@deepakbshetty deepakbshetty force-pushed the f-aws_sagemaker_domain-docker-settings branch 2 times, most recently from 18861a8 to 803c64a Compare August 31, 2024 09:06
@deepakbshetty deepakbshetty force-pushed the f-aws_sagemaker_domain-docker-settings branch from 803c64a to d4621a8 Compare August 31, 2024 19:13
@deepakbshetty
Copy link
Contributor Author

Hello @deepakbshetty , any ideas on resolving these conflicts so we can get this PR merged? Same with web portal settings PR

Hi 👋 @jmeisele, These seem to have appeared due to PR aws sdk go v2 migration for sagemaker. I have a look this in the weekend. Would have been simpler if this code was merged prior.

Hi @jmeisele, Resolved merge conflicts and both PRs are now inline with aws-go-sdk-v2 changes.

@deepakbshetty
Copy link
Contributor Author

Hi @ewbankkit, If you can kindly consider PRs #35416 an #38457 for sagemaker_domain. Not having these settings block is causing us to fall back non terraform approach

@deepakbshetty
Copy link
Contributor Author

Hi @ewbankkit Is there any opportunity consider this long standing PR for current provider release please ?

@ewbankkit ewbankkit self-assigned this Sep 12, 2024
@github-actions github-actions bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Sep 12, 2024
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

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

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccSageMaker_serial/Domain/basic\|TestAccSageMaker_serial/Domain/domainSettings' PKG=sagemaker
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.6 test ./internal/service/sagemaker/... -v -count 1 -parallel 20  -run=TestAccSageMaker_serial/Domain/basic\|TestAccSageMaker_serial/Domain/domainSettings -timeout 360m
=== RUN   TestAccSageMaker_serial
=== PAUSE TestAccSageMaker_serial
=== CONT  TestAccSageMaker_serial
=== RUN   TestAccSageMaker_serial/Domain
=== RUN   TestAccSageMaker_serial/Domain/basic
=== RUN   TestAccSageMaker_serial/Domain/domainSettings
=== RUN   TestAccSageMaker_serial/Domain/domainSettingsDockerSettingsUpdated
--- PASS: TestAccSageMaker_serial (745.01s)
    --- PASS: TestAccSageMaker_serial/Domain (745.01s)
        --- PASS: TestAccSageMaker_serial/Domain/basic (250.36s)
        --- PASS: TestAccSageMaker_serial/Domain/domainSettings (262.40s)
        --- PASS: TestAccSageMaker_serial/Domain/domainSettingsDockerSettingsUpdated (232.24s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/sagemaker	750.202s

@ewbankkit
Copy link
Contributor

@deepakbshetty Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit 1354c93 into hashicorp:main Sep 12, 2024
40 checks passed
@github-actions github-actions bot added this to the v5.67.0 milestone Sep 12, 2024
@github-actions github-actions bot removed the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Sep 13, 2024
Copy link

This functionality has been released in v5.67.0 of the Terraform AWS Provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template. Thank you!

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 issues.
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 Oct 13, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. service/sagemaker Issues and PRs that pertain to the sagemaker service. size/L Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
7 participants