enable logback

.github/workflows/module_controller_ci_build_batch_deploy_to_aliyun.yml

@@ -185,7 +185,7 @@ jobs:
             # 使用 kubectl get 命令获取资源对象的详细信息，并提取自定义字段的值
             field_value=$(kubectl get $moduledeploymentname -o custom-columns=PAUSE:.spec.pause --no-headers)
 
-            if [ "$field_value" == "$desired_field_value" ]; then
+            if [ "$field_value" == "0" ]; then
               echo "字段值已满足条件，执行分组确认"
               kubectl patch $moduledeploymentname -p '{"spec":{"pause":false}}' --type=merge
               exit 0
@@ -371,7 +371,7 @@ jobs:
             # 使用 kubectl get 命令获取资源对象的详细信息，并提取自定义字段的值
             field_value=$(kubectl get $moduledeploymentname -o custom-columns=PAUSE:.spec.pause --no-headers)
 
-            if [ "$field_value" == "$desired_field_value" ]; then
+            if [ "$field_value" == "0" ]; then
               echo "字段值已满足条件，执行分组确认"
               kubectl patch $moduledeploymentname -p '{"spec":{"pause":false}}' --type=merge
               exit 0
@@ -442,7 +442,7 @@ jobs:
             echo "缩容失败"
             exit 1
           fi
-          
+
       - name: batch scaleup
         run: |
           kubectl apply -f config/samples/ci/module-deployment_v1alpha1_moduledeployment_batch_provider.yaml
@@ -514,7 +514,7 @@ jobs:
             # 使用 kubectl get 命令获取资源对象的详细信息，并提取自定义字段的值
             field_value=$(kubectl get $moduledeploymentname -o custom-columns=PAUSE:.spec.pause --no-headers)
 
-            if [ "$field_value" == "$desired_field_value" ]; then
+            if [ "$field_value" == "0" ]; then
               echo "字段值已满足条件，执行分组确认"
               kubectl patch $moduledeploymentname -p '{"spec":{"pause":false}}' --type=merge
               exit 0
@@ -699,4 +699,4 @@ jobs:
 
       - name: delete deployment
         run: |
-          kubectl delete -n default deployment dynamic-stock-deployment
+          kubectl delete -n default deployment dynamic-stock-deployment

.github/workflows/module_controller_ci_build_batch_scaleup_then_scaledown_deploy_to_aliyun.yml

@@ -185,7 +185,7 @@ jobs:
             # 使用 kubectl get 命令获取资源对象的详细信息，并提取自定义字段的值
             field_value=$(kubectl get $moduledeploymentname -o custom-columns=PAUSE:.spec.pause --no-headers)
 
-            if [ "$field_value" == "$desired_field_value" ]; then
+            if [ "$field_value" == "0" ]; then
               echo "字段值已满足条件，执行分组确认"
               kubectl patch $moduledeploymentname -p '{"spec":{"pause":false}}' --type=merge
               exit 0
@@ -597,7 +597,7 @@ jobs:
             # 使用 kubectl get 命令获取资源对象的详细信息，并提取自定义字段的值
             field_value=$(kubectl get $moduledeploymentname -o custom-columns=PAUSE:.spec.pause --no-headers)
 
-            if [ "$field_value" == "$desired_field_value" ]; then
+            if [ "$field_value" == "0" ]; then
               echo "字段值已满足条件，执行分组确认"
               kubectl patch $moduledeploymentname -p '{"spec":{"pause":false}}' --type=merge
               exit 0
@@ -756,7 +756,7 @@ jobs:
             # 使用 kubectl get 命令获取资源对象的详细信息，并提取自定义字段的值
             field_value=$(kubectl get $moduledeploymentname -o custom-columns=PAUSE:.spec.pause --no-headers)
 
-            if [ "$field_value" == "$desired_field_value" ]; then
+            if [ "$field_value" == "0" ]; then
               echo "字段值已满足条件，执行分组确认"
               kubectl patch $moduledeploymentname -p '{"spec":{"pause":false}}' --type=merge
               exit 0

.github/workflows/module_controller_ci_build_batch_symmetric_deploy_to_aliyun.yml

@@ -167,7 +167,6 @@ jobs:
         run: |
           # 定义要等待的资源名称和字段值
           moduledeploymentname=$(kubectl get moduledeployment -o name)
-          desired_field_value=true
 
           # 定义等待的超时时间（以秒为单位）
           timeout_seconds=300
@@ -183,11 +182,11 @@ jobs:
             fi
 
             # 使用 kubectl get 命令获取资源对象的详细信息，并提取自定义字段的值
-            field_value=$(kubectl get $moduledeploymentname -o custom-columns=PAUSE:.spec.pause --no-headers)
+            field_value=$(kubectl get $moduledeploymentname -o custom-columns=CONFIRMBATCHNUM:.spec.confirmBatchNum --no-headers)
 
