setNetworkType + setTransmissionProtocol

pkg/oss/nodeserver.go

@@ -288,8 +288,12 @@ func (ns *nodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
 	regionID, _ := utils.GetRegionID()
 	if regionID == "" {
 		log.Warnf("NodePublishVolume:: failed to get region id from both env and metadata, use original URL: %s", opt.URL)
-	} else if url, done := modifiedURL(opt.URL, regionID); done {
-		log.Warnf("NodePublishVolume:: modified URL from %s to %s", opt.URL, url)
+	} else if url, done := setNetworkType(opt.URL, regionID); done {
+		log.Warnf("NodePublishVolume:: setNetworkType: modified URL from %s to %s", opt.URL, url)
+		opt.URL = url
+	}
+	if url, done := setTransmissionProtocol(opt.URL); done {
+		log.Warnf("NodePublishVolume:: setTransmissionProtocol: modified URL from %s to %s", opt.URL, url)
 		opt.URL = url
 	}
 

pkg/oss/utils.go

@@ -127,12 +127,17 @@ func doMount(mounter mountutils.Interface, target string, opts Options, mountOpt
 	return nil
 }
 
-func modifiedURL(originURL, regionID string) (URL string, modified bool) {
+func setNetworkType(originURL, regionID string) (URL string, modified bool) {
 	URL = originURL
 	if strings.Contains(originURL, regionID) && !strings.Contains(originURL, "internal") && !utils.IsPrivateCloud() {
 		URL = strings.ReplaceAll(originURL, regionID, regionID+"-internal")
 		modified = true
 	}
+	return
+}
+
+func setTransmissionProtocol(originURL string) (URL string, modified bool) {
+	URL = originURL
 	if strings.HasPrefix(URL, "http://") || strings.HasPrefix(URL, "https://") {
 		return
 	}

pkg/oss/utils_test.go

@@ -82,3 +82,87 @@ func Test_parseOtherOpts(t *testing.T) {
 		})
 	}
 }
+
+func Test_setNetworkType(t *testing.T) {
+	tests := []struct {
+		name         string
+		originURL    string
+		regionID     string
+		wantURL      string
+		wantModified bool
+	}{
+		{
+			"internal-modified",
+			"http://oss-cn-beijing.aliyuncs.com",
+			"cn-beijing",
+			"http://oss-cn-beijing-internal.aliyuncs.com",
+			true,
+		},
+		{
+			"public-unmodified",
+			"https://oss-cn-beijing.aliyuncs.com",
+			"cn-hangzhou",
+			"https://oss-cn-beijing.aliyuncs.com",
+			false,
+		},
+		{
+			"internal-unmodified",
+			"oss-cn-beijing-internal.aliyuncs.com",
+			"cn-beijing",
+			"oss-cn-beijing-internal.aliyuncs.com",
+			false,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			url, done := setNetworkType(tt.originURL, tt.regionID)
+			if url != tt.wantURL || done != tt.wantModified {
+				t.Errorf("setNetworkType(%v, %v) = %v, %v, want %v %v",
+					tt.originURL, tt.regionID, url, done, tt.wantURL, tt.wantModified)
+			}
+		})
+	}
+}
+
+func Test_setTransmissionProtocol(t *testing.T) {
+	tests := []struct {
+		name         string
+		originURL    string
+		wantURL      string
+		wantModified bool
+	}{
+		{
+			"http-unmodified",
+			"http://oss-cn-beijing.aliyuncs.com",
+			"http://oss-cn-beijing.aliyuncs.com",
+			false,
+		},
+		{
+			"https-unmodified",
+			"https://oss-cn-beijing-internal.aliyuncs.com",
+			"https://oss-cn-beijing-internal.aliyuncs.com",
+			false,
+		},
+		{
+			"public-modified",
+			"oss-cn-beijing.aliyuncs.com",
+			"https://oss-cn-beijing.aliyuncs.com",
+			true,
+		},
+		{
+			"internal-modified",
+			"oss-cn-beijing-internal.aliyuncs.com",
+			"http://oss-cn-beijing-internal.aliyuncs.com",
+			true,
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			url, done := setTransmissionProtocol(tt.originURL)
+			if url != tt.wantURL || done != tt.wantModified {
+				t.Errorf("setTransmissionProtocol(%v) = %v, %v, want %v %v",
+					tt.originURL, url, done, tt.wantURL, tt.wantModified)
+			}
+		})
+	}
+}