Skip to content

Conversation

@ewbankkit
Copy link
Contributor

@ewbankkit ewbankkit commented Dec 5, 2025

Rollback Plan

If a change needs to be reverted, we will publish an updated version of the library.

Changes to Security Controls

Are there any changes to security controls (access controls, encryption, logging) in this pull request? If so, explain.

Description

Rolls up some existing PRs and adds functionality for additional knowledge_base_configuration and storage_configuration options.

Relations

Closes #44388.
Closes #43836.
Closes #42588.
Closes #44060.
Closes #45468.
Closes #43438.
Closes #37220.
Closes #37253.
Closes #42850.
Closes #41745.

Output from Acceptance Testing

% TF_AWS_KENDRA_INDEX_ARN=arn:aws:kendra:us-west-2:123456789012:index/d1aff557-e6b1-4ce9-87d1-734f005c6a19 make testacc TESTARGS='-run=TestAccBedrockAgent_serial/KnowledgeBase/KendraBasic' PKG=bedrockagent
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_bedrockagent_knowledge_base-enhancements 🌿...
TF_ACC=1 go1.24.11 test ./internal/service/bedrockagent/... -v -count 1 -parallel 20  -run=TestAccBedrockAgent_serial/KnowledgeBase/KendraBasic -timeout 360m -vet=off
2025/12/05 14:25:11 Creating Terraform AWS Provider (SDKv2-style)...
2025/12/05 14:25:11 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccBedrockAgent_serial
=== PAUSE TestAccBedrockAgent_serial
=== CONT  TestAccBedrockAgent_serial
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase/KendraBasic
--- PASS: TestAccBedrockAgent_serial (25.71s)
    --- PASS: TestAccBedrockAgent_serial/KnowledgeBase (25.71s)
        --- PASS: TestAccBedrockAgent_serial/KnowledgeBase/KendraBasic (25.71s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent	31.073s
% make testacc TESTARGS='-run=TestAccLogs_serial' PKG=logs
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_bedrockagent_knowledge_base-enhancements 🌿...
TF_ACC=1 go1.24.11 test ./internal/service/logs/... -v -count 1 -parallel 20  -run=TestAccLogs_serial -timeout 360m -vet=off
2025/12/08 16:54:00 Creating Terraform AWS Provider (SDKv2-style)...
2025/12/08 16:54:00 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccLogs_serial
=== PAUSE TestAccLogs_serial
=== CONT  TestAccLogs_serial
=== RUN   TestAccLogs_serial/Delivery
=== RUN   TestAccLogs_serial/Delivery/basic
=== RUN   TestAccLogs_serial/Delivery/disappears
=== RUN   TestAccLogs_serial/Delivery/cloudFrontDistribution
    delivery_test.go:252: skipping tests; AWS_DEFAULT_REGION (us-west-2) not supported. Supported: [us-east-1]
=== RUN   TestAccLogs_serial/Delivery/tags
=== RUN   TestAccLogs_serial/Delivery/update
=== RUN   TestAccLogs_serial/DeliverySource
=== RUN   TestAccLogs_serial/DeliverySource/tags
=== RUN   TestAccLogs_serial/DeliverySource/basic
=== RUN   TestAccLogs_serial/DeliverySource/disappears
--- PASS: TestAccLogs_serial (280.13s)
    --- PASS: TestAccLogs_serial/Delivery (167.61s)
        --- PASS: TestAccLogs_serial/Delivery/basic (31.73s)
        --- PASS: TestAccLogs_serial/Delivery/disappears (27.85s)
        --- SKIP: TestAccLogs_serial/Delivery/cloudFrontDistribution (0.00s)
        --- PASS: TestAccLogs_serial/Delivery/tags (55.44s)
        --- PASS: TestAccLogs_serial/Delivery/update (52.58s)
    --- PASS: TestAccLogs_serial/DeliverySource (112.52s)
        --- PASS: TestAccLogs_serial/DeliverySource/tags (54.92s)
        --- PASS: TestAccLogs_serial/DeliverySource/basic (29.52s)
        --- PASS: TestAccLogs_serial/DeliverySource/disappears (28.08s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/logs	285.514s
% make testacc TESTARGS='-run=TestAccBedrockAgentAgentKnowledgeBaseAssociation_' PKG=bedrockagent ACCTEST_PARALLELISM=3
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_bedrockagent_knowledge_base-enhancements 🌿...
TF_ACC=1 go1.24.11 test ./internal/service/bedrockagent/... -v -count 1 -parallel 3  -run=TestAccBedrockAgentAgentKnowledgeBaseAssociation_ -timeout 360m -vet=off
2025/12/11 13:31:19 Creating Terraform AWS Provider (SDKv2-style)...
2025/12/11 13:31:19 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccBedrockAgentAgentKnowledgeBaseAssociation_basic
=== PAUSE TestAccBedrockAgentAgentKnowledgeBaseAssociation_basic
=== RUN   TestAccBedrockAgentAgentKnowledgeBaseAssociation_update
=== PAUSE TestAccBedrockAgentAgentKnowledgeBaseAssociation_update
=== RUN   TestAccBedrockAgentAgentKnowledgeBaseAssociation_disappears
=== PAUSE TestAccBedrockAgentAgentKnowledgeBaseAssociation_disappears
=== CONT  TestAccBedrockAgentAgentKnowledgeBaseAssociation_basic
=== CONT  TestAccBedrockAgentAgentKnowledgeBaseAssociation_disappears
=== CONT  TestAccBedrockAgentAgentKnowledgeBaseAssociation_update
--- PASS: TestAccBedrockAgentAgentKnowledgeBaseAssociation_disappears (32.12s)
--- PASS: TestAccBedrockAgentAgentKnowledgeBaseAssociation_basic (34.35s)
--- PASS: TestAccBedrockAgentAgentKnowledgeBaseAssociation_update (55.16s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent	60.623s
% make testacc TESTARGS='-run=TestAccBedrockAgent_serial/DataSource' PKG=bedrockagent
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_bedrockagent_knowledge_base-enhancements 🌿...
TF_ACC=1 go1.24.11 test ./internal/service/bedrockagent/... -v -count 1 -parallel 20  -run=TestAccBedrockAgent_serial/DataSource -timeout 360m -vet=off
2025/12/11 13:48:03 Creating Terraform AWS Provider (SDKv2-style)...
2025/12/11 13:48:03 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccBedrockAgent_serial
=== PAUSE TestAccBedrockAgent_serial
=== CONT  TestAccBedrockAgent_serial
=== RUN   TestAccBedrockAgent_serial/DataSource
=== RUN   TestAccBedrockAgent_serial/DataSource/semantic
=== RUN   TestAccBedrockAgent_serial/DataSource/hierarchical
=== RUN   TestAccBedrockAgent_serial/DataSource/parsing
=== RUN   TestAccBedrockAgent_serial/DataSource/webconfiguration
    data_source_test.go:375: This test requires external configuration of an OpenSearch collection vector index. Set the TF_AWS_BEDROCK_OSS_COLLECTION_NAME environment variable to the OpenSearch collection name where the vector index is configured.
=== RUN   TestAccBedrockAgent_serial/DataSource/basic
=== RUN   TestAccBedrockAgent_serial/DataSource/disappears
=== RUN   TestAccBedrockAgent_serial/DataSource/full
=== RUN   TestAccBedrockAgent_serial/DataSource/customtransformation
=== RUN   TestAccBedrockAgent_serial/DataSource/update
--- PASS: TestAccBedrockAgent_serial (262.66s)
    --- PASS: TestAccBedrockAgent_serial/DataSource (262.66s)
        --- PASS: TestAccBedrockAgent_serial/DataSource/semantic (31.09s)
        --- PASS: TestAccBedrockAgent_serial/DataSource/hierarchical (29.04s)
        --- PASS: TestAccBedrockAgent_serial/DataSource/parsing (29.32s)
        --- SKIP: TestAccBedrockAgent_serial/DataSource/webconfiguration (0.00s)
        --- PASS: TestAccBedrockAgent_serial/DataSource/basic (28.99s)
        --- PASS: TestAccBedrockAgent_serial/DataSource/disappears (28.52s)
        --- PASS: TestAccBedrockAgent_serial/DataSource/full (29.51s)
        --- PASS: TestAccBedrockAgent_serial/DataSource/customtransformation (45.77s)
        --- PASS: TestAccBedrockAgent_serial/DataSource/update (40.40s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent	267.919s

SMonaghan and others added 26 commits August 27, 2025 17:44
Removing unneeded changes in website/docs/cdktf
Add kendra_knowledge_base_configuration block and acceptance test
to support Kendra indexes as knowledge base backend.
Updated tests to now create a managed OpenSearch domain to be used instead of having to pre-create one.
…drockagent_knowledge_base-enhancements

# Conflicts:
#	internal/service/bedrockagent/knowledge_base_test.go
% TF_AWS_KENDRA_INDEX_ARN=arn:aws:kendra:us-west-2:123456789012:index/d1aff557-e6b1-4ce9-87d1-734f005c6a19 make testacc TESTARGS='-run=TestAccBedrockAgent_serial/KnowledgeBase/KendraBasic' PKG=bedrockagent
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_bedrockagent_knowledge_base-enhancements 🌿...
TF_ACC=1 go1.24.11 test ./internal/service/bedrockagent/... -v -count 1 -parallel 20  -run=TestAccBedrockAgent_serial/KnowledgeBase/KendraBasic -timeout 360m -vet=off
2025/12/05 14:25:11 Creating Terraform AWS Provider (SDKv2-style)...
2025/12/05 14:25:11 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccBedrockAgent_serial
=== PAUSE TestAccBedrockAgent_serial
=== CONT  TestAccBedrockAgent_serial
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase/KendraBasic
--- PASS: TestAccBedrockAgent_serial (25.71s)
    --- PASS: TestAccBedrockAgent_serial/KnowledgeBase (25.71s)
        --- PASS: TestAccBedrockAgent_serial/KnowledgeBase/KendraBasic (25.71s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent	31.073s
…'testAccKnowledgeBase_OpenSearchManagedCluster_basic'.
@github-actions
Copy link
Contributor

github-actions bot commented Dec 5, 2025

Community Guidelines

This comment is added to every new Pull Request to provide quick reference to how the Terraform AWS Provider is maintained. Please review the information below, and thank you for contributing to the community that keeps the provider thriving! 🚀

Voting for Prioritization

  • Please vote on this Pull Request by adding a 👍 reaction to the original post to help the community and maintainers prioritize it.
  • Please see our prioritization guide for additional information on how the maintainers handle prioritization.
  • Please do not leave +1 or other comments that do not add relevant new information or questions; they generate extra noise for others following the Pull Request and do not help prioritize the request.

Pull Request Authors

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • 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 prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Dec 5, 2025
@ewbankkit ewbankkit force-pushed the f-aws_bedrockagent_knowledge_base-enhancements branch from 0035035 to 41ac93e Compare December 8, 2025 20:41
% make testacc TESTARGS='-run=TestAccBedrockAgent_serial/KnowledgeBase/\(disappears\|tags\)' PKG=bedrockagent
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_bedrockagent_knowledge_base-enhancements 🌿...
TF_ACC=1 go1.24.11 test ./internal/service/bedrockagent/... -v -count 1 -parallel 20  -run=TestAccBedrockAgent_serial/KnowledgeBase/\(disappears\|tags\) -timeout 360m -vet=off
2025/12/08 16:36:13 Creating Terraform AWS Provider (SDKv2-style)...
2025/12/08 16:36:13 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccBedrockAgent_serial
=== PAUSE TestAccBedrockAgent_serial
=== CONT  TestAccBedrockAgent_serial
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase/tags
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase/disappears
--- PASS: TestAccBedrockAgent_serial (73.62s)
    --- PASS: TestAccBedrockAgent_serial/KnowledgeBase (73.62s)
        --- PASS: TestAccBedrockAgent_serial/KnowledgeBase/tags (49.23s)
        --- PASS: TestAccBedrockAgent_serial/KnowledgeBase/disappears (24.39s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent	79.008s
@github-actions github-actions bot added the service/logs Issues and PRs that pertain to the logs service. label Dec 8, 2025
% make testacc TESTARGS='-run=TestAccBedrockAgent_serial/KnowledgeBase/RDS' PKG=bedrockagent
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_bedrockagent_knowledge_base-enhancements 🌿...
TF_ACC=1 go1.24.11 test ./internal/service/bedrockagent/... -v -count 1 -parallel 20  -run=TestAccBedrockAgent_serial/KnowledgeBase/RDS -timeout 360m -vet=off
2025/12/08 17:04:05 Creating Terraform AWS Provider (SDKv2-style)...
2025/12/08 17:04:05 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccBedrockAgent_serial
=== PAUSE TestAccBedrockAgent_serial
=== CONT  TestAccBedrockAgent_serial
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase/RDS
--- PASS: TestAccBedrockAgent_serial (786.69s)
    --- PASS: TestAccBedrockAgent_serial/KnowledgeBase (786.69s)
        --- PASS: TestAccBedrockAgent_serial/KnowledgeBase/RDS (786.69s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent	792.271s
% make testacc TESTARGS='-run=TestAccBedrockAgent_serial/KnowledgeBase/S3Vectors' PKG=bedrockagent
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_bedrockagent_knowledge_base-enhancements 🌿...
TF_ACC=1 go1.24.11 test ./internal/service/bedrockagent/... -v -count 1 -parallel 20  -run=TestAccBedrockAgent_serial/KnowledgeBase/S3Vectors -timeout 360m -vet=off
2025/12/09 15:39:23 Creating Terraform AWS Provider (SDKv2-style)...
2025/12/09 15:39:23 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccBedrockAgent_serial
=== PAUSE TestAccBedrockAgent_serial
=== CONT  TestAccBedrockAgent_serial
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase/S3Vectors
--- PASS: TestAccBedrockAgent_serial (51.22s)
    --- PASS: TestAccBedrockAgent_serial/KnowledgeBase (51.22s)
        --- PASS: TestAccBedrockAgent_serial/KnowledgeBase/S3Vectors (51.22s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent	56.715s
% make testacc TESTARGS='-run=TestAccBedrockAgent_serial/KnowledgeBase/StructuredDataStoreRedshiftProvisioned' PKG=bedrockagent
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_bedrockagent_knowledge_base-enhancements 🌿...
TF_ACC=1 go1.24.11 test ./internal/service/bedrockagent/... -v -count 1 -parallel 20  -run=TestAccBedrockAgent_serial/KnowledgeBase/StructuredDataStoreRedshiftProvisioned -timeout 360m -vet=off
2025/12/10 13:56:08 Creating Terraform AWS Provider (SDKv2-style)...
2025/12/10 13:56:08 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccBedrockAgent_serial
=== PAUSE TestAccBedrockAgent_serial
=== CONT  TestAccBedrockAgent_serial
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase/StructuredDataStoreRedshiftProvisioned
--- PASS: TestAccBedrockAgent_serial (300.23s)
    --- PASS: TestAccBedrockAgent_serial/KnowledgeBase (300.23s)
        --- PASS: TestAccBedrockAgent_serial/KnowledgeBase/StructuredDataStoreRedshiftProvisioned (300.23s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent	305.618s
% make testacc TESTARGS='-run=TestAccBedrockAgent_serial/KnowledgeBase/StructuredDataStoreRedshiftServerless' PKG=bedrockagent
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_bedrockagent_knowledge_base-enhancements 🌿...
TF_ACC=1 go1.24.11 test ./internal/service/bedrockagent/... -v -count 1 -parallel 20  -run=TestAccBedrockAgent_serial/KnowledgeBase/StructuredDataStoreRedshiftServerless -timeout 360m -vet=off
2025/12/10 14:42:05 Creating Terraform AWS Provider (SDKv2-style)...
2025/12/10 14:42:05 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccBedrockAgent_serial
=== PAUSE TestAccBedrockAgent_serial
=== CONT  TestAccBedrockAgent_serial
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase/StructuredDataStoreRedshiftServerless
--- PASS: TestAccBedrockAgent_serial (378.33s)
    --- PASS: TestAccBedrockAgent_serial/KnowledgeBase (378.33s)
        --- PASS: TestAccBedrockAgent_serial/KnowledgeBase/StructuredDataStoreRedshiftServerless (378.33s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent	383.801s
% make testacc TESTARGS='-run=TestAccBedrockAgent_serial/KnowledgeBase/NeptuneAnalytics' PKG=bedrockagent
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
make: Running acceptance tests on branch: 🌿 f-aws_bedrockagent_knowledge_base-enhancements 🌿...
TF_ACC=1 go1.24.11 test ./internal/service/bedrockagent/... -v -count 1 -parallel 20  -run=TestAccBedrockAgent_serial/KnowledgeBase/NeptuneAnalytics -timeout 360m -vet=off
2025/12/11 08:48:37 Creating Terraform AWS Provider (SDKv2-style)...
2025/12/11 08:48:37 Initializing Terraform AWS Provider (SDKv2-style)...
=== RUN   TestAccBedrockAgent_serial
=== PAUSE TestAccBedrockAgent_serial
=== CONT  TestAccBedrockAgent_serial
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase
=== RUN   TestAccBedrockAgent_serial/KnowledgeBase/NeptuneAnalytics
--- PASS: TestAccBedrockAgent_serial (426.11s)
    --- PASS: TestAccBedrockAgent_serial/KnowledgeBase (426.11s)
        --- PASS: TestAccBedrockAgent_serial/KnowledgeBase/NeptuneAnalytics (426.11s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/bedrockagent	431.463s
…orage' with 'testAccKnowledgeBase_RDS_supplementalDataStorage'.
@ewbankkit ewbankkit marked this pull request as ready for review December 11, 2025 20:33
@ewbankkit ewbankkit requested a review from a team as a code owner December 11, 2025 20:33
@ewbankkit ewbankkit added the enhancement Requests to existing resources that expand the functionality or scope. label Dec 11, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. prioritized Part of the maintainer teams immediate focus. To be addressed within the current quarter. service/bedrockagent Issues and PRs that pertain to the bedrockagent service. service/logs Issues and PRs that pertain to the logs 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

4 participants