Adapt windows

arkctl/common/fileutil/file_util.go

@@ -17,6 +17,7 @@ package fileutil
 import (
 	"context"
 	"fmt"
+	"serverless.alipay.com/sofa-serverless/arkctl/common/osutil"
 	"strings"
 )
 
@@ -25,8 +26,7 @@ type FileUrl string
 
 func (url FileUrl) GetFileUrlType() FileUrlType {
 	switch {
-	// start with file:// then it's a local file
-	case strings.HasPrefix(string(url), "file://"):
+	case strings.HasPrefix(string(url), osutil.GetLocalFileProtocol()):
 		return FileUrlTypeLocal
 
 	default:

arkctl/common/osutil/os_util.go

@@ -0,0 +1,32 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package osutil
+
+import (
+	"runtime"
+	"strings"
+)
+
+func IsWindows() bool {
+	return strings.HasPrefix(strings.ToLower(runtime.GOOS), "win")
+}
+
+func GetLocalFileProtocol() string {
+	if IsWindows() {
+		return "file:///"
+	} else {
+		return "file://"
+	}
+}

arkctl/v1/cmd/deploy/deploy.go

@@ -23,6 +23,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"serverless.alipay.com/sofa-serverless/arkctl/common/osutil"
 	"strings"
 
 	"serverless.alipay.com/sofa-serverless/arkctl/common/cmdutil"
@@ -146,7 +147,7 @@ func execMavenBuild(ctx *contextutil.Context) bool {
 
 func execParseBizModel(ctx *contextutil.Context) bool {
 	style.InfoPrefix("Stage").Println("ParseBizModel")
-	bundlePath := "file://" + defaultArg
+	bundlePath := osutil.GetLocalFileProtocol() + defaultArg
 	if doBuild {
 		searchdir := defaultArg
 		if subBundlePath != "" {
@@ -164,7 +165,7 @@ func execParseBizModel(ctx *contextutil.Context) bool {
 			pterm.Error.Println("can not find pre built biz bundle in build dir!")
 			return false
 		}
-		bundlePath = "file://" + bundlePath
+		bundlePath = osutil.GetLocalFileProtocol() + bundlePath
 	}
 
 	bizModel, err := ark.ParseBizModel(ctx, fileutil.FileUrl(bundlePath))
@@ -289,7 +290,7 @@ func execInstallInKubePod(ctx *contextutil.Context) bool {
 		string(runtime.Must(json.Marshal(ark.BizModel{
 			BizName:    bizModel.BizName,
 			BizVersion: bizModel.BizVersion,
-			BizUrl:     fileutil.FileUrl("file://" + ctx.Value(ctxKeyArkBizBundlePathInSidePod).(string)),
+			BizUrl:     fileutil.FileUrl(osutil.GetLocalFileProtocol() + ctx.Value(ctxKeyArkBizBundlePathInSidePod).(string)),
 		}))),
 		fmt.Sprintf("http://127.0.0.1:%v/installBiz", portFlag),
 	)

arkctl/v1/service/ark/biz_util.go

@@ -18,6 +18,7 @@ import (
 	"archive/zip"
 	"context"
 	"fmt"
+	"serverless.alipay.com/sofa-serverless/arkctl/common/osutil"
 	"strings"
 
 	"serverless.alipay.com/sofa-serverless/arkctl/common/fileutil"
@@ -37,8 +38,7 @@ func parseJarBizModel(ctx context.Context, bizUrl fileutil.FileUrl) (*BizModel,
 		return nil, err
 	}
 
-	// remove file:// prefix
-	zipReader, err := zip.OpenReader(localPath[7:])
+	zipReader, err := zip.OpenReader(localPath[len(osutil.GetLocalFileProtocol()):])
 	if err != nil {
 		return nil, err
 	}

arkctl/v1/service/ark/biz_util_test.go

@@ -21,6 +21,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"serverless.alipay.com/sofa-serverless/arkctl/common/osutil"
 	"strings"
 	"testing"
 
@@ -74,5 +75,5 @@ func TestParseBizModel_LocalJar(t *testing.T) {
 
 	assert.Equal(t, model.BizName, "testName")
 	assert.Equal(t, model.BizVersion, "version")
-	assert.Equal(t, model.BizUrl, fileutil.FileUrl("file://"+zipFilePath))
+	assert.Equal(t, model.BizUrl, fileutil.FileUrl(osutil.GetLocalFileProtocol()+zipFilePath))
 }

arkctl/v1/service/ark/service_test.go

@@ -19,6 +19,8 @@ import (
 	"encoding/json"
 	"net"
 	"net/http"
+	"serverless.alipay.com/sofa-serverless/arkctl/common/fileutil"
+	"serverless.alipay.com/sofa-serverless/arkctl/common/osutil"
 	"testing"
 
 	"github.com/sirupsen/logrus"
@@ -123,7 +125,7 @@ func TestInstallBiz_NoServer(t *testing.T) {
 		BizModel: BizModel{
 			BizName:    "biz",
 			BizVersion: "0.0.1-SNAPSHOT",
-			BizUrl:     "file:///foobar",
+			BizUrl:     fileutil.FileUrl(osutil.GetLocalFileProtocol() + "/foobar"),
 		},
 		TargetContainer: ArkContainerRuntimeInfo{
 			RunType: ArkContainerRunTypeLocal,

sofa-serverless-runtime/arklet-core/pom.xml

@@ -17,6 +17,11 @@
             <groupId>com.alipay.sofa</groupId>
             <artifactId>sofa-ark-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.alipay.sofa.serverless</groupId>
+            <artifactId>sofa-serverless-common</artifactId>
+            <version>${revision}</version>
+        </dependency>
 
         <dependency>
             <groupId>com.github.oshi</groupId>

sofa-serverless-runtime/arklet-core/src/main/java/com/alipay/sofa/serverless/arklet/core/common/model/BatchInstallRequest.java

@@ -23,8 +23,8 @@
 
 /**
  * 合并部署请求。
- * @author gouzhendong.gzd
- * @version $Id: BatchInstallRequest, v 0.1 2023-11-20 15:21 gouzhendong.gzd Exp $
+ * @author CodeNoobKingKc2
+ * @version $Id: BatchInstallRequest, v 0.1 2023-11-20 15:21 CodeNoobKingKc2 Exp $
  */
 @NoArgsConstructor
 @AllArgsConstructor

sofa-serverless-runtime/arklet-core/src/main/java/com/alipay/sofa/serverless/arklet/core/common/model/BatchInstallResponse.java

@@ -27,8 +27,8 @@
 
 /**
  * 合并部署响应。
- * @author gouzhendong.gzd
- * @version $Id: BatchInstallResponse, v 0.1 2023-11-20 15:19 gouzhendong.gzd Exp $
+ * @author CodeNoobKingKc2
+ * @version $Id: BatchInstallResponse, v 0.1 2023-11-20 15:19 CodeNoobKingKc2 Exp $
  */
 @NoArgsConstructor
 @AllArgsConstructor

sofa-serverless-runtime/arklet-core/src/main/java/com/alipay/sofa/serverless/arklet/core/ops/BatchInstallHelper.java

@@ -32,8 +32,8 @@
 
 /**
  * 合并部署帮助类。
- * @author gouzhendong.gzd
- * @version $Id: BatchInstallService, v 0.1 2023-11-20 15:35 gouzhendong.gzd Exp $
+ * @author CodeNoobKingKc2
+ * @version $Id: BatchInstallService, v 0.1 2023-11-20 15:35 CodeNoobKingKc2 Exp $
  */
 public class BatchInstallHelper {
 

sofa-serverless-runtime/arklet-core/src/main/java/com/alipay/sofa/serverless/arklet/core/ops/UnifiedOperationServiceImpl.java

@@ -33,6 +33,7 @@
 import com.alipay.sofa.serverless.arklet.core.common.log.ArkletLoggerFactory;
 import com.alipay.sofa.serverless.arklet.core.common.model.BatchInstallRequest;
 import com.alipay.sofa.serverless.arklet.core.common.model.BatchInstallResponse;
+import com.alipay.sofa.serverless.common.util.OSUtils;
 import com.google.inject.Singleton;
 
 /**
@@ -67,7 +68,8 @@ public ClientResponse safeBatchInstall(String bizUrl) {
             BizOperation bizOperation = new BizOperation()
                 .setOperationType(BizOperation.OperationType.INSTALL);
 
-            bizOperation.putParameter(Constants.CONFIG_BIZ_URL, "file://" + bizUrl);
+            bizOperation.putParameter(Constants.CONFIG_BIZ_URL,
+                OSUtils.getLocalFileProtocolPrefix() + bizUrl);
             Map<String, Object> mainAttributes = batchInstallHelper.getMainAttributes(bizUrl);
             bizOperation.setBizName((String) mainAttributes.get(Constants.ARK_BIZ_NAME));
             bizOperation.setBizVersion((String) mainAttributes.get(Constants.ARK_BIZ_VERSION));

sofa-serverless-runtime/arklet-core/src/test/java/com/alipay/sofa/serverless/arklet/core/component/UnifiedOperationServiceImplTests.java

@@ -133,12 +133,9 @@ public void testBatchInstall() {
         BatchInstallResponse response = unifiedOperationService.batchInstall(BatchInstallRequest
             .builder().bizDirAbsolutePath("/path/to/biz").build());
 
-        Assert.assertTrue(response.getBizUrlToResponse().
+        Assert.assertTrue(response.getBizUrlToResponse().containsKey("/file/a-biz.jar"));
 
-        containsKey("/file/a-biz.jar"));
-        Assert.assertTrue(response.getBizUrlToResponse().
-
-        containsKey("/file/b-biz.jar"));
+        Assert.assertTrue(response.getBizUrlToResponse().containsKey("/file/b-biz.jar"));
 
     }
 }

sofa-serverless-runtime/arklet-core/src/test/java/com/alipay/sofa/serverless/arklet/core/ops/BatchInstallHelperTest.java

@@ -43,8 +43,8 @@
 
 /**
  *
- * @author gouzhendong.gzd
- * @version $Id: BatchInstallHelper, v 0.1 2023-11-22 10:59 gouzhendong.gzd Exp $
+ * @author CodeNoobKingKc2
+ * @version $Id: BatchInstallHelper, v 0.1 2023-11-22 10:59 CodeNoobKingKc2 Exp $
  */
 @RunWith(MockitoJUnitRunner.class)
 public class BatchInstallHelperTest {

sofa-serverless-runtime/sofa-serverless-base-plugin/src/main/java/com/alipay/sofa/serverless/plugin/manager/listener/StaticBatchInstallEventListener.java

@@ -37,8 +37,8 @@
 
 /**
  *
- * @author gouzhendong.gzd
- * @version $Id: ApplicationContextEventListener, v 0.1 2023-11-21 11:26 gouzhendong.gzd Exp $
+ * @author CodeNoobKingKc2
+ * @version $Id: ApplicationContextEventListener, v 0.1 2023-11-21 11:26 CodeNoobKingKc2 Exp $
  */
 public class StaticBatchInstallEventListener implements
                                             ApplicationListener<ApplicationContextEvent> {

sofa-serverless-runtime/sofa-serverless-base-plugin/src/test/java/com/alipay/sofa/serverless/plugin/manager/listener/StaticBatchInstallEventListenerTest.java

@@ -42,8 +42,8 @@
 
 /**
  *
- * @author gouzhendong.gzd
- * @version $Id: ApplicationContextEventListenerTest, v 0.1 2023-11-21 11:32 gouzhendong.gzd Exp $
+ * @author CodeNoobKingKc2
+ * @version $Id: ApplicationContextEventListenerTest, v 0.1 2023-11-21 11:32 CodeNoobKingKc2 Exp $
  */
 @RunWith(MockitoJUnitRunner.class)
 public class StaticBatchInstallEventListenerTest {

sofa-serverless-runtime/sofa-serverless-common/src/main/java/com/alipay/sofa/serverless/common/util/OSUtils.java

@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alipay.sofa.serverless.common.util;
+
+/**
+ * @author CodeNoobKing
+ * @data 2024/1/22
+ */
+public class OSUtils {
+
+    static String OS_NAME_KEY = "os.name"; // 操作系统名称。
+
+    /**
+     * 获取本地文件协议前缀。
+     *
+     * @return 本地文件协议前缀。
+     */
+    public static String getLocalFileProtocolPrefix() {
+        String os = System.getProperty(OS_NAME_KEY);
+        if (os.toLowerCase().startsWith("win")) {
+            return "file:///";
+        } else {
+            return "file://";
+        }
+    }
+}

sofa-serverless-runtime/sofa-serverless-common/src/test/java/com/alipay/sofa/serverless/common/util/OSUtilsTest.java

@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alipay.sofa.serverless.common.util;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * @author CodeNoobKing
+ * @data 2024/1/22
+ */
+public class OSUtilsTest {
+
+    @Test
+    public void testGetLocalFileProtocolPrefix() {
+        try {
+            OSUtils.OS_NAME_KEY = "mock.os.name";
+            System.setProperty("mock.os.name", "Windows 7");
+            Assert.assertEquals("file:///", OSUtils.getLocalFileProtocolPrefix());
+
+            System.setProperty("mock.os.name", "Linux");
+            Assert.assertEquals("file://", OSUtils.getLocalFileProtocolPrefix());
+
+            System.setProperty("mock.os.name", "Mac OS X");
+            Assert.assertEquals("file://", OSUtils.getLocalFileProtocolPrefix());
+        } finally {
+            OSUtils.OS_NAME_KEY = "os.name";
+        }
+
+    }
+}