Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor: dependency on the dapr api #1064

Open
wants to merge 17 commits into
base: upgrade_go_version
Choose a base branch
from
Open

refactor: dependency on the dapr api #1064

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8256049
remove: dependency on the dapr api
wushiling50 Jul 24, 2024
27952af
Revert "remove: dependency on the dapr api"
wushiling50 Jul 24, 2024
4f17246
refactor: remove dependency on the dapr api
wushiling50 Jul 24, 2024
6d2d01f
refactor: upgrade dapr dependency version
wushiling50 Sep 12, 2024
f6f3f2e
refactor: remove some unnecessary comment
wushiling50 Sep 12, 2024
fa22d00
refactor: pass golangci
wushiling50 Sep 12, 2024
6bf7398
refactor: pass golangci
wushiling50 Sep 16, 2024
d6a43db
refactor: pass golangci
wushiling50 Sep 16, 2024
a4b9619
refactor: pass golangci
wushiling50 Sep 16, 2024
124d48c
refactor: pass golangci
wushiling50 Sep 21, 2024
1aee920
Merge branch 'main' into main
wushiling50 Sep 21, 2024
0115907
refactor: update ci go version
wushiling50 Sep 22, 2024
c77e1fd
Merge branch 'main' of https://github.com/wushiling50/layotto
wushiling50 Sep 22, 2024
c79d57c
refactor: update ci version
wushiling50 Sep 23, 2024
fa341b8
Update layotto-ci.yml
wenxuwan Sep 24, 2024
cd64df1
Update layotto-ci.yml
wenxuwan Sep 24, 2024
7a4a001
refactor: update ci version
wushiling50 Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 14 additions & 19 deletions cmd/layotto/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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)
}),
Expand All @@ -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)
}),
Expand All @@ -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)
Expand Down Expand Up @@ -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)
}),
Expand All @@ -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)
}),
Expand Down
40 changes: 15 additions & 25 deletions cmd/layotto_multiple_api/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
}),
Expand All @@ -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)
}),
Expand All @@ -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)
Expand Down Expand Up @@ -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)
}),
Expand All @@ -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)
}),
Expand Down
33 changes: 14 additions & 19 deletions cmd/layotto_without_xds/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,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"
Expand All @@ -111,19 +111,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"
Expand Down Expand Up @@ -292,9 +294,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)
}),
Expand All @@ -304,9 +303,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)
}),
Expand All @@ -317,7 +313,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)
Expand Down Expand Up @@ -362,17 +358,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)
}),
Expand All @@ -382,7 +375,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)
}),
Expand Down
6 changes: 3 additions & 3 deletions components/delay_queue/azure/servicebus/servicebus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"net/http"
"time"

azservicebus "github.com/dapr/components-contrib/pubsub/azure/servicebus"
azservicebus "github.com/dapr/components-contrib/pubsub/azure/servicebus/queues"

delay_queue "mosn.io/layotto/components/delay_queue"

Expand All @@ -32,7 +32,7 @@ type azureServiceBus struct {
// NewAzureServiceBus returns a new Azure ServiceBus pub-sub implementation.
func NewAzureServiceBus(logger logger.Logger) pubsub.PubSub {
return &azureServiceBus{
PubSub: azservicebus.NewAzureServiceBus(logger),
PubSub: azservicebus.NewAzureServiceBusQueues(logger),
}
}

Expand All @@ -48,6 +48,6 @@ func (a *azureServiceBus) PublishDelayMessage(ctx context.Context, request *dela
Topic: request.Topic,
Metadata: request.Metadata,
}
err := a.Publish(req)
err := a.Publish(ctx, req)
return nil, err
}
Loading
Loading