Skip to content

r/aws_bedrockagentcore_gateway_target: add inference target configuration #48705

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.

Sign up for GitHub

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

Open
jesseturner21 wants to merge 6 commits into
base: main
Choose a base branch
from
+521 −3
Open

r/aws_bedrockagentcore_gateway_target: add inference target configuration #48705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d70453b
r/aws_bedrockagentcore_gateway_target: add inference target configura…
jesseturner21 Jun 30, 2026
d37aa31
r/aws_bedrockagentcore_gateway_target: inference acctest add credenti…
jesseturner21 Jun 30, 2026
fa7244e
r/aws_bedrockagentcore_gateway_target: dispatch inference Flatten thr…
jesseturner21 Jun 30, 2026
fc35ee6
r/aws_bedrockagentcore_gateway_target: anchor inference provider endp…
jesseturner21 Jul 1, 2026
5caf947
fix(bedrockagentcore): resolve gateway_target inference provider_pref…
aidandaly24 Jul 10, 2026
f67f046
chore(bedrockagentcore): rename changelog to PR number 48705
aidandaly24 Jul 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .changelog/48705.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:enhancement
resource/aws_bedrockagentcore_gateway_target: Add `inference` target configuration block with `model_mapping` and `operations` support
```
291 changes: 288 additions & 3 deletions internal/service/bedrockagentcore/gateway_target.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,6 +632,7 @@ func (r *gatewayTargetResource) Schema(ctx context.Context, request resource.Sch
listvalidator.ExactlyOneOf(
path.MatchRelative().AtParent().AtName("http"),
path.MatchRelative().AtParent().AtName("mcp"),
path.MatchRelative().AtParent().AtName("inference"),
),
},
NestedObject: schema.NestedBlockObject{
Expand Down Expand Up @@ -808,7 +809,10 @@ func (r *gatewayTargetResource) Schema(ctx context.Context, request resource.Sch
Required: true,
Validators: []validator.String{
stringvalidator.RegexMatches(
regexache.MustCompile(`https://.*`),
// Anchor the pattern so the endpoint must *start* with https://
// (an unanchored https://.* accepts any string merely
// containing https://). Mirrors the inference provider endpoint.
regexache.MustCompile(`^https://.+`),
"Must start with https://",
),
},
Expand Down Expand Up @@ -905,6 +909,123 @@ func (r *gatewayTargetResource) Schema(ctx context.Context, request resource.Sch
},
},
},
"inference": schema.ListNestedBlock{
CustomType: fwtypes.NewListNestedObjectTypeOf[inferenceTargetConfigurationModel](ctx),
Validators: []validator.List{
listvalidator.SizeAtMost(1),
},
NestedObject: schema.NestedBlockObject{
Blocks: map[string]schema.Block{
"connector": schema.ListNestedBlock{
CustomType: fwtypes.NewListNestedObjectTypeOf[inferenceConnectorTargetConfigurationModel](ctx),
Validators: []validator.List{
listvalidator.SizeAtMost(1),
listvalidator.ExactlyOneOf(
path.MatchRelative().AtParent().AtName("connector"),
path.MatchRelative().AtParent().AtName("provider"),
),
},
NestedObject: schema.NestedBlockObject{
Blocks: map[string]schema.Block{
"source": schema.ListNestedBlock{
CustomType: fwtypes.NewListNestedObjectTypeOf[inferenceConnectorSourceModel](ctx),
Validators: []validator.List{
listvalidator.IsRequired(),
listvalidator.SizeAtMost(1),
},
NestedObject: schema.NestedBlockObject{
Attributes: map[string]schema.Attribute{
"connector_id": schema.StringAttribute{
Required: true,
},
},
},
},
},
},
},
"provider": schema.ListNestedBlock{
CustomType: fwtypes.NewListNestedObjectTypeOf[inferenceProviderTargetConfigurationModel](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://",
),
},
},
},
Blocks: map[string]schema.Block{
"model_mapping": schema.ListNestedBlock{
CustomType: fwtypes.NewListNestedObjectTypeOf[modelMappingModel](ctx),
Validators: []validator.List{
listvalidator.SizeAtMost(1),
},
NestedObject: schema.NestedBlockObject{
Blocks: map[string]schema.Block{
"provider_prefix": schema.ListNestedBlock{
CustomType: fwtypes.NewListNestedObjectTypeOf[providerPrefixModel](ctx),
Validators: []validator.List{
listvalidator.SizeAtMost(1),
},
NestedObject: schema.NestedBlockObject{
Attributes: map[string]schema.Attribute{
"separator": schema.StringAttribute{
Optional: true,
},
"strip": schema.BoolAttribute{
// SDK ProviderPrefix.Strip is a non-pointer bool that the
// service defaults to false and always returns from Get, so
// a plain Optional yields "inconsistent result after apply"
// (planned null, but now cty.False). Optional+Computed with a
// false default absorbs the server value.
Optional: true,
Computed: true,
Default: booldefault.StaticBool(false),
},
},
},
},
},
},
},
"operations": schema.ListNestedBlock{
CustomType: fwtypes.NewListNestedObjectTypeOf[inferenceOperationConfigurationModel](ctx),
NestedObject: schema.NestedBlockObject{
Attributes: map[string]schema.Attribute{
names.AttrPath: schema.StringAttribute{
Required: true,
},
"provider_path": schema.StringAttribute{
Optional: true,
},
},
Blocks: map[string]schema.Block{
"models": schema.ListNestedBlock{
CustomType: fwtypes.NewListNestedObjectTypeOf[modelEntryModel](ctx),
NestedObject: schema.NestedBlockObject{
Attributes: map[string]schema.Attribute{
"model": schema.StringAttribute{
Required: true,
},
},
},
},
},
},
},
},
},
},
},
},
},
},
},
},
Expand Down Expand Up @@ -1554,8 +1675,9 @@ func (m credentialProviderConfigurationModel) Expand(ctx context.Context) (any,
}

