fixup! add make lint to Makefile

coadler · coadler · commit ce4039a69214 · 2022-03-28T14:08:03.000-05:00
diff --git a/Makefile b/Makefile
@@ -89,10 +89,7 @@ site/out:
 	git checkout HEAD site/out
 .PHONY: site/out
 
-lint/go:
+lint:
 	@echo "--- golangci-lint"
 	golangci-lint run
-.PHONY: lint/go
-
-lint: lint/go
 .PHONY: lint
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)
-	tryFlush(rw)
+	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
 			}
-			tryFlush(rw)
+			if flusher, ok := rw.(http.Flusher); ok {
+				flusher.Flush()
+			}
 		case <-ticker.C:
 			job, err := api.Database.GetProvisionerJobByID(r.Context(), job.ID)
 			if err != nil {
@@ -175,12 +179,6 @@ func (api *api) provisionerJobLogs(rw http.ResponseWriter, r *http.Request, job
 	}
 }
 
-func tryFlush(w http.ResponseWriter) {
-	if flusher, ok := w.(http.Flusher); ok {
-		flusher.Flush()
-	}
-}
-
 func (api *api) provisionerJobResources(rw http.ResponseWriter, r *http.Request, job database.ProvisionerJob) {
 	if !job.CompletedAt.Valid {
 		httpapi.Write(rw, http.StatusPreconditionFailed, httpapi.Response{
