load resource group name from cloud conf earlier if not set

kubernetes-sigs · Oct 10, 2023 · 12481b6 · 12481b6
1 parent 8feb5bf
commit 12481b6
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/pkg/azurefile/controllerserver.go b/pkg/azurefile/controllerserver.go
@@ -359,6 +359,10 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		}
 	}
 
+	if resourceGroup == "" {
+		resourceGroup = d.cloud.ResourceGroup
+	}
+
 	fileShareSize := int(requestGiB)
 	// account kind should be FileStorage for Premium File
 	accountKind := string(storage.KindStorageV2)
@@ -387,10 +391,6 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 		validFileShareName = getValidFileShareName(name)
 	}
 
-	if resourceGroup == "" {
-		resourceGroup = d.cloud.ResourceGroup
-	}
-
 	tags, err := ConvertTagsToMap(customTags)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument, err.Error())