Cleanup imports (#2635)

Signed-off-by: Marcus Noble <github@marcusnoble.co.uk>

.github/workflows/build.yaml

@@ -40,6 +40,16 @@ jobs:
            exit 1
           fi
 
+      - name: goimports
+        run: |
+          if [ "$(goimports -l . | wc -l)" -ne 0 ]
+          then
+           echo "The following files were found to have import formatting issues:"
+           goimports -l -l .
+           echo "Please run 'make fmt' to go format the above files."
+           exit 1
+          fi
+
       - name: golangci-lint
         uses: reviewdog/action-golangci-lint@v1
 
@@ -115,7 +125,7 @@ jobs:
 
       - name: Trivy Scan Image
         uses: aquasecurity/trivy-action@master
-        with: 
+        with:
           image-ref: 'ghcr.io/kyverno/kyverno:latest'
           format: 'table'
           exit-code: '1'

Makefile

@@ -308,9 +308,20 @@ endif
 deepcopy-autogen: controller-gen
 	$(CONTROLLER_GEN) object:headerFile="scripts/boilerplate.go.txt" paths="./..."
 
+goimports:
+ifeq (, $(shell which goimports))
+	@{ \
+	echo "goimports not found!";\
+	echo "installing goimports...";\
+	go get golang.org/x/tools/cmd/goimports;\
+	}
+else
+GO_IMPORTS=$(shell which goimports)
+endif
+
 # Run go fmt against code
-fmt:
-	gofmt -s -w .
+fmt: goimports
+	go fmt ./... && $(GO_IMPORTS) -w ./
 
 vet:
 	go vet ./...

pkg/cosign/client.go

@@ -2,6 +2,7 @@ package cosign
 
 import (
 	"context"
+
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/sigstore/cosign/pkg/cosign"
 )

pkg/cosign/cosign.go

@@ -6,12 +6,13 @@ import (
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
+	"strings"
+
 	"github.com/in-toto/in-toto-golang/in_toto"
 	"github.com/kyverno/kyverno/pkg/engine/common"
 	"github.com/sigstore/cosign/cmd/cosign/cli/fulcio"
 	"github.com/sigstore/cosign/pkg/cosign/attestation"
 	"github.com/sigstore/sigstore/pkg/signature/dsse"
-	"strings"
 
 	"github.com/gardener/controller-manager-library/pkg/logger"
 	"github.com/go-logr/logr"

pkg/cosign/mock.go

@@ -3,6 +3,7 @@ package cosign
 import (
 	"context"
 	"fmt"
+
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/sigstore/cosign/pkg/cosign"
 )

pkg/engine/imageVerify_test.go

@@ -2,13 +2,14 @@ package engine
 
 import (
 	"encoding/json"
+	"testing"
+
 	kyverno "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"github.com/kyverno/kyverno/pkg/cosign"
 	"github.com/kyverno/kyverno/pkg/engine/context"
 	"github.com/kyverno/kyverno/pkg/engine/response"
 	"github.com/kyverno/kyverno/pkg/engine/utils"
 	"gotest.tools/assert"
-	"testing"
 )
 
 var test_policy_good = `{

pkg/engine/jsonContext_test.go

@@ -3,8 +3,9 @@ package engine
 import (
 	"bytes"
 	"encoding/json"
-	"gotest.tools/assert"
 	"testing"
+
+	"gotest.tools/assert"
 )
 
 func Test_parseMultilineBlockBody(t *testing.T) {

pkg/engine/mutate/patchJson6902_test.go

@@ -2,9 +2,10 @@ package mutate
 
 import (
 	"fmt"
-	"github.com/kyverno/kyverno/pkg/engine/response"
 	"testing"
 
+	"github.com/kyverno/kyverno/pkg/engine/response"
+
 	"github.com/ghodss/yaml"
 	assert "github.com/stretchr/testify/assert"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"

pkg/engine/mutate/patches_test.go

@@ -1,9 +1,10 @@
 package mutate
 
 import (
-	"github.com/kyverno/kyverno/pkg/engine/response"
 	"testing"
 
+	"github.com/kyverno/kyverno/pkg/engine/response"
+
 	"gotest.tools/assert"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/controller-runtime/pkg/log"

pkg/engine/operator/operator_test.go

@@ -1,8 +1,9 @@
 package operator
 
 import (
-	"gotest.tools/assert"
 	"testing"
+
+	"gotest.tools/assert"
 )
 
 func TestGetOperatorFromStringPattern_OneChar(t *testing.T) {

pkg/engine/response/response_test.go

@@ -1,9 +1,10 @@
 package response
 
 import (
+	"testing"
+
 	"gopkg.in/yaml.v2"
 	"gotest.tools/assert"
-	"testing"
 )
 
 var sourceYAML = `

pkg/engine/utils/utils.go

@@ -2,12 +2,13 @@ package utils
 
 import (
 	"fmt"
+	"strconv"
+	"strings"
+
 	jsonpatch "github.com/evanphx/json-patch/v5"
 	commonAnchor "github.com/kyverno/kyverno/pkg/engine/anchor/common"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	"strconv"
-	"strings"
 )
 
 //RuleType defines the type for rule

pkg/testrunner/scenario_test.go

@@ -1,11 +1,12 @@
 package testrunner
 
 import (
+	"io/ioutil"
+	"testing"
+
 	"github.com/kyverno/kyverno/pkg/engine/response"
 	"gopkg.in/yaml.v3"
 	"gotest.tools/assert"
-	"io/ioutil"
-	"testing"
 )
 
 var sourceYAML = `

pkg/webhooks/validate_audit.go

@@ -1,11 +1,12 @@
 package webhooks
 
 import (
-	"github.com/kyverno/kyverno/pkg/engine"
-	"github.com/kyverno/kyverno/pkg/utils"
 	"strings"
 	"time"
 
+	"github.com/kyverno/kyverno/pkg/engine"
+	"github.com/kyverno/kyverno/pkg/utils"
+
 	"github.com/pkg/errors"
 
 	"github.com/kyverno/kyverno/pkg/common"

pkg/webhooks/verify_images.go

@@ -2,6 +2,7 @@ package webhooks
 
 import (
 	"errors"
+
 	"github.com/go-logr/logr"
 	v1 "github.com/kyverno/kyverno/pkg/api/kyverno/v1"
 	"github.com/kyverno/kyverno/pkg/engine"