-
Notifications
You must be signed in to change notification settings - Fork 605
fix: improved nil handling #3771
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
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
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
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,88 @@ | ||
| package keys | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/require" | ||
| "github.com/unkeyed/unkey/go/pkg/codes" | ||
| "github.com/unkeyed/unkey/go/pkg/fault" | ||
| ) | ||
|
|
||
| func TestGetRootKey_ErrorHandling_ReturnsError(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| // Create a service with nil dependencies, similar to create_test.go pattern | ||
| s := &service{} | ||
|
|
||
| ctx := context.Background() | ||
|
|
||
| // This test validates that GetRootKey properly handles errors from Get() | ||
| // Before the fix, GetRootKey would panic when trying to access key.Key.ForWorkspaceID.Valid | ||
| // after Get() returned an error with nil key. Now it should return the error safely. | ||
| key, log, err := s.GetRootKey(ctx, nil) | ||
|
|
||
| require.Error(t, err) | ||
| require.Nil(t, key) | ||
| require.NotNil(t, log) | ||
|
|
||
| // Verify specific error code for missing auth when session is nil | ||
| code, ok := fault.GetCode(err) | ||
| require.True(t, ok) | ||
| require.Equal(t, codes.Auth.Authentication.Missing.URN(), code) | ||
| } | ||
|
|
||
| func TestGetRootKey_WithEmptyRawKey_ReturnsError(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| // Create a service with nil dependencies, following create_test.go pattern | ||
| s := &service{} | ||
|
|
||
| ctx := context.Background() | ||
|
|
||
| // Call Get with empty raw key to test the assert.NotEmpty validation | ||
| key, log, err := s.Get(ctx, nil, "") | ||
|
|
||
| // Verify that we get an error for empty key | ||
| require.Error(t, err) | ||
| require.Nil(t, key) | ||
| require.NotNil(t, log) | ||
| require.Contains(t, err.Error(), "rawKey is empty") | ||
| } | ||
imeyer marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
|
||
| func TestGet_WithEmptyRawKey_ReturnsError(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| // Test the assert.NotEmpty validation path directly in Get function | ||
| s := &service{} | ||
| ctx := context.Background() | ||
|
|
||
| key, log, err := s.Get(ctx, nil, "") | ||
|
|
||
| require.Error(t, err) | ||
| require.Nil(t, key) | ||
| require.NotNil(t, log) | ||
| require.Contains(t, err.Error(), "rawKey is empty") | ||
| } | ||
|
|
||
| func TestGet_EmptyString_Variants(t *testing.T) { | ||
| t.Parallel() | ||
|
|
||
| // Test various empty string cases to improve assert.NotEmpty coverage | ||
| s := &service{} | ||
| ctx := context.Background() | ||
|
|
||
| // Only test cases that will hit the validation path, not the cache/db path | ||
| emptyVariants := []string{ | ||
| "", // Classic empty string | ||
| } | ||
|
|
||
| for _, empty := range emptyVariants { | ||
| key, log, err := s.Get(ctx, nil, empty) | ||
|
|
||
| require.Error(t, err) | ||
| require.Nil(t, key) | ||
| require.NotNil(t, log) | ||
| require.Contains(t, err.Error(), "rawKey is empty") | ||
| } | ||
| } | ||
imeyer marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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
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.