type targetConfigurationModel struct {
HTTP fwtypes.ListNestedObjectValueOf[httpTargetConfigurationModel] `tfsdk:"http"`
MCP fwtypes.ListNestedObjectValueOf[mcpTargetConfigurationModel] `tfsdk:"mcp"`
HTTP fwtypes.ListNestedObjectValueOf[httpTargetConfigurationModel] `tfsdk:"http"`
Inference fwtypes.ListNestedObjectValueOf[inferenceTargetConfigurationModel] `tfsdk:"inference"`
MCP fwtypes.ListNestedObjectValueOf[mcpTargetConfigurationModel] `tfsdk:"mcp"`
}

func (m *targetConfigurationModel) GetConfigurationType(ctx context.Context) string {
Expand All @@ -1579,6 +1701,15 @@ func (m *targetConfigurationModel) GetConfigurationType(ctx context.Context) str
return "smithy_model"
}
}
if !m.Inference.IsNull() {
infData, _ := m.Inference.ToPtr(ctx)
switch {
case !infData.Connector.IsNull():
return "inference_connector"
case !infData.Provider.IsNull():
return "inference_provider"
}
}
return "unknown"
}

Expand Down Expand Up @@ -1606,6 +1737,14 @@ func (m *targetConfigurationModel) Flatten(ctx context.Context, v any) diag.Diag
}
m.MCP = fwtypes.NewListNestedObjectValueOfPtrMust(ctx, &model)

case awstypes.TargetConfigurationMemberInference:
var model inferenceTargetConfigurationModel
smerr.AddEnrich(ctx, &diags, fwflex.Flatten(ctx, t.Value, &model))
if diags.HasError() {
return diags
}
m.Inference = fwtypes.NewListNestedObjectValueOfPtrMust(ctx, &model)

default:
diags.AddError(
"Unsupported Type",
Expand Down Expand Up @@ -1646,6 +1785,30 @@ func (m targetConfigurationModel) Expand(ctx context.Context) (any, diag.Diagnos
}

return &r, diags

case !m.Inference.IsNull():
inferenceConfigurationData, d := m.Inference.ToPtr(ctx)
smerr.AddEnrich(ctx, &diags, d)
if diags.HasError() {
return nil, diags
}

expanded, d := inferenceConfigurationData.Expand(ctx)
smerr.AddEnrich(ctx, &diags, d)
if diags.HasError() {
return nil, diags
}

innerUnion, ok := expanded.(awstypes.InferenceTargetConfiguration)
if !ok {
diags.AddError(
"Unsupported Inference Target Configuration Type",
fmt.Sprintf("inference target configuration expand: unexpected type %T", expanded),
)
return nil, diags
}

return &awstypes.TargetConfigurationMemberInference{Value: innerUnion}, diags
}

return nil, diags
Expand Down Expand Up @@ -1849,6 +2012,128 @@ type runtimeTargetConfigurationModel struct {
Qualifier types.String `tfsdk:"qualifier"`
}

type inferenceTargetConfigurationModel struct {
Connector fwtypes.ListNestedObjectValueOf[inferenceConnectorTargetConfigurationModel] `tfsdk:"connector"`
Provider fwtypes.ListNestedObjectValueOf[inferenceProviderTargetConfigurationModel] `tfsdk:"provider"`
}

