ci: go 1.16.x, cached tests (#1937)

Signed-off-by: Bobby DeSimone <bobbydesimone@gmail.com>

.github/workflows/release.yaml

@@ -22,7 +22,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: 1.15.x
+          go-version: 1.16.x
 
       - name: Set up Docker
         run: docker run --rm --privileged multiarch/qemu-user-static --reset -p yes

.github/workflows/test.yaml

@@ -6,80 +6,121 @@ on:
 
 name: Test
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install Go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.15.x
-      - name: Checkout code
-        uses: actions/checkout@v2
-      - name: Lint Dependencies
-        run: make build-deps
-      - name: Lint
-        run: |
-          export PATH=$PATH:$(go env GOPATH)/bin
-          make lint
-      - name: Spellcheck
-        run: |
-          export PATH=$PATH:$(go env GOPATH)/bin
-          make spellcheck
   test:
     strategy:
       matrix:
-        go-version: [1.15.x]
+        go-version: [1.16.x]
-        platform: [ubuntu-latest, macos-latest, ubuntu-16.04]
+        platform: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.platform }}
     steps:
-      - name: Install Go
+      - uses: actions/setup-go@v2
-        uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.go-version }}
-      - name: Checkout code
+      - name: set env vars
-        uses: actions/checkout@v2
+        run: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
-      - name: Build dependencies
+      - uses: actions/checkout@v2
-        run: make build-deps
-      - name: Test
-        run: |
-          export PATH=$PATH:$(go env GOPATH)/bin
-          make test
-
-  cover:
-    strategy:
-      matrix:
-        go-version: [1.15.x]
-        platform: [ubuntu-latest]
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - name: Install Go
-        uses: actions/setup-go@v2
         with:
-          go-version: ${{ matrix.go-version }}
+          fetch-depth: 0
-      - name: Checkout code
+      - uses: actions/cache@v2
-        uses: actions/checkout@v2
+        with:
-      - name: Test
+          path: |
+            ~/go/pkg
+            ~/.cache/go-build
+            ~/Library/Caches/go-build
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+      - run: make deps-lint
+      - run: make deps-build
+      - name: Lint
+        if: runner.os == 'Linux'
+        run: make lint
+      - name: spellcheck
+        if: runner.os == 'Linux'
+        run: make spellcheck
+      - name: test
+        if: runner.os != 'Linux'
+        run: make test
+      - name: cover
+        if: runner.os == 'Linux'
         run: make cover
-      - name: CodeCov
+      - name: upload code coverage
+        if: runner.os == 'Linux'
         uses: codecov/codecov-action@v1.2.1
         with:
           # The token below is used exclusively for uploading coverage reports.
           token: "d82eb1d7-5990-4a31-baa4-156473402105"
           file: ./coverage.txt
 
+  integration:
+    strategy:
+      matrix:
+        go-version: [1.16.x]
+        platform: [ubuntu-latest]
+    runs-on: ${{ matrix.platform }}
+    steps:
+      - uses: actions/setup-go@v2
+        with:
+          go-version: ${{ matrix.go-version }}
+      - name: set env vars
+        run: echo "$(go env GOPATH)/bin" >> $GITHUB_PATH
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/go/pkg
+            ~/.cache/go-build
+            ~/Library/Caches/go-build
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+      - name: install mkcert
+        if: runner.os == 'Linux'
+        run: |
+          #!/bin/bash
+          if [ ! -f mkcert ]; then
+            echo "downloading mkcert"
+            sudo curl -Lo mkcert https://github.com/FiloSottile/mkcert/releases/download/v1.4.1/mkcert-v1.4.1-linux-amd64
+            sudo chmod +x mkcert
+          fi
+          sudo install mkcert /usr/local/bin/
+      - name: Create kind cluster
+        uses: helm/kind-action@v1.1.0
+        with:
+          cluster_name: kind
+
+      - name: build dev docker image
+        run: |
+          ./scripts/build-dev-docker.bash
+
+      - name: integration tests
+        run: go test -v ./integration/...
+
   build:
     strategy:
       matrix:
-        go-version: [1.15.x]
+        go-version: [1.16.x]
-        platform: [ubuntu-latest, macos-latest, ubuntu-16.04]
+        platform: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.platform }}
     steps:
-      - name: Install Go
+      - uses: actions/setup-go@v2
-        uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.go-version }}
-      - name: Checkout code
+      - uses: actions/checkout@v2
-        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - uses: actions/cache@v2
+        with:
+          path: |
+            ~/go/pkg/mod
+            ~/.cache/go-build
+            ~/Library/Caches/go-build
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
       - name: build
         run: |
           make build-deps
@@ -96,50 +137,17 @@ jobs:
   build-docker:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout code
+      - uses: actions/checkout@v2
-        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - name: build
         run: docker build .
 
