coder · cmoog · Jan 25, 2021 · Jan 25, 2021 · Jan 25, 2021 · Jan 25, 2021
diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -23,4 +23,4 @@ jobs:
         with:
           go-version: '^1.14'
       - name: integration tests
-        run: ./ci/steps/integration.sh
+        run: ./ci/scripts/integration.sh
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -15,7 +15,8 @@ jobs:
       - name: fmt
         uses: ./ci/image
         with:
-          args: ./ci/steps/fmt.sh
+          args: make -j fmt 
+      - run: ./ci/scripts/files_changed.sh
   lint:
     runs-on: ubuntu-latest
     steps:
@@ -38,7 +39,7 @@ jobs:
       - name: test
         uses: ./ci/image
         with:
-          args: ./ci/steps/unit_test.sh
+          args: make -j test/go
   gendocs:
     runs-on: ubuntu-latest
     steps:
@@ -52,4 +53,5 @@ jobs:
       - name: generate-docs
         uses: ./ci/image
         with:
-          args: ./ci/steps/gendocs.sh
+          args: make -j gendocs
+      - run: ./ci/scripts/files_changed.sh
diff --git a/Makefile b/Makefile
@@ -1,6 +1,9 @@
 # Makefile for Coder CLI 
 
-.PHONY: clean build build/macos build/windows build/linux
+.PHONY: clean build build/macos build/windows build/linux fmt lint gendocs test/go
+
+PROJECT_ROOT := $(shell git rev-parse --show-toplevel)
+MAKE_ROOT := $(shell pwd)
 
 clean:
 	rm -rf ./ci/bin
@@ -9,8 +12,24 @@ build: build/macos build/windows build/linux
 
 build/macos:
 	# requires darwin
-	CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 ./ci/steps/build.sh
+	CGO_ENABLED=1 GOOS=darwin GOARCH=amd64 ./ci/scripts/build.sh
 build/windows:
