Skip to content

[pull] main from coder:main #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 5, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions coderd/database/dbauthz/dbauthz.go
Original file line number Diff line number Diff line change
Expand Up @@ -3617,11 +3617,6 @@ func (q *querier) GetWorkspacesEligibleForTransition(ctx context.Context, now ti
return q.db.GetWorkspacesEligibleForTransition(ctx, now)
}

func (q *querier) HasTemplateVersionsWithAITask(ctx context.Context) (bool, error) {
// Anyone can call HasTemplateVersionsWithAITask.
return q.db.HasTemplateVersionsWithAITask(ctx)
}

func (q *querier) InsertAPIKey(ctx context.Context, arg database.InsertAPIKeyParams) (database.APIKey, error) {
return insert(q.log, q.auth,
rbac.ResourceApiKey.WithOwner(arg.UserID.String()),
Expand Down
3 changes: 0 additions & 3 deletions coderd/database/dbauthz/dbauthz_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4826,9 +4826,6 @@ func (s *MethodTestSuite) TestSystemFunctions() {
})
check.Args(j.ID).Asserts(v.RBACObject(tpl), policy.ActionRead).Returns(j)
}))
s.Run("HasTemplateVersionsWithAITask", s.Subtest(func(db database.Store, check *expects) {
check.Args().Asserts()
}))
}

func (s *MethodTestSuite) TestNotifications() {
Expand Down
7 changes: 0 additions & 7 deletions coderd/database/dbmetrics/querymetrics.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 0 additions & 15 deletions coderd/database/dbmock/dbmock.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions coderd/database/querier.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions coderd/database/queries.sql.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions coderd/database/queries/templateversions.sql
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,3 @@ FROM
WHERE
template_versions.id IN (archived_versions.id)
RETURNING template_versions.id;

-- name: HasTemplateVersionsWithAITask :one
-- Determines if the template versions table has any rows with has_ai_task = TRUE.
SELECT EXISTS (SELECT 1 FROM template_versions WHERE has_ai_task = TRUE);
2 changes: 2 additions & 0 deletions helm/coder/templates/_coder.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ env:
value: "0.0.0.0:8080"
- name: CODER_PROMETHEUS_ADDRESS
value: "0.0.0.0:2112"
- name: CODER_PPROF_ADDRESS
value: "0.0.0.0:6060"
{{- if .Values.provisionerDaemon.pskSecretName }}
- name: CODER_PROVISIONER_DAEMON_PSK
valueFrom:
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/auto_access_url_1.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: KUBE_POD_IP
valueFrom:
fieldRef:
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/auto_access_url_1_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: KUBE_POD_IP
valueFrom:
fieldRef:
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/auto_access_url_2.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.default.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/auto_access_url_2_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.coder.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/auto_access_url_3.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: KUBE_POD_IP
valueFrom:
fieldRef:
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/auto_access_url_3_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: KUBE_POD_IP
valueFrom:
fieldRef:
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/command.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.default.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/command_args.golden
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.default.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/command_args_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.coder.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/command_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.coder.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/custom_resources.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.default.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/custom_resources_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.coder.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/default_values.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.default.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/default_values_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.coder.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/env_from.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.default.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/env_from_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.coder.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/extra_templates.golden
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.default.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/extra_templates_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.coder.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/labels_annotations.golden
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.default.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/labels_annotations_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.coder.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/partial_resources.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.default.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/partial_resources_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.coder.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/pod_securitycontext.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.default.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/pod_securitycontext_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.coder.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/prometheus.golden
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.default.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/prometheus_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.coder.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/provisionerd_psk.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_PROVISIONER_DAEMON_PSK
valueFrom:
secretKeyRef:
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/provisionerd_psk_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_PROVISIONER_DAEMON_PSK
valueFrom:
secretKeyRef:
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/sa.golden
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.default.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/sa_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.coder.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/sa_disabled.golden
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.default.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/sa_disabled_coder.golden
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.coder.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
2 changes: 2 additions & 0 deletions helm/coder/tests/testdata/sa_extra_rules.golden
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ spec:
value: 0.0.0.0:8080
- name: CODER_PROMETHEUS_ADDRESS
value: 0.0.0.0:2112
- name: CODER_PPROF_ADDRESS
value: 0.0.0.0:6060
- name: CODER_ACCESS_URL
value: http://coder.default.svc.cluster.local
- name: KUBE_POD_IP
Expand Down
Loading
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy