refactor: dependency on the dapr api

.github/workflows/layotto-ci.yml

@@ -44,21 +44,23 @@ jobs:
   golangci-lint:
     name: "Go CI Linter"
     needs: [style-check,resolve-modules]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix: ${{ fromJson(needs.resolve-modules.outputs.matrix) }}
     steps:
     - uses: actions/checkout@v3
     - name: Set up Go
-      uses: actions/setup-go@v3
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.18.5
+        go-version: '1.21'
+      env:
+        GO111MODULE: off
     - name: Go Lint Test
       uses: golangci/golangci-lint-action@v3
       with:
-        version: v1.46.2
+        version: v1.61.0
         working-directory: ${{ matrix.workdir }}
-        args: "--out-${NO_FUTURE}format colored-line-number"
+        args: "--timeout 5m --out-${NO_FUTURE}format colored-line-number"
 
   go-unit-test:
     name: "Go Unit Test"
@@ -330,4 +332,4 @@ jobs:
       - 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
+          CHART_VERSION=v0.0.0-latest APP_VERSION=latest make helm-push

.github/workflows/layotto-release.yml

@@ -32,21 +32,21 @@ jobs:
   golangci-lint:
     name: "Go CI Linter"
     needs: [ style-check,resolve-modules ]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       matrix: ${{ fromJson(needs.resolve-modules.outputs.matrix) }}
     steps:
       - uses: actions/checkout@v3
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
-          go-version: 1.18.5
+          go-version: '1.21'
       - name: Go Lint Test
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.46.2
+          version: v1.61.0
           working-directory: ${{ matrix.workdir }}
-          args: "--out-${NO_FUTURE}format colored-line-number"
+          args: "--timeout 5m --out-${NO_FUTURE}format colored-line-number"
 
   go-unit-test:
     name: "Go Unit Test"

.golangci.yml

@@ -2,13 +2,6 @@ run :
   deadline : 10m
   tests : true
   modules-download-mode : readonly
-  skip-dirs :
-    - spec/proto
-    - pkg/mock
-  skip-files :
-    - .pb.go
-    - rpc/invoker/mosn/transport_protocol/bolt.go
-
 
 linters :
   disable-all : true
@@ -36,6 +29,12 @@ issues :
     - linters :
         - staticcheck
       text : "SA1019:"
+  exclude-dirs :
+    - spec/proto
+    - pkg/mock
+  exclude-files :
+    - .pb.go
+    - rpc/invoker/mosn/transport_protocol/bolt.go
 
 linters-settings :
   goconst :

cmd/layotto/main.go