-	CGO_ENABLED=0 GOOS=windows GOARCH=386 ./ci/steps/build.sh
+	CGO_ENABLED=0 GOOS=windows GOARCH=386 ./ci/scripts/build.sh
 build/linux:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 ./ci/steps/build.sh
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 ./ci/scripts/build.sh
+
+fmt:
+	go mod tidy
+	gofmt -w -s .
+	goimports -w "-local=$$(go list -m)" .
+
+lint:
+	golangci-lint run -c .golangci.yml
+
+gendocs:
+	rm -rf ./docs
+	mkdir ./docs
+	go run ./cmd/coder gen-docs ./docs
+
+test/go:
+	go test $$(go list ./... | grep -v pkg/tcli | grep -v ci/integration | grep -v coder-sdk)
diff --git a/ci/integration/envs_test.go b/ci/integration/envs_test.go
@@ -10,12 +10,13 @@ import (
 	"testing"
 	"time"
 
-	"cdr.dev/coder-cli/coder-sdk"
-	"cdr.dev/coder-cli/pkg/tcli"
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest"
 	"cdr.dev/slog/sloggers/slogtest/assert"
 	"github.com/google/go-cmp/cmp"
+
+	"cdr.dev/coder-cli/coder-sdk"
+	"cdr.dev/coder-cli/pkg/tcli"
 )
 
 func cleanupClient(ctx context.Context, t *testing.T) *coder.Client {

diff --git a/ci/integration/integration_test.go b/ci/integration/integration_test.go
@@ -6,8 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"cdr.dev/coder-cli/pkg/tcli"
 	"cdr.dev/slog/sloggers/slogtest/assert"
+
+	"cdr.dev/coder-cli/pkg/tcli"
 )
 
 func run(t *testing.T, container string, execute func(t *testing.T, ctx context.Context, runner *tcli.ContainerRunner)) {

diff --git a/ci/integration/setup_test.go b/ci/integration/setup_test.go
@@ -9,8 +9,9 @@ import (
 	"strings"
 	"testing"
 
-	"cdr.dev/coder-cli/pkg/tcli"
 	"golang.org/x/xerrors"
+
+	"cdr.dev/coder-cli/pkg/tcli"
 )
 
 // binpath is populated during package initialization with a path to the coder binary.

diff --git a/ci/integration/tags_test.go b/ci/integration/tags_test.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"testing"
 
+	"cdr.dev/slog/sloggers/slogtest/assert"
+
 	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/coder-cli/pkg/tcli"
-	"cdr.dev/slog/sloggers/slogtest/assert"
 )
 
 func TestTags(t *testing.T) {

diff --git a/ci/integration/users_test.go b/ci/integration/users_test.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"testing"
 
+	"cdr.dev/slog/sloggers/slogtest/assert"
+
 	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/coder-cli/pkg/tcli"
-	"cdr.dev/slog/sloggers/slogtest/assert"
 )
 
 func TestUsers(t *testing.T) {

diff --git a/ci/steps/build.sh → ci/scripts/build.sh b/ci/steps/build.sh → ci/scripts/build.sh
@@ -6,7 +6,7 @@ popd() { builtin popd >/dev/null; }
 
 set -euo pipefail
 
-cd "$(git rev-parse --show-toplevel)/ci/steps"
+cd "$(git rev-parse --show-toplevel)/ci/scripts"
 
 tag=$(git describe --tags)
 

diff --git a/ci/scripts/files_changed.sh b/ci/scripts/files_changed.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -euo pipefail
+
+cd "$(git rev-parse --show-toplevel)"
+
+if [[ $(git ls-files --other --modified --exclude-standard) ]]; then
+  echo "Files have changed:"
+  git -c color.ui=never status
+  exit 1
+fi
diff --git a/ci/steps/integration.sh → ci/scripts/integration.sh b/ci/steps/integration.sh → ci/scripts/integration.sh
diff --git a/ci/steps/fmt.sh b/ci/steps/fmt.sh
diff --git a/ci/steps/gendocs.sh b/ci/steps/gendocs.sh
diff --git a/ci/steps/lint.sh b/ci/steps/lint.sh
diff --git a/ci/steps/unit_test.sh b/ci/steps/unit_test.sh
diff --git a/coder-sdk/config_test.go b/coder-sdk/config_test.go
@@ -7,10 +7,11 @@ import (
 	"testing"
 	"time"
 
-	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/slog"
 	"cdr.dev/slog/sloggers/slogtest"
 	"cdr.dev/slog/sloggers/slogtest/assert"
+
+	"cdr.dev/coder-cli/coder-sdk"
 )
 
 func newClient(t *testing.T) *coder.Client {

diff --git a/internal/cmd/ceapi.go b/internal/cmd/ceapi.go
@@ -5,9 +5,10 @@ import (
 	"fmt"
 	"strings"
 
+	"golang.org/x/xerrors"
+
 	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/coder-cli/pkg/clog"
-	"golang.org/x/xerrors"
 )
 
 // Helpers for working with the Coder Enterprise API.

diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go
@@ -4,9 +4,10 @@ package cmd
 import (
 	"os"
 
-	"cdr.dev/coder-cli/internal/x/xcobra"
 	"github.com/spf13/cobra"
 	"github.com/spf13/cobra/doc"
+
+	"cdr.dev/coder-cli/internal/x/xcobra"
 )
 
 // verbose is a global flag for specifying that a command should give verbose output.

diff --git a/internal/cmd/configssh.go b/internal/cmd/configssh.go
@@ -12,11 +12,12 @@ import (
 
 	"cdr.dev/coder-cli/pkg/clog"
 
+	"github.com/spf13/cobra"
+	"golang.org/x/xerrors"
+
 	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/coder-cli/internal/coderutil"
 	"cdr.dev/coder-cli/internal/config"
-	"github.com/spf13/cobra"
-	"golang.org/x/xerrors"
 )
 
 const sshStartToken = "# ------------START-CODER-ENTERPRISE-----------"

diff --git a/internal/cmd/images.go b/internal/cmd/images.go
@@ -4,11 +4,12 @@ import (
 	"encoding/json"
 	"os"
 
+	"github.com/spf13/cobra"
+	"golang.org/x/xerrors"
+
 	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/coder-cli/pkg/clog"
 	"cdr.dev/coder-cli/pkg/tablewriter"
-	"github.com/spf13/cobra"
-	"golang.org/x/xerrors"
 )
 
 func imgsCmd() *cobra.Command {

diff --git a/internal/cmd/login.go b/internal/cmd/login.go
@@ -8,16 +8,17 @@ import (
 	"net/url"
 	"strings"
 
+	"github.com/pkg/browser"
+	"github.com/spf13/cobra"
+	"golang.org/x/sync/errgroup"
+	"golang.org/x/xerrors"
+
 	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/coder-cli/internal/config"
 	"cdr.dev/coder-cli/internal/loginsrv"
 	"cdr.dev/coder-cli/internal/version"
 	"cdr.dev/coder-cli/internal/x/xcobra"
 	"cdr.dev/coder-cli/pkg/clog"
-	"github.com/pkg/browser"
-	"github.com/spf13/cobra"
-	"golang.org/x/sync/errgroup"
-	"golang.org/x/xerrors"
 )
 
 func loginCmd() *cobra.Command {

diff --git a/internal/cmd/logout.go b/internal/cmd/logout.go
@@ -3,10 +3,11 @@ package cmd
 import (
 	"os"
 
-	"cdr.dev/coder-cli/internal/config"
-	"cdr.dev/coder-cli/pkg/clog"
 	"github.com/spf13/cobra"
 	"golang.org/x/xerrors"
+
+	"cdr.dev/coder-cli/internal/config"
+	"cdr.dev/coder-cli/pkg/clog"
 )
 
 func logoutCmd() *cobra.Command {

diff --git a/internal/cmd/rebuild.go b/internal/cmd/rebuild.go
@@ -7,15 +7,16 @@ import (
 	"strings"
 	"time"
 
-	"cdr.dev/coder-cli/coder-sdk"
-	"cdr.dev/coder-cli/internal/x/xcobra"
-	"cdr.dev/coder-cli/pkg/clog"
 	"github.com/briandowns/spinner"
 	"github.com/fatih/color"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
 	"golang.org/x/crypto/ssh/terminal"
 	"golang.org/x/xerrors"
+
+	"cdr.dev/coder-cli/coder-sdk"
+	"cdr.dev/coder-cli/internal/x/xcobra"
+	"cdr.dev/coder-cli/pkg/clog"
 )
 
 func rebuildEnvCommand() *cobra.Command {

diff --git a/internal/cmd/resourcemanager.go b/internal/cmd/resourcemanager.go
@@ -7,10 +7,11 @@ import (
 	"sort"
 	"text/tabwriter"
 
-	"cdr.dev/coder-cli/coder-sdk"
-	"cdr.dev/coder-cli/pkg/clog"
 	"github.com/spf13/cobra"
 	"golang.org/x/xerrors"
+
+	"cdr.dev/coder-cli/coder-sdk"
+	"cdr.dev/coder-cli/pkg/clog"
 )
 
 func resourceCmd() *cobra.Command {

diff --git a/internal/cmd/shell.go b/internal/cmd/shell.go
@@ -15,12 +15,13 @@ import (
 	"golang.org/x/xerrors"
 	"nhooyr.io/websocket"
 
+	"cdr.dev/wsep"
+
 	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/coder-cli/internal/activity"
 	"cdr.dev/coder-cli/internal/coderutil"
 	"cdr.dev/coder-cli/internal/x/xterminal"
 	"cdr.dev/coder-cli/pkg/clog"
-	"cdr.dev/wsep"
 )
 
 func getEnvsForCompletion(user string) func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {

diff --git a/internal/cmd/sync.go b/internal/cmd/sync.go
@@ -8,12 +8,13 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/spf13/cobra"
+	"golang.org/x/xerrors"
+
 	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/coder-cli/internal/sync"
 	"cdr.dev/coder-cli/internal/x/xcobra"
 	"cdr.dev/coder-cli/pkg/clog"
-	"github.com/spf13/cobra"
-	"golang.org/x/xerrors"
 )
 
 func syncCmd() *cobra.Command {

diff --git a/internal/cmd/tags.go b/internal/cmd/tags.go
@@ -4,12 +4,13 @@ import (
 	"encoding/json"
 	"os"
 
+	"github.com/spf13/cobra"
+	"golang.org/x/xerrors"
+
 	"cdr.dev/coder-cli/coder-sdk"
 	"cdr.dev/coder-cli/internal/x/xcobra"
 	"cdr.dev/coder-cli/pkg/clog"
 	"cdr.dev/coder-cli/pkg/tablewriter"
-	"github.com/spf13/cobra"
-	"golang.org/x/xerrors"
 )
 
 func tagsCmd() *cobra.Command {