chore: Bump to Go 1.22 (#58)

epam · May 16, 2024 · 9c184d6 · 9c184d6
1 parent 2ce2e4c
commit 9c184d6
Show file tree

Hide file tree

Showing 63 changed files with 2,336 additions and 754 deletions.
diff --git a/.github/workflows/codecov.yaml b/.github/workflows/codecov.yaml
@@ -5,7 +5,7 @@ on:
     branches: [ master ]
 
 env:
-  GOLANG_VERSION: '1.20'
+  GOLANG_VERSION: '1.22'
 
 jobs:
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -5,7 +5,7 @@ on:
       - 'v*'
 
 env:
-    GOLANG_VERSION: '1.20'
+    GOLANG_VERSION: '1.22'
 
 jobs:
   prepare-release:

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,6 +1,6 @@
 run:
   timeout: 10m
-  go: "1.20"
+  go: "1.22"
   issues-exit-code: 1
   skip-dirs:
     - "mocks"

diff --git a/.mockery.yaml b/.mockery.yaml
@@ -0,0 +1,26 @@
+with-expecter: True
+inpackage: False
+dir: "{{.InterfaceDir}}/mocks"
+mockname: "Mock{{.InterfaceName}}"
+outpkg: "mocks"
+filename: "{{.InterfaceName | lower}}_mock.go"
+packages:
+  github.com/epam/edp-codebase-operator/v2/controllers/cdstagedeploy/chain:
+    interfaces:
+      CDStageDeployHandler:
+  github.com/epam/edp-codebase-operator/v2/controllers/codebase/service/chain/handler:
+    interfaces:
+      CodebaseHandler:
+  github.com/epam/edp-codebase-operator/v2/pkg/client/jira:
+    interfaces:
+      Client:
+  github.com/epam/edp-codebase-operator/v2/pkg/gerrit:
+    interfaces:
+      Client:
+  github.com/epam/edp-codebase-operator/v2/pkg/git:
+    interfaces:
+      Git:
+      Command:
+  github.com/epam/edp-codebase-operator/v2/pkg/gitprovider:
+    interfaces:
+      GitProjectProvider:
diff --git a/Makefile b/Makefile
@@ -155,7 +155,7 @@ crdoc: ## Download crdoc locally if necessary.
 CONTROLLER_GEN = $(LOCALBIN)/controller-gen
 .PHONY: controller-gen
 controller-gen: ## Download controller-gen locally if necessary.
-	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen,v0.13.0)
+	$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen,v0.15.0)
 # 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
@@ -178,6 +178,10 @@ bundle: manifests kustomize ## Generate bundle manifests and metadata, then vali
 	$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle $(BUNDLE_GEN_FLAGS)
 	operator-sdk bundle validate ./bundle
 
-.PHONY: go-generate
-go-generate: ## Run go generate to generate mocks
-	go generate ./...
+mocks: mockery
+	$(MOCKERY)
+
+MOCKERY = $(LOCALBIN)/mockery
+.PHONY: mockery
+mockery: ## Download mockery locally if necessary.
+	$(call go-get-tool,$(MOCKERY),github.com/vektra/mockery/v2,v2.43.0)
diff --git a/config/crd/bases/v2.edp.epam.com_cdstagedeployments.yaml b/config/crd/bases/v2.edp.epam.com_cdstagedeployments.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: cdstagedeployments.v2.edp.epam.com
 spec:
   group: v2.edp.epam.com
@@ -22,14 +22,19 @@ spec:
         description: CDStageDeploy is the Schema for the CDStageDeployments API.
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object
@@ -103,14 +108,19 @@ spec:
         description: CDStageDeploy is the Schema for the CDStageDeployments API.
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object

diff --git a/config/crd/bases/v2.edp.epam.com_codebasebranches.yaml b/config/crd/bases/v2.edp.epam.com_codebasebranches.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: codebasebranches.v2.edp.epam.com
 spec:
   group: v2.edp.epam.com
@@ -39,14 +39,19 @@ spec:
         description: CodebaseBranch is the Schema for the CodebaseBranches API.
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object
@@ -90,8 +95,9 @@ spec:
                 nullable: true
                 type: string
               detailedMessage:
-                description: Detailed information regarding action result which were
-                  performed
+                description: |-
+                  Detailed information regarding action result
+                  which were performed
                 type: string
               failureCount:
                 description: Amount of times, operator fail to serve with existing
@@ -109,8 +115,10 @@ spec:
                 format: date-time
                 type: string
               result:
-                description: 'A result of an action which were performed. - "success":
-                  action where performed successfully; - "error": error has occurred;'
+                description: |-
+                  A result of an action which were performed.
+                  - "success": action where performed successfully;
+                  - "error": error has occurred;
                 enum:
                 - success
                 - error
@@ -150,14 +158,19 @@ spec:
         description: CodebaseBranch is the Schema for the CodebaseBranches API.
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object
@@ -201,8 +214,9 @@ spec:
                 nullable: true
                 type: string
               detailedMessage:
-                description: Detailed information regarding action result which were
-                  performed
+                description: |-
+                  Detailed information regarding action result
+                  which were performed
                 type: string
               failureCount:
                 description: Amount of times, operator fail to serve with existing
@@ -217,8 +231,10 @@ spec:
                 format: date-time
                 type: string
               result:
-                description: 'A result of an action which were performed. - "success":
-                  action where performed successfully; - "error": error has occurred;'
+                description: |-
+                  A result of an action which were performed.
+                  - "success": action where performed successfully;
+                  - "error": error has occurred;
                 enum:
                 - success
                 - error

diff --git a/config/crd/bases/v2.edp.epam.com_codebaseimagestreams.yaml b/config/crd/bases/v2.edp.epam.com_codebaseimagestreams.yaml
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.13.0
+    controller-gen.kubebuilder.io/version: v0.15.0
   name: codebaseimagestreams.v2.edp.epam.com
 spec:
   group: v2.edp.epam.com
@@ -28,14 +28,19 @@ spec:
           API.
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object
@@ -71,8 +76,9 @@ spec:
             description: CodebaseImageStreamStatus defines the observed state of CodebaseImageStream.
             properties:
               detailed_message:
-                description: Detailed information regarding action result which were
-                  performed
+                description: |-
+                  Detailed information regarding action result
+                  which were performed
                 type: string
               failureCount:
                 description: Amount of times, operator fail to serve with existing
@@ -95,14 +101,19 @@ spec:
           API.
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation
-              of an object. Servers should convert recognized schemas to the latest
-              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: |-
+              APIVersion defines the versioned schema of this representation of an object.
+              Servers should convert recognized schemas to the latest internal value, and
+              may reject unrecognized values.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this
-              object represents. Servers may infer this from the endpoint the client
-              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: |-
+              Kind is a string value representing the REST resource this object represents.
+              Servers may infer this from the endpoint the client submits requests to.
+              Cannot be updated.
+              In CamelCase.
+              More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
             type: string
           metadata:
             type: object
@@ -138,8 +149,9 @@ spec:
             description: CodebaseImageStreamStatus defines the observed state of CodebaseImageStream.
             properties:
               detailed_message:
-                description: Detailed information regarding action result which were
-                  performed
+                description: |-
+                  Detailed information regarding action result
+                  which were performed
                 type: string
               failureCount:
                 description: Amount of times, operator fail to serve with existing