Update go version to 1.22 (#124)

dell · Feb 23, 2024 · 49ab804 · 49ab804
1 parent c08dd89
commit 49ab804
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 31 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run the formatter, linter, and vetter
         uses: dell/common-github-actions/go-code-formatter-linter-vetter@main
         with:
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run the forbidden words scan
         uses: dell/common-github-actions/code-sanitizer@main
         with:
@@ -31,10 +31,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
-      - uses: actions/setup-go@v4
+        uses: actions/checkout@v4
+      - uses: actions/setup-go@v5
         with:
-          go-version: ^1.21
+          go-version: ^1.22
       - run: cd repctl && make test
       - name: Run unit tests and check package coverage
         run: make gen-coverage
@@ -44,7 +44,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run Go Security - Main Folder
         uses: securego/gosec@master
         with:
@@ -55,19 +55,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Download GoSec
-        run: cd ./repctl && wget https://github.com/securego/gosec/releases/download/v2.17.0/gosec_2.17.0_linux_amd64.tar.gz
+        run: cd ./repctl && wget https://github.com/securego/gosec/releases/download/v2.19.0/gosec_2.19.0_linux_amd64.tar.gz
       - name: Unpack GoSec
-        run:  cd ./repctl && tar xzf gosec_2.17.0_linux_amd64.tar.gz
+        run:  cd ./repctl && tar xzf gosec_2.19.0_linux_amd64.tar.gz
       - name: GoSec scan
         run: cd ./repctl && ./gosec  ./...
   malware_security_scan:
     name: Malware Scanner
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Run malware scan
         uses: dell/common-github-actions/malware-scanner@main
         with:
@@ -83,13 +83,13 @@ jobs:
       PASSED_BUILD: false
     steps:
       - name: Checkout the code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.21
+          go-version: ^1.22
       - name: Build CSM Replication Docker Images
         run: |
           make images

diff --git a/.github/workflows/linters.yaml b/.github/workflows/linters.yaml
@@ -14,17 +14,17 @@ jobs:
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/setup-go@v4
+      - uses: actions/setup-go@v5
         with:
           go-version: "1.22"
           cache: false
       - name: Checkout the code
-        uses: actions/checkout@v3.2.0
+        uses: actions/checkout@v4
       - name: Vendor packages
         run: |
           go mod vendor
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v4
         with:
           version: latest
           skip-cache: true
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/dell/csm-replication
 
-go 1.21
+go 1.22
 
 require (
 	github.com/bombsimon/logrusr/v4 v4.0.0

diff --git a/go.sum b/go.sum
@@ -109,16 +109,10 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/dell/dell-csi-extensions/common v1.2.0 h1:vh6f0qNfHSIGZnT5fZLFOt6ABoQAQDIk64z7f+B3xX0=
-github.com/dell/dell-csi-extensions/common v1.2.0/go.mod h1:RLDVq6tz2yVzsX804Daopj/JBB147uqH2NKx6O3G0vA=
 github.com/dell/dell-csi-extensions/common v1.3.0 h1:8QqCaf1E4Y4gJxGk6+wYFbW8uOpNH8vxBvbXOXeU/UM=
 github.com/dell/dell-csi-extensions/common v1.3.0/go.mod h1:RLDVq6tz2yVzsX804Daopj/JBB147uqH2NKx6O3G0vA=
-github.com/dell/dell-csi-extensions/migration v1.2.0 h1:Q7M2KjPqqi9h0dNSONkoIswIjtp78EPuQ89KXTqKPEs=
-github.com/dell/dell-csi-extensions/migration v1.2.0/go.mod h1:NFvvtIXUddsGjIdWKtbh6tCnk7TINU7rLjMXqNz+tzA=
 github.com/dell/dell-csi-extensions/migration v1.3.0 h1:eyWYQLUNLxna6adpqQHZsBpYsuqwtE4fQNrjkZ0sClw=
 github.com/dell/dell-csi-extensions/migration v1.3.0/go.mod h1:qlsRHUJv3cWdIdmgk9S8Ap0WCYDv+cFv1MvaJMyc8uo=
-github.com/dell/dell-csi-extensions/replication v1.5.0 h1:xbnWCmNy/nhh6zdBHyM/UqCh/oBfLFwijdBC7UCNANg=
-github.com/dell/dell-csi-extensions/replication v1.5.0/go.mod h1:puNHmHJWoWeMNj5NXER7oXZtxVnkWZjFNP8mwK0ev18=
 github.com/dell/dell-csi-extensions/replication v1.6.0 h1:KdCstIeI50tKkKT6/OTZG7d3bgb8QZ9r4/BIGmshEDY=
 github.com/dell/dell-csi-extensions/replication v1.6.0/go.mod h1:/hdPGCicZU254Ltr4nsvCn4E+XoC+1FDsmCFn9qNoU4=
 github.com/dell/gobrick v1.9.0 h1:kx69ygz1QV/uCAyIx9pX9gqiwDK7I4WOv5ZUs2zcfPg=

diff --git a/repctl/go.mod b/repctl/go.mod
@@ -1,6 +1,6 @@
 module github.com/dell/repctl
 
-go 1.21
+go 1.22
 
 replace github.com/dell/csm-replication => ../
 

diff --git a/repctl/pkg/cmd/create.go b/repctl/pkg/cmd/create.go
@@ -279,8 +279,10 @@ func getCreateStorageClassCommand() *cobra.Command {
 
 	createSCCmd.Flags().String("from-config", "", "path to storage class config file")
 	_ = viper.BindPFlag("from-config", createSCCmd.Flags().Lookup("from-config"))
-	createSCCmd.MarkFlagRequired("from-config") // TODO: required because we don't have interactive option rn
-
+	err := createSCCmd.MarkFlagRequired("from-config") // TODO: required because we don't have interactive option rn
+	if err != nil {
+		log.Fatalf(" error in marking flag from-config required %s", err.Error())
+	}
 	createSCCmd.Flags().Bool("dry-run", false, "generate storage classes but don't create them")
 	_ = viper.BindPFlag("create-sc-dry-run", createSCCmd.Flags().Lookup("dry-run"))
 

diff --git a/repctl/pkg/cmd/migrate.go b/repctl/pkg/cmd/migrate.go
@@ -99,7 +99,10 @@ This command will perform a migrate command to target StorageClass.`,
 	_ = viper.BindPFlag("pvtarget-ns", migrateCmd.Flags().Lookup("target-ns"))
 	migrateCmd.Flags().Bool("wait", true, "wait for action to complete")
 	_ = viper.BindPFlag("pvwait", migrateCmd.Flags().Lookup("wait"))
-	migrateCmd.MarkFlagRequired("to-sc")
+	err := migrateCmd.MarkFlagRequired("to-sc")
+	if err != nil {
+		log.Fatalf(" error in marking flag to-sc required %s", err.Error())
+	}
 	return migrateCmd
 }
 
@@ -140,8 +143,14 @@ This command will perform a migrate command to target StorageClass.`,
 	_ = viper.BindPFlag("pvctarget-ns", migrateCmd.Flags().Lookup("target-ns"))
 	migrateCmd.Flags().Bool("wait", true, "wait for action to complete")
 	_ = viper.BindPFlag("pvcwait", migrateCmd.Flags().Lookup("wait"))
-	migrateCmd.MarkFlagRequired("to-sc")
-	migrateCmd.MarkFlagRequired("namespace")
+	err := migrateCmd.MarkFlagRequired("to-sc")
+	if err != nil {
+		log.Fatalf(" error in marking flag to-sc required %s", err.Error())
+	}
+	err = migrateCmd.MarkFlagRequired("namespace")
+	if err != nil {
+		log.Fatalf(" error in marking flag namespace required %s", err.Error())
+	}
 	return migrateCmd
 }
 
@@ -188,8 +197,14 @@ This command will perform a migrate command to target StorageClass.`,
 	_ = viper.BindPFlag("ndu", migrateCmd.Flags().Lookup("ndu"))
 	migrateCmd.Flags().BoolP("yes", "y", false, "agree with prompts")
 	_ = viper.BindPFlag("yes", migrateCmd.Flags().Lookup("yes"))
-	migrateCmd.MarkFlagRequired("to-sc")
-	migrateCmd.MarkFlagRequired("namespace")
+	err := migrateCmd.MarkFlagRequired("to-sc")
+	if err != nil {
+		log.Fatalf(" error in marking flag to-sc required %s", err.Error())
+	}
+	err = migrateCmd.MarkFlagRequired("namespace")
+	if err != nil {
+		log.Fatalf(" error in marking flag namespace required %s", err.Error())
+	}
 	return migrateCmd
 }