Skip to content

Commit 2e3611b

Browse files
matifalimatifali
authored
Merge branch 'main' into execscripts
2 parents 9513acf + 4158180 commit 2e3611b

File tree

15 files changed

+48
-29
lines changed

15 files changed

+48
-29
lines changed

‎.github/pr-deployments/template/main.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,9 @@ terraform {
22
required_providers {
33
coder = {
44
source = "coder/coder"
5-
version = "~> 0.11.0"
65
}
76
kubernetes = {
87
source = "hashicorp/kubernetes"
9-
version = "~> 2.22"
108
}
119
}
1210
}

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
137137
# Check for any typos
138138
- name: Check for typos
139-
uses: crate-ci/typos@v1.16.11
139+
uses: crate-ci/typos@v1.16.13
140140
with:
141141
config: .github/workflows/typos.toml
142142

‎.github/workflows/pr-auto-assign.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- name: Assign author
17-
uses: toshimaru/auto-author-assign@v1.6.2
17+
uses: toshimaru/auto-author-assign@v2.0.0

‎.github/workflows/pr-deploy.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,6 @@ jobs:
419419
420420
# Create template
421421
cd ./.github/pr-deployments/template
422-
terraform init
423422
coder templates create -y --variable namespace=pr${{ env.PR_NUMBER }} kubernetes
424423
425424
# Create workspace

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,3 +67,6 @@ result
6767

6868
# Data dumps from unit tests
6969
**/*.test.sql
70+
71+
# Filebrowser.db
72+
**/filebrowser.db

‎.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ result
7070

7171
# Data dumps from unit tests
7272
**/*.test.sql
73+
74+
# Filebrowser.db
75+
**/filebrowser.db
7376
# .prettierignore.include:
7477
# Helm templates contain variables that are invalid YAML and can't be formatted
7578
# by Prettier.

‎docs/admin/encryption.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ Additional database fields may be encrypted in the future.
4242
4343
## Enabling encryption
4444

