Skip to content

Commit 8de2362

Browse files
committed
linting
1 parent 39b428f commit 8de2362

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

cli/clibase/yaml.go

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ func (optSet *OptionSet) MarshalYAML() (any, error) {
7676
}
7777

7878
_, isValidator := opt.Value.(interface{ IsValidator() })
79-
8079
var valueNode yaml.Node
8180
if opt.Value == nil {
8281
valueNode = yaml.Node{

cli/server.go

+7-8
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,6 @@ import (
5353
"gopkg.in/yaml.v3"
5454
"tailscale.com/tailcfg"
5555

56-
"github.com/coder/coder/v2/coderd/workspaceapps/appurl"
57-
"github.com/coder/pretty"
58-
5956
"cdr.dev/slog"
6057
"cdr.dev/slog/sloggers/sloghuman"
6158
"github.com/coder/coder/v2/buildinfo"
@@ -89,6 +86,7 @@ import (
8986
"github.com/coder/coder/v2/coderd/util/slice"
9087
stringutil "github.com/coder/coder/v2/coderd/util/strings"
9188
"github.com/coder/coder/v2/coderd/workspaceapps"
89+
"github.com/coder/coder/v2/coderd/workspaceapps/appurl"
9290
"github.com/coder/coder/v2/codersdk"
9391
"github.com/coder/coder/v2/codersdk/drpc"
9492
"github.com/coder/coder/v2/cryptorand"
@@ -99,6 +97,7 @@ import (
9997
"github.com/coder/coder/v2/provisionersdk"
10098
sdkproto "github.com/coder/coder/v2/provisionersdk/proto"
10199
"github.com/coder/coder/v2/tailnet"
100+
"github.com/coder/pretty"
102101
"github.com/coder/retry"
103102
"github.com/coder/wgtunnel/tunnelsdk"
104103
)
@@ -434,11 +433,11 @@ func (r *RootCmd) Server(newAPI func(context.Context, *coderd.Options) (*coderd.
434433

435434
if vals.WildcardAccessURL.String() == "" {
436435
// Suffixed wildcard access URL.
437-
//u, err := url.Parse(fmt.Sprintf("*--%s", tunnel.URL.Hostname()))
438-
//if err != nil {
439-
// return xerrors.Errorf("parse wildcard url: %w", err)
440-
//}
441-
vals.WildcardAccessURL.Set(fmt.Sprintf("*--%s", tunnel.URL.Hostname()))
436+
wu := fmt.Sprintf("*--%s", tunnel.URL.Hostname())
437+
err = vals.WildcardAccessURL.Set(wu)
438+
if err != nil {
439+
return xerrors.Errorf("set wildcard access url %q: %w", wu, err)
440+
}
442441
}
443442
}
444443

0 commit comments

Comments
 (0)