Skip to content

Commit 0e6b2d4

Browse files
AbhineetJainAbhineetJain
committed
Fix merge conflicts and refactor
2 parents 931e7d5 + a03615a commit 0e6b2d4

File tree

156 files changed

+3605
-2278
lines changed

Some content is hidden

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

156 files changed

+3605
-2278
lines changed

‎.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
site/ @coder/frontend
2-
site/src/xServices @presleyp

‎.github/workflows/coder.yaml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
- run: go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.26
106106
- run: go install storj.io/drpc/cmd/protoc-gen-go-drpc@v0.0.26
107107
- run: go install golang.org/x/tools/cmd/goimports@latest
108-
- run: "make --output-sync -j gen"
108+
- run: "make --output-sync -j -B gen"
109109
- run: ./scripts/check_unstaged.sh
110110

111111
style-fmt:
@@ -133,8 +133,7 @@ jobs:
133133
- name: Install node_modules
134134
run: ./scripts/yarn_install.sh
135135

136-
- name: "make fmt"
137-
run: "make --output-sync -j fmt"
136+
- run: "make --output-sync -j -B fmt"
138137

139138
test-go:
140139
name: "test/go"
@@ -355,7 +354,7 @@ jobs:
355354
js-${{ runner.os }}-
356355
357356
- name: Build site
358-
run: make site/out/index.html
357+
run: make -B site/out/index.html
359358

360359
- name: Build Release
361360
uses: goreleaser/goreleaser-action@v2.9.1
@@ -488,7 +487,7 @@ jobs:
488487

489488
- name: Build
490489
run: |
491-
make site/out/index.html
490+
make -B site/out/index.html
492491
493492
- run: yarn playwright:install
494493
working-directory: site

‎.golangci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ linters-settings:
103103
settings:
104104
ruleguard:
105105
failOn: all
106-
rules: rules.go
106+
rules: '${configDir}/scripts/rules.go'
107107

108108
staticcheck:
109109
# https://staticcheck.io/docs/options#checks

‎.goreleaser.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,9 @@ docker_manifests:
153153

154154
release:
155155
ids: [coder-linux, coder-darwin, coder-windows, packages]
156+
footer: |
157+
## Container Image
158+
- `docker pull ghcr.io/coder/coder:{{ .Tag }}`
156159
157160
signs:
158161
- ids: [coder-darwin]

‎.vscode/settings.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"cSpell.words": [
3+
"buildname",
34
"circbuf",
45
"cliflag",
56
"cliui",
@@ -55,6 +56,7 @@
5556
"TCGETS",
5657
"tcpip",
5758
"TCSETS",
59+
"testid",
5860
"tfexec",
5961
"tfjson",
6062
"tfstate",
@@ -76,7 +78,7 @@
7678
},
7779
{
7880
"match": "provisionerd/proto/provisionerd.proto",
79-
"cmd": "make provisionerd/proto/provisionerd.pb.go",
81+
"cmd": "make provisionerd/proto/provisionerd.pb.go"
8082
}
8183
]
8284
},
@@ -104,5 +106,5 @@
104106
},
105107
// We often use a version of TypeScript that's ahead of the version shipped
106108
// with VS Code.
107-
"typescript.tsdk": "./site/node_modules/typescript/lib",
109+
"typescript.tsdk": "./site/node_modules/typescript/lib"
108110
}

‎agent/usershell/usershell_darwin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ package usershell
33
import "os"
44

