Merge pull request #44991 from tabito-hara/f-aws_bedrockagentcore_gateway_target-add_mcp_server

[Enhancement] aws_bedrockagentcore_gateway_target: Add `target_configuration.mcp.mcp_server` block

Author: ewbankkit

.changelog/44991.txt

@@ -0,0 +1,7 @@
+```release-note:enhancement
+resource/aws_bedrockagentcore_gateway_target: Add `target_configuration.mcp.mcp_server` block
+```
+
+```release-note:enhancement
+resource/aws_bedrockagentcore_gateway_target: Make `credential_provider_configuration` block optional
+```

internal/service/bedrockagentcore/gateway_target.go

@@ -224,7 +224,6 @@ func (r *gatewayTargetResource) Schema(ctx context.Context, request resource.Sch
 			"credential_provider_configuration": schema.ListNestedBlock{
 				CustomType: fwtypes.NewListNestedObjectTypeOf[credentialProviderConfigurationModel](ctx),
 				Validators: []validator.List{
-					listvalidator.IsRequired(),
 					listvalidator.SizeAtMost(1),
 				},
 				NestedObject: schema.NestedBlockObject{
@@ -385,6 +384,25 @@ func (r *gatewayTargetResource) Schema(ctx context.Context, request resource.Sch
 											},
 										},
 									},
+									"mcp_server": schema.ListNestedBlock{
+										CustomType: fwtypes.NewListNestedObjectTypeOf[mcpServerConfigurationModel](ctx),
+										Validators: []validator.List{
+											listvalidator.SizeAtMost(1),
+										},
+										NestedObject: schema.NestedBlockObject{
+											Attributes: map[string]schema.Attribute{
+												names.AttrEndpoint: schema.StringAttribute{
+													Required: true,
+													Validators: []validator.String{
+														stringvalidator.RegexMatches(
+															regexache.MustCompile(`https://.*`),
+															"Must start with https://",
+														),
+													},
+												},
+											},
+										},
+									},
 									"open_api_schema": schema.ListNestedBlock{
 										CustomType: fwtypes.NewListNestedObjectTypeOf[apiSchemaConfigurationModel](ctx),
 										Validators: []validator.List{
@@ -875,6 +893,8 @@ func (m *targetConfigurationModel) GetConfigurationType(ctx context.Context) str
 	switch mcpData, _ := m.MCP.ToPtr(ctx); {
 	case !mcpData.Lambda.IsNull():
 		return "lambda"
+	case !mcpData.MCPServer.IsNull():
+		return "mcp_server"
 	case !mcpData.OpenApiSchema.IsNull():
 		return "open_api_schema"
 	case !mcpData.SmithyModel.IsNull():
@@ -933,6 +953,7 @@ func (m targetConfigurationModel) Expand(ctx context.Context) (any, diag.Diagnos
 
 type mcpConfigurationModel struct {
 	Lambda        fwtypes.ListNestedObjectValueOf[mcpLambdaConfigurationModel] `tfsdk:"lambda"`
+	MCPServer     fwtypes.ListNestedObjectValueOf[mcpServerConfigurationModel] `tfsdk:"mcp_server"`
 	SmithyModel   fwtypes.ListNestedObjectValueOf[apiSchemaConfigurationModel] `tfsdk:"smithy_model"`
 	OpenApiSchema fwtypes.ListNestedObjectValueOf[apiSchemaConfigurationModel] `tfsdk:"open_api_schema"`
 }
@@ -953,6 +974,14 @@ func (m *mcpConfigurationModel) Flatten(ctx context.Context, v any) diag.Diagnos
 		}
 		m.Lambda = fwtypes.NewListNestedObjectValueOfPtrMust(ctx, &model)
 
+	case awstypes.McpTargetConfigurationMemberMcpServer:
+		var model mcpServerConfigurationModel
+		smerr.AddEnrich(ctx, &diags, fwflex.Flatten(ctx, t.Value, &model))
+		if diags.HasError() {
+			return diags
+		}
+		m.MCPServer = fwtypes.NewListNestedObjectValueOfPtrMust(ctx, &model)
+
 	case awstypes.McpTargetConfigurationMemberOpenApiSchema:
 		var model apiSchemaConfigurationModel
 		smerr.AddEnrich(ctx, &diags, fwflex.Flatten(ctx, t.Value, &model))
@@ -995,6 +1024,20 @@ func (m mcpConfigurationModel) Expand(ctx context.Context) (any, diag.Diagnostic
 		}
 		return &r, diags
 
+	case !m.MCPServer.IsNull():
+		mcpServerConfigurationData, d := m.MCPServer.ToPtr(ctx)
+		smerr.AddEnrich(ctx, &diags, d)
+		if diags.HasError() {
+			return nil, diags
+		}
+
+		var r awstypes.McpTargetConfigurationMemberMcpServer
+		smerr.AddEnrich(ctx, &diags, fwflex.Expand(ctx, mcpServerConfigurationData, &r.Value))
+		if diags.HasError() {
+			return nil, diags
+		}
+		return &r, diags
+
 	case !m.OpenApiSchema.IsNull():
 		openApiMCPConfigurationData, d := m.OpenApiSchema.ToPtr(ctx)
 		smerr.AddEnrich(ctx, &diags, d)
@@ -1547,6 +1590,10 @@ type s3ConfigurationModel struct {
 	Uri                  types.String `tfsdk:"uri"`
 }
 
+type mcpServerConfigurationModel struct {
+	Endpoint types.String `tfsdk:"endpoint"`
+}
+
 type apiSchemaConfigurationModel struct {
 	InlinePayload fwtypes.ListNestedObjectValueOf[inlinePayloadModel]   `tfsdk:"inline_payload"`
 	S3            fwtypes.ListNestedObjectValueOf[s3ConfigurationModel] `tfsdk:"s3"`

internal/service/bedrockagentcore/gateway_target_test.go

@@ -241,6 +241,58 @@ func TestAccBedrockAgentCoreGatewayTarget_targetConfiguration(t *testing.T) {
 	})
 }
 
+func TestAccBedrockAgentCoreGatewayTarget_targetConfigurationMCPServer(t *testing.T) {
+	ctx := acctest.Context(t)
+	var gatewayTarget bedrockagentcorecontrol.GetGatewayTargetOutput
+	rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix)
+	resourceName := "aws_bedrockagentcore_gateway_target.test"
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck: func() {
+			acctest.PreCheck(ctx, t)
+			acctest.PreCheckPartitionHasService(t, names.BedrockEndpointID)
+			testAccPreCheckGatewayTargets(ctx, t)
+		},
+		ErrorCheck:               acctest.ErrorCheck(t, names.BedrockAgentCoreServiceID),
+		ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories,
+		CheckDestroy:             testAccCheckGatewayTargetDestroy(ctx),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccGatewayTargetConfig_targetConfigurationMCPServer(rName, "https://knowledge-mcp.global.api.aws"),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckGatewayTargetExists(ctx, resourceName, &gatewayTarget),
+					resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
+					resource.TestCheckResourceAttr(resourceName, "target_configuration.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "target_configuration.0.mcp.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "target_configuration.0.mcp.0.mcp_server.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "target_configuration.0.mcp.0.mcp_server.0.endpoint", "https://knowledge-mcp.global.api.aws"),
+				),
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionCreate),
+					},
+				},
+			},
+			{
+				Config: testAccGatewayTargetConfig_targetConfigurationMCPServer(rName, "https://docs.mcp.cloudflare.com/mcp"),
+				Check: resource.ComposeAggregateTestCheckFunc(
+					testAccCheckGatewayTargetExists(ctx, resourceName, &gatewayTarget),
+					resource.TestCheckResourceAttr(resourceName, names.AttrName, rName),
+					resource.TestCheckResourceAttr(resourceName, "target_configuration.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "target_configuration.0.mcp.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "target_configuration.0.mcp.0.mcp_server.#", "1"),
+					resource.TestCheckResourceAttr(resourceName, "target_configuration.0.mcp.0.mcp_server.0.endpoint", "https://docs.mcp.cloudflare.com/mcp"),
+				),
+				ConfigPlanChecks: resource.ConfigPlanChecks{
+					PreApply: []plancheck.PlanCheck{
+						plancheck.ExpectResourceAction(resourceName, plancheck.ResourceActionUpdate),
+					},
+				},
+			},
+		},
+	})
+}
+
 func TestAccBedrockAgentCoreGatewayTarget_credentialProvider(t *testing.T) {
 	ctx := acctest.Context(t)
 	var gatewayTarget, gatewayTargetPrev bedrockagentcorecontrol.GetGatewayTargetOutput
@@ -734,6 +786,23 @@ resource "aws_bedrockagentcore_gateway_target" "test" {
 `, rName, schemaContent))
 }
 
+func testAccGatewayTargetConfig_targetConfigurationMCPServer(rName, endpoint string) string {
+	return acctest.ConfigCompose(testAccGatewayTargetConfig_infra(rName), fmt.Sprintf(`
+resource "aws_bedrockagentcore_gateway_target" "test" {
+  name               = %[1]q
+  gateway_identifier = aws_bedrockagentcore_gateway.test.gateway_id
+
+  target_configuration {
+    mcp {
+      mcp_server {
+        endpoint = %[2]q
+      }
+    }
+  }
+}
+`, rName, endpoint))
+}
+
 func testAccSchema_primitive() string {
 	return `
 			type        = "string"

website/docs/r/bedrockagentcore_gateway_target.html.markdown

@@ -294,11 +294,11 @@ The following arguments are required:
 
 * `name` - (Required) Name of the gateway target.
 * `gateway_identifier` - (Required) Identifier of the gateway that this target belongs to.
-* `credential_provider_configuration` - (Required) Configuration for authenticating requests to the target. See [`credential_provider_configuration`](#credential_provider_configuration) below.
 * `target_configuration` - (Required) Configuration for the target endpoint. See [`target_configuration`](#target_configuration) below.
 
 The following arguments are optional:
 
+* `credential_provider_configuration` - (Optional) Configuration for authenticating requests to the target. Required when using `lambda`, `open_api_schema` and `smithy_model` in `mcp` block. If using `mcp_server` in `mcp` block with no authorization, it should not be specified. See [`credential_provider_configuration`](#credential_provider_configuration) below.
 * `description` - (Optional) Description of the gateway target.
 * `region` - (Optional) AWS region where the resource will be created. If not provided, the region from the provider configuration will be used.
 
@@ -338,6 +338,7 @@ The `target_configuration` block supports the following:
 The `mcp` block supports exactly one of the following:
 
 * `lambda` - (Optional) Lambda function target configuration. See [`lambda`](#lambda) below.
+* `mcp_server` - (Optional) MCP server target configuration. See [`mcp_server`](#mcp_server) below.
 * `open_api_schema` - (Optional) OpenAPI schema-based target configuration. See [`api_schema_configuration`](#api_schema_configuration) below.
 * `smithy_model` - (Optional) Smithy model-based target configuration. See [`api_schema_configuration`](#api_schema_configuration) below.
 
@@ -371,6 +372,12 @@ The `s3` block supports the following:
 * `uri` - (Optional) S3 URI where the tool schema is stored.
 * `bucket_owner_account_id` - (Optional) Account ID of the S3 bucket owner.
 
+### `mcp_server`
+
+The `mcp_server` block supports the following:
+
+* `endpoint` - (Required) Endpoint for the MCP server target configuration.
+
 ### `api_schema_configuration`
 
 The `api_schema_configuration` block supports exactly one of the following: