fix(nas): set global query RegionId in v2 sdk client

kubernetes-sigs · Dec 6, 2023 · c753c10 · c753c10
1 parent d5b7b85
commit c753c10
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/pkg/nas/controllerserver.go b/pkg/nas/controllerserver.go
@@ -75,7 +75,6 @@ func NewControllerServer(d *csicommon.CSIDriver) (csi.ControllerServer, error) {
 }
 
 func validateCreateVolumeRequest(req *csi.CreateVolumeRequest) error {
-	log.Infof("Starting nfs validate create volume request %s, %v", req.Name, req)
 	valid, err := utils.CheckRequestArgs(req.GetParameters())
 	if !valid {
 		return status.Errorf(codes.InvalidArgument, err.Error())

diff --git a/pkg/nas/internal/nas_client_v2.go b/pkg/nas/internal/nas_client_v2.go
@@ -15,13 +15,19 @@ import (
 )
 
 func newNasClientV2(region string) (*sdk.Client, error) {
-	config := new(openapi.Config)
+	config := new(openapi.Config).
+		SetRegionId(region).
+		SetGlobalParameters(&openapi.GlobalParameters{
+			Queries: map[string]*string{
+				"RegionId": &region,
+			},
+		})
 	// set credential
 	cred, err := utils.GetCredentialV2()
 	if err != nil {
 		return nil, fmt.Errorf("init credential: %w", err)
 	}
-	config = config.SetRegionId(region).SetCredential(cred)
+	config = config.SetCredential(cred)
 	// set endpoint
 	ep := os.Getenv("NAS_ENDPOINT")
 	if ep == "" {