Merge branch 'main' into zhenjunMa-patch-1

mosn · Feb 26, 2024 · a3307a2 · a3307a2
2 parents f90d603 + 94fc2ed
commit a3307a2
Show file tree

Hide file tree

Showing 203 changed files with 14,258 additions and 1,795 deletions.
diff --git a/.github/dead_link_check_config.json b/.github/dead_link_check_config.json
@@ -15,6 +15,9 @@
     {
       "pattern": "^https://docs.buf.build/"
     },
+    {
+      "pattern":"^https://techhenzy.com/proxy-webassembly-architecture/"
+    },
     {
       "pattern": "^#"
     }
@@ -33,13 +36,12 @@
       "replacement": "http://localhost:3000/#/en/"
     }
   ],
-  "timeout": "3s",
+  "timeout": "10s",
   "retryOn429": true,
   "retryCount": 2,
-  "fallbackRetryDelay": "1s",
+  "fallbackRetryDelay": "10s",
   "aliveStatusCodes": [
-    200,
-    401,
-    403
+    200,  
+    401
   ]
 }
diff --git a/.github/workflows/cloud_code_scan.yml b/.github/workflows/cloud_code_scan.yml
@@ -0,0 +1,24 @@
+name: Alipay Cloud Devops Codescan
+on:
+  pull_request_target:
+jobs:
+  stc:   #安全扫描
+    runs-on: ubuntu-latest
+    steps:
+      - name: codeScan
+        uses: layotto/alipay-cloud-devops-codescan@main
+        with:
+          parent_uid: ${{ secrets.ALI_PID }}
+          private_key: ${{ secrets.ALI_PK }}
+          scan_type: stc
+          tips: '可以加入钉钉群：31912621  来申请查看权限'
+  sca:   # 开源合规
+    runs-on: ubuntu-latest
+    steps:
+      - name: codeScan
+        uses: layotto/alipay-cloud-devops-codescan@main
+        with:
+          parent_uid: ${{ secrets.ALI_PID }}
+          private_key: ${{ secrets.ALI_PK }}
+          scan_type: sca
+          tips: '可以加入钉钉群：31912621  来申请查看权限'
diff --git a/.github/workflows/layotto-ci.yml b/.github/workflows/layotto-ci.yml
@@ -272,6 +272,12 @@ jobs:
       - name: Push Image to DockerHub
         run: |
           make image.push.linux_amd64.layotto VERSION=latest
+      - name: Build layotto/layotto_injector:latest Image
+        run: |
+          make image.build.linux_amd64.layotto_injector VERSION=latest
+      - name: Push layotto/layotto_injector:latest Image to DockerHub
+        run: |
+          make image.push.linux_amd64.layotto_injector VERSION=latest
       - name: Build layotto/proxyv2:latest Image
         run: |
           make image.proxyv2.build VERSION=latest
@@ -280,7 +286,7 @@ jobs:
           make image.proxyv2.push VERSION=latest
 
   build-push-linux-arm64-image:
-    name: "Linux ARMD64 Image"
+    name: "Linux ARM64 Image"
     needs: [build-wasm-binary-linux-amd64-artifact,build-binary-linux-arm64-artifact,build-binary-linux-amd64-artifact,build-binary-darwin-amd64-artifact,build-binary-darwin-arm64-artifact]
     if: github.ref_name == 'main'
     runs-on: ubuntu-latest
@@ -302,3 +308,26 @@ jobs:
       - name: Push Image to DockerHub
         run: |
           make image.push.linux_arm64.layotto VERSION=latest
+      - name: Build layotto/layotto_injector:latest Image
+        run: |
+          make image.build.linux_arm64.layotto_injector VERSION=latest
+      - name: Push layotto/layotto_injector:latest Image to DockerHub
+        run: |
+          make image.push.linux_arm64.layotto_injector VERSION=latest
+
+  package-push-injector-helm-chart:
+    name: "Layotto Injector Helm Chart"
+    if: github.ref_name == 'main'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Package and Push Layotto Injector Latest Helm Chart
+        run: |
+          CHART_VERSION=v0.0.0-latest APP_VERSION=latest make helm-package
+          CHART_VERSION=v0.0.0-latest APP_VERSION=latest make helm-push
diff --git a/.github/workflows/layotto-release.yml b/.github/workflows/layotto-release.yml
@@ -305,9 +305,15 @@ jobs:
       - name: Push Image to DockerHub
         run: |
           make image.push.linux_amd64.layotto 
+      - name: Build Layotto Injector Latest Image
+        run: |
+          make image.build.linux_amd64.layotto_injector
+      - name: Push Layotto Injector Latest Image to DockerHub
+        run: |
+          make image.push.linux_amd64.layotto_injector
 
   build-push-linux-arm64-image:
-    name: "Linux ARMD64 Image"
+    name: "Linux ARM64 Image"
     needs: [build-wasm-binary-linux-amd64-artifact,build-binary-linux-arm64-artifact,build-binary-linux-amd64-artifact,build-binary-darwin-amd64-artifact,build-binary-darwin-arm64-artifact]
     runs-on: ubuntu-latest
     steps:
