Skip to content

Commit e8e3212

Browse files
mafredrimafredri
authored
Merge branch 'main' into mafredri/chore-prevent-database-import-in-slim-builds
2 parents 2d6eeb0 + adba421 commit e8e3212

29 files changed

+645
-346
lines changed

‎.prettierignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,3 +83,6 @@ scripts/apitypings/testdata/**/*.ts
8383
site/e2e/provisionerGenerated.ts
8484

8585
**/pnpm-lock.yaml
86+
87+
# Ignore generated JSON (e.g. examples/examples.gen.json).
88+
**/*.gen.json

‎.prettierignore.include

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@ scripts/apitypings/testdata/**/*.ts
1313
site/e2e/provisionerGenerated.ts
1414

1515
**/pnpm-lock.yaml
16+
17+
# Ignore generated JSON (e.g. examples/examples.gen.json).
18+
**/*.gen.json

‎Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,8 @@ gen: \
471471
site/.prettierrc.yaml \
472472
site/.prettierignore \
473473
site/.eslintignore \
474-
site/e2e/provisionerGenerated.ts
474+
site/e2e/provisionerGenerated.ts \
475+
examples/examples.gen.json
475476
.PHONY: gen
476477

477478
# Mark all generated files as fresh so make thinks they're up-to-date. This is
@@ -494,6 +495,7 @@ gen/mark-fresh:
494495
site/.prettierignore \
495496
site/.eslintignore \
496497
site/e2e/provisionerGenerated.ts \
498+
examples/examples.gen.json \
497499
"
498500
for file in $$files; do
499501
echo "$$file"
@@ -545,14 +547,18 @@ site/e2e/provisionerGenerated.ts:
545547
../scripts/pnpm_install.sh
546548
pnpm run gen:provisioner
547549

550+
551+
examples/examples.gen.json: scripts/examplegen/main.go examples/examples.go $(shell find ./examples/templates)
552+
go run ./scripts/examplegen/main.go > examples/examples.gen.json
553+
548554
coderd/rbac/object_gen.go: scripts/rbacgen/main.go coderd/rbac/object.go
549555
go run scripts/rbacgen/main.go ./coderd/rbac > coderd/rbac/object_gen.go
550556

551557
docs/admin/prometheus.md: scripts/metricsdocgen/main.go scripts/metricsdocgen/metrics
552558
go run scripts/metricsdocgen/main.go
553559
pnpm run format:write:only ./docs/admin/prometheus.md
554560

555-
docs/cli.md: scripts/clidocgen/main.go $(GO_SRC_FILES)
561+
docs/cli.md: scripts/clidocgen/main.go examples/examples.gen.json $(GO_SRC_FILES)
556562
BASE_PATH="." go run ./scripts/clidocgen
557563
pnpm run format:write:only ./docs/cli.md ./docs/cli/*.md ./docs/manifest.json
558564

@@ -605,7 +611,7 @@ site/.prettierrc.yaml: .prettierrc.yaml
605611
# - ./ -> ../
606612
# - ./site -> ./
607613
yq \
608-
'.overrides[].files |= map(. | sub("^./"; "") | sub("^"; "../") | sub("../site/"; "./"))' \
614+
'.overrides[].files |= map(. | sub("^./"; "") | sub("^"; "../") | sub("../site/"; "./") | sub("../!"; "!../"))' \
609615
"$<" >> "$@"
610616

611617
# Combine .gitignore with .prettierignore.include to generate .prettierignore.

‎cli/netcheck.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"golang.org/x/xerrors"
1010

1111
"github.com/coder/coder/v2/cli/clibase"
12-
"github.com/coder/coder/v2/coderd/healthcheck"
12+
"github.com/coder/coder/v2/coderd/healthcheck/derphealth"
1313
"github.com/coder/coder/v2/codersdk"
1414
)
1515

@@ -33,8 +33,8 @@ func (r *RootCmd) netcheck() *clibase.Cmd {
3333

3434
_, _ = fmt.Fprint(inv.Stderr, "Gathering a network report. This may take a few seconds...\n\n")
3535

36-
var report healthcheck.DERPReport
37-
report.Run(ctx, &healthcheck.DERPReportOptions{
36+
var report derphealth.Report
37+
report.Run(ctx, &derphealth.ReportOptions{
3838
DERPMap: connInfo.DERPMap,
3939
})
4040

‎cli/netcheck_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/stretchr/testify/require"
1010

1111
"github.com/coder/coder/v2/cli/clitest"
12-
"github.com/coder/coder/v2/coderd/healthcheck"
12+
"github.com/coder/coder/v2/coderd/healthcheck/derphealth"
1313
"github.com/coder/coder/v2/pty/ptytest"
1414
)
1515

@@ -27,7 +27,7 @@ func TestNetcheck(t *testing.T) {
2727

2828
b := out.Bytes()
2929
t.Log(string(b))
30-
var report healthcheck.DERPReport
30+
var report derphealth.Report
3131
require.NoError(t, json.Unmarshal(b, &report))
3232

3333
assert.True(t, report.Healthy)

‎cli/root.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import (
3636
"github.com/coder/coder/v2/cli/cliui"
3737
"github.com/coder/coder/v2/cli/config"
3838
"github.com/coder/coder/v2/cli/gitauth"
39-
"github.com/coder/coder/v2/coderd/telemetry"
39+
"github.com/coder/coder/v2/cli/telemetry"
4040
"github.com/coder/coder/v2/codersdk"
4141
"github.com/coder/coder/v2/codersdk/agentsdk"
4242
)
@@ -467,17 +467,17 @@ func addTelemetryHeader(client *codersdk.Client, inv *clibase.Invocation) {
467467
client.HTTPClient.Transport = transport
468468
}
469469

470-
var topts []telemetry.CLIOption
470+
var topts []telemetry.Option
471471
for _, opt := range inv.Command.FullOptions() {
472472
if opt.ValueSource == clibase.ValueSourceNone || opt.ValueSource == clibase.ValueSourceDefault {
473473
continue
474474
}
475-
topts = append(topts, telemetry.CLIOption{
475+
topts = append(topts, telemetry.Option{
476476
Name: opt.Name,
477477
ValueSource: string(opt.ValueSource),
478478
})
479479
}
480-
ti := telemetry.CLIInvocation{
480+
ti := telemetry.Invocation{
481481
Command: inv.Command.FullName(),
482482
Options: topts,
483483
InvokedAt: time.Now(),

‎cli/telemetry/telemetry.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package telemetry
2+
3+
import "time"
4+
5+
type Option struct {
6+
Name string `json:"name"`
7+
ValueSource string `json:"value_source"`
8+
}
9+
10+
type Invocation struct {
11+
Command string `json:"command"`
12+
Options []Option `json:"options"`
13+
// InvokedAt is provided for deduplication purposes.
14+
InvokedAt time.Time `json:"invoked_at"`
15+
}

‎cli/templatecreate.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ import (
1616

1717
"github.com/coder/coder/v2/cli/clibase"
1818
"github.com/coder/coder/v2/cli/cliui"
19-
"github.com/coder/coder/v2/coderd/database"
2019
"github.com/coder/coder/v2/coderd/util/ptr"
2120
"github.com/coder/coder/v2/codersdk"
22-
"github.com/coder/coder/v2/provisionerd"
2321
)
2422

2523
func (r *RootCmd) templateCreate() *clibase.Cmd {
@@ -111,7 +109,7 @@ func (r *RootCmd) templateCreate() *clibase.Cmd {
111109
Message: message,
112110
Client: client,
113111
Organization: organization,
114-
Provisioner: database.ProvisionerType(provisioner),
112+
Provisioner: codersdk.ProvisionerType(provisioner),
115113
FileID: resp.ID,
116114
ProvisionerTags: tags,
117115
VariablesFile: variablesFile,
@@ -224,7 +222,7 @@ type createValidTemplateVersionArgs struct {
224222
Message string
225223
Client *codersdk.Client
226224
Organization codersdk.Organization
227-
Provisioner database.ProvisionerType
225+
Provisioner codersdk.ProvisionerType
228226
FileID uuid.UUID
229227

230228
VariablesFile string
@@ -258,7 +256,7 @@ func createValidTemplateVersion(inv *clibase.Invocation, args createValidTemplat
258256
Message: args.Message,
259257
StorageMethod: codersdk.ProvisionerStorageMethodFile,
260258
FileID: args.FileID,
261-
Provisioner: codersdk.ProvisionerType(args.Provisioner),
259+
Provisioner: args.Provisioner,
262260
ProvisionerTags: args.ProvisionerTags,
263261
UserVariableValues: variableValues,
264262
}
@@ -284,7 +282,10 @@ func createValidTemplateVersion(inv *clibase.Invocation, args createValidTemplat
284282
})
285283
if err != nil {
286284
var jobErr *cliui.ProvisionerJobError
287-
if errors.As(err, &jobErr) && !provisionerd.IsMissingParameterErrorCode(string(jobErr.Code)) {
285+
if errors.As(err, &jobErr) && !codersdk.JobIsMissingParameterErrorCode(jobErr.Code) {
286+
return nil, err
287+
}
288+
if err != nil {
288289
return nil, err
289290
}
290291
}

‎cli/templatepush.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313

1414
"github.com/coder/coder/v2/cli/clibase"
1515
"github.com/coder/coder/v2/cli/cliui"
16-
"github.com/coder/coder/v2/coderd/database"
1716
"github.com/coder/coder/v2/codersdk"
1817
"github.com/coder/coder/v2/provisionersdk"
1918
)
@@ -216,7 +215,7 @@ func (r *RootCmd) templatePush() *clibase.Cmd {
216215
Message: message,
217216
Client: client,
218217
Organization: organization,
219-
Provisioner: database.ProvisionerType(provisioner),
218+
Provisioner: codersdk.ProvisionerType(provisioner),
220219
FileID: resp.ID,
221220
ProvisionerTags: tags,
222221
VariablesFile: variablesFile,

‎coderd/apidoc/docs.go

Lines changed: 31 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)