Skip to content

Commit 63133cf

Browse files
EmyrkEmyrk
committed
Merge remote-tracking branch 'origin/main' into stevenmasley/relax_csrf
2 parents a4bbc80 + f0132b5 commit 63133cf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+801
-1759
lines changed

‎.github/dependabot.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ updates:
4343
- dependency-name: "*"
4444
update-types:
4545
- version-update:semver-patch
46-
groups:
47-
go:
48-
patterns:
49-
- "*"
5046

5147
# Update our Dockerfile.
5248
- package-ecosystem: "docker"

‎.github/workflows/ci.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
142142
# Check for any typos
143143
- name: Check for typos
144-
uses: crate-ci/typos@v1.16.26
144+
uses: crate-ci/typos@v1.17.0
145145
with:
146146
config: .github/workflows/typos.toml
147147

@@ -188,7 +188,7 @@ jobs:
188188
go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33
189189
go install golang.org/x/tools/cmd/goimports@latest
190190
go install github.com/mikefarah/yq/v4@v4.30.6
191-
go install github.com/golang/mock/mockgen@v1.6.0
191+
go install go.uber.org/mock/mockgen@v0.4.0
192192
193193
- name: Install Protoc
194194
run: |
@@ -221,7 +221,7 @@ jobs:
221221
uses: ./.github/actions/setup-node
222222

223223
- name: Setup Go
224-
uses: buildjet/setup-go@v4
224+
uses: buildjet/setup-go@v5
225225
with:
226226
# This doesn't need caching. It's super fast anyways!
227227
cache: false
@@ -450,7 +450,7 @@ jobs:
450450
go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33
451451
go install golang.org/x/tools/cmd/goimports@latest
452452
go install github.com/mikefarah/yq/v4@v4.30.6
453-
go install github.com/golang/mock/mockgen@v1.6.0
453+
go install go.uber.org/mock/mockgen@v0.4.0
454454
455455
- name: Install Protoc
456456
run: |
@@ -592,7 +592,7 @@ jobs:
592592
go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.33
593593
go install golang.org/x/tools/cmd/goimports@latest
594594
go install github.com/mikefarah/yq/v4@v4.30.6
595-
go install github.com/golang/mock/mockgen@v1.6.0
595+
go install go.uber.org/mock/mockgen@v0.4.0
596596
597597
- name: Setup sqlc
598598
uses: ./.github/actions/setup-sqlc

‎.github/workflows/security.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
- name: Install yq
7676
run: go run github.com/mikefarah/yq/v4@v4.30.6
7777
- name: Install mockgen
78-
run: go install github.com/golang/mock/mockgen@v1.6.0
78+
run: go install go.uber.org/mock/mockgen@v0.4.0
7979
- name: Install protoc-gen-go
8080
run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.30
8181
- name: Install protoc-gen-go-drpc
@@ -122,7 +122,7 @@ jobs:
122122
image_name: ${{ steps.build.outputs.image }}
123123

124124
- name: Run Trivy vulnerability scanner
125-
uses: aquasecurity/trivy-action@91713af97dc80187565512baba96e4364e983601
125+
uses: aquasecurity/trivy-action@d43c1f16c00cfd3978dde6c07f4bbcf9eb6993ca
126126
with:
127127
image-ref: ${{ steps.build.outputs.image }}
128128
format: sarif

‎agent/agent_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"time"
2828

2929
"github.com/bramvdbogaerde/go-scp"
30-
"github.com/golang/mock/gomock"
3130
"github.com/google/uuid"
3231
"github.com/pion/udp"
3332
"github.com/pkg/sftp"
@@ -37,6 +36,7 @@ import (
3736
"github.com/stretchr/testify/assert"
3837
"github.com/stretchr/testify/require"
3938
"go.uber.org/goleak"
39+
"go.uber.org/mock/gomock"
4040
"golang.org/x/crypto/ssh"
4141
"golang.org/x/exp/slices"
4242
"golang.org/x/xerrors"

‎agent/agentproc/agentproctest/syscallermock.go

Lines changed: 9 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎agent/agentproc/proc_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ import (
55
"syscall"
66
"testing"
77

8-
"github.com/golang/mock/gomock"
98
"github.com/spf13/afero"
109
"github.com/stretchr/testify/require"
10+
"go.uber.org/mock/gomock"
1111
"golang.org/x/xerrors"
1212

1313
"github.com/coder/coder/v2/agent/agentproc"

‎coderd/apidoc/docs.go

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/apidoc/swagger.json

Lines changed: 1 addition & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎coderd/database/dbauthz/setup_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"strings"
1010
"testing"
1111

12-
"github.com/golang/mock/gomock"
1312
"github.com/google/uuid"
1413
"github.com/open-policy-agent/opa/topdown"
1514
"github.com/stretchr/testify/require"
1615
"github.com/stretchr/testify/suite"
16+
"go.uber.org/mock/gomock"
1717
"golang.org/x/xerrors"
1818

1919
"cdr.dev/slog"

0 commit comments

Comments
 (0)