Mark Grafana API key as sensitive. #34105
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Community NoteVoting for Prioritization
For Submitters
|
github-actions
bot
added
service/grafana
terraform-aws-provider
bot
added
the
needs-triage
github-actions
bot
added
the
service/grafana
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
There was a problem hiding this comment.
Welcome @jrouly 👋
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! 😃
justinretzolk
added
bug
% make testacc TESTARGS='-run=TestAccGrafana_serial/Workspace/configuration' 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/configuration -timeout 360m
=== RUN TestAccGrafana_serial
=== PAUSE TestAccGrafana_serial
=== CONT TestAccGrafana_serial
=== RUN TestAccGrafana_serial/Workspace
=== RUN TestAccGrafana_serial/Workspace/configuration
--- PASS: TestAccGrafana_serial (621.17s)
--- PASS: TestAccGrafana_serial/Workspace (621.17s)
--- PASS: TestAccGrafana_serial/Workspace/configuration (621.17s)
PASS
ok github.com/hashicorp/terraform-provider-aws/internal/service/grafana 631.729s
github-actions
bot
added
size/L
% 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 360m
=== RUN TestAccGrafana_serial
=== PAUSE TestAccGrafana_serial
=== CONT TestAccGrafana_serial
=== RUN TestAccGrafana_serial/Workspace
=== RUN TestAccGrafana_serial/Workspace/tags
=== RUN TestAccGrafana_serial/Workspace/saml
=== RUN TestAccGrafana_serial/Workspace/organization
acctest.go:1009: this AWS account must be the management account of an AWS Organization
=== RUN TestAccGrafana_serial/Workspace/dataSources
=== RUN TestAccGrafana_serial/Workspace/permissionType
=== RUN TestAccGrafana_serial/Workspace/notificationDestinations
=== RUN TestAccGrafana_serial/Workspace/version
=== RUN TestAccGrafana_serial/Workspace/sso
acctest.go:1051: skipping tests; no SSO Instances found.
=== RUN TestAccGrafana_serial/Workspace/disappears
=== RUN TestAccGrafana_serial/Workspace/vpc
workspace_test.go:114: Step 1/4 error: Error running apply: exit status 1
Error: creating EC2 VPC: operation error EC2: CreateVpc, https response error StatusCode: 400, RequestID: ebca4a7c-ac66-436c-b2aa-1975e1b66e08, api error VpcLimitExceeded: The maximum number of VPCs has been reached.
with aws_vpc.test,
on terraform_plugin_test.tf line 30, in resource "aws_vpc" "test":
30: resource "aws_vpc" "test" {
=== RUN TestAccGrafana_serial/Workspace/configuration
=== RUN TestAccGrafana_serial/Workspace/networkAccess
--- FAIL: TestAccGrafana_serial (4103.41s)
--- FAIL: TestAccGrafana_serial/Workspace (4103.41s)
--- PASS: TestAccGrafana_serial/Workspace/tags (358.91s)
--- PASS: TestAccGrafana_serial/Workspace/saml (320.42s)
--- SKIP: TestAccGrafana_serial/Workspace/organization (0.70s)
--- PASS: TestAccGrafana_serial/Workspace/dataSources (321.41s)
--- PASS: TestAccGrafana_serial/Workspace/permissionType (348.85s)
--- PASS: TestAccGrafana_serial/Workspace/notificationDestinations (349.90s)
--- PASS: TestAccGrafana_serial/Workspace/version (601.81s)
--- SKIP: TestAccGrafana_serial/Workspace/sso (0.45s)
--- PASS: TestAccGrafana_serial/Workspace/disappears (318.63s)
--- FAIL: TestAccGrafana_serial/Workspace/vpc (11.98s)
--- PASS: TestAccGrafana_serial/Workspace/configuration (666.38s)
--- PASS: TestAccGrafana_serial/Workspace/networkAccess (803.97s)
FAIL
FAIL github.com/hashicorp/terraform-provider-aws/internal/service/grafana 4109.237s
FAIL
make: *** [testacc] Error 1
This reverts commit d5dbad1.
ewbankkit
approved these changes
Nov 16, 2023
There was a problem hiding this comment.
LGTM 🚀.
% make testacc TESTARGS='-run=TestAccGrafana_serial/Workspace/configuration\|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/configuration\|TestAccGrafana_serial/Workspace/version -timeout 360m
=== RUN TestAccGrafana_serial
=== PAUSE TestAccGrafana_serial
=== CONT TestAccGrafana_serial
=== RUN TestAccGrafana_serial/Workspace
=== RUN TestAccGrafana_serial/Workspace/configuration
=== RUN TestAccGrafana_serial/Workspace/version
--- PASS: TestAccGrafana_serial (1378.00s)
--- PASS: TestAccGrafana_serial/Workspace (1378.00s)
--- PASS: TestAccGrafana_serial/Workspace/configuration (746.14s)
--- PASS: TestAccGrafana_serial/Workspace/version (631.86s)
PASS
ok github.com/hashicorp/terraform-provider-aws/internal/service/grafana 1383.634s
|
@jrouly Thanks for the contribution 🎉 👏. |
|
This functionality has been released in v5.26.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! |
|
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. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
The
aws_grafana_workspace_api_keyresource creates a Grafana API Key. Thekeyattribute contains the value of the key.The
keyattribute is not currently marked as sensitive, despite containing an authentication credential. This PR marks it as sensitive.Resolves #34106.
Closes #34417.
Output from Acceptance Testing
I am not sure what the expectations for acceptance testing are, given it may cost money to run. I ran them and there were some successes, some failures, likely due to external constraints on my environment. I also do not think any of these tests are relevant to the change included in this PR.