Skip to content

Commit 73bc4e6

Browse files
kylecarbskylecarbs
committed
Merge branch 'main' into provisionerservice
2 parents b495991 + bf90ded commit 73bc4e6

23 files changed

+370
-103
lines changed

‎.github/dependabot.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "github-actions"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
time: "06:00"
8+
timezone: "America/Chicago"
9+
commit-message:
10+
prefix: "chore"
11+
ignore:
12+
# These actions deliver the latest versions by updating the major
13+
# release tag, so ignore minor and patch versions
14+
- dependency-name: "actions/*"
15+
update-types:
16+
- version-update:semver-minor
17+
- version-update:semver-patch
18+
- dependency-name: "Apple-Actions/import-codesign-certs"
19+
update-types:
20+
- version-update:semver-minor
21+
- version-update:semver-patch
22+
- dependency-name: "marocchino/sticky-pull-request-comment"
23+
update-types:
24+
- version-update:semver-minor
25+
- version-update:semver-patch
26+
27+
- package-ecosystem: "gomod"
28+
directory: "/"
29+
schedule:
30+
interval: "daily"
31+
time: "06:00"
32+
timezone: "America/Chicago"
33+
commit-message:
34+
prefix: "chore"
35+
36+
- package-ecosystem: "npm"
37+
directory: "/"
38+
schedule:
39+
interval: "daily"
40+
time: "06:00"
41+
timezone: "America/Chicago"
42+
commit-message:
43+
prefix: "chore"
44+
ignore:
45+
# Ignore major updates to Node.js types, because they need to
46+
# correspond to the Node.js engine version
47+
- dependency-name: "@types/node"
48+
update-types:
49+
- version-update:semver-major

‎.github/stale.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Number of days of inactivity before an issue becomes stale
2+
daysUntilStale: 14
3+
# Number of days of inactivity before a stale issue is closed
4+
daysUntilClose: 5
5+
# Label to apply when stale.
6+
staleLabel: stale
7+
# Comment to post when marking an issue as stale. Set to `false` to disable
8+
markComment: >
9+
This issue has been automatically marked as stale because it has not had
10+
recent activity. It will be closed if no activity occurs in the next 5 days.
11+
# Comment to post when closing a stale issue. Set to `false` to disable
12+
closeComment: false

‎.github/workflows/coder.yaml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,12 @@ permissions:
2626
security-events: none
2727
statuses: none
2828

29+
# Cancel in-progress runs for pull requests when developers push
30+
# additional changes
31+
concurrency:
32+
group: ${{ github.workflow }}-${{ github.ref }}
33+
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
34+
2935
jobs:
3036
style-lint-golangci:
3137
name: style/lint/golangci
@@ -89,14 +95,7 @@ jobs:
8995
style:
9096
- fmt
9197
fail-fast: false
92-
permissions:
93-
actions: write # for cancel-workflow-action
94-
contents: read
9598
steps:
96-
- name: Cancel previous runs
97-
if: github.event_name == 'pull_request'
98-
uses: styfle/cancel-workflow-action@0.9.1
99-
10099
- name: Checkout
101100
uses: actions/checkout@v2
102101
with:
@@ -168,6 +167,7 @@ jobs:
168167
-count=1 -race -parallel=1
169168

170169
- uses: codecov/codecov-action@v2
170+
if: github.actor != 'dependabot[bot]'
171171
with:
172172
token: ${{ secrets.CODECOV_TOKEN }}
173173
files: ./gotests.coverage
@@ -200,6 +200,7 @@ jobs:
200200
- run: yarn test:coverage
201201

202202
- uses: codecov/codecov-action@v2
203+
if: github.actor != 'dependabot[bot]'
203204
with:
204205
token: ${{ secrets.CODECOV_TOKEN }}
205206
files: ./coverage/lcov.info

‎.vscode/extensions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"foxundermoon.shell-format",
77
"emeraldwalk.runonsave",
88
"zxh404.vscode-proto3",
9-
"redhat.vscode-yaml"
9+
"redhat.vscode-yaml",
10+
"streetsidesoftware.code-spell-checker"
1011
]
1112
}

‎coderd/coderd.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package coderd
33
import (
44
"net/http"
55

6-
"github.com/go-chi/chi"
6+
"github.com/go-chi/chi/v5"
77

88
"cdr.dev/slog"
99
"github.com/coder/coder/database"

‎coderd/coderdtest/coderdtest.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ func (s *Server) RandomInitialUser(t *testing.T) coderd.CreateInitialUserRequest
6464
return req
6565
}
6666

