Skip to content

Commit 82ca13e

Browse files
dannykoppingdannykopping
committed
Merge branch 'main' of github.com:coder/coder into dk/provision-detailed-apply
2 parents 15282bb + d0f36dc commit 82ca13e

File tree

1,052 files changed

+118574
-119745
lines changed

Some content is hidden

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

1,052 files changed

+118574
-119745
lines changed

‎.devcontainer/devcontainer.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"name": "Development environments on your infrastructure",
3-
"image": "codercom/oss-dogfood:latest",
2+
"name": "Development environments on your infrastructure",
3+
"image": "codercom/oss-dogfood:latest",
44

5-
"features": {
6-
// See all possible options here https://github.com/devcontainers/features/tree/main/src/docker-in-docker
7-
"ghcr.io/devcontainers/features/docker-in-docker:2": {
8-
"moby": "false"
9-
}
10-
},
11-
// SYS_PTRACE to enable go debugging
12-
"runArgs": ["--cap-add=SYS_PTRACE"]
5+
"features": {
6+
// See all possible options here https://github.com/devcontainers/features/tree/main/src/docker-in-docker
7+
"ghcr.io/devcontainers/features/docker-in-docker:2": {
8+
"moby": "false"
9+
}
10+
},
11+
// SYS_PTRACE to enable go debugging
12+
"runArgs": ["--cap-add=SYS_PTRACE"]
1313
}

‎.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ trim_trailing_whitespace = true
77
insert_final_newline = true
88
indent_style = tab
99

10-
[*.{md,json,yaml,yml,tf,tfvars,nix}]
10+
[*.{md,yaml,yml,tf,tfvars,nix}]
1111
indent_style = space
1212
indent_size = 2
1313

‎.git-blame-ignore-revs

+2
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@
33

44
# chore: format code with semicolons when using prettier (#9555)
55
988c9af0153561397686c119da9d1336d2433fdd
6+
# chore: use tabs for prettier and biome (#14283)
7+
95a7c0c4f087744a22c2e88dd3c5d30024d5fb02

‎.github/dependabot.yaml

-4
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,6 @@ updates:
9595
- "@emotion*"
9696
exclude-patterns:
9797
- "jest-runner-eslint"
98-
eslint:
99-
patterns:
100-
- "eslint*"
101-
- "@typescript-eslint*"
10298
jest:
10399
patterns:
104100
- "jest"

‎.github/workflows/ci.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168

169169
- name: Get golangci-lint cache dir
170170
run: |
171-
linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/Dockerfile | cut -d '=' -f 2)
171+
linter_ver=$(egrep -o 'GOLANGCI_LINT_VERSION=\S+' dogfood/contents/Dockerfile | cut -d '=' -f 2)
172172
go install github.com/golangci/golangci-lint/cmd/golangci-lint@v$linter_ver
173173
dir=$(golangci-lint cache status | awk '/Dir/ { print $2 }')
174174
echo "LINT_CACHE_DIR=$dir" >> $GITHUB_ENV

‎.github/workflows/dogfood.yaml

+11-13
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
project: b4q6ltmpzh
5757
token: ${{ secrets.DEPOT_TOKEN }}
5858
buildx-fallback: true
59-
context: "{{defaultContext}}:dogfood"
59+
context: "{{defaultContext}}:dogfood/contents"
6060
pull: true
6161
save: true
6262
push: ${{ github.ref == 'refs/heads/main' }}
@@ -69,7 +69,7 @@ jobs:
6969
token: ${{ secrets.DEPOT_TOKEN }}
7070
buildx-fallback: true
7171
context: "."
72-
file: "dogfood/Dockerfile.nix"
72+
file: "dogfood/contents/Dockerfile.nix"
7373
pull: true
7474
save: true
7575
push: ${{ github.ref == 'refs/heads/main' }}
@@ -90,6 +90,9 @@ jobs:
9090
cd dogfood
9191
terraform init -upgrade
9292
terraform validate
93+
cd contents
94+
terraform init -upgrade
95+
terraform validate
9396
9497
- name: Get short commit SHA
9598
if: github.ref == 'refs/heads/main'
@@ -101,22 +104,17 @@ jobs:
101104
id: message
102105
run: echo "pr_title=$(git log --format=%s -n 1 ${{ github.sha }})" >> $GITHUB_OUTPUT
103106

104-
- name: "Get latest Coder binary from the server"
105-
if: github.ref == 'refs/heads/main'
106-
run: |
107-
curl -fsSL "https://dev.coder.com/bin/coder-linux-amd64" -o "./coder"
108-
chmod +x "./coder"
109-
110107
- name: "Push template"
111108
if: github.ref == 'refs/heads/main'
112109
run: |
113-
./coder templates push $CODER_TEMPLATE_NAME --directory $CODER_TEMPLATE_DIR --yes --name=$CODER_TEMPLATE_VERSION --message="$CODER_TEMPLATE_MESSAGE"
110+
cd dogfood
111+
terraform apply -auto-approve
114112
env:
115113
# Consumed by Coder CLI
116114
CODER_URL: https://dev.coder.com
117115
CODER_SESSION_TOKEN: ${{ secrets.CODER_SESSION_TOKEN }}
118116
# Template source & details
119-
CODER_TEMPLATE_NAME: ${{ secrets.CODER_TEMPLATE_NAME }}
120-
CODER_TEMPLATE_VERSION: ${{ steps.vars.outputs.sha_short }}
121-
CODER_TEMPLATE_DIR: ./dogfood
122-
CODER_TEMPLATE_MESSAGE: ${{ steps.message.outputs.pr_title }}
117+
TF_VAR_CODER_TEMPLATE_NAME: ${{ secrets.CODER_TEMPLATE_NAME }}
118+
TF_VAR_CODER_TEMPLATE_VERSION: ${{ steps.vars.outputs.sha_short }}
119+
TF_VAR_CODER_TEMPLATE_DIR: ./contents
120+
TF_VAR_CODER_TEMPLATE_MESSAGE: ${{ steps.message.outputs.pr_title }}

