feat: add ProjectID to Bedrock and Bedrock Mantle key configs for Mantle project scoping
#5131
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package bedrock | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| schemas "github.com/maximhq/bifrost/core/schemas" | ||
| ) | ||
|
|
||
| // TestWithMantleProject verifies the project header is added only when a project ID is present, | ||
| // the target header name is honoured, and the base map is never mutated. | ||
| func TestWithMantleProject(t *testing.T) { | ||
| t.Run("empty project returns base unchanged", func(t *testing.T) { | ||
| base := map[string]string{"X-Custom": "v"} | ||
| got := WithMantleProject(base, MantleOpenAIProjectHeader, "") | ||
| if _, ok := got[MantleOpenAIProjectHeader]; ok { | ||
| t.Fatalf("expected no project header when project ID is empty, got %v", got) | ||
| } | ||
| // Empty project must return the base map as-is (default-project behaviour). | ||
| if len(got) != 1 || got["X-Custom"] != "v" { | ||
| t.Fatalf("expected base returned unchanged, got %v", got) | ||
| } | ||
| }) | ||
|
|
||
| t.Run("OpenAI project header set", func(t *testing.T) { | ||
| base := map[string]string{"X-Custom": "v"} | ||
| got := WithMantleProject(base, MantleOpenAIProjectHeader, "proj_abc") | ||
| if got[MantleOpenAIProjectHeader] != "proj_abc" { | ||
| t.Fatalf("expected %s=proj_abc, got %v", MantleOpenAIProjectHeader, got) | ||
| } | ||
| if got["X-Custom"] != "v" { | ||
| t.Fatalf("existing headers must be preserved, got %v", got) | ||
| } | ||
| // base must not be mutated. | ||
| if _, ok := base[MantleOpenAIProjectHeader]; ok { | ||
| t.Fatalf("base map was mutated: %v", base) | ||
| } | ||
| }) | ||
|
|
||
| t.Run("Anthropic workspace header set", func(t *testing.T) { | ||
| got := WithMantleProject(nil, MantleAnthropicProjectHeader, "proj_xyz") | ||
| if got[MantleAnthropicProjectHeader] != "proj_xyz" { | ||
| t.Fatalf("expected %s=proj_xyz, got %v", MantleAnthropicProjectHeader, got) | ||
| } | ||
| }) | ||
|
|
||
| t.Run("nil base with empty project stays nil", func(t *testing.T) { | ||
| if got := WithMantleProject(nil, MantleOpenAIProjectHeader, ""); got != nil { | ||
| t.Fatalf("expected nil when base is nil and project is empty, got %v", got) | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| // TestResolveMantleProjectID verifies precedence of the BedrockKeyConfig.ProjectID field. | ||
| func TestResolveMantleProjectID(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| key schemas.Key | ||
| want string | ||
| }{ | ||
| {name: "no bedrock config", key: schemas.Key{}, want: ""}, | ||
| {name: "config without project", key: schemas.Key{BedrockKeyConfig: &schemas.BedrockKeyConfig{}}, want: ""}, | ||
| { | ||
| name: "config with project", | ||
| key: schemas.Key{BedrockKeyConfig: &schemas.BedrockKeyConfig{ProjectID: schemas.NewSecretVar("proj_abc")}}, | ||
| want: "proj_abc", | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| if got := resolveMantleProjectID(tt.key); got != tt.want { | ||
| t.Fatalf("resolveMantleProjectID = %q, want %q", got, tt.want) | ||
| } | ||
| }) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| package bedrockmantle | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| schemas "github.com/maximhq/bifrost/core/schemas" | ||
| ) | ||
|
|
||
| // TestResolveProjectID verifies the BedrockMantleKeyConfig.ProjectID field is honoured and that an | ||
| // absent project resolves to "" (AWS default project). | ||
| func TestResolveProjectID(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| key schemas.Key | ||
| want string | ||
| }{ | ||
| {name: "no mantle config", key: schemas.Key{}, want: ""}, | ||
| {name: "config without project", key: schemas.Key{BedrockMantleKeyConfig: &schemas.BedrockMantleKeyConfig{}}, want: ""}, | ||
| { | ||
| name: "config with project", | ||
| key: schemas.Key{BedrockMantleKeyConfig: &schemas.BedrockMantleKeyConfig{ProjectID: schemas.NewSecretVar("proj_xyz")}}, | ||
| want: "proj_xyz", | ||
| }, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| if got := resolveProjectID(tt.key); got != tt.want { | ||
| t.Fatalf("resolveProjectID = %q, want %q", got, tt.want) | ||
| } | ||
| }) | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.