67+
// AddProvisionerd launches a new provisionerd instance!
6768
func (s *Server) AddProvisionerd(t *testing.T) io.Closer {
6869
tfClient, tfServer := provisionersdk.TransportPipe()
6970
ctx, cancelFunc := context.WithCancel(context.Background())

‎go.mod

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ require (
1212
cdr.dev/slog v1.4.1
1313
github.com/coder/retry v1.3.0
1414
github.com/go-chi/chi v1.5.4
15+
github.com/go-chi/chi/v5 v5.0.7
1516
github.com/go-chi/render v1.0.1
1617
github.com/go-playground/validator/v10 v10.10.0
1718
github.com/golang-migrate/migrate/v4 v4.15.1
@@ -27,7 +28,7 @@ require (
2728
github.com/pion/datachannel v1.5.2
2829
github.com/pion/logging v0.2.2
2930
github.com/pion/transport v0.13.0
30-
github.com/pion/webrtc/v3 v3.1.17
31+
github.com/pion/webrtc/v3 v3.1.18
3132
github.com/spf13/cobra v1.3.0
3233
github.com/stretchr/testify v1.7.0
3334
github.com/unrolled/secure v1.0.9
@@ -38,7 +39,7 @@ require (
3839
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
3940
google.golang.org/protobuf v1.27.1
4041
nhooyr.io/websocket v1.8.7
41-
storj.io/drpc v0.0.28
42+
storj.io/drpc v0.0.29
4243
)
4344

4445
require (
@@ -83,7 +84,7 @@ require (
8384
github.com/opencontainers/go-digest v1.0.0 // indirect
8485
github.com/opencontainers/image-spec v1.0.2 // indirect
8586
github.com/opencontainers/runc v1.1.0 // indirect
86-
github.com/pion/dtls/v2 v2.1.0 // indirect
87+
github.com/pion/dtls/v2 v2.1.1 // indirect
8788
github.com/pion/ice/v2 v2.1.19 // indirect
8889
github.com/pion/interceptor v0.1.7 // indirect
8990
github.com/pion/mdns v0.0.5 // indirect

‎go.sum

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,8 @@ github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwv
439439
github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
440440
github.com/go-chi/chi v1.5.4 h1:QHdzF2szwjqVV4wmByUnTcsbIg7UGaQ0tPF2t5GcAIs=
441441
github.com/go-chi/chi v1.5.4/go.mod h1:uaf8YgoFazUOkPBG7fxPftUylNumIev9awIWOENIuEg=
442+
github.com/go-chi/chi/v5 v5.0.7 h1:rDTPXLDHGATaeHvVlLcR4Qe0zftYethFucbjVQ1PxU8=
443+
github.com/go-chi/chi/v5 v5.0.7/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
442444
github.com/go-chi/render v1.0.1 h1:4/5tis2cKaNdnv9zFLfXzcquC9HbeZgCnxGnKrltBS8=
443445
github.com/go-chi/render v1.0.1/go.mod h1:pq4Rr7HbnsdaeHagklXub+p6Wd16Af5l9koip1OvJns=
444446
github.com/go-fonts/dejavu v0.1.0/go.mod h1:4Wt4I4OU2Nq9asgDCteaAaWZOV24E+0/Pwo0gppep4g=
@@ -1005,13 +1007,11 @@ github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi
10051007
github.com/pierrec/lz4/v4 v4.1.8/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
10061008
github.com/pion/datachannel v1.5.2 h1:piB93s8LGmbECrpO84DnkIVWasRMk3IimbcXkTQLE6E=
10071009
github.com/pion/datachannel v1.5.2/go.mod h1:FTGQWaHrdCwIJ1rw6xBIfZVkslikjShim5yr05XFuCQ=
1008-
github.com/pion/dtls/v2 v2.0.13/go.mod h1:OaE7eTM+ppaUhJ99OTO4aHl9uY6vPrT1gPY27uNTxRY=
1009-
github.com/pion/dtls/v2 v2.1.0 h1:g6gtKVNLp6URDkv9OijFJl16kqGHzVzZG+Fa4A38GTY=
10101010
github.com/pion/dtls/v2 v2.1.0/go.mod h1:qG3gA7ZPZemBqpEFqRKyURYdKEwFZQCGb7gv9T3ON3Y=
1011-
github.com/pion/ice/v2 v2.1.18/go.mod h1:9jDr0iIUg8P6+0Jq8QJ/eFSkX3JnsPd293TjCdkfpTs=
1011+
github.com/pion/dtls/v2 v2.1.1 h1:+ak8AXk2Hw0xjBTwC3ZwTmg72nLckNs3kpIugs4R594=
1012+
github.com/pion/dtls/v2 v2.1.1/go.mod h1:qG3gA7ZPZemBqpEFqRKyURYdKEwFZQCGb7gv9T3ON3Y=
10121013
github.com/pion/ice/v2 v2.1.19 h1:z7iVx/fHlqvPILUbvcj1xjuz/6eVKgEFOM8h1AuLbF8=
10131014
github.com/pion/ice/v2 v2.1.19/go.mod h1:E5frMpIJ3zzcQiRo+XyT7z1IiAsGc1hDURcVJQUzGWA=
1014-
github.com/pion/interceptor v0.1.6/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U=
10151015
github.com/pion/interceptor v0.1.7 h1:HThW0tIIKT9RRoDWGURe8rlZVOx0fJHxBHpA0ej0+bo=
10161016
github.com/pion/interceptor v0.1.7/go.mod h1:Lh3JSl/cbJ2wP8I3ccrjh1K/deRGRn3UlSPuOTiHb6U=
10171017
github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
@@ -1043,8 +1043,8 @@ github.com/pion/turn/v2 v2.0.6 h1:AsXjSPR6Im15DMTB39NlfdTY9BQfieANPBjdg/aVNwY=
10431043
github.com/pion/turn/v2 v2.0.6/go.mod h1:+y7xl719J8bAEVpSXBXvTxStjJv3hbz9YFflvkpcGPw=
10441044
github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o=
10451045
github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M=
1046-
github.com/pion/webrtc/v3 v3.1.17 h1:6V4Yf5wnvJZKs86401EcpsKmB5Px5pfF1ICXdPIRsC0=
1047-
github.com/pion/webrtc/v3 v3.1.17/go.mod h1:kHunUx6HPCbCvGy/HdWQNwtT9LJ2XMS/sBmLwB1A4rs=
1046+
github.com/pion/webrtc/v3 v3.1.18 h1:GV4I/UrK88wByimrADFTSFDoiQtTkniS2Y2/nFiqMXI=
1047+
github.com/pion/webrtc/v3 v3.1.18/go.mod h1:hgdzaqmY/q855FhUvqSdxerEiBG6Jrj/CftRgVwnh+Y=
10481048
github.com/pkg/browser v0.0.0-20210706143420-7d21f8c997e2/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
10491049
github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8/go.mod h1:HKlIX3XHQyzLZPlr7++PzdhaXEj94dEiJgZDTsxEqUI=
10501050
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
@@ -1307,7 +1307,6 @@ golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5y
13071307
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
13081308
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
13091309
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
1310-
golang.org/x/crypto v0.0.0-20211117183948-ae814b36b871/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
13111310
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
13121311
golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8 h1:kACShD3qhmr/3rLmg1yXyt+N4HcwutKyPRB93s54TIU=
13131312
golang.org/x/crypto v0.0.0-20220126234351-aa10faf2a1f8/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
@@ -1973,5 +1972,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
19731972
sigs.k8s.io/structured-merge-diff/v4 v4.0.3/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
19741973
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
19751974
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
1976-
storj.io/drpc v0.0.28 h1:t8v3Sk7b8NiMIwgKYJCKDyu21x+yCRASOnIpBywl6vs=
1977-
storj.io/drpc v0.0.28/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg=
1975+
storj.io/drpc v0.0.29 h1:Ihd4ls/JQFr0lctefie3iu+3QM4duccCKr9uMzf4sKY=
1976+
storj.io/drpc v0.0.29/go.mod h1:6rcOyR/QQkSTX/9L5ZGtlZaE2PtXTTZl8d+ulSeeYEg=

‎httpmw/organizationparam.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88
"net/http"
99

10-
"github.com/go-chi/chi"
10+
"github.com/go-chi/chi/v5"
1111

1212
"github.com/coder/coder/database"
1313
"github.com/coder/coder/httpapi"

‎httpmw/organizationparam_test.go

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

12-
"github.com/go-chi/chi"
12+
"github.com/go-chi/chi/v5"
1313
"github.com/google/uuid"
1414
"github.com/stretchr/testify/require"
1515

0 commit comments

Comments
 (0)