chore: replace github.com/go-jose/go-jose/v3 with v4
#16031
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 |
|---|---|---|
|
|
@@ -20,14 +20,15 @@ import ( | |
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/go-jose/go-jose/v4" | ||
| "github.com/google/uuid" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
| "golang.org/x/xerrors" | ||
|
|
||
| "github.com/coder/coder/v2/coderd/coderdtest" | ||
| "github.com/coder/coder/v2/coderd/database" | ||
| "github.com/coder/coder/v2/coderd/jwtutils" | ||
| "github.com/coder/coder/v2/coderd/rbac" | ||
| "github.com/coder/coder/v2/coderd/workspaceapps" | ||
| "github.com/coder/coder/v2/codersdk" | ||
|
|
@@ -430,7 +431,7 @@ func Run(t *testing.T, appHostIsPrimary bool, factory DeploymentFactory) { | |
| require.NotNil(t, appTokenCookie, "no signed app token cookie in response") | ||
| require.Equal(t, appTokenCookie.Path, u.Path, "incorrect path on app token cookie") | ||
|
|
||
| object, err := jose.ParseSigned(appTokenCookie.Value, []jose.SignatureAlgorithm{jwtutils.SigningAlgo}) | ||
|
There was a problem hiding this comment. This is the only breaking change that affects us. In v4, https://github.com/go-jose/go-jose/blob/main/CHANGELOG.md#v400 |
||
| require.NoError(t, err) | ||
| require.Len(t, object.Signatures, 1) | ||
|
|
||
|
|
@@ -712,7 +713,7 @@ func Run(t *testing.T, appHostIsPrimary bool, factory DeploymentFactory) { | |
|
|
||
| // Parse the JWT without verifying it (since we can't access the key | ||
| // from this test). | ||
| object, err := jose.ParseSigned(appTokenCookie.Value, []jose.SignatureAlgorithm{jwtutils.SigningAlgo}) | ||
| require.NoError(t, err) | ||
| require.Len(t, object.Signatures, 1) | ||
|
|
||
|
|
@@ -1192,7 +1193,7 @@ func Run(t *testing.T, appHostIsPrimary bool, factory DeploymentFactory) { | |
| require.NotNil(t, appTokenCookie, "no signed token cookie in response") | ||
| require.Equal(t, appTokenCookie.Path, "/", "incorrect path on signed token cookie") | ||
|
|
||
| object, err := jose.ParseSigned(appTokenCookie.Value, []jose.SignatureAlgorithm{jwtutils.SigningAlgo}) | ||
| require.NoError(t, err) | ||
| require.Len(t, object.Signatures, 1) | ||
|
|
||
|
|
||
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.
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.
I exported this constant variable for the
jose.ParseSignedfunction calls incoderd/workspaceapps/apptest/apptest.go. See the previous review comment.