55
// Get returns the $SHELL environment variable.
6-
func Get(username string) (string, error) {
6+
func Get(_ string) (string, error) {
77
return os.Getenv("SHELL"), nil
88
}

‎cli/agent_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ func TestWorkspaceAgent(t *testing.T) {
1919
instanceID := "instanceidentifier"
2020
certificates, metadataClient := coderdtest.NewAzureInstanceIdentity(t, instanceID)
2121
client := coderdtest.New(t, &coderdtest.Options{
22-
AzureCertificates: certificates,
22+
AzureCertificates: certificates,
23+
IncludeProvisionerD: true,
2324
})
2425
user := coderdtest.CreateFirstUser(t, client)
25-
coderdtest.NewProvisionerDaemon(t, client)
2626
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
2727
Parse: echo.ParseComplete,
2828
Provision: []*proto.Provision_Response{{
@@ -73,10 +73,10 @@ func TestWorkspaceAgent(t *testing.T) {
7373
instanceID := "instanceidentifier"
7474
certificates, metadataClient := coderdtest.NewAWSInstanceIdentity(t, instanceID)
7575
client := coderdtest.New(t, &coderdtest.Options{
76-
AWSCertificates: certificates,
76+
AWSCertificates: certificates,
77+
IncludeProvisionerD: true,
7778
})
7879
user := coderdtest.CreateFirstUser(t, client)
79-
coderdtest.NewProvisionerDaemon(t, client)
8080
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
8181
Parse: echo.ParseComplete,
8282
Provision: []*proto.Provision_Response{{
@@ -128,9 +128,9 @@ func TestWorkspaceAgent(t *testing.T) {
128128
validator, metadata := coderdtest.NewGoogleInstanceIdentity(t, instanceID, false)
129129
client := coderdtest.New(t, &coderdtest.Options{
130130
GoogleTokenValidator: validator,
131+
IncludeProvisionerD: true,
131132
})
132133
user := coderdtest.CreateFirstUser(t, client)
133-
coderdtest.NewProvisionerDaemon(t, client)
134134
version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, &echo.Responses{
135135
Parse: echo.ParseComplete,
136136
Provision: []*proto.Provision_Response{{

‎cli/autostart_test.go

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ func TestAutostart(t *testing.T) {
2222

2323
var (
2424
ctx = context.Background()
25-
client = coderdtest.New(t, nil)
26-
_ = coderdtest.NewProvisionerDaemon(t, client)
25+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
2726
user = coderdtest.CreateFirstUser(t, client)
2827
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
2928
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -54,8 +53,7 @@ func TestAutostart(t *testing.T) {
5453

5554
var (
5655
ctx = context.Background()
57-
client = coderdtest.New(t, nil)
58-
_ = coderdtest.NewProvisionerDaemon(t, client)
56+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
5957
user = coderdtest.CreateFirstUser(t, client)
6058
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
6159
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -99,8 +97,7 @@ func TestAutostart(t *testing.T) {
9997
t.Parallel()
10098

10199
var (
102-
client = coderdtest.New(t, nil)
103-
_ = coderdtest.NewProvisionerDaemon(t, client)
100+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
104101
user = coderdtest.CreateFirstUser(t, client)
105102
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
106103
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -117,8 +114,7 @@ func TestAutostart(t *testing.T) {
117114
t.Parallel()
118115

119116
var (
120-
client = coderdtest.New(t, nil)
121-
_ = coderdtest.NewProvisionerDaemon(t, client)
117+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
122118
user = coderdtest.CreateFirstUser(t, client)
123119
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
124120
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)
@@ -136,8 +132,7 @@ func TestAutostart(t *testing.T) {
136132

137133
var (
138134
ctx = context.Background()
139-
client = coderdtest.New(t, nil)
140-
_ = coderdtest.NewProvisionerDaemon(t, client)
135+
client = coderdtest.New(t, &coderdtest.Options{IncludeProvisionerD: true})
141136
user = coderdtest.CreateFirstUser(t, client)
142137
version = coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
143138
_ = coderdtest.AwaitTemplateVersionJob(t, client, version.ID)

‎cli/autostop.go

Lines changed: 0 additions & 167 deletions
This file was deleted.

‎cli/cliui/parameter.go

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"github.com/coder/coder/codersdk"
1111
)
1212

13-
func ParameterSchema(cmd *cobra.Command, parameterSchema codersdk.TemplateVersionParameterSchema) (string, error) {
13+
func ParameterSchema(cmd *cobra.Command, parameterSchema codersdk.ParameterSchema) (string, error) {
1414
_, _ = fmt.Fprintln(cmd.OutOrStdout(), Styles.Bold.Render("var."+parameterSchema.Name))
1515
if parameterSchema.Description != "" {
1616
_, _ = fmt.Fprintln(cmd.OutOrStdout(), " "+strings.TrimSpace(strings.Join(strings.Split(parameterSchema.Description, "\n"), "\n "))+"\n")
@@ -30,16 +30,32 @@ func ParameterSchema(cmd *cobra.Command, parameterSchema codersdk.TemplateVersio
3030
_, _ = fmt.Fprint(cmd.OutOrStdout(), "\033[1A")
3131
value, err = Select(cmd, SelectOptions{
3232
Options: options,
33+
Default: parameterSchema.DefaultSourceValue,
3334
HideSearch: true,
3435
})
3536
if err == nil {
3637
_, _ = fmt.Fprintln(cmd.OutOrStdout())
3738
_, _ = fmt.Fprintln(cmd.OutOrStdout(), " "+Styles.Prompt.String()+Styles.Field.Render(value))
3839
}
3940
} else {
41+
text := "Enter a value"
42+
if parameterSchema.DefaultSourceValue != "" {
43+
text += fmt.Sprintf(" (default: %q)", parameterSchema.DefaultSourceValue)
44+
}
45+
text += ":"
46+
4047
value, err = Prompt(cmd, PromptOptions{
41-
Text: Styles.Bold.Render("Enter a value:"),
48+
Text: Styles.Bold.Render(text),
4249
})
4350
}
44-
return value, err
51+
if err != nil {
52+
return "", err
53+
}
54+
55+
// If they didn't specify anything, use the default value if set.
56+
if len(options) == 0 && value == "" {
57+
value = parameterSchema.DefaultSourceValue
58+
}
59+
60+
return value, nil
4561
}

0 commit comments

Comments
 (0)