Merge 78d4989 into 1602407

Author: timflannagan

.github/workflows/go.yaml

@@ -1,25 +1,36 @@
 name: Go
 on:
   push:
-    branches: 
+    branches:
       - master
+      - main
   pull_request:
-    branches: 
+    branches:
       - master
+      - main
 jobs:
   build:
     name: Build
     runs-on: ubuntu-latest
     steps:
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v2
     - name: Set up Go
       uses: actions/setup-go@v2
       with:
         go-version: 1.16
       id: go
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+    - name: Cache dependencies
+      uses: actions/cache@v2
+      with:
+        path: |
+          ~/.cache/go-build
+          ~/go/pkg/mod
+        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+        restore-keys: |
+          ${{ runner.os }}-go-
     - name: unit-test
-      run: go test -mod=vendor -v ./...
+      run: go test -v ./...
 
   go-apidiff:
     name: go-apidiff

.github/workflows/verify.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - main
   pull_request:
     paths:
       - '**'

.gitignore

@@ -18,3 +18,5 @@
 .LSOverride
 
 .idea/*
+vendor/
+bin/

Makefile

@@ -11,8 +11,7 @@ endif
 
 REPO = github.com/operator-framework/api
 BUILD_PATH = $(REPO)/cmd/operator-verify
-PKGS = $(shell go list ./... | grep -v /vendor/)
-YQ := go run $(MOD_FLAGS) ./vendor/github.com/mikefarah/yq/v3/
+PKGS = $(shell go list ./...)
 
 .PHONY: help
 help: ## Show this help screen
@@ -25,7 +24,6 @@ help: ## Show this help screen
 .PHONY: install
 
 install: ## Build & install operator-verify
-	
 	$(Q)go install \
 		-gcflags "all=-trimpath=${GOPATH}" \
 		-asmflags "all=-trimpath=${GOPATH}" \
@@ -35,25 +33,25 @@ install: ## Build & install operator-verify
 		" \
 		$(BUILD_PATH)
 
+###
 # Code management.
-.PHONY: format tidy clean vendor generate manifests
+###
+.PHONY: format tidy clean generate manifests
 
 format: ## Format the source code
 	$(Q)go fmt $(PKGS)
 
 tidy: ## Update dependencies
 	$(Q)go mod tidy -v
-
-vendor: tidy ## Update vendor directory
-	$(Q)go mod vendor 
+	$(Q)go mod verify
 
 clean: ## Clean up the build artifacts
 	$(Q)rm -rf build
 
 generate: controller-gen  ## Generate code
 	$(CONTROLLER_GEN) object:headerFile=./hack/boilerplate.go.txt paths=./...
 
-manifests: controller-gen ## Generate manifests e.g. CRD, RBAC etc
+manifests: yq controller-gen ## Generate manifests e.g. CRD, RBAC etc
 	@# Create CRDs for new APIs
 	$(CONTROLLER_GEN) crd:crdVersions=v1 output:crd:dir=./crds paths=./pkg/operators/...
 
@@ -88,9 +86,28 @@ test-unit: ## Run the unit tests
 verify: manifests generate format
 	git diff --exit-code
 
+###
 # Utilities.
-.PHONY: controller-gen
-
-controller-gen: vendor ## Find or download controller-gen 
-CONTROLLER_GEN=$(Q)go run -mod=vendor ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen
-
+###
+
+# go-get-tool will 'go get' any package $2 and install it to $1.
+PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))
+define go-get-tool
+@[ -f $(1) ] || { \
+set -e ;\
+TMP_DIR=$$(mktemp -d) ;\
+cd $$TMP_DIR ;\
+go mod init tmp ;\
+echo "Downloading $(2)" ;\
+GOBIN=$(PROJECT_DIR)/bin go get $(2) ;\
+rm -rf $$TMP_DIR ;\
+}
+endef
+
+CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
+controller-gen: ## Download controller-gen locally if necessary.
+	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/[email protected])
+
+YQ = $(shell pwd)/bin/yq
+yq:
+	$(call go-get-tool,$(YQ),github.com/mikefarah/yq/v3)

go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-bindata/go-bindata/v3 v3.1.3
 	github.com/google/cel-go v0.9.0
-	github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
+	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.2.1
 	github.com/stretchr/testify v1.7.0
@@ -18,5 +18,4 @@ require (
 	k8s.io/apimachinery v0.22.1
 	k8s.io/client-go v0.22.1
 	sigs.k8s.io/controller-runtime v0.10.0
-	sigs.k8s.io/controller-tools v0.6.2
 )

go.sum

@@ -3,10 +3,6 @@
 package tools
 
 import (
-	// Generate deepcopy and conversion.
-	_ "sigs.k8s.io/controller-tools/cmd/controller-gen"
-	// Manipulate YAML.
-	_ "github.com/mikefarah/yq/v3"
 	// Generate embedded files.
 	_ "github.com/go-bindata/go-bindata/v3/go-bindata"
 )