Skip to content

Commit f13df97

Browse files
normana10normana10
committed
Merge branch 'main' into configurable-openid-connect-text
# Conflicts: # cli/deployment/config.go # cli/server.go # cli/testdata/coder_server_--help.golden # coderd/userauth.go # codersdk/deploymentconfig.go # docs/admin/auth.md # site/src/api/typesGenerated.ts # site/src/components/SignInForm/SignInForm.tsx
2 parents 0858ad0 + ee74df3 commit f13df97

File tree

342 files changed

+11710
-3941
lines changed

Some content is hidden

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

342 files changed

+11710
-3941
lines changed

‎.github/workflows/coder.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
with:
9797
go-version: "~1.19"
9898
- name: golangci-lint
99-
uses: golangci/golangci-lint-action@v3.3.0
99+
uses: golangci/golangci-lint-action@v3.3.1
100100
with:
101101
version: v1.48.0
102102

@@ -336,7 +336,7 @@ jobs:
336336
echo ::set-output name=cover::false
337337
fi
338338
set -x
339-
gotestsum --junitfile="gotests.xml" --packages="./..." -- -parallel=8 -timeout=3m -short -failfast $COVERAGE_FLAGS
339+
gotestsum --junitfile="gotests.xml" --packages="./..." --debug -- -parallel=8 -timeout=3m -short -failfast $COVERAGE_FLAGS
340340
341341
- uses: codecov/codecov-action@v3
342342
# This action has a tendency to error out unexpectedly, it has
@@ -428,7 +428,7 @@ jobs:
428428
fetch-depth: 0
429429

430430
- name: Authenticate to Google Cloud
431-
uses: google-github-actions/auth@v0
431+
uses: google-github-actions/auth@v1
432432
with:
433433
workload_identity_provider: projects/573722524737/locations/global/workloadIdentityPools/github/providers/github
434434
service_account: coder-ci@coder-dogfood.iam.gserviceaccount.com

‎.github/workflows/dependabot.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ jobs:
99
permissions:
1010
pull-requests: write
1111
steps:
12-
- uses: hmarr/auto-approve-action@v2
12+
- uses: hmarr/auto-approve-action@v3
1313
if: github.actor == 'dependabot[bot]'

‎.github/workflows/dogfood.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- name: Get branch name
1919
id: branch-name
20-
uses: tj-actions/branch-names@v6.2
20+
uses: tj-actions/branch-names@v6.3
2121

2222
- name: "Branch name to Docker tag name"
2323
id: docker-tag-name

‎.github/workflows/packages.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
name: Submit Packages
22
on:
3-
release:
4-
types: [published]
5-
3+
workflow_run:
4+
workflows: [release]
5+
types:
6+
- completed
67
env:
78
CODER_VERSION: "${{ github.event.release.tag_name }}"
89

‎.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ jobs:
170170
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
171171

172172
- name: Authenticate to Google Cloud
173-
uses: google-github-actions/auth@v0
173+
uses: google-github-actions/auth@v1
174174
with:
175175
workload_identity_provider: ${{ secrets.GCP_WORKLOAD_ID_PROVIDER }}
176176
service_account: ${{ secrets.GCP_SERVICE_ACCOUNT }}

‎.github/workflows/stale.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ jobs:
1717
with:
1818
stale-issue-label: 'stale'
1919
stale-pr-label: 'stale'
20-
exempt-issue-labels: 'never stale'
21-
exempt-pr-labels: 'never stale'
2220
# Pull Requests become stale more quickly due to merge conflicts.
2321
# Also, we promote minimizing WIP.
2422
days-before-pr-stale: 7

‎.github/workflows/typos.toml

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ MacOS = "macOS"
88
# do as sudo replacement
99
doas = "doas"
1010
darcula = "darcula"
11+
Hashi = "Hashi"
12+
trialer = "trialer"
1113