@@ -95,11 +95,11 @@ import (
 	pubsub_snssqs "github.com/dapr/components-contrib/pubsub/aws/snssqs"
 	pubsub_eventhubs "github.com/dapr/components-contrib/pubsub/azure/eventhubs"
 	pubsub_gcp "github.com/dapr/components-contrib/pubsub/gcp/pubsub"
-	pubsub_hazelcast "github.com/dapr/components-contrib/pubsub/hazelcast"
+
 	pubsub_inmemory "github.com/dapr/components-contrib/pubsub/in-memory"
 	pubsub_kafka "github.com/dapr/components-contrib/pubsub/kafka"
-	pubsub_mqtt "github.com/dapr/components-contrib/pubsub/mqtt"
-	"github.com/dapr/components-contrib/pubsub/natsstreaming"
+	pubsub_mqtt3 "github.com/dapr/components-contrib/pubsub/mqtt3"
+
 	pubsub_pulsar "github.com/dapr/components-contrib/pubsub/pulsar"
 	"github.com/dapr/components-contrib/pubsub/rabbitmq"
 	pubsub_redis "github.com/dapr/components-contrib/pubsub/redis"
@@ -117,19 +117,21 @@ import (
 	"github.com/dapr/components-contrib/state"
 	"github.com/dapr/components-contrib/state/aerospike"
 	state_dynamodb "github.com/dapr/components-contrib/state/aws/dynamodb"
-	state_azure_blobstorage "github.com/dapr/components-contrib/state/azure/blobstorage"
+
+	state_azure_blobstorage "github.com/dapr/components-contrib/state/azure/blobstorage/v1"
 	state_cosmosdb "github.com/dapr/components-contrib/state/azure/cosmosdb"
 	state_azure_tablestorage "github.com/dapr/components-contrib/state/azure/tablestorage"
 	"github.com/dapr/components-contrib/state/cassandra"
-	"github.com/dapr/components-contrib/state/cloudstate"
+
 	"github.com/dapr/components-contrib/state/couchbase"
 	"github.com/dapr/components-contrib/state/gcp/firestore"
 	"github.com/dapr/components-contrib/state/hashicorp/consul"
 	"github.com/dapr/components-contrib/state/hazelcast"
 	"github.com/dapr/components-contrib/state/memcached"
 	"github.com/dapr/components-contrib/state/mongodb"
 	state_mysql "github.com/dapr/components-contrib/state/mysql"
-	"github.com/dapr/components-contrib/state/postgresql"
+
+	state_postgresql "github.com/dapr/components-contrib/state/postgresql/v1"
 	state_redis "github.com/dapr/components-contrib/state/redis"
 	"github.com/dapr/components-contrib/state/rethinkdb"
 	"github.com/dapr/components-contrib/state/sqlserver"
@@ -332,9 +334,6 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 			pubsub.NewFactory("redis", func() dapr_comp_pubsub.PubSub {
 				return pubsub_redis.NewRedisStreams(loggerForDaprComp)
 			}),
-			pubsub.NewFactory("natsstreaming", func() dapr_comp_pubsub.PubSub {
-				return natsstreaming.NewNATSStreamingPubSub(loggerForDaprComp)
-			}),
 			pubsub.NewFactory("azure.eventhubs", func() dapr_comp_pubsub.PubSub {
 				return pubsub_eventhubs.NewAzureEventHubs(loggerForDaprComp)
 			}),
@@ -344,9 +343,6 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 			pubsub.NewFactory("rabbitmq", func() dapr_comp_pubsub.PubSub {
 				return rabbitmq.NewRabbitMQ(loggerForDaprComp)
 			}),
-			pubsub.NewFactory("hazelcast", func() dapr_comp_pubsub.PubSub {
-				return pubsub_hazelcast.NewHazelcastPubSub(loggerForDaprComp)
-			}),
 			pubsub.NewFactory("gcp.pubsub", func() dapr_comp_pubsub.PubSub {
 				return pubsub_gcp.NewGCPPubSub(loggerForDaprComp)
 			}),
@@ -357,7 +353,7 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 				return pubsub_snssqs.NewSnsSqs(loggerForDaprComp)
 			}),
 			pubsub.NewFactory("mqtt", func() dapr_comp_pubsub.PubSub {
-				return pubsub_mqtt.NewMQTTPubSub(loggerForDaprComp)
+				return pubsub_mqtt3.NewMQTTPubSub(loggerForDaprComp)
 			}),
 			pubsub.NewFactory("pulsar", func() dapr_comp_pubsub.PubSub {
 				return pubsub_pulsar.NewPulsar(loggerForDaprComp)
@@ -402,17 +398,14 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 				return firestore.NewFirestoreStateStore(loggerForDaprComp)
 			}),
 			runtime_state.NewFactory("postgresql", func() state.Store {
-				return postgresql.NewPostgreSQLStateStore(loggerForDaprComp)
+				return state_postgresql.NewPostgreSQLStateStore(loggerForDaprComp)
 			}),
 			runtime_state.NewFactory("sqlserver", func() state.Store {
-				return sqlserver.NewSQLServerStateStore(loggerForDaprComp)
+				return sqlserver.New(loggerForDaprComp)
 			}),
 			runtime_state.NewFactory("hazelcast", func() state.Store {
 				return hazelcast.NewHazelcastStore(loggerForDaprComp)
 			}),
-			runtime_state.NewFactory("cloudstate.crdt", func() state.Store {
-				return cloudstate.NewCRDT(loggerForDaprComp)
-			}),
 			runtime_state.NewFactory("couchbase", func() state.Store {
 				return couchbase.NewCouchbaseStateStore(loggerForDaprComp)
 			}),
