coder · kylecarbs · Mar 22, 2022 · Mar 10, 2022 · Mar 10, 2022 · Mar 11, 2022
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
@@ -157,7 +157,7 @@ jobs:
       - name: Test with Mock Database
         shell: bash
         env:
-          GOCOUNT: ${{ runner.os == 'Windows' && 3 || 5 }}
+          GOCOUNT: ${{ runner.os == 'Windows' && 1 || 2 }}
           GOMAXPROCS: ${{ runner.os == 'Windows' && 1 || 2 }}
         run: gotestsum --junitfile="gotests.xml" --packages="./..." --
           -covermode=atomic -coverprofile="gotests.coverage"
@@ -178,7 +178,7 @@ jobs:
         run: DB=true gotestsum --junitfile="gotests.xml" --packages="./..." --
           -covermode=atomic -coverprofile="gotests.coverage" -timeout=3m
           -coverpkg=./...,github.com/coder/coder/codersdk
-          -count=1 -race -parallel=2 -failfast
+          -count=1 -parallel=2 -failfast
 
       - name: Upload DataDog Trace
         if: (success() || failure()) && github.actor != 'dependabot[bot]' && runner.os == 'Linux'

diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,8 @@ site/**/*.typegen.ts
 # Build
 dist/
 site/out/
+
+*.tfstate
+*.tfplan
+*.lock.hcl
+.terraform/
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -1,5 +1,6 @@
 archives:
-  - builds:
+  - id: coder
+    builds:
       - coder
     files:
       - README.md
@@ -12,18 +13,18 @@ before:
 builds:
   - id: coder-slim
     dir: cmd/coder
-    flags: [-tags=slim]
     ldflags: ["-s -w"]
     env: [CGO_ENABLED=0]
     goos: [darwin, linux, windows]
     goarch: [amd64, arm64]
     hooks:
       # The "trimprefix" appends ".exe" on Windows.
       post: |
-        cp {{.Path}} site/out/bin/coder_{{ .Os }}_{{ .Arch }}{{ trimprefix .Name "coder" }}
+        cp {{.Path}} site/out/bin/coder-{{ .Os }}-{{ .Arch }}{{ trimprefix .Name "coder" }}
 
   - id: coder
     dir: cmd/coder