-  integration-tests:
-    runs-on: ubuntu-latest
-    steps:
-      - name: install mkcert
-        run: |
-          #!/bin/bash
-          if [ ! -f mkcert ]; then
-            echo "downloading mkcert"
-            sudo curl -Lo mkcert https://github.com/FiloSottile/mkcert/releases/download/v1.4.1/mkcert-v1.4.1-linux-amd64
-            sudo chmod +x mkcert
-          fi
-          sudo install mkcert /usr/local/bin/
-
-      - name: Create kind cluster
-        uses: helm/kind-action@v1.0.0-rc.1
-        with:
-          cluster_name: kind
-
-      - name: install go
-        uses: actions/setup-go@v2
-        with:
-          go-version: 1.15.x
-
-      - name: checkout code
-        uses: actions/checkout@v2
-
-      - name: build dev docker image
-        run: |
-          ./scripts/build-dev-docker.bash
-
-      - name: test
-        run: go test -v ./integration/...
-
   precommit:
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'
     steps:
-      - name: checkout code
+      - uses: actions/checkout@v2
-        uses: actions/checkout@v2
         with:
           fetch-depth: 0
       - uses: actions/setup-python@v2
@@ -153,14 +161,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [1.15.x]
+        go-version: [1.16.x]
         platform: [ubuntu-latest]
     needs:
       - build
     steps:
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.15.x
+          go-version: 1.16.x
 
       - uses: actions/checkout@v2
 

Makefile

@@ -33,9 +33,9 @@ GOOS = $(shell $(GO) env GOOS)
 GOARCH= $(shell $(GO) env GOARCH)
 MISSPELL_VERSION = v0.3.4
 GOLANGCI_VERSION = v1.34.1
-OPA_VERSION = v0.25.2
+OPA_VERSION = v0.26.0
 GETENVOY_VERSION = v0.2.0
-GORELEASER_VERSION = v0.150.0
+GORELEASER_VERSION = v0.157.0
 
 .PHONY: all
 all: clean build-deps test lint spellcheck build ## Runs a clean, build, fmt, lint, test, and vet.
@@ -46,15 +46,27 @@ generate-mocks: ## Generate mocks
 	@echo "==> $@"
 	@go run github.com/golang/mock/mockgen -destination internal/directory/auth0/mock_auth0/mock.go github.com/pomerium/pomerium/internal/directory/auth0 RoleManager
 
-.PHONY: build-deps
+.PHONY: build-lint
-build-deps: ## Install build dependencies
+deps-lint: ## Install lint dependencies
+	@echo "==> $@"
+	@$(GO) install github.com/client9/misspell/cmd/misspell@${MISSPELL_VERSION}
+	@$(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_VERSION}
+
+.PHONY: deps-build
+deps-build: ## Install build dependencies
+	@echo "==> $@"
+	@$(GO) install github.com/open-policy-agent/opa@${OPA_VERSION}
+	@$(GO) install github.com/tetratelabs/getenvoy/cmd/getenvoy@${GETENVOY_VERSION}
+
+.PHONY: deps-release
+deps-release: ## Install release dependencies
 	@echo "==> $@"
-	@cd /tmp; GO111MODULE=on $(GO) get github.com/client9/misspell/cmd/misspell@${MISSPELL_VERSION}
-	@cd /tmp; GO111MODULE=on $(GO) get github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCI_VERSION}
-	@cd /tmp; GO111MODULE=on $(GO) get github.com/open-policy-agent/opa@${OPA_VERSION}
-	@cd /tmp; GO111MODULE=on $(GO) get github.com/tetratelabs/getenvoy/cmd/getenvoy@${GETENVOY_VERSION}
 	@cd /tmp; GO111MODULE=on $(GO) get github.com/goreleaser/goreleaser@${GORELEASER_VERSION}
 
+.PHONY: build-deps
+build-deps: deps-lint deps-build deps-release
+	@echo "==> $@"
+
 .PHONY: docs
 docs: ## Start the vuepress docs development server
 	@echo "==> $@"

internal/middleware/middleware_test.go

@@ -86,7 +86,6 @@ func TestStripCookie(t *testing.T) {
 func TestTimeoutHandlerFunc(t *testing.T) {
 	t.Parallel()
 	fn := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "text/plain; charset=utf-8")
 		fmt.Fprint(w, http.StatusText(http.StatusOK))
 		w.WriteHeader(http.StatusOK)
 	})
@@ -120,7 +119,6 @@ func TestTimeoutHandlerFunc(t *testing.T) {
 func TestValidateSignature(t *testing.T) {
 	t.Parallel()
 	fn := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "text/plain; charset=utf-8")
 		fmt.Fprint(w, http.StatusText(http.StatusOK))
 		w.WriteHeader(http.StatusOK)
 	})