‎.github/workflows/mlc_config.json

+24-24
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
{
2-
"ignorePatterns": [
3-
{
4-
"pattern": "://localhost"
5-
},
6-
{
7-
"pattern": "://.*.?example\\.com"
8-
},
9-
{
10-
"pattern": "developer.github.com"
11-
},
12-
{
13-
"pattern": "docs.github.com"
14-
},
15-
{
16-
"pattern": "support.google.com"
17-
},
18-
{
19-
"pattern": "tailscale.com"
20-
},
21-
{
22-
"pattern": "wireguard.com"
23-
}
24-
],
25-
"aliveStatusCodes": [200, 0]
2+
"ignorePatterns": [
3+
{
4+
"pattern": "://localhost"
5+
},
6+
{
7+
"pattern": "://.*.?example\\.com"
8+
},
9+
{
10+
"pattern": "developer.github.com"
11+
},
12+
{
13+
"pattern": "docs.github.com"
14+
},
15+
{
16+
"pattern": "support.google.com"
17+
},
18+
{
19+
"pattern": "tailscale.com"
20+
},
21+
{
22+
"pattern": "wireguard.com"
23+
}
24+
],
25+
"aliveStatusCodes": [200, 0]
2626
}

‎.github/workflows/release-validation.yaml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: release-validation
2+
3+
on:
4+
push:
5+
tags:
6+
- "v*"
7+
8+
jobs:
9+
network-performance:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- name: Run Schmoder CI
14+
uses: benc-uk/workflow-dispatch@v1.2.4
15+
with:
16+
workflow: ci.yaml
17+
repo: coder/schmoder
18+
inputs: '{ "num_releases": "3", "commit": "${{ github.sha }}" }'
19+
token: ${{ secrets.CDRCI_SCHMODER_ACTIONS_TOKEN }}
20+
ref: main

‎.prettierignore

+6-12
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,13 @@ result
7979
# by Prettier.
8080
helm/**/templates/*.yaml
8181

82-
# Terraform state files used in tests, these are automatically generated.
83-
# Example: provisioner/terraform/testdata/instance-id/instance-id.tfstate.json
84-
**/testdata/**/*.tf*.json
85-
8682
# Testdata shouldn't be formatted.
87-
scripts/apitypings/testdata/**/*.ts
88-
enterprise/tailnet/testdata/*.golden.html
89-
tailnet/testdata/*.golden.html
90-
91-
# Generated files shouldn't be formatted.
92-
site/e2e/provisionerGenerated.ts
83+
testdata/
9384

85+
# Ignore generated files
9486
**/pnpm-lock.yaml
95-
96-
# Ignore generated JSON (e.g. examples/examples.gen.json).
9787
**/*.gen.json
88+
89+
# Everything in site/ is formatted by Biome. For the rest of the repo though, we
90+
# need broader language support.
91+
site/

‎.prettierignore.include

+6-12
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,13 @@
22
# by Prettier.
33
helm/**/templates/*.yaml
44

5-
# Terraform state files used in tests, these are automatically generated.
6-
# Example: provisioner/terraform/testdata/instance-id/instance-id.tfstate.json
7-
**/testdata/**/*.tf*.json
8-
95
# Testdata shouldn't be formatted.
10-
scripts/apitypings/testdata/**/*.ts
11-
enterprise/tailnet/testdata/*.golden.html
12-
tailnet/testdata/*.golden.html
13-
14-
# Generated files shouldn't be formatted.
15-
site/e2e/provisionerGenerated.ts
6+
testdata/
167

8+
# Ignore generated files
179
**/pnpm-lock.yaml
18-
19-
# Ignore generated JSON (e.g. examples/examples.gen.json).
2010
**/*.gen.json
11+
12+
# Everything in site/ is formatted by Biome. For the rest of the repo though, we
13+
# need broader language support.
14+
site/

‎.prettierrc.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
printWidth: 80
55
proseWrap: always
66
trailingComma: all
7-
useTabs: false
7+
useTabs: true
88
tabWidth: 2
99
overrides:
1010
- files:

‎.vscode/extensions.json

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
2-
"recommendations": [
3-
"github.vscode-codeql",
4-
"golang.go",
5-
"hashicorp.terraform",
6-
"esbenp.prettier-vscode",
7-
"foxundermoon.shell-format",
8-
"emeraldwalk.runonsave",
9-
"zxh404.vscode-proto3",
10-
"redhat.vscode-yaml",
11-
"streetsidesoftware.code-spell-checker",
12-
"dbaeumer.vscode-eslint",
13-
"EditorConfig.EditorConfig"
14-
]
2+
"recommendations": [
3+
"github.vscode-codeql",
4+
"golang.go",
5+
"hashicorp.terraform",
6+
"esbenp.prettier-vscode",
7+
"foxundermoon.shell-format",
8+
"emeraldwalk.runonsave",
9+
"zxh404.vscode-proto3",
10+
"redhat.vscode-yaml",
11+
"streetsidesoftware.code-spell-checker",
12+
"EditorConfig.EditorConfig",
13+
"biomejs.biome"
14+
]
1515
}

0 commit comments

Comments
 (0)