Merge pull request #47832 from hashicorp/td-bedrock-nova

[bedrock|bedrockagent]: prefer `nova` foundation models

Author: jar-b

docs/acc-test-environment-variables.md

@@ -112,6 +112,7 @@ Environment variables (beyond standard AWS Go SDK ones) used by acceptance testi
 | `TF_ACC_ASSUME_ROLE_ARN`                                        | Amazon Resource Name of existing IAM Role to use for limited permissions acceptance testing.                                                                                                     |
 | `TF_ACC_REQUIRED_TAG_KEY`                                       | Name of the tag key required for the resource being tested as defined in the organizational tagging policy                                                                                       |
 | `TF_AWS_BEDROCK_OSS_COLLECTION_NAME`                            | Name of the OpenSearch Serverless collection to be used with an Amazon Bedrock Knowledge Base.                                                                                                   |
+| `TF_AWS_BEDROCK_TITAN_MODELS_ALLOWED`                            | Flag to enable tests which require use of Amazon Titan foundation models. Set to `1` to run tests.                                                                                                    |
 | `TF_AWS_CONTROLTOWER_CONTROL_OU_NAME`                           | Organizational unit name to be targeted by the Control Tower control.                                                                                                                            |
 | `TF_AWS_CONTROLTOWER_BASELINE_ENABLE_BASELINE_ARN`              | Enable baseline ARN.                                                                                                                                                                             |
 | `TF_AWS_DATAEXCHANGE_DATA_SET_ID`                               | ID of DataExchange Data Set to use for testing.                                                                                                                                                  |

internal/service/bedrock/custom_model.go

@@ -51,6 +51,9 @@ import (
 // @Testing(serialize=true)
 // @Testing(importIgnore="base_model_identifier", plannableImportAction="Replace")
 // @Testing(preIdentityVersion="v5.100.0")
+// @Testing(preCheckRegion="us-east-1")
+// Model availability is region-specific
+// @Testing(identityRegionOverrideTest=false)
 func newCustomModelResource(context.Context) (resource.ResourceWithConfigure, error) {
 	r := &customModelResource{}
 

internal/service/bedrock/custom_model_data_source_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 
 	"github.com/aws/aws-sdk-go-v2/service/bedrock"
+	"github.com/hashicorp/aws-sdk-go-base/v2/endpoints"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 	"github.com/hashicorp/terraform-provider-aws/internal/acctest"
 	"github.com/hashicorp/terraform-provider-aws/names"
@@ -24,7 +25,11 @@ func testAccCustomModelDataSource_basic(t *testing.T) {
 	var v bedrock.GetModelCustomizationJobOutput
 
 	acctest.Test(ctx, t, resource.TestCase{
-		PreCheck:                 func() { acctest.PreCheck(ctx, t); acctest.PreCheckPartitionHasService(t, names.BedrockEndpointID) },
+		PreCheck: func() {
+			acctest.PreCheck(ctx, t)
+			acctest.PreCheckPartitionHasService(t, names.BedrockEndpointID)
+			acctest.PreCheckRegion(t, endpoints.UsEast1RegionID)
+		},
 		ErrorCheck:               acctest.ErrorCheck(t, names.BedrockServiceID),
 		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
 		Steps: []resource.TestStep{