-
Notifications
You must be signed in to change notification settings - Fork 127
Support for thrift annotation auth.actor_uuidAnnotate #2463
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.
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
oneporter
wants to merge
6
commits into
yarpc:main
Choose a base branch
from
oneporter:annotate
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
8a3c208
Initial impl of UUID on struct
porterrf 2d697d8
only generated if annotated
porterrf 62c868a
Parse file once, add error handling
porterrf 2c1068b
improve test cases
porterrf fdbdab5
gofmt
porterrf 5fad22d
ActorUUID
porterrf File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
74 changes: 69 additions & 5 deletions
74
encoding/thrift/thriftrw-plugin-yarpc/internal/tests/NOSERVICES/NOSERVICES.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
12 changes: 12 additions & 0 deletions
12
encoding/thrift/thriftrw-plugin-yarpc/internal/tests/NOSERVICES/types_yarpc_uuid.go
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
6 changes: 6 additions & 0 deletions
6
encoding/thrift/thriftrw-plugin-yarpc/internal/uuid_test_thrift/broken.thrift
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,6 @@ | ||
|
|
||
| // We cannot have 2 fields annotated with actor uuid in the same struct. | ||
| struct BadStruct { | ||
| 1: optional string baz (auth.actor_uuid = "true") | ||
| 2: optional string UserIdentifier (auth.actor_uuid = "true") | ||
| } | ||
5 changes: 5 additions & 0 deletions
5
encoding/thrift/thriftrw-plugin-yarpc/internal/uuid_test_thrift/happy.thrift
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,5 @@ | ||
|
|
||
| struct Struct { | ||
| 1: optional string baz | ||
| 2: optional string UserIdentifier (auth.actor_uuid = "true") | ||
| } |
10 changes: 10 additions & 0 deletions
10
...ng/thrift/thriftrw-plugin-yarpc/internal/uuid_test_thrift/multipleAnnotatedStructs.thrift
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,10 @@ | ||
|
|
||
| struct RedStruct { | ||
| 1: optional string baz | ||
| 2: optional string UserIdentifier (auth.actor_uuid = "true") | ||
| } | ||
|
|
||
| struct GreenStruct { | ||
| 1: optional string baz | ||
| 2: optional string CatIdentifier (auth.actor_uuid = "true") | ||
| } |
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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,84 @@ | ||
| // Copyright (c) 2026 Uber Technologies, Inc. | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| // of this software and associated documentation files (the "Software"), to deal | ||
| // in the Software without restriction, including without limitation the rights | ||
| // to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| // copies of the Software, and to permit persons to whom the Software is | ||
| // furnished to do so, subject to the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be included in | ||
| // all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| // AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| // THE SOFTWARE. | ||
|
|
||
| package main | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "go.uber.org/thriftrw/compile" | ||
| "go.uber.org/thriftrw/ptr" | ||
| noservices "go.uber.org/yarpc/encoding/thrift/thriftrw-plugin-yarpc/internal/tests/NOSERVICES" | ||
| ) | ||
|
|
||
| func TestGetUUID(t *testing.T) { | ||
| t.Run("happyCase", func(t *testing.T) { | ||
| assert.NotPanics(t, func() { | ||
| spec, err := compile.Compile("internal/uuid_test_thrift/happy.thrift") | ||
| assert.NoError(t, err) | ||
| annotatedTypes, err := anyAnnotatedTypes(spec.Types) | ||
| assert.NoError(t, err) | ||
| assert.Equal(t, 1, len(annotatedTypes)) | ||
| for k, v := range annotatedTypes { | ||
| assert.Equal(t, "Struct", k.Name) | ||
| assert.Equal(t, v, "UserIdentifier") | ||
| } | ||
|
|
||
| }) | ||
| }) | ||
| t.Run("multipleAnnotatedStructs", func(t *testing.T) { | ||
| assert.NotPanics(t, func() { | ||
| spec, err := compile.Compile("internal/uuid_test_thrift/multipleAnnotatedStructs.thrift") | ||
| assert.NoError(t, err) | ||
| annotatedTypes, err := anyAnnotatedTypes(spec.Types) | ||
| assert.NoError(t, err) | ||
| assert.Equal(t, 2, len(annotatedTypes)) | ||
| uuidFields := map[string]string{ | ||
| "RedStruct": "UserIdentifier", | ||
| "GreenStruct": "CatIdentifier", | ||
| } | ||
| for k, v := range annotatedTypes { | ||
| assert.Equal(t, uuidFields[k.Name], v) | ||
| } | ||
|
|
||
| }) | ||
| }) | ||
|
|
||
| t.Run("errorCase", func(t *testing.T) { | ||
| assert.NotPanics(t, func() { | ||
| spec, err := compile.Compile("internal/uuid_test_thrift/broken.thrift") | ||
| assert.NoError(t, err) | ||
| _, err = anyAnnotatedTypes(spec.Types) | ||
| assert.Error(t, err) | ||
|
|
||
| }) | ||
| }) | ||
| } | ||
|
|
||
| func TestGetGeneratedUUID(t *testing.T) { | ||
| t.Run("Found the UUID", func(t *testing.T) { | ||
| st := noservices.Struct{ | ||
| Baz: ptr.String("asdf"), | ||
| UserIdentifier: ptr.String("my-uuid"), | ||
| } | ||
| assert.Equal(t, "my-uuid", st.ActorUUID()) | ||
| }) | ||
| } |
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.
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.
empty line on each new .thrift