Upgrade upstream deps to v1.33.1

Author: uneet7

.github/workflows/makefile.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v2
         with:
-          go-version: '1.22.9'
+          go-version: '1.24.0'
         id: go
 
       - name: Check out code into the Go module directory

Dockerfile

@@ -14,7 +14,7 @@
 
 ARG CI_IMAGE_REGISTRY
 
-FROM golang:1.23.4 as builder
+FROM golang:1.24.0 as builder
 
 ARG COMPONENT
 

Dockerfile_arm_all

@@ -1,6 +1,6 @@
 ARG CI_IMAGE_REGISTRY
 
-FROM golang:1.23.4 as builder
+FROM golang:1.24.0 as builder
 
 ARG COMPONENT
 

go.mod

@@ -1222,8 +1222,8 @@ func getListenersNetworkLoadBalancer(svc *v1.Service, listenerBackendIpVersion [
 			listeners[listenerName] = genericListener
 		}
 		if requireIPv6 {
-			listenerNameIPv6 := fmt.Sprintf(listenerName + "-" + IPv6)
-			backendSetNameIPv6 := fmt.Sprintf(backendSetName + "-" + IPv6)
+			listenerNameIPv6 := fmt.Sprintf("%s", listenerName+"-"+IPv6)
+			backendSetNameIPv6 := fmt.Sprintf("%s", backendSetName+"-"+IPv6)
 			genericListener.Name = common.String(listenerNameIPv6)
 			genericListener.IpVersion = GenericIpVersion(client.GenericIPv6)
 			genericListener.DefaultBackendSetName = common.String(backendSetNameIPv6)
@@ -1580,7 +1580,7 @@ func getBackendSetNamePortMap(service *v1.Service) map[string]v1.ServicePort {
 			} else {
 				backendSetName = getBackendSetName(string(servicePort.Protocol), int(servicePort.Port))
 			}
-			backendSetNameIPv6 := fmt.Sprintf(backendSetName + "-" + IPv6)
+			backendSetNameIPv6 := fmt.Sprintf("%s", backendSetName+"-"+IPv6)
 			backendSetPortMap[backendSetNameIPv6] = servicePort
 		}
 

go.sum

@@ -1246,7 +1246,7 @@ func Test_addLoadBalancerOkeSystemTags(t *testing.T) {
 				}
 			}
 			err := clb.addLoadBalancerOkeSystemTags(context.Background(), testcase.lb, testcase.spec)
-			t.Logf(err.Error())
+			t.Logf("%s", err.Error())
 			if !assertError(err, testcase.wantErr) {
 				t.Errorf("Expected error = %v, but got %v", testcase.wantErr, err)
 				return

pkg/cloudprovider/providers/oci/load_balancer_spec.go

@@ -300,7 +300,7 @@ func hasBackendSetChanged(logger *zap.SugaredLogger, actual client.GenericBacken
 	}
 
 	if len(backendChanges) != 0 {
-		backendSetChanges = append(backendChanges)
+		backendSetChanges = append(backendSetChanges, backendChanges...)
 	}
 
 	if len(backendSetChanges) != 0 {
@@ -667,13 +667,13 @@ func getSanitizedName(name string) string {
 	fields := strings.Split(name, "-")
 	if strings.EqualFold(fields[0], "HTTP") {
 		fields[0] = "TCP"
-		name = fmt.Sprintf(strings.Join(fields, "-"))
+		name = fmt.Sprintf("%s", strings.Join(fields, "-"))
 	}
 	if len(fields) > 2 {
 		if contains(fields, IPv6) {
-			return fmt.Sprintf(strings.Join(fields[:3], "-"))
+			return fmt.Sprintf("%s", strings.Join(fields[:3], "-"))
 		}
-		return fmt.Sprintf(strings.Join(fields[:2], "-"))
+		return fmt.Sprintf("%s", strings.Join(fields[:2], "-"))
 	}
 	return name
 }

pkg/cloudprovider/providers/oci/load_balancer_test.go

@@ -142,7 +142,7 @@ func extractVolumeParameters(log *zap.SugaredLogger, parameters map[string]strin
 		case attachmentType:
 			attachmentTypeLower := strings.ToLower(v)
 			if attachmentTypeLower != attachmentTypeISCSI && attachmentTypeLower != attachmentTypeParavirtualized {
-				return p, status.Errorf(codes.InvalidArgument, fmt.Sprintf("invalid attachment-type: %s provided "+
+				return p, status.Errorf(codes.InvalidArgument, "%s", fmt.Sprintf("invalid attachment-type: %s provided "+
 					"for storageclass. supported attachment-types are %s and %s", v, attachmentTypeISCSI, attachmentTypeParavirtualized))
 			}
 			p.attachmentParameter[attachmentType] = attachmentTypeLower
@@ -196,7 +196,7 @@ func extractSnapshotParameters(parameters map[string]string) (SnapshotParameters
 			} else if backupTypeLower == backupTypeFull {
 				p.backupType = core.CreateVolumeBackupDetailsTypeFull
 			} else {
-				return p, status.Errorf(codes.InvalidArgument, fmt.Sprintf("invalid backupType: %s provided "+
+				return p, status.Errorf(codes.InvalidArgument, "%s", fmt.Sprintf("invalid backupType: %s provided "+
 					"in volumesnapshotclass. supported backupType are %s and %s", v, backupTypeIncremental, backupTypeFull))
 			}
 		case backupFreeformTags:
@@ -465,7 +465,6 @@ func (d *BlockVolumeControllerDriver) CreateVolume(ctx context.Context, req *csi
 			fullAvailabilityDomainName = *ad.Name
 		}
 
-
 		bvTags := getBVTags(log, d.config.Tags, volumeParams)
 
 		provisionedVolume, err = provision(ctx, log, d.client, volumeName, size, fullAvailabilityDomainName, d.config.CompartmentID, srcSnapshotId, srcVolumeId,
@@ -1061,7 +1060,6 @@ func (d *BlockVolumeControllerDriver) ValidateVolumeCapabilities(ctx context.Con
 			return nil, status.Errorf(codes.NotFound, "Volume ID not found.")
 		}
 		found = *volume.Id == volumeID
-		supportedVolumeCapabilities = supportedVolumeCapabilities
 	}
 
 	if !found {

pkg/cloudprovider/providers/oci/load_balancer_util.go

@@ -696,7 +696,7 @@ func (d BlockVolumeNodeDriver) NodeUnpublishVolume(ctx context.Context, req *csi
 			return &csi.NodeUnpublishVolumeResponse{}, nil
 		}
 		logger.With(zap.Error(rbvCheckErr)).Error("failed to check if it is a device file")
-		return nil, status.Errorf(codes.Internal, rbvCheckErr.Error())
+		return nil, status.Errorf(codes.Internal, "%s", rbvCheckErr.Error())
 	}
 
 	if acquired := d.volumeLocks.TryAcquire(req.VolumeId); !acquired {