Merge branch 'main' into reusable-workflows

.github/CODEOWNERS

@@ -1,31 +1,19 @@
 # CODEOWNERS
 #
-# documentation for this file can be found at:
+# Documentation for this file can be found at:
 # https://help.github.com/en/articles/about-code-owners
+
 # These are the default owners for the code and will
 # be requested for review when someone opens a pull request.
-# order is alphabetical for easier maintenance.
+# Order is alphabetical for easier maintenance.
 #
-# Abhilash (abhi16394)
+# Abhilash Muralidhara (abhi16394)
 # Adarsh Kumar Yadav (adarsh-dell)
 # Akshay Saini (AkshaySainiDell)
-# Aaron Tye (atye)
-# Ashley Joy (ashleyvjoy)
-# Bharath Sreekanth (bharathsreekanth)
-# Deepak Ghivari (Deepak-Ghivari)
-# Emily Kinuthia (EmilyKatdell)
-# Jacob Grosner (JacobGros)
-# Jooseppi Luna (jooseppi-luna)
-# Rajshree Khare (khareRajshree)
-# Kshitija Kakde (KshitijaKakde)
-# Kumar Karthik Gosa (kumarkgosa)
-# Abrar Basha (mbasha-dell)
-# Matt Schmaelzle (mjsdell)
-# Prabhu Revur (prabhu-dell)
-# Rishabh Raj (rishabhatdell)
-# Sakshi Garg (sakshi-garg1)
-# Shayna Finocchiaro (shaynafinocchiaro)
-# Surya Prakash Gupta (suryagupta4)
+# Bahubali Jain (bpjain2004)
+# Don Khan (donatwork)
+# Trevor Dawe (tdawe)
 
+# for all files
+* @abhi16394 @adarsh-dell @AkshaySainiDell @bpjain2004 @donatwork @tdawe
 
-* @abhi16394 @adarsh-dell @AkshaySainiDell @atye @ashleyvjoy @bharathsreekanth @Deepak-Ghivari @EmilyKatdell @JacobGros @jooseppi-luna @khareRajshree @KshitijaKakde @kumarkgosa @mbasha-dell @mjsdell @prabhu-dell  @rishabhatdell @sakshi-garg1 @shaynafinocchiaro @suryagupta4

service/controller.go

@@ -1245,7 +1245,7 @@ func (s *service) ControllerPublishVolume(
 		if err != nil {
 			return nil, status.Errorf(codes.NotFound, "%s", err.Error())
 		} else if len(sdcIPs) == 0 {
-			return nil, status.Errorf(codes.NotFound, "received empty sdcIPs")
+			return nil, status.Errorf(codes.NotFound, "%s", "received empty sdcIPs")
 		}
 
 		externalAccess := s.opts.ExternalAccess
@@ -1568,7 +1568,7 @@ func (s *service) ControllerUnpublishVolume(
 		if err != nil {
 			return nil, status.Errorf(codes.NotFound, "%s", err.Error())
 		} else if len(sdcIPs) == 0 {
-			return nil, status.Errorf(codes.NotFound, "received empty sdcIPs")
+			return nil, status.Errorf(codes.NotFound, "%s", "received empty sdcIPs")
 		}
 
 		// unexport for NFS

service/service.go

@@ -819,7 +819,7 @@ func getArrayConfig(_ context.Context) (map[string]*ArrayConnectionData, error)
 		}
 
 		if len(creds) == 0 {
-			return nil, fmt.Errorf("no arrays are provided in vxflexos-creds secret")
+			return nil, fmt.Errorf("%s", "no arrays are provided in vxflexos-creds secret")
 		}
 
 		noOfDefaultArray := 0

service/step_defs_test.go

@@ -2144,9 +2144,9 @@ func (f *feature) iCallListVolumesWith(maxEntriesString, startingToken string) e
 		default:
 			return fmt.Errorf(`want start token of "next", "none", "invalid", "larger", got %q`, st)
 		}
-		// ignoring integer overflow issue, will not be an issue if maxEntries is less than 2147483647
-		// #nosec G115
+
 		req = f.getControllerListVolumesRequest(int32(maxEntries), startingToken)
+
 		f.listVolumesRequest = req
 	}
 	log.Printf("Calling ListVolumes with req=%+v", f.listVolumesRequest)
@@ -3669,9 +3669,9 @@ func (f *feature) iCallListSnapshotsWithMaxentriesAndStartingtoken(maxEntriesStr
 		return nil
 	}
 	ctx := new(context.Context)
-	// ignoring integer overflow issue, will not be an issue if maxEntries is less than 2147483647
-	// #nosec G115
+
 	req := &csi.ListSnapshotsRequest{MaxEntries: int32(maxEntries), StartingToken: startingTokenString}
+
 	f.listSnapshotsRequest = req
 	log.Printf("Calling ListSnapshots with req=%+v", f.listVolumesRequest)
 	f.listSnapshotsResponse, f.err = f.service.ListSnapshots(*ctx, req)

test/integration/step_defs_test.go

@@ -1126,7 +1126,9 @@ func (f *feature) expectErrorListSnapshotResponse() error {
 	if !strings.Contains(err.Error(), expected) {
 		return fmt.Errorf("Error %s does not contain the expected message: %s", err.Error(), expected)
 	}
-	fmt.Printf("got expected error %s", err.Error())
+
+	fmt.Printf("got expected error: %s", err.Error())
+
 	return nil
 }