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

feat: Add function schema and return of control support to aws_bedrockagent_agent_action_group #37484

Conversation

acwwat
Copy link
Contributor

@acwwat acwwat commented May 13, 2024

Description

This PR is to add support for function schema and return of control to the aws_bedrockagent_agent_action_group resource.

The function schema change was a bit tricky as the parameters argument for the function block is a map of objects (being the parameter detail). With help from one of the maintainers, we determined a way to define the schema properly. Consequently, parameters is effectively a configuration block for each parameter, and what would've been the map key (and the parameter name) must now be defined using the map_block_key argument within the parameters block.

Relations

Closes #37391
Closes #37087

References

Referred to FunctionSchema and ActionGroupExecutor for API specs.

Output from Acceptance Testing

$ make testacc TESTS=TestAccBedrockAgentAgentActionGroup_ PKG=bedrockagent
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.2 test ./internal/service/bedrockagent/... -v -count 1 -parallel 20 -run='TestAccBedrockAgentAgentActionGroup_'  -timeout 360m
=== RUN   TestAccBedrockAgentAgentActionGroup_basic
=== PAUSE TestAccBedrockAgentAgentActionGroup_basic
=== RUN   TestAccBedrockAgentAgentActionGroup_s3APISchema
=== PAUSE TestAccBedrockAgentAgentActionGroup_s3APISchema
=== RUN   TestAccBedrockAgentAgentActionGroup_update
=== PAUSE TestAccBedrockAgentAgentActionGroup_update
=== RUN   TestAccBedrockAgentAgentActionGroup_functionSchema
=== PAUSE TestAccBedrockAgentAgentActionGroup_functionSchema
=== RUN   TestAccBedrockAgentAgentActionGroup_returnControl
=== PAUSE TestAccBedrockAgentAgentActionGroup_returnControl
=== CONT  TestAccBedrockAgentAgentActionGroup_basic
=== CONT  TestAccBedrockAgentAgentActionGroup_functionSchema
=== CONT  TestAccBedrockAgentAgentActionGroup_update
=== CONT  TestAccBedrockAgentAgentActionGroup_s3APISchema
=== CONT  TestAccBedrockAgentAgentActionGroup_returnControl
--- PASS: TestAccBedrockAgentAgentActionGroup_functionSchema (37.29s)
--- PASS: TestAccBedrockAgentAgentActionGroup_s3APISchema (42.76s)
--- PASS: TestAccBedrockAgentAgentActionGroup_returnControl (47.44s)
--- PASS: TestAccBedrockAgentAgentActionGroup_basic (53.90s)
--- PASS: TestAccBedrockAgentAgentActionGroup_update (77.69s)
PASS
ok      github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent       77.876s

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. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. service/bedrockagent Issues and PRs that pertain to the bedrockagent service. labels May 13, 2024
@terraform-aws-provider terraform-aws-provider bot added needs-triage Waiting for first response or review from a maintainer. external-maintainer Contribution from a trusted external contributor. labels May 13, 2024
@acwwat acwwat force-pushed the f-aws_bedrockagent_agent_action_group-add_function_schema_support branch 3 times, most recently from 3233de7 to 7e7b002 Compare May 14, 2024 02:49
@acwwat acwwat changed the title [WIP] feat: Add function schema support to aws_bedrockagent_agent_action_group feat: Add function schema support to aws_bedrockagent_agent_action_group May 14, 2024
@github-actions github-actions bot added size/XL Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. and removed size/L Managed by automation to categorize the size of a PR. labels May 14, 2024
@acwwat acwwat force-pushed the f-aws_bedrockagent_agent_action_group-add_function_schema_support branch 2 times, most recently from c61cd9a to 3b9a6db Compare May 15, 2024 02:16
@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 16, 2024
@acwwat acwwat force-pushed the f-aws_bedrockagent_agent_action_group-add_function_schema_support branch from 3b9a6db to 751bee7 Compare May 20, 2024 23:04
@acwwat acwwat changed the title feat: Add function schema support to aws_bedrockagent_agent_action_group feat: Add function schema and return of control support to aws_bedrockagent_agent_action_group May 20, 2024
@acwwat
Copy link
Contributor Author

acwwat commented May 20, 2024

I was working on a separate branch to add return of control support but realized that I am not doing myself a favor. I've decided to just add the commit to this branch/PR so both features can go in with changes to the same set of files.

# Conflicts:
#	internal/service/bedrockagent/agent_action_group.go
@ewbankkit ewbankkit requested a review from a team as a code owner July 18, 2024 16:08
@ewbankkit ewbankkit self-assigned this Jul 18, 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=TestAccBedrockAgentAgentActionGroup_' PKG=bedrockagent ACCTEST_PARALLELISM=3
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.22.5 test ./internal/service/bedrockagent/... -v -count 1 -parallel 3  -run=TestAccBedrockAgentAgentActionGroup_ -timeout 360m
=== RUN   TestAccBedrockAgentAgentActionGroup_basic
=== PAUSE TestAccBedrockAgentAgentActionGroup_basic
=== RUN   TestAccBedrockAgentAgentActionGroup_s3APISchema
=== PAUSE TestAccBedrockAgentAgentActionGroup_s3APISchema
=== RUN   TestAccBedrockAgentAgentActionGroup_update
=== PAUSE TestAccBedrockAgentAgentActionGroup_update
=== RUN   TestAccBedrockAgentAgentActionGroup_functionSchema
=== PAUSE TestAccBedrockAgentAgentActionGroup_functionSchema
=== RUN   TestAccBedrockAgentAgentActionGroup_returnControl
=== PAUSE TestAccBedrockAgentAgentActionGroup_returnControl
=== CONT  TestAccBedrockAgentAgentActionGroup_basic
=== CONT  TestAccBedrockAgentAgentActionGroup_functionSchema
=== CONT  TestAccBedrockAgentAgentActionGroup_returnControl
--- PASS: TestAccBedrockAgentAgentActionGroup_basic (40.76s)
=== CONT  TestAccBedrockAgentAgentActionGroup_update
--- PASS: TestAccBedrockAgentAgentActionGroup_functionSchema (42.63s)
=== CONT  TestAccBedrockAgentAgentActionGroup_s3APISchema
--- PASS: TestAccBedrockAgentAgentActionGroup_returnControl (46.52s)
--- PASS: TestAccBedrockAgentAgentActionGroup_s3APISchema (34.93s)
--- PASS: TestAccBedrockAgentAgentActionGroup_update (42.79s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent	88.752s

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.

@ewbankkit ewbankkit merged commit dbddca1 into hashicorp:main Jul 18, 2024
41 checks passed
@ewbankkit
Copy link
Contributor

@acwwat Thanks for the contribution 🎉 👏.

@github-actions github-actions bot added this to the v5.59.0 milestone Jul 18, 2024
Copy link

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

@acwwat acwwat deleted the f-aws_bedrockagent_agent_action_group-add_function_schema_support branch July 20, 2024 19:07
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 Aug 20, 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. external-maintainer Contribution from a trusted external contributor. service/bedrockagent Issues and PRs that pertain to the bedrockagent service. size/XL 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
3 participants