Merge pull request #265 from RadekManak/test-utils

[OCPCLOUD-1706] Migrate test utils from CPMSO repository

.gitignore

@@ -1,4 +1,5 @@
 /bin/
 .idea
+.cache
 
 _out/

Makefile

@@ -35,23 +35,27 @@ else
  -e "GO111MODULE=$(GO111MODULE)" \
  -e "GOFLAGS=$(GOFLAGS)" \
  -e "GOPROXY=$(GOPROXY)" \
- registry.ci.openshift.org/openshift/release:golang-1.18
+ registry.ci.openshift.org/openshift/release:golang-1.19
  IMAGE_BUILD_CMD = $(ENGINE) build
 endif
 
 .PHONY: all
-all: check
+all: check unit
+
+.PHONY: check
+check: lint
 
 .PHONY: vendor
 vendor:
- $(DOCKER_CMD) ./hack/go-mod.sh
-
-.PHONY: check
-check: fmt vet #lint ## Check your code
+ go mod tidy
+ go mod vendor
+ go mod verify
+ make -C testutils vendor
 
 .PHONY: lint
 lint: ## Go lint your code
  ( GOLANGCI_LINT_CACHE=$(PROJECT_DIR)/.cache $(GOLANGCI_LINT) run --timeout 10m )
+ make -C testutils lint
 
 .PHONY: fmt
 fmt: ## Go fmt your code
@@ -61,14 +65,15 @@ fmt: ## Go fmt your code
 goimports: ## Go fmt your code
  $(DOCKER_CMD) hack/goimports.sh .
 
-.PHONY: vet
-vet: ## Apply go vet to all go files
- $(DOCKER_CMD) hack/go-vet.sh ./...
+.PHONY: unit
+unit: ## Run unit tests
+ make -C testutils unit
 
 .PHONY: build-e2e
 build-e2e:
  $(DOCKER_CMD) go test -c -o "$(BUILD_DEST)" github.com/openshift/cluster-api-actuator-pkg/pkg/
 
+
 .PHONY: test-e2e
 test-e2e: ## Run openshift specific e2e test
  hack/ci-integration.sh $(GINKGO_ARGS) --label-filter='!periodic' -p

go.mod

