Skip to content

Commit 960084d

Browse files
defelmnqdefelmnq
committed
Merge remote-tracking branch 'origin/main' into api-endpoint-provisioners-info
2 parents 8eeffb1 + 029cd5d commit 960084d

File tree

226 files changed

+7960
-2911
lines changed

Some content is hidden

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

226 files changed

+7960
-2911
lines changed

‎.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
- "cmd/**"
8181
- "coderd/**"
8282
- "enterprise/**"
83-
- "examples/*"
83+
- "examples/**"
8484
- "helm/**"
8585
- "provisioner/**"
8686
- "provisionerd/**"

‎.github/workflows/docker-base.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ jobs:
6666
context: base-build-context
6767
file: scripts/Dockerfile.base
6868
platforms: linux/amd64,linux/arm64,linux/arm/v7
69+
provenance: true
6970
pull: true
7071
no-cache: true
7172
push: ${{ github.event_name != 'pull_request' }}

‎.github/workflows/release.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,7 @@ jobs:
263263
context: base-build-context
264264
file: scripts/Dockerfile.base
265265
platforms: linux/amd64,linux/arm64,linux/arm/v7
266+
provenance: true
266267
pull: true
267268
no-cache: true
268269
push: true

‎.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ jobs:
4747

4848
# Upload the results to GitHub's code scanning dashboard.
4949
- name: "Upload to code-scanning"
50-
uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
50+
uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
5151
with:
5252
sarif_file: results.sarif

‎.github/workflows/security.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
uses: ./.github/actions/setup-go
3939

4040
- name: Initialize CodeQL
41-
uses: github/codeql-action/init@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
41+
uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
4242
with:
4343
languages: go, javascript
4444

@@ -48,7 +48,7 @@ jobs:
4848
rm Makefile
4949
5050
- name: Perform CodeQL Analysis
51-
uses: github/codeql-action/analyze@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
51+
uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
5252

5353
- name: Send Slack notification on failure
5454
if: ${{ failure() }}
@@ -142,7 +142,7 @@ jobs:
142142
severity: "CRITICAL,HIGH"
143143

144144
- name: Upload Trivy scan results to GitHub Security tab
145-
uses: github/codeql-action/upload-sarif@4f3212b61783c3c68e8309a0f18a699764811cda # v3.27.1
145+
uses: github/codeql-action/upload-sarif@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4
146146
with:
147147
sarif_file: trivy-results.sarif
148148
category: "Trivy"

‎CODEOWNERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# These APIs are versioned, so any changes need to be carefully reviewed for whether
2+
# to bump API major or minor versions.
3+
agent/proto/ @spikecurtis @johnstcn
4+
tailnet/proto/ @spikecurtis @johnstcn
5+
vpn/vpn.proto @spikecurtis @johnstcn
6+
vpn/version.go @spikecurtis @johnstcn

‎Makefile

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,13 @@ DB_GEN_FILES := \
482482
coderd/database/dbauthz/dbauthz.go \
483483
coderd/database/dbmock/dbmock.go
484484

485+
TAILNETTEST_MOCKS := \
486+
tailnet/tailnettest/coordinatormock.go \
487+
tailnet/tailnettest/coordinateemock.go \
488+
tailnet/tailnettest/workspaceupdatesprovidermock.go \
489+
tailnet/tailnettest/subscriptionmock.go
490+
491+
485492
# all gen targets should be added here and to gen/mark-fresh
486493
gen: \
487494
tailnet/proto/tailnet.pb.go \
@@ -495,6 +502,7 @@ gen: \
495502
coderd/rbac/object_gen.go \
496503
codersdk/rbacresources_gen.go \
497504
site/src/api/rbacresourcesGenerated.ts \
505+
site/src/api/countriesGenerated.ts \
498506
docs/admin/integrations/prometheus.md \
499507
docs/reference/cli/index.md \
500508
docs/admin/security/audit-logs.md \
@@ -505,8 +513,7 @@ gen: \
505513
site/e2e/provisionerGenerated.ts \
506514
site/src/theme/icons.json \
507515
examples/examples.gen.json \
508-
tailnet/tailnettest/coordinatormock.go \
509-
tailnet/tailnettest/coordinateemock.go \
516+
$(TAILNETTEST_MOCKS) \
510517
coderd/database/pubsub/psmock/psmock.go
511518
.PHONY: gen
512519