1214
[files]
1315
extend-exclude = [

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ vendor
1414
.eslintcache
1515
yarn-error.log
1616
gotests.coverage
17+
gotests.xml
1718
.idea
1819
.gitpod.yml
1920
.DS_Store

‎.golangci.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,8 @@ linters-settings:
123123

124124
misspell:
125125
locale: US
126+
ignore-words:
127+
- trialer
126128

127129
nestif:
128130
min-complexity: 4 # Min complexity of if statements (def 5, goal 4)

‎.vscode/settings.json

+7-8
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"codersdk",
1818
"cronstrue",
1919
"databasefake",
20+
"dbtype",
2021
"DERP",
2122
"derphttp",
2223
"derpmap",
@@ -32,6 +33,7 @@
3233
"enablements",
3334
"errgroup",
3435
"eventsourcemock",
36+
"Failf",
3537
"fatih",
3638
"Formik",
3739
"gitauth",
@@ -105,6 +107,7 @@
105107
"slogtest",
106108
"sourcemapped",
107109
"Srcs",
110+
"stdbuf",
108111
"stretchr",
109112
"STTY",
110113
"stuntest",
@@ -126,7 +129,9 @@
126129
"tfplan",
127130
"tfstate",
128131
"tios",
132+
"tmpdir",
129133
"tparallel",
134+
"trialer",
130135
"trimprefix",
131136
"tsdial",
132137
"tslogger",
@@ -158,10 +163,7 @@
158163
"xstate",
159164
"yamux"
160165
],
161-
"cSpell.ignorePaths": [
162-
"site/package.json",
163-
".vscode/settings.json"
164-
],
166+
"cSpell.ignorePaths": ["site/package.json", ".vscode/settings.json"],
165167
"emeraldwalk.runonsave": {
166168
"commands": [
167169
{
@@ -193,10 +195,7 @@
193195
// To reduce redundancy in tests, it's covered by other packages.
194196
// Since package coverage pairing can't be defined, all packages cover
195197
// all other packages.
196-
"go.testFlags": [
197-
"-short",
198-
"-coverpkg=./..."
199-
],
198+
"go.testFlags": ["-short", "-coverpkg=./..."],
200199
// We often use a version of TypeScript that's ahead of the version shipped
201200
// with VS Code.
202201
"typescript.tsdk": "./site/node_modules/typescript/lib"

‎ADOPTERS.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
# Adopters
1+
# Adopters
2+
23
[!["Join us on
34
Discord"](https://img.shields.io/badge/join-us%20on%20Discord-gray.svg?longCache=true&logo=discord&colorB=green)](https://coder.com/chat?utm_source=github.com/coder/coder&utm_medium=github&utm_campaign=adopters.md) [![Twitter
45
Follow](https://img.shields.io/twitter/follow/coderhq?label=%40coderhq&style=social)](https://twitter.com/coderhq)
@@ -7,6 +8,6 @@ Follow](https://img.shields.io/twitter/follow/coderhq?label=%40coderhq&style=soc
78

89
> 👋 _If you are considering using Coder in your organization please introduce yourself via https://coder.com/demo_ 🙇🏻‍♂️
910
10-
| Organization | Contact | Description of Use |
11-
| --------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
12-
| [Coder](https://www.coder.com) | [@coderhq](https://twitter.com/coderhq) | Coder builds coder with Coder. |
11+
| Organization | Contact | Description of Use |
12+
| ------------------------------ | --------------------------------------- | ------------------------------ |
13+
| [Coder](https://www.coder.com) | [@coderhq](https://twitter.com/coderhq) | Coder builds coder with Coder. |

‎Makefile

+11-5
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,9 @@ fmt/prettier:
359359
cd site
360360
# Avoid writing files in CI to reduce file write activity
361361
ifdef CI
362-
yarn run format:check
362+
yarn run format:check . ../*.md ../docs
363363
else
364-
yarn run format:write
364+
yarn run format:write . ../*.md ../docs
365365
endif
366366
.PHONY: fmt/prettier
367367

@@ -399,13 +399,14 @@ gen: \
399399
coderd/database/querier.go \
400400
provisionersdk/proto/provisioner.pb.go \
401401
provisionerd/proto/provisionerd.pb.go \
402-
site/src/api/typesGenerated.ts
402+
site/src/api/typesGenerated.ts \
403+
docs/admin/prometheus.md
403404
.PHONY: gen
404405

405406
# Mark all generated files as fresh so make thinks they're up-to-date. This is
406407
# used during releases so we don't run generation scripts.
407408
gen/mark-fresh:
408-
files="coderd/database/dump.sql coderd/database/querier.go provisionersdk/proto/provisioner.pb.go provisionerd/proto/provisionerd.pb.go site/src/api/typesGenerated.ts"
409+
files="coderd/database/dump.sql coderd/database/querier.go provisionersdk/proto/provisioner.pb.go provisionerd/proto/provisionerd.pb.go site/src/api/typesGenerated.ts docs/admin/prometheus.md"
409410
for file in $$files; do
410411
echo "$$file"
411412
if [ ! -f "$$file" ]; then
@@ -448,6 +449,11 @@ site/src/api/typesGenerated.ts: scripts/apitypings/main.go $(shell find codersdk
448449
cd site
449450
yarn run format:types
450451

452+
docs/admin/prometheus.md: scripts/metricsdocgen/main.go scripts/metricsdocgen/metrics
453+
go run scripts/metricsdocgen/main.go
454+
cd site
455+
yarn run format:write ../docs/admin/prometheus.md
456+
451457
update-golden-files: cli/testdata/.gen-golden
452458
.PHONY: update-golden-files
453459

@@ -457,7 +463,7 @@ cli/testdata/.gen-golden: $(wildcard cli/testdata/*.golden) $(GO_SRC_FILES)
457463
touch "$@"
458464

459465
test: test-clean
460-
gotestsum -- -v -short ./...
466+
gotestsum --debug -- -v -short ./...
461467
.PHONY: test
462468

463469
# When updating -timeout for this test, keep in sync with

‎README.md

+16-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ Discord"](https://img.shields.io/badge/join-us%20on%20Discord-gray.svg?longCache
77
[![Twitter
88
Follow](https://img.shields.io/twitter/follow/coderhq?label=%40coderhq&style=social)](https://twitter.com/coderhq)
99

10-
Coder creates remote development machines so your team can develop from anywhere.
10+
Software development on your infrastructure. Offload your team's development from local workstations to cloud servers. Onboard developers in minutes. Build, test and compile at the speed of the cloud. Keep your source code and data behind your firewall.
11+
12+
> "By leveraging Terraform, Coder lets developers run any IDE on any compute platform including on-prem, AWS, Azure, GCP, DigitalOcean, Kubernetes, Docker, and more, with workspaces running on Linux, Windows, or Mac." - **Kevin Fishner Chief of Staff at [HashiCorp](https://hashicorp.com/)**
1113
1214
<p align="center">
1315
<img src="./docs/images/hero-image.png">
@@ -27,10 +29,15 @@ Coder creates remote development machines so your team can develop from anywhere
2729
- Access your environment from any place on any client (even an iPad)
2830
- Onboard instantly then stay up to date continuously
2931

30-
## Getting Started
32+
## Recommended Reading
33+
34+
- [How our development team shares one giant bare metal machine](https://coder.com/blog/how-our-development-team-shares-one-giant-bare-metal-machine?utm_source=github.com/coder/coder&utm_medium=github&utm_campaign=readme.md)
35+
- [Laptop development is dead: why remote development is the future](https://medium.com/@elliotgraebert/laptop-development-is-dead-why-remote-development-is-the-future-f92ce103fd13)
36+
- [Learn how Palantir improved build times by 78% with coder](https://blog.palantir.com/the-benefits-of-remote-ephemeral-workspaces-1a1251ed6e53).
37+
- [A software development environment is not just a container](https://coder.com/blog/not-a-container?utm_source=github.com/coder/coder&utm_medium=github&utm_campaign=readme.md).
38+
- [What Coder is not](https://coder.com/docs/coder-oss/latest/index#what-coder-is-not?utm_source=github.com/coder/coder&utm_medium=github&utm_campaign=readme.md).
3139

32-
> **Note**:
33-
> Coder is in a beta state. [Report issues here](https://github.com/coder/coder/issues/new).
40+
## Getting Started
3441

3542
The easiest way to install Coder is to use our
3643
[install script](https://github.com/coder/coder/blob/main/install.sh) for Linux
@@ -75,6 +82,10 @@ Use `coder --help` to get a complete list of flags and environment variables. Us
7582

7683
Visit our docs [here](https://coder.com/docs/coder-oss).
7784

85+
## Templates
86+
87+
Find our templates [here](./examples/templates).
88+
7889
## Comparison
7990

8091
Please file [an issue](https://github.com/coder/coder/issues/new) if any information is out of date. Also refer to: [What Coder is not](https://coder.com/docs/coder-oss/latest/index#what-coder-is-not).
@@ -84,7 +95,7 @@ Please file [an issue](https://github.com/coder/coder/issues/new) if any informa
8495
| [Coder](https://github.com/coder/coder) | Platform | OSS + Self-Managed | Pay your cloud | All [Terraform](https://www.terraform.io/registry/providers) resources, all clouds, multi-architecture: Linux, Mac, Windows, containers, VMs, amd64, arm64 |
8596
| [code-server](https://github.com/cdr/code-server) | Web IDE | OSS + Self-Managed | Pay your cloud | Linux, Mac, Windows, containers, VMs, amd64, arm64 |
8697
| [Coder (Classic)](https://coder.com/docs) | Platform | Self-Managed | Pay your cloud + license fees | Kubernetes Linux Containers |
87-
| [GitHub Codespaces](https://github.com/features/codespaces) | Platform | SaaS | 2x Azure Compute | Linux containers |
98+
| [GitHub Codespaces](https://github.com/features/codespaces) | Platform | SaaS | 2x Azure Compute | Linux Virtual Machines |
8899

89100
---
90101

0 commit comments

Comments
 (0)