@@ -328,3 +334,25 @@ jobs:
       - name: Push Image to DockerHub
         run: |
           make image.push.linux_arm64.layotto 
+      - name: Build Layotto Injector Latest Image
+        run: |
+          make image.build.linux_arm64.layotto_injector
+      - name: Push Layotto Injector Latest Image to DockerHub
+        run: |
+          make image.push.linux_arm64.layotto_injector
+
+  package-push-injector-helm-chart:
+    name: "Layotto Injector Helm Chart"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Package and Push Injector Latest Helm Chart
+        run: |
+          make helm-package
+          make helm-push
diff --git a/Makefile b/Makefile
@@ -30,4 +30,4 @@
 _run:
 	@$(MAKE) --warn-undefined-variables -f make/common.mk $(MAKECMDGOALS)
 .PHONY: _run
-$(if $(MAKECMDGOALS),$(MAKECMDGOALS): %: _run)
+$(if $(MAKECMDGOALS),$(MAKECMDGOALS): %: _run)
diff --git a/README.md b/README.md
@@ -127,7 +127,7 @@ Layotto enriches the <a href="https://landscape.cncf.io/serverless">CNCF CLOUD N
 
 | Platform                                               | Link                                                                                                                                                                           |
 | :----------------------------------------------------- | :----------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| 💬 [DingTalk](https://www.dingtalk.com/en) (preferred) | Search the group number: 31912621 or scan the QR code below <br> <img src="https://gw.alipayobjects.com/mdn/rms_5891a1/afts/img/A*HUKsSrFthtUAAAAAAAAAAAAAARQnAQ" height="200px"> |
+| 💬 [DingTalk](https://www.dingtalk.com/en) (preferred) | Search the group number: 31912621 or scan the QR code below <br> <img src="https://img.alicdn.com/imgextra/i2/O1CN01SjbQiK21NgcAxArxq_!!6000000006973-0-tps-900-912.jpg" height="200px"> |
 
 [comment]: <> (| 💬 [Wechat]&#40;https://www.wechat.com/en/&#41; | Scan the QR code below and she will invite you into the wechat group <br> <img src="/img/wechat-group.jpg" height="200px">)
 

diff --git a/cmd/layotto/main.go b/cmd/layotto/main.go
@@ -23,6 +23,12 @@ import (
 	"strconv"
 	"time"
 
+	"mosn.io/layotto/components/sms"
+
+	"mosn.io/layotto/components/cryption"
+
+	"mosn.io/layotto/components/email"
+
 	"mosn.io/layotto/pkg/grpc/lifecycle"
 
 	"mosn.io/layotto/components/oss"
@@ -37,8 +43,13 @@ import (
 
 	"mosn.io/mosn/pkg/istio"
 
+	aliyun_cryption "mosn.io/layotto/components/cryption/aliyun"
+	aws_cryption "mosn.io/layotto/components/cryption/aws"
 	aliyun_file "mosn.io/layotto/components/file/aliyun"
 
+	aliyun_email "mosn.io/layotto/components/email/aliyun"
+	tencentcloud_sms "mosn.io/layotto/components/sms/tencentcloud"
+
 	"github.com/dapr/components-contrib/secretstores"
 	"github.com/dapr/components-contrib/secretstores/aws/parameterstore"
 	"github.com/dapr/components-contrib/secretstores/aws/secretmanager"
@@ -65,6 +76,7 @@ import (
 	"mosn.io/pkg/log"
 
 	"mosn.io/layotto/components/configstores/etcdv3"
+	"mosn.io/layotto/components/configstores/nacos"
 	"mosn.io/layotto/components/file"
 	"mosn.io/layotto/components/sequencer"
 	"mosn.io/layotto/pkg/runtime/bindings"
@@ -278,6 +290,7 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 		runtime.WithConfigStoresFactory(
 			configstores.NewStoreFactory("apollo", apollo.NewStore),
 			configstores.NewStoreFactory("etcd", etcdv3.NewStore),
+			configstores.NewStoreFactory("nacos", nacos.NewStore),
 		),
 
 		// RPC
@@ -300,6 +313,20 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 			oss.NewFactory("ceph", ceph_oss.NewCephOss),
 			oss.NewFactory("huaweicloud.oss", huaweicloud_oss.NewHuaweicloudOSS),
 		),
+		// Cryption
+		runtime.WithCryptionServiceFactory(
+			cryption.NewFactory("aliyun.kms", aliyun_cryption.NewCryption),
+			cryption.NewFactory("aws.kms", aws_cryption.NewCryption),
+		),
+
+		// Email
+		runtime.WithEmailServiceFactory(
+			email.NewFactory("aliyun.email", aliyun_email.NewAliyunEmail),
+		),
+		// Sms
+		runtime.WithSmsServiceFactory(
+			sms.NewFactory("tencentcloud.sms", tencentcloud_sms.NewSms),
+		),
 		// PubSub
 		runtime.WithPubSubFactory(
 			pubsub.NewFactory("redis", func() dapr_comp_pubsub.PubSub {

diff --git a/cmd/layotto_injector/main.go b/cmd/layotto_injector/main.go
@@ -0,0 +1,23 @@
+package main
+
+import (
+	log "github.com/sirupsen/logrus"
+
+	"mosn.io/layotto/pkg/injector/service"
+)
+
+func main() {
+	cfg, err := service.GetConfig()
+	if err != nil {
+		log.Fatalf("Error getting config: %v", err)
+	}
+	inj, err := service.NewInjector(cfg)
+	if err != nil {
+		log.Fatalf("Error creating layotto-injector: %v", err)
+	}
+	err = inj.Run()
+	if err != nil {
+		log.Fatalf("Error running layotto-injector: %v", err)
+	}
+	log.Info("Layotto sidecar injector shutdown gracefully")
+}
diff --git a/cmd/layotto_multiple_api/main.go b/cmd/layotto_multiple_api/main.go
@@ -23,6 +23,13 @@ import (
 	"strconv"
 	"time"
 
+	"mosn.io/layotto/components/sms"
+
+	"mosn.io/layotto/components/cryption"
+	aliyun_cryption "mosn.io/layotto/components/cryption/aliyun"
+	aws_cryption "mosn.io/layotto/components/cryption/aws"
+	tencentcloud_sms "mosn.io/layotto/components/sms/tencentcloud"
+
 	"mosn.io/layotto/pkg/grpc/lifecycle"
 
 	huaweicloud_oss "mosn.io/layotto/components/oss/huaweicloud"
@@ -85,6 +92,7 @@ import (
 	// Configuration
 	"mosn.io/layotto/components/configstores"
 	"mosn.io/layotto/components/configstores/apollo"
+	"mosn.io/layotto/components/configstores/nacos"
 
 	// Pub/Sub
 	dapr_comp_pubsub "github.com/dapr/components-contrib/pubsub"
@@ -288,6 +296,7 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 		runtime.WithConfigStoresFactory(
 			configstores.NewStoreFactory("apollo", apollo.NewStore),
 			configstores.NewStoreFactory("etcd", etcdv3.NewStore),
+			configstores.NewStoreFactory("nacos", nacos.NewStore),
 		),
 
 		// RPC
@@ -413,6 +422,15 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 				return state_mysql.NewMySQLStateStore(loggerForDaprComp)
 			}),
 		),
+		// Cryption
+		runtime.WithCryptionServiceFactory(
+			cryption.NewFactory("aliyun.kms", aliyun_cryption.NewCryption),
+			cryption.NewFactory("aws.kms", aws_cryption.NewCryption),
+		),
+		// Sms
+		runtime.WithSmsServiceFactory(
+			sms.NewFactory("tencentcloud.sms", tencentcloud_sms.NewSms),
+		),
 		// Lock
 		runtime.WithLockFactory(
 			runtime_lock.NewFactory("redis_cluster", func() lock.LockStore {

diff --git a/cmd/layotto_without_xds/main.go b/cmd/layotto_without_xds/main.go
@@ -23,6 +23,13 @@ import (
 	"strconv"
 	"time"
 
+	"mosn.io/layotto/components/sms"
+
+	"mosn.io/layotto/components/cryption"
+	aliyun_cryption "mosn.io/layotto/components/cryption/aliyun"
+	aws_cryption "mosn.io/layotto/components/cryption/aws"
+	tencentcloud_sms "mosn.io/layotto/components/sms/tencentcloud"
+
 	"mosn.io/layotto/pkg/grpc/lifecycle"
 
 	"mosn.io/layotto/components/oss"
@@ -63,6 +70,7 @@ import (
 	"mosn.io/pkg/log"
 
 	"mosn.io/layotto/components/configstores/etcdv3"
+	"mosn.io/layotto/components/configstores/nacos"
 	"mosn.io/layotto/components/file"
 	"mosn.io/layotto/components/sequencer"
 	"mosn.io/layotto/pkg/runtime/bindings"
@@ -261,6 +269,7 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 		runtime.WithConfigStoresFactory(
 			configstores.NewStoreFactory("apollo", apollo.NewStore),
 			configstores.NewStoreFactory("etcd", etcdv3.NewStore),
+			configstores.NewStoreFactory("nacos", nacos.NewStore),
 		),
 
 		// RPC
@@ -417,7 +426,15 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 			oss.NewFactory("ceph", ceph_oss.NewCephOss),
 			oss.NewFactory("huaweicloud.oss", huaweicloud_oss.NewHuaweicloudOSS),
 		),
-
+		// Cryption
+		runtime.WithCryptionServiceFactory(
+			cryption.NewFactory("aliyun.kms", aliyun_cryption.NewCryption),
+			cryption.NewFactory("aws.kms", aws_cryption.NewCryption),
+		),
+		// Sms
+		runtime.WithSmsServiceFactory(
+			sms.NewFactory("tencentcloud.sms", tencentcloud_sms.NewSms),
+		),
 		// Sequencer
 		runtime.WithSequencerFactory(
 			runtime_sequencer.NewFactory("etcd", func() sequencer.Store {