Skip to content

chore: move app proxying code to workspaceapps pkg #6998

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.

Sign up for GitHub

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 12 commits into from
Apr 5, 2023
Merged

chore: move app proxying code to workspaceapps pkg #6998

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
921a7c5
chore: move app proxying code to workspaceapps pkg
deansheather Apr 4, 2023
7e0ea10
fixup! chore: move app proxying code to workspaceapps pkg
deansheather Apr 4, 2023
70309ce
Renamed from PR review
Emyrk Apr 4, 2023
900709b
Attach rate limiter outside the pkg
Emyrk Apr 4, 2023
20ecf88
Fix some accidental renameS
Emyrk Apr 4, 2023
540de03
rate limiter over api key
Emyrk Apr 4, 2023
2e710e2
chore: upgrade to go-jose v3
deansheather Apr 5, 2023
b38c1c8
chore: change app signing key to be 96 bytes
deansheather Apr 5, 2023
a933d6d
fixup! chore: change app signing key to be 96 bytes
deansheather Apr 5, 2023
fe28e42
chore: Rename AppSigningKey to AppSecurityKey
Emyrk Apr 5, 2023
691c328
Merge remote-tracking branch 'origin/main' into dean/move-app-proxy-r…
Emyrk Apr 5, 2023
a34b663
Formatting
Emyrk Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
chore: upgrade to go-jose v3
  • Loading branch information
@deansheather
deansheather committed Apr 5, 2023
commit 2e710e257b481719df7f9a35ad70585feb277850
2 changes: 1 addition & 1 deletion coderd/workspaceapps/token.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"encoding/json"
"time"

"github.com/go-jose/go-jose/v3"
"github.com/google/uuid"
"golang.org/x/xerrors"
"gopkg.in/square/go-jose.v2"

"github.com/coder/coder/coderd/database"
)
Expand Down
2 changes: 1 addition & 1 deletion coderd/workspaceapps/token_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"testing"
"time"

"github.com/go-jose/go-jose/v3"
"github.com/google/uuid"
"github.com/stretchr/testify/require"
"gopkg.in/square/go-jose.v2"

"github.com/coder/coder/coderd/coderdtest"
"github.com/coder/coder/coderd/database"
Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ require (
github.com/go-chi/chi/v5 v5.0.7
github.com/go-chi/httprate v0.7.1
github.com/go-chi/render v1.0.1
github.com/go-jose/go-jose/v3 v3.0.0
github.com/go-logr/logr v1.2.3
github.com/go-ping/ping v1.1.0
github.com/go-playground/validator/v10 v10.12.0
Expand Down Expand Up @@ -166,7 +167,6 @@ require (
google.golang.org/grpc v1.53.0
google.golang.org/protobuf v1.28.2-0.20230118093459-a9481185b34d
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/square/go-jose.v2 v2.6.0
gopkg.in/yaml.v3 v3.0.1
gvisor.dev/gvisor v0.0.0-20221203005347-703fd9b7fbc0
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
Expand Down Expand Up @@ -346,6 +346,7 @@ require (
golang.zx2c4.com/wireguard/windows v0.5.3 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230223222841-637eb2293923 // indirect
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
howett.net/plist v1.0.0 // indirect
inet.af/peercred v0.0.0-20210906144145-0893ea02156a // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,8 @@ github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
Expand Down