fix: use Environment.StorageEndpointSuffix if not specified

andyzhangx · andyzhangx · commit ddd7a30f4fa0 · 2021-02-03T02:42:22.000Z
fix
diff --git a/pkg/blob/nodeserver.go b/pkg/blob/nodeserver.go
@@ -168,7 +168,11 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
 	}
 
 	if strings.TrimSpace(storageEndpointSuffix) == "" {
-		storageEndpointSuffix = "core.windows.net"
+		if d.cloud.Environment.StorageEndpointSuffix != "" {
+			storageEndpointSuffix = d.cloud.Environment.StorageEndpointSuffix
+		} else {
+			storageEndpointSuffix = "core.windows.net"
+		}
 	}
 
 	if strings.TrimSpace(serverAddress) == "" {

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,11 @@ func (d Driver) NodeStageVolume(ctx context.Context, req csi.NodeStageVolumeRe`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`if strings.TrimSpace(storageEndpointSuffix) == "" {`
`171`		`- storageEndpointSuffix = "core.windows.net"`
	`171`	`+ if d.cloud.Environment.StorageEndpointSuffix != "" {`
	`172`	`+ storageEndpointSuffix = d.cloud.Environment.StorageEndpointSuffix`
	`173`	`+ } else {`
	`174`	`+ storageEndpointSuffix = "core.windows.net"`
	`175`	`+ }`
`172`	`176`	`}`
`173`	`177`
`174`	`178`	`if strings.TrimSpace(serverAddress) == "" {`