[New Resource] aws_bedrockagent_agent_collaborator to manage multi-agent collaboration #40559

drewtul · 2024-12-13T16:13:07Z

Description

Relations

Depends on #40543

References

Output from Acceptance Testing

%  make testacc TESTS=TestAccBedrockAgentAgentCollaborator_ PKG=bedrockagent
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.23.3 test ./internal/service/bedrockagent/... -v -count 1 -parallel 20 -run='TestAccBedrockAgentAgentCollaborator_'  -timeout 360m
2025/01/07 11:06:36 Initializing Terraform AWS Provider...
=== RUN   TestAccBedrockAgentAgentCollaborator_basic
=== PAUSE TestAccBedrockAgentAgentCollaborator_basic
=== RUN   TestAccBedrockAgentAgentCollaborator_update
=== PAUSE TestAccBedrockAgentAgentCollaborator_update
=== RUN   TestAccBedrockAgentAgentCollaborator_disappears
=== PAUSE TestAccBedrockAgentAgentCollaborator_disappears
=== CONT  TestAccBedrockAgentAgentCollaborator_basic
=== CONT  TestAccBedrockAgentAgentCollaborator_disappears
=== CONT  TestAccBedrockAgentAgentCollaborator_update
--- PASS: TestAccBedrockAgentAgentCollaborator_disappears (39.52s)
--- PASS: TestAccBedrockAgentAgentCollaborator_basic (42.11s)
--- PASS: TestAccBedrockAgentAgentCollaborator_update (62.38s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent       66.750s

% make testacc TESTS=TestAccBedrockAgentAgent_ PKG=bedrockagent
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.23.3 test ./internal/service/bedrockagent/... -v -count 1 -parallel 20 -run='TestAccBedrockAgentAgent_'  -timeout 360m
2025/01/07 16:52:18 Initializing Terraform AWS Provider...
=== RUN   TestAccBedrockAgentAgent_basic
=== PAUSE TestAccBedrockAgentAgent_basic
=== RUN   TestAccBedrockAgentAgent_full
=== PAUSE TestAccBedrockAgentAgent_full
=== RUN   TestAccBedrockAgentAgent_singlePrompt
=== PAUSE TestAccBedrockAgentAgent_singlePrompt
=== RUN   TestAccBedrockAgentAgent_singlePromptUpdate
=== PAUSE TestAccBedrockAgentAgent_singlePromptUpdate
=== RUN   TestAccBedrockAgentAgent_addPrompt
=== PAUSE TestAccBedrockAgentAgent_addPrompt
=== RUN   TestAccBedrockAgentAgent_guardrail
=== PAUSE TestAccBedrockAgentAgent_guardrail
=== RUN   TestAccBedrockAgentAgent_update
=== PAUSE TestAccBedrockAgentAgent_update
=== RUN   TestAccBedrockAgentAgent_tags
=== PAUSE TestAccBedrockAgentAgent_tags
=== RUN   TestAccBedrockAgentAgent_kms
=== PAUSE TestAccBedrockAgentAgent_kms
=== RUN   TestAccBedrockAgentAgent_agentCollaboration
=== PAUSE TestAccBedrockAgentAgent_agentCollaboration
=== CONT  TestAccBedrockAgentAgent_basic
=== CONT  TestAccBedrockAgentAgent_guardrail
=== CONT  TestAccBedrockAgentAgent_kms
=== CONT  TestAccBedrockAgentAgent_singlePromptUpdate
=== CONT  TestAccBedrockAgentAgent_update
=== CONT  TestAccBedrockAgentAgent_tags
=== CONT  TestAccBedrockAgentAgent_singlePrompt
=== CONT  TestAccBedrockAgentAgent_agentCollaboration
=== CONT  TestAccBedrockAgentAgent_full
=== CONT  TestAccBedrockAgentAgent_addPrompt
--- PASS: TestAccBedrockAgentAgent_basic (33.35s)
--- PASS: TestAccBedrockAgentAgent_singlePrompt (34.30s)
--- PASS: TestAccBedrockAgentAgent_full (36.80s)
--- PASS: TestAccBedrockAgentAgent_agentCollaboration (48.79s)
--- PASS: TestAccBedrockAgentAgent_kms (54.86s)
--- PASS: TestAccBedrockAgentAgent_singlePromptUpdate (56.24s)
--- PASS: TestAccBedrockAgentAgent_tags (65.82s)
--- PASS: TestAccBedrockAgentAgent_update (66.13s)
--- PASS: TestAccBedrockAgentAgent_guardrail (85.61s)
--- PASS: TestAccBedrockAgentAgent_addPrompt (86.28s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent       91.811s

github-actions · 2024-12-13T16:13:25Z

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.

…ved the last collaborator

…to f-bedrock-agent-collab-associate

…d updating as required to remove any connection to collaborator alias

…ey change

ewbankkit

LGTM 🚀.

% make testacc TESTARGS='-run=TestAccBedrockAgentAgentCollaborator_\|TestAccBedrockAgentAgent_' PKG=bedrockagent ACCTEST_PARALLELISM=3
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.23.3 test ./internal/service/bedrockagent/... -v -count 1 -parallel 3  -run=TestAccBedrockAgentAgentCollaborator_\|TestAccBedrockAgentAgent_ -timeout 360m
2025/01/08 09:03:12 Initializing Terraform AWS Provider...
=== RUN   TestAccBedrockAgentAgentCollaborator_basic
=== PAUSE TestAccBedrockAgentAgentCollaborator_basic
=== RUN   TestAccBedrockAgentAgentCollaborator_update
=== PAUSE TestAccBedrockAgentAgentCollaborator_update
=== RUN   TestAccBedrockAgentAgentCollaborator_disappears
=== PAUSE TestAccBedrockAgentAgentCollaborator_disappears
=== RUN   TestAccBedrockAgentAgent_basic
=== PAUSE TestAccBedrockAgentAgent_basic
=== RUN   TestAccBedrockAgentAgent_full
=== PAUSE TestAccBedrockAgentAgent_full
=== RUN   TestAccBedrockAgentAgent_singlePrompt
=== PAUSE TestAccBedrockAgentAgent_singlePrompt
=== RUN   TestAccBedrockAgentAgent_singlePromptUpdate
=== PAUSE TestAccBedrockAgentAgent_singlePromptUpdate
=== RUN   TestAccBedrockAgentAgent_addPrompt
=== PAUSE TestAccBedrockAgentAgent_addPrompt
=== RUN   TestAccBedrockAgentAgent_guardrail
=== PAUSE TestAccBedrockAgentAgent_guardrail
=== RUN   TestAccBedrockAgentAgent_update
=== PAUSE TestAccBedrockAgentAgent_update
=== RUN   TestAccBedrockAgentAgent_tags
=== PAUSE TestAccBedrockAgentAgent_tags
=== RUN   TestAccBedrockAgentAgent_kms
=== PAUSE TestAccBedrockAgentAgent_kms
=== RUN   TestAccBedrockAgentAgent_agentCollaboration
=== PAUSE TestAccBedrockAgentAgent_agentCollaboration
=== CONT  TestAccBedrockAgentAgentCollaborator_basic
=== CONT  TestAccBedrockAgentAgent_addPrompt
=== CONT  TestAccBedrockAgentAgent_full
--- PASS: TestAccBedrockAgentAgent_full (21.42s)
=== CONT  TestAccBedrockAgentAgent_singlePromptUpdate
--- PASS: TestAccBedrockAgentAgentCollaborator_basic (32.51s)
=== CONT  TestAccBedrockAgentAgentCollaborator_disappears
--- PASS: TestAccBedrockAgentAgent_singlePromptUpdate (29.17s)
=== CONT  TestAccBedrockAgentAgent_basic
--- PASS: TestAccBedrockAgentAgent_addPrompt (54.93s)
=== CONT  TestAccBedrockAgentAgent_tags
--- PASS: TestAccBedrockAgentAgentCollaborator_disappears (31.63s)
=== CONT  TestAccBedrockAgentAgent_agentCollaboration
--- PASS: TestAccBedrockAgentAgent_basic (19.33s)
=== CONT  TestAccBedrockAgentAgent_kms
--- PASS: TestAccBedrockAgentAgent_agentCollaboration (26.24s)
=== CONT  TestAccBedrockAgentAgent_update
--- PASS: TestAccBedrockAgentAgent_tags (39.45s)
=== CONT  TestAccBedrockAgentAgent_singlePrompt
--- PASS: TestAccBedrockAgentAgent_kms (35.08s)
=== CONT  TestAccBedrockAgentAgent_guardrail
--- PASS: TestAccBedrockAgentAgent_singlePrompt (19.54s)
=== CONT  TestAccBedrockAgentAgentCollaborator_update
--- PASS: TestAccBedrockAgentAgent_update (39.52s)
--- PASS: TestAccBedrockAgentAgent_guardrail (51.96s)
--- PASS: TestAccBedrockAgentAgentCollaborator_update (50.15s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent	169.447s

jar-b

A few documentation nits, otherwise LGTM

It's not a hard requirement yet, but we could also remove the id attribute in favor of setting the mutli-part key values during import, if desired.

website/docs/r/bedrockagent_agent_collaborator.html.markdown

Co-authored-by: Jared Baker <[email protected]>

ewbankkit

LGTM 🚀.

ewbankkit · 2025-01-08T15:34:12Z

@drewtul Thanks for the contribution 🎉 👏.

github-actions · 2025-01-09T18:12:02Z

This functionality has been released in v5.83.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 · 2025-02-09T02:19:38Z

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.

drewtul added 8 commits December 12, 2024 13:40

Initial resource implementation

f24c87f

Make gen

c7156ea

Get tests to compile

6e3f60e

Get tests mostly running

0da8b31

Fix read and hence import

86092ea

shorten timeouts

fbf1c90

docs

00fc215

docs

daedd48

drewtul added 5 commits December 13, 2024 16:17

Formatting

587f3f8

Fix imports

4b552a5

Delete unused function

aea1287

Fix imports

08095b2

Constants

290574e

justinretzolk added new-resource Introduces a new resource. and removed needs-triage Waiting for first response or review from a maintainer. labels Dec 13, 2024

drewtul added 8 commits December 13, 2024 17:40

Whitespace

c5baf43

Expand tests to update and fix collaborator id being passed into update

08bb22e

Prepare agent during collaborator deletion ignoring errors if we remo…

18ae447

…ved the last collaborator

Merge branch 'main' of github.com:hashicorp/terraform-provider-aws in…

4432667

…to f-bedrock-agent-collab-associate

Add collaboration to example

6f9d600

Resolve issues deleting collaborations by preparing the supervisor an…

35b4794

…d updating as required to remove any connection to collaborator alias

Add proper error handling in case flatten fails when we read the agent.

e1800bc

Whitespace

85d6be2

Use flex for update, ignore the fields we have to flex manually if th…

4db8130

…ey change

drewtul marked this pull request as ready for review January 7, 2025 16:40

drewtul requested a review from a team as a code owner January 7, 2025 16:40

Copy encryption arn for update input

8d0e512

ewbankkit self-assigned this Jan 7, 2025

Merge branch 'main' into HEAD

68cc331

github-actions bot added the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Jan 7, 2025

ewbankkit added 3 commits January 7, 2025 16:21

Add CHANGELOG entry.

df60915

Tidy up.

f2a8319

Add 'agentCollaboratorDisappearsStateFunc'.

f38b5a9

ewbankkit previously approved these changes Jan 8, 2025

View reviewed changes

jar-b reviewed Jan 8, 2025

View reviewed changes

website/docs/r/bedrockagent_agent_collaborator.html.markdown Outdated Show resolved Hide resolved

website/docs/r/bedrockagent_agent_collaborator.html.markdown Outdated Show resolved Hide resolved

website/docs/r/bedrockagent_agent_collaborator.html.markdown Outdated Show resolved Hide resolved

Update website/docs/r/bedrockagent_agent_collaborator.html.markdown

29ab884

Co-authored-by: Jared Baker <[email protected]>

drewtul dismissed ewbankkit’s stale review via 29ab884 January 8, 2025 14:59

drewtul and others added 2 commits January 8, 2025 14:59

Update website/docs/r/bedrockagent_agent_collaborator.html.markdown

fa98066

Co-authored-by: Jared Baker <[email protected]>

Update website/docs/r/bedrockagent_agent_collaborator.html.markdown

601023c

Co-authored-by: Jared Baker <[email protected]>

ewbankkit approved these changes Jan 8, 2025

View reviewed changes

ewbankkit merged commit ec7adc7 into hashicorp:main Jan 8, 2025
43 checks passed

github-actions bot added this to the v5.83.0 milestone Jan 8, 2025

drewtul deleted the f-bedrock-agent-collab-associate branch January 8, 2025 16:55

github-actions bot removed the prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. label Jan 9, 2025

github-actions bot locked as resolved and limited conversation to collaborators Feb 9, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[New Resource] aws_bedrockagent_agent_collaborator to manage multi-agent collaboration #40559

[New Resource] aws_bedrockagent_agent_collaborator to manage multi-agent collaboration #40559

Uh oh!

drewtul commented Dec 13, 2024 •

edited

Loading

Uh oh!

github-actions bot commented Dec 13, 2024

Uh oh!

ewbankkit left a comment

Uh oh!

jar-b left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ewbankkit left a comment

Uh oh!

ewbankkit commented Jan 8, 2025

Uh oh!

Uh oh!

github-actions bot commented Jan 9, 2025

Uh oh!

github-actions bot commented Feb 9, 2025

Uh oh!

Uh oh!

[New Resource] aws_bedrockagent_agent_collaborator to manage multi-agent collaboration #40559

[New Resource] aws_bedrockagent_agent_collaborator to manage multi-agent collaboration #40559

Uh oh!

Conversation

drewtul commented Dec 13, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Relations

References

Output from Acceptance Testing

Uh oh!

github-actions bot commented Dec 13, 2024

Community Note

Uh oh!

ewbankkit left a comment

Choose a reason for hiding this comment

Uh oh!

jar-b left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ewbankkit left a comment

Choose a reason for hiding this comment

Uh oh!

ewbankkit commented Jan 8, 2025

Uh oh!

Uh oh!

github-actions bot commented Jan 9, 2025

Uh oh!

github-actions bot commented Feb 9, 2025

Uh oh!

Uh oh!

drewtul commented Dec 13, 2024 •

edited

Loading