Revert "update req params with secretMap values"

This reverts commit 4fe088a.

Revert commit to main

Author: Bhagyashreek8

pkg/driver/controllerserver.go

@@ -133,13 +133,9 @@ func (cs *controllerServer) CreateVolume(_ context.Context, req *csi.CreateVolum
 		secretMap = secretMapCustom
 	}
 
-	klog.Info("SecretMap Parameters:\n\t", maskSecretkeys(secretMap))
-
 	endPoint = secretMap["cosEndpoint"]
 	if endPoint == "" {
 		endPoint = params["cosEndpoint"]
-	} else {
-		params["cosEndpoint"] = secretMap["cosEndpoint"]
 	}
 	if endPoint == "" {
 		return nil, status.Error(codes.InvalidArgument, "cosEndpoint unknown")
@@ -148,26 +144,28 @@ func (cs *controllerServer) CreateVolume(_ context.Context, req *csi.CreateVolum
 	locationConstraint = secretMap["locationConstraint"]
 	if locationConstraint == "" {
 		locationConstraint = params["locationConstraint"]
-	} else {
-		params["locationConstraint"] = secretMap["locationConstraint"]
 	}
 	if locationConstraint == "" {
 		return nil, status.Error(codes.InvalidArgument, "locationConstraint unknown")
 	}
 
 	kpRootKeyCrn = secretMap["kpRootKeyCRN"]
+	if kpRootKeyCrn == "" {
+		kpRootKeyCrn = secretMapCustom["kpRootKeyCRN"]
+	}
 	if kpRootKeyCrn != "" {
 		klog.Infof("key protect root key crn provided for bucket creation")
 	}
 
 	mounter := secretMap["mounter"]
 	if mounter == "" {
 		mounter = params["mounter"]
-	} else {
-		params["mounter"] = secretMap["mounter"]
 	}
 
 	bucketName = secretMap["bucketName"]
+	if bucketName == "" {
+		bucketName = secretMapCustom["bucketName"]
+	}
 
 	// Check for bucketVersioning parameter
 	if val, ok := secretMap[constants.BucketVersioning]; ok && val != "" {
@@ -191,7 +189,7 @@ func (cs *controllerServer) CreateVolume(_ context.Context, req *csi.CreateVolum
 	if err != nil {
 		return nil, status.Error(codes.InvalidArgument, fmt.Sprintf("Error in getting credentials %v", err))
 	}
-	klog.Infof("endPoint and locationConstraint getting paased to ObjectStorageSession: %s, %s", endPoint, locationConstraint)
+
 	sess := cs.cosSession.NewObjectStorageSession(endPoint, locationConstraint, creds, cs.Logger)
 
 	params["userProvidedBucket"] = "true"
@@ -555,18 +553,6 @@ func parseCustomSecret(secret *v1.Secret) map[string]string {
 	return secretMapCustom
 }
 
-func maskSecretkeys(secretMap map[string]string) map[string]string {
-	maskedSecretMap := make(map[string]string)
-	for k, v := range secretMap {
-		if k == "accessKey" || k == "secretKey" || k == "apiKey" || k == "kpRootKeyCRN" {
-			maskedSecretMap[k] = "xxxxxxx"
-			continue
-		}
-		maskedSecretMap[k] = v
-	}
-	return maskedSecretMap
-}
-
 func getTempBucketName(mounterType, volumeID string) string {
 	klog.Infof("mounterType: %v", mounterType)
 	currentTime := time.Now()