HYPERFLEET-1471 - feat: Server-set tenancy on the resource write path #339
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
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
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,43 @@ | ||
| package tenant | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
|
|
||
| "gorm.io/datatypes" | ||
| ) | ||
|
|
||
| type contextKey struct{} | ||
|
|
||
| // ResolvedTenant holds the tenant identity resolved from gateway-injected request headers. | ||
| type ResolvedTenant struct { | ||
| Dimensions map[string]string | ||
| System bool | ||
| } | ||
|
|
||
| // WithTenant attaches a resolved tenant identity to the context. | ||
| func WithTenant(ctx context.Context, t *ResolvedTenant) context.Context { | ||
| return context.WithValue(ctx, contextKey{}, t) | ||
| } | ||
|
|
||
| // FromContext returns the tenant identity attached to ctx, or nil if none was resolved. | ||
| func FromContext(ctx context.Context) *ResolvedTenant { | ||
| if t, ok := ctx.Value(contextKey{}).(*ResolvedTenant); ok { | ||
| return t | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| // TenancyJSON returns the caller's tenancy map as JSONB for storage on created resources. | ||
| // System and unscoped/absent callers get an empty map, which no tenant-scoped query can ever match. | ||
| func TenancyJSON(ctx context.Context) datatypes.JSON { | ||
| t := FromContext(ctx) | ||
| if t == nil || t.System || len(t.Dimensions) == 0 { | ||
| return datatypes.JSON([]byte("{}")) | ||
| } | ||
| b, err := json.Marshal(t.Dimensions) | ||
| if err != nil { | ||
| return datatypes.JSON([]byte("{}")) | ||
| } | ||
| return datatypes.JSON(b) | ||
| } |
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,74 @@ | ||
| package tenant | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| . "github.com/onsi/gomega" | ||
| ) | ||
|
|
||
| func TestFromContext_NoTenant(t *testing.T) { | ||
| RegisterTestingT(t) | ||
|
|
||
| got := FromContext(context.Background()) | ||
| Expect(got).To(BeNil()) | ||
| } | ||
|
|
||
| func TestWithTenant_RoundTrip(t *testing.T) { | ||
| RegisterTestingT(t) | ||
|
|
||
| want := &ResolvedTenant{Dimensions: map[string]string{"org": "acme"}} | ||
| ctx := WithTenant(context.Background(), want) | ||
|
|
||
| got := FromContext(ctx) | ||
| Expect(got).To(Equal(want)) | ||
| } | ||
|
|
||
| func TestTenancyJSON(t *testing.T) { | ||
| tests := []struct { | ||
| name string | ||
| ctx context.Context | ||
| want string | ||
| }{ | ||
| { | ||
| name: "no tenant in context", | ||
| ctx: context.Background(), | ||
| want: "{}", | ||
| }, | ||
| { | ||
| name: "system identity", | ||
| ctx: WithTenant(context.Background(), &ResolvedTenant{System: true, Dimensions: map[string]string{"org": "acme"}}), | ||
| want: "{}", | ||
| }, | ||
| { | ||
| name: "empty dimensions", | ||
| ctx: WithTenant(context.Background(), &ResolvedTenant{Dimensions: map[string]string{}}), | ||
| want: "{}", | ||
| }, | ||
| { | ||
| name: "nil dimensions", | ||
| ctx: WithTenant(context.Background(), &ResolvedTenant{}), | ||
| want: "{}", | ||
| }, | ||
| { | ||
| name: "tenant with single dimension", | ||
| ctx: WithTenant(context.Background(), &ResolvedTenant{Dimensions: map[string]string{"org": "acme"}}), | ||
| want: `{"org":"acme"}`, | ||
| }, | ||
| { | ||
| name: "tenant with multiple dimensions", | ||
| ctx: WithTenant(context.Background(), &ResolvedTenant{ | ||
| Dimensions: map[string]string{"org": "acme", "project": "project-1"}, | ||
| }), | ||
| want: `{"org":"acme","project":"project-1"}`, | ||
| }, | ||
| } | ||
|
|
||
| for _, tt := range tests { | ||
| t.Run(tt.name, func(t *testing.T) { | ||
| RegisterTestingT(t) | ||
| got := TenancyJSON(tt.ctx) | ||
| Expect(string(got)).To(MatchJSON(tt.want)) | ||
| }) | ||
| } | ||
| } |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
presentTenancy returns nil for zero-length JSON but {} for stored "{}". Worth normalizing so empty tenancy always serializes the same way.