@@ -525,6 +532,7 @@ gen/mark-fresh:
525532
coderd/rbac/object_gen.go \
526533
codersdk/rbacresources_gen.go \
527534
site/src/api/rbacresourcesGenerated.ts \
535+
site/src/api/countriesGenerated.ts \
528536
docs/admin/integrations/prometheus.md \
529537
docs/reference/cli/index.md \
530538
docs/admin/security/audit-logs.md \
@@ -534,8 +542,7 @@ gen/mark-fresh:
534542
site/e2e/provisionerGenerated.ts \
535543
site/src/theme/icons.json \
536544
examples/examples.gen.json \
537-
tailnet/tailnettest/coordinatormock.go \
538-
tailnet/tailnettest/coordinateemock.go \
545+
$(TAILNETTEST_MOCKS) \
539546
coderd/database/pubsub/psmock/psmock.go \
540547
"
541548

@@ -568,7 +575,7 @@ coderd/database/dbmock/dbmock.go: coderd/database/db.go coderd/database/querier.
568575
coderd/database/pubsub/psmock/psmock.go: coderd/database/pubsub/pubsub.go
569576
go generate ./coderd/database/pubsub/psmock
570577

571-
tailnet/tailnettest/coordinatormock.go tailnet/tailnettest/coordinateemock.go: tailnet/coordinator.go
578+
$(TAILNETTEST_MOCKS): tailnet/coordinator.go tailnet/service.go
572579
go generate ./tailnet/tailnettest/
573580

574581
tailnet/proto/tailnet.pb.go: tailnet/proto/tailnet.proto
@@ -626,17 +633,20 @@ site/src/theme/icons.json: $(wildcard scripts/gensite/*) $(wildcard site/static/
626633
examples/examples.gen.json: scripts/examplegen/main.go examples/examples.go $(shell find ./examples/templates)
627634
go run ./scripts/examplegen/main.go > examples/examples.gen.json
628635

629-
coderd/rbac/object_gen.go: scripts/rbacgen/rbacobject.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
630-
go run scripts/rbacgen/main.go rbac > coderd/rbac/object_gen.go
636+
coderd/rbac/object_gen.go: scripts/typegen/rbacobject.gotmpl scripts/typegen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
637+
go run scripts/typegen/main.go rbac object > coderd/rbac/object_gen.go
631638

632-
codersdk/rbacresources_gen.go: scripts/rbacgen/codersdk.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
639+
codersdk/rbacresources_gen.go: scripts/typegen/codersdk.gotmpl scripts/typegen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
633640
# Do no overwrite codersdk/rbacresources_gen.go directly, as it would make the file empty, breaking
634641
# the `codersdk` package and any parallel build targets.
635-
go run scripts/rbacgen/main.go codersdk > /tmp/rbacresources_gen.go
642+
go run scripts/typegen/main.go rbac codersdk > /tmp/rbacresources_gen.go
636643
mv /tmp/rbacresources_gen.go codersdk/rbacresources_gen.go
637644

638-
site/src/api/rbacresourcesGenerated.ts: scripts/rbacgen/codersdk.gotmpl scripts/rbacgen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
639-
go run scripts/rbacgen/main.go typescript > "$@"
645+
site/src/api/rbacresourcesGenerated.ts: scripts/typegen/codersdk.gotmpl scripts/typegen/main.go coderd/rbac/object.go coderd/rbac/policy/policy.go
646+
go run scripts/typegen/main.go rbac typescript > "$@"
647+
648+
site/src/api/countriesGenerated.ts: scripts/typegen/countries.tstmpl scripts/typegen/main.go codersdk/countries.go
649+
go run scripts/typegen/main.go countries > "$@"
640650

641651
docs/admin/integrations/prometheus.md: scripts/metricsdocgen/main.go scripts/metricsdocgen/metrics
642652
go run scripts/metricsdocgen/main.go

0 commit comments

Comments
 (0)