Merge branch 'main' into awsauth

kylecarbs · kylecarbs · commit eec8e29cb9b2 · 2022-03-28T19:21:03.000Z
diff --git a/.github/workflows/coder-test-stability.yaml b/.github/workflows/coder-test-stability.yaml
@@ -14,9 +14,9 @@ on:
   workflow_dispatch:
     inputs:
       iterationCount:
-        description: 'Iteration Count'     
+        description: "Iteration Count"
         required: false
-        default: '10'
+        default: "10"
 
 # Cancel in-progress runs for pull requests when developers push
 # additional changes, and serialize builds in branches.
@@ -43,7 +43,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: "^1.17"
+          go-version: "~1.18"
 
       - uses: actions/cache@v3
         with:
diff --git a/.github/workflows/coder.yaml b/.github/workflows/coder.yaml
@@ -44,7 +44,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3.1.0
         with:
-          version: v1.43.0
+          version: v1.45.2
 
   style-lint-typescript:
     name: "style/lint/typescript"
@@ -201,7 +201,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: "~1.17"
+          go-version: "~1.18"
 
       - name: Echo Go Cache Paths
         id: go-cache-paths
@@ -299,7 +299,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: "~1.17"
+          go-version: "~1.18"
 
       - name: Echo Go Cache Paths
         id: go-cache-paths
@@ -362,7 +362,7 @@ jobs:
       # Go is required for uploading the test results to datadog
       - uses: actions/setup-go@v2
         with:
-          go-version: "~1.17"
+          go-version: "~1.18"
 
       - uses: actions/setup-node@v3
         with:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -12,7 +12,7 @@ jobs:
           fetch-depth: 0
       - uses: actions/setup-go@v2
         with:
-          go-version: "^1.17"
+          go-version: "~1.18"
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2.9.1
diff --git a/.golangci.yml b/.golangci.yml
@@ -154,7 +154,7 @@ linters-settings:
       - name: import-shadowing
       - name: increment-decrement
       - name: indent-error-flow
-      - name: modifies-parameter
+      # - name: modifies-parameter
       - name: modifies-value-receiver
       - name: package-comments
       - name: range
@@ -185,6 +185,8 @@ linters-settings:
       - i
       - db
       - t
+      - id
+      - wg
     # Optional list of variable declarations that should be ignored completely. (defaults to empty list)
     # Entries must be in the form of "<variable name> <type>" or "<variable name> *<type>" for
     # variables, or "const <name>" for constants.
@@ -193,6 +195,8 @@ linters-settings:
       - r *http.Request
       - t testing.T
       - t testing.TB
+      - ok bool
+      - wg sync.WaitGroup
 
 issues:
   # Rules listed here: https://github.com/securego/gosec#available-rules
diff --git a/Makefile b/Makefile
@@ -88,3 +88,7 @@ site/out:
 	# Restores GITKEEP files!
 	git checkout HEAD site/out
 .PHONY: site/out
