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

Enhancement: Add argument grafana_version to r/aws_grafana_workspace #31083

Merged
merged 10 commits into from
May 3, 2023

Conversation

tamiros
Copy link
Contributor

@tamiros tamiros commented May 1, 2023

Description

This PR adds the optional argument grafana_version to be used during creation of a workspace.

As of now, the supported versions are "8.4" and "9.4". Any other version will throw an error by the API call with an appropriate error.

Also, it seems you cannot upgrade/update the Managed Grafana workspace version once you provision so you must re-create it (tried via the Web Console and also couldn't support for it in the API nor official documentation.

AWS provides a migration tool that takes a source and destination workspace, meaning the 9.4 must be up and running as the tools just copies content into it and not actually provisioning one.

Relations

Closes #31078

Depends on #31079 (requires AWS Go SDK v1.44.253 as this property for Create method was introduced there)

References

https://github.com/aws/aws-sdk-go/blob/main/service/managedgrafana/api.go
https://aws.amazon.com/blogs/mt/announcing-amazon-managed-grafana-workspace-version-selection-with-version-9-4-support/
https://github.com/aws-observability/amazon-managed-grafana-migrator

Output from Acceptance Testing

make testacc TESTS='TestAccGrafana_serial/Workspace/version' PKG=grafana
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/grafana/... -v -count 1 -parallel 20 -run='TestAccGrafana_serial/Workspace/version'  -timeout 180m
=== RUN   TestAccGrafana_serial
=== PAUSE TestAccGrafana_serial
=== CONT  TestAccGrafana_serial
=== RUN   TestAccGrafana_serial/Workspace
=== RUN   TestAccGrafana_serial/Workspace/version
--- PASS: TestAccGrafana_serial (304.23s)
    --- PASS: TestAccGrafana_serial/Workspace (304.23s)
        --- PASS: TestAccGrafana_serial/Workspace/version (304.23s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/grafana    304.347s

@github-actions
Copy link

github-actions bot commented May 1, 2023

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 documentation Introduces or discusses updates to documentation. service/grafana Issues and PRs that pertain to the grafana service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. size/S Managed by automation to categorize the size of a PR. needs-triage Waiting for first response or review from a maintainer. labels May 1, 2023
@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 May 1, 2023
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=TestAccGrafana_serial/Workspace' PKG=grafana
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/grafana/... -v -count 1 -parallel 20  -run=TestAccGrafana_serial/Workspace -timeout 180m
=== RUN   TestAccGrafana_serial
=== PAUSE TestAccGrafana_serial
=== CONT  TestAccGrafana_serial
=== RUN   TestAccGrafana_serial/Workspace
=== RUN   TestAccGrafana_serial/Workspace/saml
=== RUN   TestAccGrafana_serial/Workspace/organization
    acctest.go:924: this AWS account must be the management account of an AWS Organization
=== RUN   TestAccGrafana_serial/Workspace/dataSources
=== RUN   TestAccGrafana_serial/Workspace/notificationDestinations
=== RUN   TestAccGrafana_serial/Workspace/tags
=== RUN   TestAccGrafana_serial/Workspace/networkAccess
=== RUN   TestAccGrafana_serial/Workspace/sso
    acctest.go:944: skipping tests: AccessDeniedException: User: arn:aws:sts::187416307283:assumed-role/terraform_team1_dev-developer/[email protected] is not authorized to perform: sso:ListInstances
=== RUN   TestAccGrafana_serial/Workspace/disappears
=== RUN   TestAccGrafana_serial/Workspace/permissionType
=== RUN   TestAccGrafana_serial/Workspace/vpc
=== RUN   TestAccGrafana_serial/Workspace/configuration
=== RUN   TestAccGrafana_serial/Workspace/version
--- PASS: TestAccGrafana_serial (4982.28s)
    --- PASS: TestAccGrafana_serial/Workspace (4982.28s)
        --- PASS: TestAccGrafana_serial/Workspace/saml (334.30s)
        --- SKIP: TestAccGrafana_serial/Workspace/organization (0.56s)
        --- PASS: TestAccGrafana_serial/Workspace/dataSources (281.91s)
        --- PASS: TestAccGrafana_serial/Workspace/notificationDestinations (326.80s)
        --- PASS: TestAccGrafana_serial/Workspace/tags (310.09s)
        --- PASS: TestAccGrafana_serial/Workspace/networkAccess (522.63s)
        --- SKIP: TestAccGrafana_serial/Workspace/sso (0.49s)
        --- PASS: TestAccGrafana_serial/Workspace/disappears (309.29s)
        --- PASS: TestAccGrafana_serial/Workspace/permissionType (328.12s)
        --- PASS: TestAccGrafana_serial/Workspace/vpc (1194.63s)
        --- PASS: TestAccGrafana_serial/Workspace/configuration (1060.75s)
        --- PASS: TestAccGrafana_serial/Workspace/version (312.71s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/grafana	4987.797s

@ewbankkit
Copy link
Contributor

@tamiros Thanks for the contribution 🎉 👏.

@ewbankkit ewbankkit merged commit d510408 into hashicorp:main May 3, 2023
@github-actions github-actions bot added this to the v4.66.0 milestone May 3, 2023
@sidekick-eimantas
Copy link

Big thanks to everyone involved ! ❤️

@tamiros tamiros deleted the f-grafana-version-31078 branch May 3, 2023 15:14
@github-actions
Copy link

github-actions bot commented May 5, 2023

This functionality has been released in v4.66.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!

@github-actions
Copy link

github-actions bot commented Jun 6, 2023

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 Jun 6, 2023
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/grafana Issues and PRs that pertain to the grafana service. size/S 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
Development

Successfully merging this pull request may close these issues.

[Enhancement]: Setting Managed Grafana Version
4 participants