@@ -5,15 +5,15 @@ go 1.19
 require (
  github.com/golangci/golangci-lint v1.50.1
  github.com/google/uuid v1.3.0
- github.com/onsi/ginkgo/v2 v2.5.0
- github.com/onsi/gomega v1.24.1
- github.com/openshift/api v0.0.0-20220930192943-199dc0598fd1
+ github.com/onsi/ginkgo/v2 v2.7.0
+ github.com/onsi/gomega v1.26.0
+ github.com/openshift/api v0.0.0-20221004120407-c46852673d03
  github.com/openshift/cluster-autoscaler-operator v0.0.1-0.20220930224803-cdc49524de94
  github.com/openshift/library-go v0.0.0-20220930165906-a18683c20aee
  github.com/openshift/machine-api-operator v0.2.1-0.20220922080915-f7f326323f37
  k8s.io/api v0.25.1
  k8s.io/apimachinery v0.25.1
- k8s.io/client-go v12.0.0+incompatible
+ k8s.io/client-go v0.25.1
  k8s.io/klog v1.0.0
  k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
  sigs.k8s.io/controller-runtime v0.13.0
@@ -77,7 +77,7 @@ require (
  github.com/go-toolsmith/astp v1.0.0 // indirect
  github.com/go-toolsmith/strparse v1.0.0 // indirect
  github.com/go-toolsmith/typep v1.0.2 // indirect
- github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect
+ github.com/go-xmlfmt/xmlfmt v0.0.0-20220206211657-0a94163c4677 // indirect
  github.com/gobwas/glob v0.2.3 // indirect
  github.com/gofrs/flock v0.8.1 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
@@ -96,15 +96,15 @@ require (
  github.com/google/gnostic v0.5.7-v3refs // indirect
  github.com/google/go-cmp v0.5.9 // indirect
  github.com/google/gofuzz v1.2.0 // indirect
- github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
+ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
  github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
  github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect
  github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
  github.com/gostaticanalysis/comment v1.4.2 // indirect
  github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
  github.com/gostaticanalysis/nilerr v0.1.1 // indirect
  github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
- github.com/hashicorp/errwrap v1.0.0 // indirect
+ github.com/hashicorp/errwrap v1.1.0 // indirect
  github.com/hashicorp/go-multierror v1.1.1 // indirect
  github.com/hashicorp/go-version v1.6.0 // indirect
  github.com/hashicorp/hcl v1.0.0 // indirect
@@ -135,7 +135,7 @@ require (
  github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect
  github.com/mattn/go-colorable v0.1.13 // indirect
  github.com/mattn/go-isatty v0.0.16 // indirect
- github.com/mattn/go-runewidth v0.0.9 // indirect
+ github.com/mattn/go-runewidth v0.0.13 // indirect
  github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
  github.com/mbilski/exhaustivestruct v1.2.0 // indirect
  github.com/mgechev/revive v1.2.4 // indirect
@@ -154,7 +154,7 @@ require (
  github.com/nishanths/exhaustive v0.8.3 // indirect
  github.com/nishanths/predeclared v0.2.2 // indirect
  github.com/olekukonko/tablewriter v0.0.5 // indirect
- github.com/openshift/client-go v0.0.0-20220915152853-9dfefb19db2e // indirect
+ github.com/openshift/client-go v0.0.0-20221006134153-58ea193f9d20 // indirect
  github.com/pelletier/go-toml v1.9.5 // indirect
  github.com/pelletier/go-toml/v2 v2.0.5 // indirect
  github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
@@ -164,16 +164,17 @@ require (
  github.com/polyfloyd/go-errorlint v1.0.5 // indirect
  github.com/prometheus/client_golang v1.12.2 // indirect
  github.com/prometheus/client_model v0.2.0 // indirect
- github.com/prometheus/common v0.32.1 // indirect
+ github.com/prometheus/common v0.37.0 // indirect
  github.com/prometheus/procfs v0.7.3 // indirect
  github.com/quasilyte/go-ruleguard v0.3.18 // indirect
  github.com/quasilyte/gogrep v0.0.0-20220828223005-86e4605de09f // indirect
- github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect
+ github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
  github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
+ github.com/rivo/uniseg v0.2.0 // indirect
  github.com/russross/blackfriday v1.5.2 // indirect
  github.com/ryancurrah/gomodguard v1.2.4 // indirect
  github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect
- github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect
+ github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
  github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
  github.com/sashamelentyev/usestdlibvars v1.20.0 // indirect
  github.com/securego/gosec/v2 v2.13.1 // indirect
@@ -184,7 +185,7 @@ require (
  github.com/sivchari/tenv v1.7.0 // indirect
  github.com/sonatard/noctx v0.0.1 // indirect
  github.com/sourcegraph/go-diff v0.6.1 // indirect
- github.com/spf13/afero v1.8.2 // indirect
+ github.com/spf13/afero v1.9.2 // indirect
  github.com/spf13/cast v1.5.0 // indirect
  github.com/spf13/cobra v1.6.0 // indirect
  github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -209,20 +210,20 @@ require (
  github.com/yeya24/promlinter v0.2.0 // indirect
  gitlab.com/bosi/decorder v0.2.3 // indirect
  go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
- go.uber.org/atomic v1.8.0 // indirect
- go.uber.org/multierr v1.6.0 // indirect
+ go.uber.org/atomic v1.9.0 // indirect
+ go.uber.org/multierr v1.8.0 // indirect
  go.uber.org/zap v1.21.0 // indirect
  golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
  golang.org/x/exp/typeparams v0.0.0-20220827204233-334a2380cb91 // indirect
- golang.org/x/mod v0.6.0 // indirect
- golang.org/x/net v0.2.0 // indirect
+ golang.org/x/mod v0.7.0 // indirect
+ golang.org/x/net v0.5.0 // indirect
  golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect
- golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde // indirect
- golang.org/x/sys v0.2.0 // indirect
- golang.org/x/term v0.2.0 // indirect
- golang.org/x/text v0.4.0 // indirect
+ golang.org/x/sync v0.1.0 // indirect
+ golang.org/x/sys v0.4.0 // indirect
+ golang.org/x/term v0.4.0 // indirect
+ golang.org/x/text v0.6.0 // indirect
  golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
- golang.org/x/tools v0.2.0 // indirect
+ golang.org/x/tools v0.4.0 // indirect
  gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
  google.golang.org/appengine v1.6.7 // indirect
  google.golang.org/protobuf v1.28.0 // indirect
@@ -247,5 +248,3 @@ require (
  sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
  sigs.k8s.io/yaml v1.3.0 // indirect
 )
-
-replace k8s.io/client-go => k8s.io/client-go v0.25.1