45+
> NOTE: Enabling encryption does not encrypt all existing data. To encrypt
46+
> existing data, see [rotating keys](#rotating-keys) below.
47+
4548
- Ensure you have a valid backup of your database. **Do not skip this step.** If
4649
you are using the built-in PostgreSQL database, you can run
4750
[`coder server postgres-builtin-url`](../cli/server_postgres-builtin-url.md)

‎filebrowser.db

-64 KB
Binary file not shown.

‎go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ require (
8888
github.com/coder/flog v1.1.0
8989
github.com/coder/pretty v0.0.0-20230908205945-e89ba86370e0
9090
github.com/coder/retry v1.4.0
91-
github.com/coder/terraform-provider-coder v0.11.1
91+
github.com/coder/terraform-provider-coder v0.12.0
9292
github.com/coder/wgtunnel v0.1.12
9393
github.com/coreos/go-oidc/v3 v3.6.0
9494
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
@@ -113,7 +113,7 @@ require (
113113
github.com/go-ping/ping v1.1.0
114114
github.com/go-playground/validator/v10 v10.15.1
115115
github.com/gofrs/flock v0.8.1
116-
github.com/gohugoio/hugo v0.118.2
116+
github.com/gohugoio/hugo v0.119.0
117117
github.com/golang-jwt/jwt/v4 v4.5.0
118118
github.com/golang-migrate/migrate/v4 v4.16.0
119119
github.com/golang/mock v1.6.0
@@ -152,7 +152,7 @@ require (
152152
github.com/prometheus/common v0.42.0
153153
github.com/quasilyte/go-ruleguard/dsl v0.3.21
154154
github.com/robfig/cron/v3 v3.0.1
155-
github.com/spf13/afero v1.9.5
155+
github.com/spf13/afero v1.10.0
156156
github.com/spf13/pflag v1.0.5
157157
github.com/sqlc-dev/pqtype v0.2.0
158158
github.com/stretchr/testify v1.8.4
@@ -184,7 +184,7 @@ require (
184184
golang.org/x/tools v0.13.0
185185
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
186186
golang.zx2c4.com/wireguard v0.0.0-20230704135630-469159ecf7d1
187-
google.golang.org/api v0.141.0
187+
google.golang.org/api v0.142.0
188188
google.golang.org/grpc v1.58.1
189189
google.golang.org/protobuf v1.31.0
190190
gopkg.in/DataDog/dd-trace-go.v1 v1.55.0
@@ -266,7 +266,7 @@ require (
266266
github.com/go-openapi/jsonpointer v0.19.6 // indirect
267267
github.com/go-openapi/jsonreference v0.20.2 // indirect
268268
github.com/go-openapi/spec v0.20.6 // indirect
269-
github.com/go-openapi/swag v0.22.3 // indirect
269+
github.com/go-openapi/swag v0.22.4 // indirect
270270
github.com/go-playground/locales v0.14.1 // indirect
271271
github.com/go-playground/universal-translator v0.18.1 // indirect
272272
github.com/go-sql-driver/mysql v1.7.1 // indirect
@@ -398,7 +398,7 @@ require (
398398
google.golang.org/appengine v1.6.7 // indirect
399399
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
400400
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
401-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230911183012-2d3300fd4832 // indirect
401+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb // indirect
402402
gopkg.in/yaml.v2 v2.4.0 // indirect
403403
howett.net/plist v1.0.0 // indirect
404404
inet.af/netaddr v0.0.0-20230525184311-b8eac61e914a // indirect

‎go.sum

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,8 @@ github.com/coder/ssh v0.0.0-20230621095435-9a7e23486f1c h1:TI7TzdFI0UvQmwgyQhtI1
229229
github.com/coder/ssh v0.0.0-20230621095435-9a7e23486f1c/go.mod h1:aGQbuCLyhRLMzZF067xc84Lh7JDs1FKwCmF1Crl9dxQ=
230230
github.com/coder/tailscale v1.1.1-0.20230921183700-c821c9c9966d h1:Y2nq36GM7lKzjrM2pi3BnjS4BNGDTJqkqhMMYAUl+YE=
231231
github.com/coder/tailscale v1.1.1-0.20230921183700-c821c9c9966d/go.mod h1:L8tPrwSi31RAMEMV8rjb0vYTGs7rXt8rAHbqY/p41j4=
232-
github.com/coder/terraform-provider-coder v0.11.1 h1:1sXcHfQrX8XhmLbtKxBED2lZ5jk3/ezBtaw6uVhpJZ4=
233-
github.com/coder/terraform-provider-coder v0.11.1/go.mod h1:UIfU3bYNeSzJJvHyJ30tEKjD6Z9utloI+HUM/7n94CY=
232+
github.com/coder/terraform-provider-coder v0.12.0 h1:lUVaMrojcDgorGBRE7L9jZYN7qJIJsy8kAzZJN0th+A=
233+
github.com/coder/terraform-provider-coder v0.12.0/go.mod h1:mCNxmzZtpUbRCc9YU0oHavGf+IrSmAJ1NX5jMbGlurg=
234234
github.com/coder/wgtunnel v0.1.12 h1:j3v1Q7qyplrRyyNPm0DK50d3O3flboIErxBFhm4NCkA=
235235
github.com/coder/wgtunnel v0.1.12/go.mod h1:QzfptVUdEO+XbkzMKx1kw13i9wwpJlfI1RrZ6SNZ0hA=
236236
github.com/coder/wireguard-go v0.0.0-20230807234434-d825b45ccbf5 h1:eDk/42Kj4xN4yfE504LsvcFEo3dWUiCOaBiWJ2uIH2A=
@@ -368,8 +368,9 @@ github.com/go-openapi/spec v0.20.6 h1:ich1RQ3WDbfoeTqTAb+5EIxNmpKVJZWBNah9RAT0jI
368368
github.com/go-openapi/spec v0.20.6/go.mod h1:2OpW+JddWPrpXSCIX8eOx7lZ5iyuWj3RYR6VaaBKcWA=
369369
github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
370370
github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
371-
github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
372371
github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
372+
github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
373+
github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
373374
github.com/go-ping/ping v1.1.0 h1:3MCGhVX4fyEUuhsfwPrsEdQw6xspHkv5zHsiSoDFZYw=
374375
github.com/go-ping/ping v1.1.0/go.mod h1:xIFjORFzTxqIV/tDVGO4eDy/bLuSyawEeojSm3GfRGk=
375376
github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
@@ -408,8 +409,8 @@ github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw=
408409
github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
409410
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
410411
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
411-
github.com/gohugoio/hugo v0.118.2 h1:N+Gf+Zs74xuURsBN/Q1mevb68SgH77bapkREDjW4/Ss=
412-
github.com/gohugoio/hugo v0.118.2/go.mod h1:loOGCp1OeKj3qCxrUe6L/FP1m0qF0EA9QbZ6ARXVoho=
412+
github.com/gohugoio/hugo v0.119.0 h1:kQha6WHt5GcCbI2PELB5KjWMHFJ8LJLrh3lusxnmCng=
413+
github.com/gohugoio/hugo v0.119.0/go.mod h1:pXwmL2lFumAkr3qS2D262seu4SWDLphQLvYfhdGdLRU=
413414
github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
414415
github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
415416
github.com/golang-migrate/migrate/v4 v4.16.0 h1:FU2GR7EdAO0LmhNLcKthfDzuYCtMcWNR7rUbZjsgH3o=
@@ -807,8 +808,8 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
807808
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
808809
github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
809810
github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
810-
github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=
811-
github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
811+
github.com/spf13/afero v1.10.0 h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=
812+
github.com/spf13/afero v1.10.0/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=
812813
github.com/spf13/cast v1.5.1 h1:R+kOtfhWQE6TVQzY+4D7wJLBgkdVasCEFxSUBYBYIlA=
813814
github.com/spf13/cast v1.5.1/go.mod h1:b9PdjNptOpzXr7Rq1q9gJML/2cdGQAo69NKzQ10KN48=
814815
github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
@@ -1295,8 +1296,8 @@ google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz513
12951296
google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
12961297
google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
12971298
google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
1298-
google.golang.org/api v0.141.0 h1:Df6vfMgDoIM6ss0m7H4MPwFwY87WNXHfBIda/Bmfl4E=
1299-
google.golang.org/api v0.141.0/go.mod h1:iZqLkdPlXKyG0b90eu6KxVSE4D/ccRF2e/doKD2CnQQ=
1299+
google.golang.org/api v0.142.0 h1:mf+7EJ94fi5ZcnpPy+m0Yv2dkz8bKm+UL0snTCuwXlY=
1300+
google.golang.org/api v0.142.0/go.mod h1:zJAN5o6HRqR7O+9qJUFOWrZkYE66RH+efPBdTLA4xBA=
13001301
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
13011302
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
13021303
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
@@ -1344,8 +1345,8 @@ google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 h1:L6iMMGrtzgHsWof
13441345
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5/go.mod h1:oH/ZOT02u4kWEp7oYBGYFFkCdKS/uYR9Z7+0/xuuFp8=
13451346
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q=
13461347
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d/go.mod h1:KjSP20unUpOx5kyQUFa7k4OJg0qeJ7DEZflGDu2p6Bk=
1347-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230911183012-2d3300fd4832 h1:o4LtQxebKIJ4vkzyhtD2rfUNZ20Zf0ik5YVP5E7G7VE=
1348-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230911183012-2d3300fd4832/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
1348+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb h1:Isk1sSH7bovx8Rti2wZK0UZF6oraBDK74uoyLEEVFN0=
1349+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230913181813-007df8e322eb/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M=
13491350
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
13501351
google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
13511352
google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=

‎site/.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ result
7070

7171
# Data dumps from unit tests
7272
**/*.test.sql
73+
74+
# Filebrowser.db
75+
**/filebrowser.db
7376
# .prettierignore.include:
7477
# Helm templates contain variables that are invalid YAML and can't be formatted
7578
# by Prettier.

‎site/.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ result
7070

7171
# Data dumps from unit tests
7272
**/*.test.sql
73+
74+
# Filebrowser.db
75+
**/filebrowser.db
7376
# .prettierignore.include:
7477
# Helm templates contain variables that are invalid YAML and can't be formatted
7578
# by Prettier.

‎site/e2e/helpers.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,10 @@ export const createServer = async (
570570
port: number,
571571
): Promise<ReturnType<typeof express>> => {
572572
const e = express();
573-
await new Promise<void>((r) => e.listen(port, r));
573+
// We need to specify the local IP address as the web server
574+
// tends to fail with IPv6 related error:
575+
// listen EADDRINUSE: address already in use :::50516
576+
await new Promise<void>((r) => e.listen(port, "0.0.0.0", r));
574577
return e;
575578
};
576579

‎site/src/AppRouter.tsx

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ import { FullScreenLoader } from "components/Loader/FullScreenLoader";
22
import { TemplateLayout } from "components/TemplateLayout/TemplateLayout";
33
import { UsersLayout } from "components/UsersLayout/UsersLayout";
44
import AuditPage from "pages/AuditPage/AuditPage";
5-
import GroupsPage from "pages/GroupsPage/GroupsPage";
65
import LoginPage from "pages/LoginPage/LoginPage";
76
import { SetupPage } from "pages/SetupPage/SetupPage";
8-
import { TemplateSettingsPage } from "pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage";
97
import TemplatesPage from "pages/TemplatesPage/TemplatesPage";
108
import UsersPage from "pages/UsersPage/UsersPage";
119
import WorkspacesPage from "pages/WorkspacesPage/WorkspacesPage";
@@ -152,15 +150,12 @@ const WorkspaceSettingsPage = lazy(
152150
const CreateTokenPage = lazy(
153151
() => import("./pages/CreateTokenPage/CreateTokenPage"),
154152
);
155-
156153
const TemplateDocsPage = lazy(
157154
() => import("./pages/TemplatePage/TemplateDocsPage/TemplateDocsPage"),
158155
);
159-
160156
const TemplateFilesPage = lazy(
161157
() => import("./pages/TemplatePage/TemplateFilesPage/TemplateFilesPage"),
162158
);
163-
164159
const TemplateVersionsPage = lazy(
165160
() =>
166161
import("./pages/TemplatePage/TemplateVersionsPage/TemplateVersionsPage"),
@@ -171,7 +166,12 @@ const TemplateSchedulePage = lazy(
171166
"./pages/TemplateSettingsPage/TemplateSchedulePage/TemplateSchedulePage"
172167
),
173168
);
174-
169+
const TemplateSettingsPage = lazy(
170+
() =>
171+
import(
172+
"./pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage"
173+
),
174+
);
175175
const LicensesSettingsPage = lazy(
176176
() =>
177177
import(
@@ -190,6 +190,7 @@ const TemplateInsightsPage = lazy(
190190
import("./pages/TemplatePage/TemplateInsightsPage/TemplateInsightsPage"),
191191
);
192192
const HealthPage = lazy(() => import("./pages/HealthPage/HealthPage"));
193+
const GroupsPage = lazy(() => import("./pages/GroupsPage/GroupsPage"));
193194

194195
export const AppRouter: FC = () => {
195196
return (

‎site/src/pages/TemplateSettingsPage/TemplateGeneralSettingsPage/TemplateSettingsPage.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,3 +55,5 @@ export const TemplateSettingsPage: FC = () => {
5555
</>
5656
);
5757
};
58+
59+
export default TemplateSettingsPage;

0 commit comments

Comments
 (0)