Merge pull request #114 from nginxinc/unvendor

Removes vendoring of dependencies

Author: ornj

.gitignore

@@ -16,9 +16,6 @@ __pycache__/
 *.out
 coverage.*
 
-# Kubernetes Generated files - skip generated files, except for vendored files
-!vendor/**/zz_generated.*
-
 # editor and IDE paraphernalia
 .idea
 .vscode

.golangci.yml

@@ -40,7 +40,7 @@ linters:
 run:
   # 10 minute timeout for analysis
   timeout: 10m
-  modules-download-mode: vendor
+  modules-download-mode: mod
   skip-dirs-use-default: true
 
 # Specific linter settings

Makefile

@@ -1,6 +1,5 @@
 PACKAGE           = $(notdir $(patsubst %/,%,$(dir $(realpath $(lastword $(MAKEFILE_LIST))))))
 OUT_DIR          ?= build
-VENDOR_DIR       ?= vendor
 RESULTS_DIR		 ?= results
 DOCKER_REGISTRY  ?= local
 DOCKER_TAG       ?= latest
@@ -25,7 +24,6 @@ deps:
 	go mod download
 	go mod tidy
 	go mod verify
-	go mod vendor
 
 deps-upgrade:
 	GOFLAGS="" go get -u ./...
@@ -36,7 +34,7 @@ deps-upgrade:
 #######################################
 fmt:
 	$(info Running goimports...)
-	@goimports -w -e $$(find . -type f -name '*.go' -not -path "./vendor/*")
+	@goimports -w -e $$(find . -type f -name '*.go')
 
 test:
 	$(info Running unit tests...)
@@ -60,7 +58,7 @@ lint-docker:
 	docker run --rm -v "${PWD}":/app -w /app golangci/golangci-lint:v1.51.2 golangci-lint run
 
 lint-shell:
-	shellcheck -x $$(find . -name "*.sh" -type f -not -path "./vendor/*")
+	shellcheck -x $$(find . -name "*.sh" -type f)
 
 gen:
 	go generate -x ./...

buffer.go

@@ -14,7 +14,7 @@ import (
 
 // Creator abstracts file creation (to write configs to something other than files).
 type Creator interface {
-	Create(string) (io.WriteCloser, error)
+	Create(path string) (io.WriteCloser, error)
 	Reset()
 }
 

types_test.go

@@ -40,7 +40,7 @@ func TestDirective_String(t *testing.T) {
 		},
 	} {
 		s := tf.directive.String()
-		assert.Equal(t, s, tf.expected)
+		assert.Equal(t, tf.expected, s)
 	}
 }
 

util.go

@@ -64,7 +64,7 @@ func validExpr(d *Directive) bool {
 		strings.HasSuffix(d.Args[e], ")") &&
 		((l == 1 && len(d.Args[b]) > 2) || // empty expression single arg '()'
 			(l == 2 && (len(d.Args[b]) > 1 || len(d.Args[e]) > 1)) || // empty expression two args '(', ')'
-			(l > 2))
+			(l > 2)) //nolint: mnd
 }
 
 // prepareIfArgs removes parentheses from an `if` directive's arguments.

util_test.go

@@ -11,7 +11,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	. "github.com/nginxinc/nginx-go-crossplane"
+	. "github.com/nginxinc/nginx-go-crossplane" //nolint: revive
 )
 
 //nolint:funlen