Skip to content

chore: move app URL parsing to its own package #11651

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.

Sign up for GitHub

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 9 commits into from
Jan 17, 2024
Merged

chore: move app URL parsing to its own package #11651

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
6329d26
chore: move app url parsing to it's own package
Emyrk Jan 16, 2024
30268a6
make gen
Emyrk Jan 16, 2024
0ef1e62
update golden files
Emyrk Jan 16, 2024
1ea9a8b
linting
Emyrk Jan 16, 2024
39b428f
linting
Emyrk Jan 16, 2024
8de2362
linting
Emyrk Jan 16, 2024
b9fd441
handle empty string case
Emyrk Jan 16, 2024
515f112
linting
Emyrk Jan 16, 2024
7e94606
move tests to pkg
Emyrk Jan 17, 2024
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
Prev Previous commit
Next Next commit
update golden files
  • Loading branch information
@Emyrk
Emyrk committed Jan 16, 2024
commit 0ef1e621e9a5aab0b7cbdc441dc66ac08163b107
22 changes: 22 additions & 0 deletions cli/clibase/values.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,28 @@ func (i *Validator[T]) Type() string {
return i.Value.Type()
}

func (u *Validator[T]) MarshalYAML() (interface{}, error) {
m, ok := any(u.Value).(yaml.Marshaler)
if !ok {
return u.Value, nil
}
return m.MarshalYAML()
}

func (u *Validator[T]) UnmarshalYAML(n *yaml.Node) error {
return n.Decode(u.Value)
}

func (u *Validator[T]) MarshalJSON() ([]byte, error) {
return json.Marshal(u.Value)
}

func (u *Validator[T]) UnmarshalJSON(b []byte) error {
return json.Unmarshal(b, u.Value)
}

func (*Validator[T]) IsValidator() {}

// values.go contains a standard set of value types that can be used as
// Option Values.

Expand Down
6 changes: 5 additions & 1 deletion cli/clibase/yaml.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,17 @@ func (optSet *OptionSet) MarshalYAML() (any, error) {
Value: opt.YAML,
HeadComment: comment,
}

_, isValidator := opt.Value.(interface{ IsValidator() })

var valueNode yaml.Node
if opt.Value == nil {
valueNode = yaml.Node{
Kind: yaml.ScalarNode,
Value: "null",
}
} else if m, ok := opt.Value.(yaml.Marshaler); ok {
} else if m, ok := opt.Value.(yaml.Marshaler); ok && !isValidator {
// Validators do a wrap, and should be handled by the else statement.
v, err := m.MarshalYAML()
if err != nil {
return nil, xerrors.Errorf(
Expand Down
2 changes: 1 addition & 1 deletion cli/testdata/coder_server_--help.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ NETWORKING OPTIONS:
--secure-auth-cookie bool, $CODER_SECURE_AUTH_COOKIE
Controls if the 'Secure' property is set on browser session cookies.

--wildcard-access-url url, $CODER_WILDCARD_ACCESS_URL
--wildcard-access-url string, $CODER_WILDCARD_ACCESS_URL
Specifies the wildcard hostname to use for workspace applications in
the form "*.example.com".

Expand Down
4 changes: 2 additions & 2 deletions cli/testdata/server-config.yaml.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ networking:
accessURL:
# Specifies the wildcard hostname to use for workspace applications in the form
# "*.example.com".
# (default: <unset>, type: url)
wildcardAccessURL:
# (default: <unset>, type: string)
wildcardAccessURL: ""
# Specifies the custom docs URL.
# (default: <unset>, type: url)
docsURL:
Expand Down
2 changes: 1 addition & 1 deletion enterprise/cli/testdata/coder_server_--help.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ NETWORKING OPTIONS:
--secure-auth-cookie bool, $CODER_SECURE_AUTH_COOKIE
Controls if the 'Secure' property is set on browser session cookies.

--wildcard-access-url url, $CODER_WILDCARD_ACCESS_URL
--wildcard-access-url string, $CODER_WILDCARD_ACCESS_URL
Specifies the wildcard hostname to use for workspace applications in
the form "*.example.com".

Expand Down