+
+lint:
+	golangci-lint run
+.PHONY: lint
diff --git a/cli/cliui/select.go b/cli/cliui/select.go
@@ -35,12 +35,15 @@ func Select(cmd *cobra.Command, opts SelectOptions) (string, error) {
 		Templates: &promptui.SelectTemplates{
 			FuncMap: template.FuncMap{
 				"faint": func(value interface{}) string {
+					//nolint:forcetypeassert
 					return Styles.Placeholder.Render(value.(string))
 				},
 				"subtle": func(value interface{}) string {
+					//nolint:forcetypeassert
 					return defaultStyles.Subtle.Render(value.(string))
 				},
 				"selected": func(value interface{}) string {
+					//nolint:forcetypeassert
 					return defaultStyles.Keyword.Render("> " + value.(string))
 					// return defaultStyles.SelectedMenuItem.Render("> " + value.(string))
 				},
diff --git a/coderd/database/postgres/postgres.go b/coderd/database/postgres/postgres.go
@@ -138,5 +138,7 @@ func getFreePort() (port int, err error) {
 	}
 
 	defer listener.Close()
+	// This is always a *net.TCPAddr.
+	// nolint:forcetypeassert
 	return listener.Addr().(*net.TCPAddr).Port, nil
 }
diff --git a/coderd/database/pubsub.go b/coderd/database/pubsub.go
@@ -72,6 +72,9 @@ func (p *pgPubsub) Subscribe(event string, listener Listener) (cancel func(), er
 }
 
 func (p *pgPubsub) Publish(event string, message []byte) error {
+	// This is safe because we are calling pq.QuoteLiteral. pg_notify doesn't
+	// support the first parameter being a prepared statement.
+	//nolint:gosec
 	_, err := p.db.ExecContext(context.Background(), `select pg_notify(`+pq.QuoteLiteral(event)+`, $1)`, message)
 	if err != nil {
 		return xerrors.Errorf("exec: %w", err)
diff --git a/coderd/provisionerjobs.go b/coderd/provisionerjobs.go
@@ -138,7 +138,9 @@ func (api *api) provisionerJobLogs(rw http.ResponseWriter, r *http.Request, job
 	// See: https://canjs.com/doc/can-ndjson-stream.html
 	rw.Header().Set("Content-Type", "application/stream+json")
 	rw.WriteHeader(http.StatusOK)
-	rw.(http.Flusher).Flush()
+	if flusher, ok := rw.(http.Flusher); ok {
+		flusher.Flush()
+	}
 
 	// The Go stdlib JSON encoder appends a newline character after message write.
 	encoder := json.NewEncoder(rw)
@@ -161,7 +163,9 @@ func (api *api) provisionerJobLogs(rw http.ResponseWriter, r *http.Request, job
 			if err != nil {
 				return
 			}
-			rw.(http.Flusher).Flush()
+			if flusher, ok := rw.(http.Flusher); ok {
+				flusher.Flush()
+			}
 		case <-ticker.C:
 			job, err := api.Database.GetProvisionerJobByID(r.Context(), job.ID)
 			if err != nil {
diff --git a/codersdk/client.go b/codersdk/client.go
@@ -94,6 +94,7 @@ func readBodyAsError(res *http.Response) error {
 		}
 	}
 
+	//nolint:varnamelen
 	var m httpapi.Response
 	err := json.NewDecoder(res.Body).Decode(&m)
 	if err != nil {
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/coder/coder
 
-go 1.17
+go 1.18
 
 // Required until https://github.com/manifoldco/promptui/pull/169 is merged.
 replace github.com/manifoldco/promptui => github.com/kylecarbs/promptui v0.8.1-0.20201231190244-d8f2159af2b2
diff --git a/go.sum b/go.sum
diff --git a/peer/conn_test.go b/peer/conn_test.go
diff --git a/provisionerd/provisionerd_test.go b/provisionerd/provisionerd_test.go

Original file line number	Diff line number	Diff line change
`@@ -138,5 +138,7 @@ func getFreePort() (port int, err error) {`
`138`	`138`	`}`
`139`	`139`
`140`	`140`	`defer listener.Close()`
	`141`	`+ // This is always a *net.TCPAddr.`
	`142`	`+ // nolint:forcetypeassert`
`141`	`143`	`return listener.Addr().(*net.TCPAddr).Port, nil`
`142`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,9 @@ func (p *pgPubsub) Subscribe(event string, listener Listener) (cancel func(), er`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`func (p *pgPubsub) Publish(event string, message []byte) error {`
	`75`	`+ // This is safe because we are calling pq.QuoteLiteral. pg_notify doesn't`
	`76`	`+ // support the first parameter being a prepared statement.`
	`77`	`+ //nolint:gosec`
`75`	`78`	_, err := p.db.ExecContext(context.Background(), `select pg_notify(`+pq.QuoteLiteral(event)+`, $1)`, message)
`76`	`79`	`if err != nil {`
`77`	`80`	`return xerrors.Errorf("exec: %w", err)`
Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,7 @@ func readBodyAsError(res *http.Response) error {`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
	`97`	`+ //nolint:varnamelen`
`97`	`98`	`var m httpapi.Response`
`98`	`99`	`err := json.NewDecoder(res.Body).Decode(&m)`
`99`	`100`	`if err != nil {`