Update mocks, dependency versions

Signed-off-by: Jonathan West <[email protected]>
redhat-appstudio · Sep 6, 2024 · 18bafa7 · 18bafa7
1 parent 0cc706d
commit 18bafa7
Show file tree

Hide file tree

Showing 10 changed files with 267 additions and 11 deletions.
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -83,7 +83,7 @@ jobs:
 
       - name: "Ensure 'backend' passes 'go-lint' - run 'make lint' to identify issues"
         run: |
-          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.3
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.60.3
           cd $GITHUB_WORKSPACE/backend
           make lint 
 
@@ -291,7 +291,7 @@ jobs:
         run: |
           cd $GITHUB_WORKSPACE
           go install github.com/golang/mock/mockgen@latest
-          go install github.com/vektra/mockery/v2@v2.36.0
+          go install github.com/vektra/mockery/v2@v2.45.0
       - name: "Generate mocks"
         run: |
           cd $GITHUB_WORKSPACE

diff --git a/appstudio-controller/Makefile b/appstudio-controller/Makefile
@@ -38,7 +38,7 @@
 # Image URL to use all building/pushing image targets
 IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.23
+ENVTEST_K8S_VERSION = 1.28
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

diff --git a/backend-shared/Makefile b/backend-shared/Makefile
@@ -58,7 +58,7 @@ clean:
 	rm -rf vendor/ bin/
 
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.21
+ENVTEST_K8S_VERSION = 1.28
 
 ENVTEST = $(shell pwd)/bin/setup-envtest
 envtest: ## Download envtest-setup locally if necessary.

diff --git a/backend/Makefile b/backend/Makefile
@@ -1,5 +1,5 @@
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.21
+ENVTEST_K8S_VERSION = 1.28
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

diff --git a/cluster-agent/Makefile b/cluster-agent/Makefile
@@ -38,7 +38,7 @@
 # # Image URL to use all building/pushing image targets
 # IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
-ENVTEST_K8S_VERSION = 1.21
+ENVTEST_K8S_VERSION = 1.28
 
 # Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
 ifeq (,$(shell go env GOBIN))

diff --git a/cluster-agent/utils/mocks/ApplicationServiceClient.go b/cluster-agent/utils/mocks/ApplicationServiceClient.go