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

[Bug] Fix issues where only some prompts are overridden #38944

Merged
merged 6 commits into from
Aug 22, 2024

Conversation

drewtul
Copy link
Contributor

@drewtul drewtul commented Aug 20, 2024

Description

Fixes consistency issues where only some prompts are overridden. Filter so we only persist the user configured prompt overrides to state.

Relations

Closes #37168

References

Output from Acceptance Testing

% make testacc TESTS=TestAccBedrockAgentAgent_ PKG=bedrockagent
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.6 test ./internal/service/bedrockagent/... -v -count 1 -parallel 20 -run='TestAccBedrockAgentAgent_'  -timeout 360m
=== RUN   TestAccBedrockAgentAgent_basic
=== PAUSE TestAccBedrockAgentAgent_basic
=== RUN   TestAccBedrockAgentAgent_full
=== PAUSE TestAccBedrockAgentAgent_full
=== RUN   TestAccBedrockAgentAgent_singlePrompt
=== PAUSE TestAccBedrockAgentAgent_singlePrompt
=== RUN   TestAccBedrockAgentAgent_addPrompt
=== PAUSE TestAccBedrockAgentAgent_addPrompt
=== RUN   TestAccBedrockAgentAgent_update
=== PAUSE TestAccBedrockAgentAgent_update
=== RUN   TestAccBedrockAgentAgent_tags
=== PAUSE TestAccBedrockAgentAgent_tags
=== CONT  TestAccBedrockAgentAgent_basic
=== CONT  TestAccBedrockAgentAgent_addPrompt
=== CONT  TestAccBedrockAgentAgent_tags
=== CONT  TestAccBedrockAgentAgent_update
=== CONT  TestAccBedrockAgentAgent_singlePrompt
=== CONT  TestAccBedrockAgentAgent_full
--- PASS: TestAccBedrockAgentAgent_basic (31.54s)
--- PASS: TestAccBedrockAgentAgent_full (31.61s)
--- PASS: TestAccBedrockAgentAgent_singlePrompt (36.44s)
--- PASS: TestAccBedrockAgentAgent_tags (56.25s)
--- PASS: TestAccBedrockAgentAgent_update (60.07s)
--- PASS: TestAccBedrockAgentAgent_addPrompt (80.36s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent       85.230s

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 tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/bedrockagent Issues and PRs that pertain to the bedrockagent service. needs-triage Waiting for first response or review from a maintainer. partner Contribution from a partner. labels Aug 20, 2024
@drewtul drewtul marked this pull request as ready for review August 20, 2024 14:38
@drewtul drewtul requested a review from a team as a code owner August 20, 2024 14:38
@drewtul drewtul force-pushed the bug-single-prompt-configuration branch from ce47b22 to 732e180 Compare August 20, 2024 14:44
@justinretzolk justinretzolk added bug Addresses a defect in current functionality. and removed needs-triage Waiting for first response or review from a maintainer. labels Aug 20, 2024
Copy link
Member

@jar-b jar-b 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 PKG=bedrockagent TESTS=TestAccBedrockAgentAgent_
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.6 test ./internal/service/bedrockagent/... -v -count 1 -parallel 20 -run='TestAccBedrockAgentAgent_'  -timeout 360m

--- PASS: TestAccBedrockAgentAgent_full (22.87s)
--- PASS: TestAccBedrockAgentAgent_basic (23.00s)
--- PASS: TestAccBedrockAgentAgent_singlePrompt (33.07s)
--- PASS: TestAccBedrockAgentAgent_update (41.77s)
--- PASS: TestAccBedrockAgentAgent_tags (42.24s)
--- PASS: TestAccBedrockAgentAgent_addPrompt (58.53s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent       64.787s

@jar-b
Copy link
Member

jar-b commented Aug 22, 2024

Thanks for your contribution, @drewtul! 👍

@jar-b jar-b merged commit 82a8eaf into hashicorp:main Aug 22, 2024
32 checks passed
@github-actions github-actions bot added this to the v5.64.0 milestone Aug 22, 2024
Copy link

This functionality has been released in v5.64.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 Sep 23, 2024
@drewtul drewtul deleted the bug-single-prompt-configuration branch September 24, 2024 10:17
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
bug Addresses a defect in current functionality. partner Contribution from a partner. service/bedrockagent Issues and PRs that pertain to the bedrockagent service. 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.

[Bug]: aws_bedrockagent_agent resource fails to create due to inconsistent result after apply
3 participants