var (
_ fwflex.Expander = inferenceTargetConfigurationModel{}
_ fwflex.Flattener = &inferenceTargetConfigurationModel{}
)

func (m *inferenceTargetConfigurationModel) Flatten(ctx context.Context, v any) diag.Diagnostics {
var diags diag.Diagnostics
switch t := v.(type) {
case awstypes.InferenceTargetConfigurationMemberConnector:
var model inferenceConnectorTargetConfigurationModel
smerr.AddEnrich(ctx, &diags, fwflex.Flatten(ctx, t.Value, &model))
if diags.HasError() {
return diags
}
m.Connector = fwtypes.NewListNestedObjectValueOfPtrMust(ctx, &model)

case *awstypes.InferenceTargetConfigurationMemberConnector:
var model inferenceConnectorTargetConfigurationModel
smerr.AddEnrich(ctx, &diags, fwflex.Flatten(ctx, t.Value, &model))
if diags.HasError() {
return diags
}
m.Connector = fwtypes.NewListNestedObjectValueOfPtrMust(ctx, &model)

case awstypes.InferenceTargetConfigurationMemberProvider:
var model inferenceProviderTargetConfigurationModel
smerr.AddEnrich(ctx, &diags, fwflex.Flatten(ctx, t.Value, &model))
if diags.HasError() {
return diags
}
m.Provider = fwtypes.NewListNestedObjectValueOfPtrMust(ctx, &model)

case *awstypes.InferenceTargetConfigurationMemberProvider:
var model inferenceProviderTargetConfigurationModel
smerr.AddEnrich(ctx, &diags, fwflex.Flatten(ctx, t.Value, &model))
if diags.HasError() {
return diags
}
m.Provider = fwtypes.NewListNestedObjectValueOfPtrMust(ctx, &model)

default:
diags.AddError(
"Unsupported Inference Target Configuration Type",
fmt.Sprintf("inference target configuration flatten: %T", v),
)
}
return diags
}

func (m inferenceTargetConfigurationModel) Expand(ctx context.Context) (any, diag.Diagnostics) {
var diags diag.Diagnostics
switch {
case !m.Connector.IsNull():
connectorData, d := m.Connector.ToPtr(ctx)
smerr.AddEnrich(ctx, &diags, d)
if diags.HasError() {
return nil, diags
}

var r awstypes.InferenceTargetConfigurationMemberConnector
smerr.AddEnrich(ctx, &diags, fwflex.Expand(ctx, connectorData, &r.Value))
if diags.HasError() {
return nil, diags
}
return &r, diags

case !m.Provider.IsNull():
providerData, d := m.Provider.ToPtr(ctx)
smerr.AddEnrich(ctx, &diags, d)
if diags.HasError() {
return nil, diags
}

var r awstypes.InferenceTargetConfigurationMemberProvider
smerr.AddEnrich(ctx, &diags, fwflex.Expand(ctx, providerData, &r.Value))
if diags.HasError() {
return nil, diags
}
return &r, diags
}

return nil, diags
}

type inferenceConnectorTargetConfigurationModel struct {
Source fwtypes.ListNestedObjectValueOf[inferenceConnectorSourceModel] `tfsdk:"source"`
}

type inferenceConnectorSourceModel struct {
ConnectorID types.String `tfsdk:"connector_id"`
}

type inferenceProviderTargetConfigurationModel struct {
Endpoint types.String `tfsdk:"endpoint"`
ModelMapping fwtypes.ListNestedObjectValueOf[modelMappingModel] `tfsdk:"model_mapping"`
Operations fwtypes.ListNestedObjectValueOf[inferenceOperationConfigurationModel] `tfsdk:"operations"`
}

type modelMappingModel struct {
ProviderPrefix fwtypes.ListNestedObjectValueOf[providerPrefixModel] `tfsdk:"provider_prefix"`
}

type providerPrefixModel struct {
Separator types.String `tfsdk:"separator"`
Strip types.Bool `tfsdk:"strip"`
}

type inferenceOperationConfigurationModel struct {
Models fwtypes.ListNestedObjectValueOf[modelEntryModel] `tfsdk:"models"`
Path types.String `tfsdk:"path"`
ProviderPath types.String `tfsdk:"provider_path"`
}

type modelEntryModel struct {
Model types.String `tfsdk:"model"`
}

type gatewayAPIKeyCredentialProviderModel struct {
CredentialLocation fwtypes.StringEnum[awstypes.ApiKeyCredentialLocation] `tfsdk:"credential_location"`
CredentialParameterName types.String `tfsdk:"credential_parameter_name"`
Expand Down
Loading