+    flags: [-tags=embed]
     ldflags: ["-s -w"]
     env: [CGO_ENABLED=0]
     goos: [darwin, linux, windows]

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,5 +1,6 @@
 {
   "cSpell.words": [
+    "cliui",
     "coderd",
     "coderdtest",
     "codersdk",
@@ -12,8 +13,10 @@
     "goleak",
     "gossh",
     "hashicorp",
+    "hclsyntax",
     "httpmw",
     "idtoken",
+    "Iflag",
     "incpatch",
     "isatty",
     "Jobf",
@@ -40,11 +43,14 @@
     "retrier",
     "sdkproto",
     "stretchr",
+    "TCGETS",
     "tcpip",
+    "TCSETS",
     "tfexec",
     "tfstate",
     "trimprefix",
     "unconvert",
+    "Untar",
     "webrtc",
     "xerrors",
     "yamux"
@@ -69,7 +75,7 @@
   "go.coverOnSave": true,
   // The codersdk is used by coderd another other packages extensively.
   // To reduce redundancy in tests, it's covered by other packages.
-  "go.testFlags": ["-coverpkg=./.,github.com/coder/coder/codersdk"],
+  "go.testFlags": ["-short", "-coverpkg=./.,github.com/coder/coder/codersdk"],
   "go.coverageDecorator": {
     "type": "gutter",
     "coveredHighlightColor": "rgba(64,128,128,0.5)",

diff --git a/Makefile b/Makefile
@@ -55,6 +55,10 @@ install: bin
 	@echo "-- CLI available at $(shell ls $(INSTALL_DIR)/coder*)"
 .PHONY: install
 
+package: 
+	goreleaser release --snapshot --rm-dist
+.PHONY: package
+
 peerbroker/proto: peerbroker/proto/peerbroker.proto
 	protoc \
 		--go_out=. \
@@ -89,7 +93,3 @@ site/out:
 	# Restores GITKEEP files!
 	git checkout HEAD site/out
 .PHONY: site/out
-
-snapshot: 
-	goreleaser release --snapshot --rm-dist
-.PHONY: snapshot
diff --git a/agent/agent.go b/agent/agent.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"io"
 	"net"
+	"os"
 	"os/exec"
 	"os/user"
 	"sync"
@@ -85,6 +86,76 @@ type server struct {
 	sshServer *ssh.Server
 }
 
+func (s *server) run(ctx context.Context) {
+	var peerListener *peerbroker.Listener
+	var err error
+	// An exponential back-off occurs when the connection is failing to dial.
+	// This is to prevent server spam in case of a coderd outage.
+	for retrier := retry.New(50*time.Millisecond, 10*time.Second); retrier.Wait(ctx); {
+		peerListener, err = s.clientDialer(ctx, s.options)
+		if err != nil {
+			if errors.Is(err, context.Canceled) {
+				return
+			}
+			if s.isClosed() {
+				return
+			}
+			s.options.Logger.Warn(context.Background(), "failed to dial", slog.Error(err))
+			continue
+		}
+		s.options.Logger.Debug(context.Background(), "connected")
+		break
+	}
+	select {
+	case <-ctx.Done():
+		return
+	default:
+	}
+
+	for {
+		conn, err := peerListener.Accept()
+		if err != nil {
+			if s.isClosed() {
+				return
+			}
+			s.options.Logger.Debug(ctx, "peer listener accept exited; restarting connection", slog.Error(err))
+			s.run(ctx)
+			return
+		}
+		s.closeMutex.Lock()
+		s.connCloseWait.Add(1)
+		s.closeMutex.Unlock()
+		go s.handlePeerConn(ctx, conn)
+	}
+}
+
+func (s *server) handlePeerConn(ctx context.Context, conn *peer.Conn) {
+	go func() {
+		<-conn.Closed()
+		s.connCloseWait.Done()
+	}()
+	for {
+		channel, err := conn.Accept(ctx)
+		if err != nil {
+			if errors.Is(err, peer.ErrClosed) || s.isClosed() {
+				return
+			}
+			s.options.Logger.Debug(ctx, "accept channel from peer connection", slog.Error(err))
+			return
+		}
+
+		switch channel.Protocol() {
+		case "ssh":
+			s.sshServer.HandleConn(channel.NetConn())
+		default:
+			s.options.Logger.Warn(ctx, "unhandled protocol from channel",
+				slog.F("protocol", channel.Protocol()),
+				slog.F("label", channel.Label()),
+			)
+		}
+	}
+}
+
 func (s *server) init(ctx context.Context) {
 	// Clients' should ignore the host key when connecting.
 	// The agent needs to authenticate with coderd to SSH,
@@ -197,7 +268,7 @@ func (*server) handleSSHSession(session ssh.Session) error {
 	}()
 
 	cmd := exec.CommandContext(session.Context(), command, args...)
-	cmd.Env = session.Environ()
+	cmd.Env = append(os.Environ(), session.Environ()...)
 
 	sshPty, windowSize, isPty := session.Pty()
 	if isPty {
@@ -244,76 +315,6 @@ func (*server) handleSSHSession(session ssh.Session) error {
 	return nil
 }
 
-func (s *server) run(ctx context.Context) {
-	var peerListener *peerbroker.Listener
-	var err error
-	// An exponential back-off occurs when the connection is failing to dial.
-	// This is to prevent server spam in case of a coderd outage.
-	for retrier := retry.New(50*time.Millisecond, 10*time.Second); retrier.Wait(ctx); {
-		peerListener, err = s.clientDialer(ctx, s.options)
-		if err != nil {
-			if errors.Is(err, context.Canceled) {
-				return
-			}
-			if s.isClosed() {
-				return
-			}
-			s.options.Logger.Warn(context.Background(), "failed to dial", slog.Error(err))
-			continue
-		}
-		s.options.Logger.Debug(context.Background(), "connected")
-		break
-	}
-	select {
-	case <-ctx.Done():
-		return
-	default:
-	}
-
-	for {
-		conn, err := peerListener.Accept()
-		if err != nil {
-			if s.isClosed() {
-				return
-			}
-			s.options.Logger.Debug(ctx, "peer listener accept exited; restarting connection", slog.Error(err))
-			s.run(ctx)
-			return
-		}
-		s.closeMutex.Lock()
-		s.connCloseWait.Add(1)
-		s.closeMutex.Unlock()
-		go s.handlePeerConn(ctx, conn)
-	}
-}
-
-func (s *server) handlePeerConn(ctx context.Context, conn *peer.Conn) {
-	go func() {
-		<-conn.Closed()
-		s.connCloseWait.Done()
-	}()
-	for {
-		channel, err := conn.Accept(ctx)
-		if err != nil {
-			if errors.Is(err, peer.ErrClosed) || s.isClosed() {
-				return
-			}
-			s.options.Logger.Debug(ctx, "accept channel from peer connection", slog.Error(err))
-			return
-		}
-
-		switch channel.Protocol() {
-		case "ssh":
-			s.sshServer.HandleConn(channel.NetConn())
-		default:
-			s.options.Logger.Warn(ctx, "unhandled protocol from channel",
-				slog.F("protocol", channel.Protocol()),
-				slog.F("label", channel.Label()),
-			)
-		}
-	}
-}
-
 // isClosed returns whether the API is closed or not.
 func (s *server) isClosed() bool {
 	select {

diff --git a/agent/usershell/usershell_windows.go b/agent/usershell/usershell_windows.go
@@ -1,6 +1,12 @@
 package usershell
 
+import "os/exec"
+
 // Get returns the command prompt binary name.
 func Get(username string) (string, error) {
+	_, err := exec.LookPath("powershell.exe")
+	if err == nil {
+		return "powershell.exe", nil
+	}
 	return "cmd.exe", nil
 }
diff --git a/cli/cliui/cliui.go b/cli/cliui/cliui.go
@@ -0,0 +1,50 @@
+package cliui
+
+import (
+	"github.com/charmbracelet/charm/ui/common"
+	"github.com/charmbracelet/lipgloss"
+	"golang.org/x/xerrors"
+)
+
+var (
+	Canceled = xerrors.New("canceled")
+
+	defaultStyles = common.DefaultStyles()
+)
+
+// ValidateNotEmpty is a helper function to disallow empty inputs!
+func ValidateNotEmpty(s string) error {
+	if s == "" {
+		return xerrors.New("Must be provided!")
+	}
+	return nil
+}
+
+// Styles compose visual elements of the UI!
+var Styles = struct {
+	Bold,
+	Code,
+	Field,
+	Keyword,
+	Paragraph,
+	Placeholder,
+	Prompt,
+	FocusedPrompt,
+	Fuschia,
+	Logo,
+	Warn,
+	Wrap lipgloss.Style
+}{
+	Bold:          lipgloss.NewStyle().Bold(true),
+	Code:          defaultStyles.Code,
+	Field:         defaultStyles.Code.Copy().Foreground(lipgloss.AdaptiveColor{Light: "#000000", Dark: "#FFFFFF"}),
+	Keyword:       defaultStyles.Keyword,
+	Paragraph:     defaultStyles.Paragraph,
+	Placeholder:   lipgloss.NewStyle().Foreground(lipgloss.Color("240")),
+	Prompt:        defaultStyles.Prompt.Foreground(lipgloss.AdaptiveColor{Light: "#9B9B9B", Dark: "#5C5C5C"}),
+	FocusedPrompt: defaultStyles.FocusedPrompt.Foreground(lipgloss.Color("#651fff")),
+	Fuschia:       defaultStyles.SelectedMenuItem.Copy(),
+	Logo:          defaultStyles.Logo.SetString("Coder"),
+	Warn:          lipgloss.NewStyle().Foreground(lipgloss.AdaptiveColor{Light: "#04B575", Dark: "#ECFD65"}),
+	Wrap:          defaultStyles.Wrap,
+}