Skip to content

Commit

Permalink
refactor: upgrade dapr dependency version
Browse files Browse the repository at this point in the history 
Signed-off-by: wushiling50 <2531010934@qq.com>
  • Loading branch information
@wushiling50
wushiling50 committed Sep 12, 2024
1 parent 4f17246 commit 6d2d01f
Show file tree
Hide file tree
Showing 27 changed files with 1,651 additions and 2,270 deletions.
33 changes: 14 additions & 19 deletions cmd/layotto/main.go
View file
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
33 changes: 14 additions & 19 deletions cmd/layotto_multiple_api/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 @@ -322,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 @@ -334,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 @@ -347,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 @@ -392,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 @@ -412,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
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
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

0 comments on commit 6d2d01f

Please sign in to comment.