@@ -422,7 +415,9 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 			runtime_state.NewFactory("rethinkdb", func() state.Store {
 				return rethinkdb.NewRethinkDBStateStore(loggerForDaprComp)
 			}),
-			runtime_state.NewFactory("aws.dynamodb", state_dynamodb.NewDynamoDBStateStore),
+			runtime_state.NewFactory("aws.dynamodb", func() state.Store {
+				return state_dynamodb.NewDynamoDBStateStore(loggerForDaprComp)
+			}),
 			runtime_state.NewFactory("mysql", func() state.Store {
 				return state_mysql.NewMySQLStateStore(loggerForDaprComp)
 			}),

cmd/layotto_multiple_api/main.go

@@ -81,7 +81,7 @@ import (
 	"mosn.io/layotto/components/file/qiniu"
 	"mosn.io/layotto/components/file/tencentcloud"
 	"mosn.io/layotto/components/sequencer"
-	"mosn.io/layotto/pkg/grpc/dapr"
+
 	"mosn.io/layotto/pkg/runtime/bindings"
 	runtime_sequencer "mosn.io/layotto/pkg/runtime/sequencer"
 
@@ -99,11 +99,11 @@ import (
 	pubsub_snssqs "github.com/dapr/components-contrib/pubsub/aws/snssqs"
 	pubsub_eventhubs "github.com/dapr/components-contrib/pubsub/azure/eventhubs"
 	pubsub_gcp "github.com/dapr/components-contrib/pubsub/gcp/pubsub"
-	pubsub_hazelcast "github.com/dapr/components-contrib/pubsub/hazelcast"
+
 	pubsub_inmemory "github.com/dapr/components-contrib/pubsub/in-memory"
 	pubsub_kafka "github.com/dapr/components-contrib/pubsub/kafka"
-	pubsub_mqtt "github.com/dapr/components-contrib/pubsub/mqtt"
-	"github.com/dapr/components-contrib/pubsub/natsstreaming"
+
+	pubsub_mqtt3 "github.com/dapr/components-contrib/pubsub/mqtt3"
 	pubsub_pulsar "github.com/dapr/components-contrib/pubsub/pulsar"
 	"github.com/dapr/components-contrib/pubsub/rabbitmq"
 	pubsub_redis "github.com/dapr/components-contrib/pubsub/redis"
@@ -121,19 +121,21 @@ import (
 	"github.com/dapr/components-contrib/state"
 	"github.com/dapr/components-contrib/state/aerospike"
 	state_dynamodb "github.com/dapr/components-contrib/state/aws/dynamodb"
-	state_azure_blobstorage "github.com/dapr/components-contrib/state/azure/blobstorage"
+
+	state_azure_blobstorage "github.com/dapr/components-contrib/state/azure/blobstorage/v1"
 	state_cosmosdb "github.com/dapr/components-contrib/state/azure/cosmosdb"
 	state_azure_tablestorage "github.com/dapr/components-contrib/state/azure/tablestorage"
 	"github.com/dapr/components-contrib/state/cassandra"
-	"github.com/dapr/components-contrib/state/cloudstate"
+
 	"github.com/dapr/components-contrib/state/couchbase"
 	"github.com/dapr/components-contrib/state/gcp/firestore"
 	"github.com/dapr/components-contrib/state/hashicorp/consul"
 	"github.com/dapr/components-contrib/state/hazelcast"
 	"github.com/dapr/components-contrib/state/memcached"
 	"github.com/dapr/components-contrib/state/mongodb"
 	state_mysql "github.com/dapr/components-contrib/state/mysql"
-	"github.com/dapr/components-contrib/state/postgresql"
+
+	state_postgresql "github.com/dapr/components-contrib/state/postgresql/v1"
 	state_redis "github.com/dapr/components-contrib/state/redis"
 	"github.com/dapr/components-contrib/state/rethinkdb"
 	"github.com/dapr/components-contrib/state/sqlserver"
@@ -281,11 +283,6 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 
 			// a demo to show how to register your own gRPC API
 			helloworld_api.NewHelloWorldAPI,
-
-			// support Dapr API
-			// Currently it only support Dapr's InvokeService,secret API,state API and InvokeBinding API.
-			// Note: this feature is still in Alpha state and we don't recommend that you use it in your production environment.
-			dapr.NewDaprAPI_Alpha,
 		),
 		runtime.WithExtensionGrpcAPI(),
 		// Hello
@@ -327,9 +324,6 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 			pubsub.NewFactory("redis", func() dapr_comp_pubsub.PubSub {
 				return pubsub_redis.NewRedisStreams(loggerForDaprComp)
 			}),
-			pubsub.NewFactory("natsstreaming", func() dapr_comp_pubsub.PubSub {
-				return natsstreaming.NewNATSStreamingPubSub(loggerForDaprComp)
-			}),
 			pubsub.NewFactory("azure.eventhubs", func() dapr_comp_pubsub.PubSub {
 				return pubsub_eventhubs.NewAzureEventHubs(loggerForDaprComp)
 			}),
@@ -339,9 +333,6 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 			pubsub.NewFactory("rabbitmq", func() dapr_comp_pubsub.PubSub {
 				return rabbitmq.NewRabbitMQ(loggerForDaprComp)
 			}),
-			pubsub.NewFactory("hazelcast", func() dapr_comp_pubsub.PubSub {
-				return pubsub_hazelcast.NewHazelcastPubSub(loggerForDaprComp)
-			}),
 			pubsub.NewFactory("gcp.pubsub", func() dapr_comp_pubsub.PubSub {
 				return pubsub_gcp.NewGCPPubSub(loggerForDaprComp)
 			}),
@@ -352,7 +343,7 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 				return pubsub_snssqs.NewSnsSqs(loggerForDaprComp)
 			}),
 			pubsub.NewFactory("mqtt", func() dapr_comp_pubsub.PubSub {
-				return pubsub_mqtt.NewMQTTPubSub(loggerForDaprComp)
+				return pubsub_mqtt3.NewMQTTPubSub(loggerForDaprComp)
 			}),
 			pubsub.NewFactory("pulsar", func() dapr_comp_pubsub.PubSub {
 				return pubsub_pulsar.NewPulsar(loggerForDaprComp)
@@ -397,17 +388,14 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 				return firestore.NewFirestoreStateStore(loggerForDaprComp)
 			}),
 			runtime_state.NewFactory("postgresql", func() state.Store {
-				return postgresql.NewPostgreSQLStateStore(loggerForDaprComp)
+				return state_postgresql.NewPostgreSQLStateStore(loggerForDaprComp)
 			}),
 			runtime_state.NewFactory("sqlserver", func() state.Store {
-				return sqlserver.NewSQLServerStateStore(loggerForDaprComp)
+				return sqlserver.New(loggerForDaprComp)
 			}),
 			runtime_state.NewFactory("hazelcast", func() state.Store {
 				return hazelcast.NewHazelcastStore(loggerForDaprComp)
 			}),
-			runtime_state.NewFactory("cloudstate.crdt", func() state.Store {
-				return cloudstate.NewCRDT(loggerForDaprComp)
-			}),
 			runtime_state.NewFactory("couchbase", func() state.Store {
 				return couchbase.NewCouchbaseStateStore(loggerForDaprComp)
 			}),
@@ -417,7 +405,9 @@ func NewRuntimeGrpcServer(data json.RawMessage, opts ...grpc.ServerOption) (mgrp
 			runtime_state.NewFactory("rethinkdb", func() state.Store {
 				return rethinkdb.NewRethinkDBStateStore(loggerForDaprComp)
 			}),
-			runtime_state.NewFactory("aws.dynamodb", state_dynamodb.NewDynamoDBStateStore),
+			runtime_state.NewFactory("aws.dynamodb", func() state.Store {
+				return state_dynamodb.NewDynamoDBStateStore(loggerForDaprComp)
+			}),
 			runtime_state.NewFactory("mysql", func() state.Store {
 				return state_mysql.NewMySQLStateStore(loggerForDaprComp)
 			}),