-            if [ "$field_value" == "$desired_field_value" ]; then
+            if [ "$field_value" == "0" ]; then
               echo "字段值已满足条件，执行分组确认"
-              kubectl patch $moduledeploymentname -p '{"spec":{"pause":false}}' --type=merge
+              kubectl patch $moduledeploymentname -p '{"spec":{"confirmBatchNum":1}}' --type=merge
               exit 0
             else
               echo "等待字段值满足条件..."
@@ -213,7 +212,6 @@ jobs:
         run: |
           # 定义要等待的资源名称和字段值
           moduledeploymentname=$(kubectl get moduledeployment -o name)
-          desired_field_value=true
 
           # 定义等待的超时时间（以秒为单位）
           timeout_seconds=300
@@ -229,11 +227,11 @@ jobs:
             fi
 
             # 使用 kubectl get 命令获取资源对象的详细信息，并提取自定义字段的值
-            field_value=$(kubectl get $moduledeploymentname -o custom-columns=PAUSE:.spec.pause --no-headers)
+            field_value=$(kubectl get $moduledeploymentname -o custom-columns=CONFIRMBATCHNUM:.spec.confirmBatchNum --no-headers)
 
-            if [ "$field_value" == "$desired_field_value" ]; then
+            if [ "$field_value" == "1" ]; then
               echo "字段值已满足条件，执行分组确认"
-              kubectl patch $moduledeploymentname -p '{"spec":{"pause":false}}' --type=merge
+              kubectl patch $moduledeploymentname -p '{"spec":{"confirmBatchNum":2}}' --type=merge
               exit 0
             else
               echo "等待字段值满足条件..."

.github/workflows/serverless_runtime_snapshot.yml

@@ -0,0 +1,81 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
+
+name: SOFA Serverless Runtime Snapshot
+
+## https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#release
+## trigger manually
+on:
+  workflow_dispatch:
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up Docker
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            node:14
+
+      - name: Test Env prepare
+        run: |
+          sudo apt-get update >>/tmp/envprepare.out
+          sudo apt-get install -y expect >>/tmp/envprepare.out
+          docker pull mongo:7.0.2-jammy
+          docker run --name mongodb -d -p 27017:27017 -v /home/runner/work/data:/data/db mongo:7.0.2-jammy
+          docker pull zookeeper:3.9.0
+          docker run -p 2181:2181 -it --name zookeeper --restart always -d zookeeper:3.9.0
+          sudo apt-get install redis-server -y
+          sudo systemctl start redis-server
+          sudo cp .github/workflows/ccbin/arkctl /usr/bin/arkctl
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+
+      - name: Build with Maven
+        working-directory: sofa-serverless-runtime
+        run: mvn clean install -DskipTests -B -U -e
+
+      - name: get sofa-runtime version & update sofa-runtime version for all test sample app
+        run: |
+          serverless_runtime_version=$(find sofa-serverless-runtime/sofa-serverless-common -name "*.jar" |grep -v source |sed "s/.*sofa-serverless-common-\(.*\).jar/\1/")
+          echo "升级sofa-runtime version to $serverless_runtime_version"
+          for testsample in `find samples -name "*[3]-samples"`;do  sed -i "s/<sofa.serverless.runtime.version>.*<\/sofa.serverless.runtime.version>/<sofa.serverless.runtime.version>$serverless_runtime_version<\/sofa.serverless.runtime.version>/g"  $testsample/pom.xml ;done
+          for testsample in `find samples -name "*[3]-samples"`;do if cat $testsample/pom.xml |grep "<sofa.serverless.runtime.version>"|grep $serverless_runtime_version;then echo "版本校验通过";else echo "版本校验失败";exit 1;fi;done
+
+      - name: Run jdk17 serverless runtime test
+        run: |
+          set -e
+          bash .github/workflows/ccbin/start.sh jdk17
+
+  snapshot_for_jdk17:
+    needs: build_and_test
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+          cache: maven
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+          gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase
+      - name: Build with Maven
+        run: mvn --batch-mode deploy -DskipTests -Psnapshot
+        working-directory: sofa-serverless-runtime
+        env:
+          MAVEN_USERNAME: ${{ secrets.MAVEN_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}

README.md

@@ -2,7 +2,8 @@
 ![license](https://img.shields.io/badge/license-Apache--2.0-green.svg)
 ![Maven Central](https://img.shields.io/maven-central/v/com.alipay.sofa.serverless/sofa-serverless-runtime)
 
-完整产品介绍欢迎查阅 [SOFAServerless 官网](https://sofaserverless.gitee.io/home/)
+SOFAServerless 品牌全新升级为 Koupleless，欢迎访问全新 GitHub 地址：https://github.com/koupleless/koupleless
+完整产品介绍欢迎查阅 [Koupleless 全新官网](https://koupleless.gitee.io/home/)
 
 <br/>
 

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,