remove redundant configuration

apache · Oct 11, 2022 · 5c72022 · 5c72022
1 parent 2cf911c
commit 5c72022
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 33 deletions.
diff --git a/golang/client.go b/golang/client.go
@@ -507,7 +507,7 @@ func (cli *defaultClient) Sign(ctx context.Context) context.Context {
 			innerMD.EncryptHeader,
 			innerMD.Credential,
 			cli.config.Credentials.AccessKey,
-			cli.config.Region,
+			"",
 			innerMD.Rocketmq,
 			innerMD.SignedHeaders,
 			innerMD.DateTime,

diff --git a/golang/client_test.go b/golang/client_test.go
@@ -28,7 +28,6 @@ func TestCLINewClient(t *testing.T) {
 	endpoints := fmt.Sprintf("%s:%d", fakeHost, fakePort)
 	cli, err := NewClient(&Config{
 		Endpoint:    endpoints,
-		Group:       "",
 		Credentials: &credentials.SessionCredentials{},
 	})
 	if err != nil {

diff --git a/golang/config.go b/golang/config.go
@@ -20,9 +20,8 @@ package golang
 import "github.com/apache/rocketmq-clients/golang/credentials"
 
 type Config struct {
-	Endpoint    string `validate:"required"`
-	Region      string
-	NameSpace   string
-	Group       string                          `validate:"required"`
-	Credentials *credentials.SessionCredentials `validate:"required"`
+	Endpoint      string `validate:"required"`
+	NameSpace     string
+	ConsumerGroup string
+	Credentials   *credentials.SessionCredentials `validate:"required"`
 }
diff --git a/golang/example/consumer/simple_consumer/main.go b/golang/example/consumer/simple_consumer/main.go
@@ -32,7 +32,6 @@ const (
 	Topic     = "xxxxxx"
 	GroupName = "xxxxxx"
 	Endpoint  = "xxxxxx"
-	Region    = "xxxxxx"
 	AccessKey = "xxxxxx"
 	SecretKey = "xxxxxx"
 )
@@ -53,9 +52,8 @@ func main() {
 	golang.ResetLogger()
 	// new simpleConsumer instance
 	simpleConsumer, err := golang.NewSimpleConsumer(&golang.Config{
-		Endpoint: Endpoint,
-		Group:    GroupName,
-		Region:   Region,
+		Endpoint:      Endpoint,
+		ConsumerGroup: GroupName,
 		Credentials: &credentials.SessionCredentials{
 			AccessKey:    AccessKey,
 			AccessSecret: SecretKey,

diff --git a/golang/example/producer/async/main.go b/golang/example/producer/async/main.go
@@ -31,9 +31,7 @@ import (
 
 const (
 	Topic     = "xxxxxx"
-	GroupName = "xxxxxx"
 	Endpoint  = "xxxxxx"
-	Region    = "xxxxxx"
 	AccessKey = "xxxxxx"
 	SecretKey = "xxxxxx"
 )
@@ -45,8 +43,6 @@ func main() {
 	// new producer instance
 	producer, err := golang.NewProducer(&golang.Config{
 		Endpoint: Endpoint,
-		Group:    GroupName,
-		Region:   Region,
 		Credentials: &credentials.SessionCredentials{
 			AccessKey:    AccessKey,
 			AccessSecret: SecretKey,

diff --git a/golang/example/producer/delay/main.go b/golang/example/producer/delay/main.go
@@ -31,9 +31,7 @@ import (
 
 const (
 	Topic     = "xxxxxx"
-	GroupName = "xxxxxx"
 	Endpoint  = "xxxxxx"
-	Region    = "xxxxxx"
 	AccessKey = "xxxxxx"
 	SecretKey = "xxxxxx"
 )
@@ -45,8 +43,6 @@ func main() {
 	// new producer instance
 	producer, err := golang.NewProducer(&golang.Config{
 		Endpoint: Endpoint,
-		Group:    GroupName,
-		Region:   Region,
 		Credentials: &credentials.SessionCredentials{
 			AccessKey:    AccessKey,
 			AccessSecret: SecretKey,

diff --git a/golang/example/producer/fifo/main.go b/golang/example/producer/fifo/main.go
@@ -31,9 +31,7 @@ import (
 
 const (
 	Topic     = "xxxxxx"
-	GroupName = "xxxxxx"
 	Endpoint  = "xxxxxx"
-	Region    = "xxxxxx"
 	AccessKey = "xxxxxx"
 	SecretKey = "xxxxxx"
 )
@@ -45,8 +43,6 @@ func main() {
 	// new producer instance
 	producer, err := golang.NewProducer(&golang.Config{
 		Endpoint: Endpoint,
-		Group:    GroupName,
-		Region:   Region,
 		Credentials: &credentials.SessionCredentials{
 			AccessKey:    AccessKey,
 			AccessSecret: SecretKey,

diff --git a/golang/example/producer/normal/main.go b/golang/example/producer/normal/main.go
@@ -31,9 +31,7 @@ import (
 
 const (
 	Topic     = "xxxxxx"
-	GroupName = "xxxxxx"
 	Endpoint  = "xxxxxx"
-	Region    = "xxxxxx"
 	AccessKey = "xxxxxx"
 	SecretKey = "xxxxxx"
 )
@@ -44,8 +42,6 @@ func main() {
 	// new producer instance
 	producer, err := golang.NewProducer(&golang.Config{
 		Endpoint: Endpoint,
-		Group:    GroupName,
-		Region:   Region,
 		Credentials: &credentials.SessionCredentials{
 			AccessKey:    AccessKey,
 			AccessSecret: SecretKey,

diff --git a/golang/example/producer/transaction/main.go b/golang/example/producer/transaction/main.go
@@ -31,9 +31,7 @@ import (
 
 const (
 	Topic     = "xxxxxx"
-	GroupName = "xxxxxx"
 	Endpoint  = "xxxxxx"
-	Region    = "xxxxxx"
 	AccessKey = "xxxxxx"
 	SecretKey = "xxxxxx"
 )
@@ -45,8 +43,6 @@ func main() {
 	// new producer instance
 	producer, err := golang.NewProducer(&golang.Config{
 		Endpoint: Endpoint,
-		Group:    GroupName,
-		Region:   Region,
 		Credentials: &credentials.SessionCredentials{
 			AccessKey:    AccessKey,
 			AccessSecret: SecretKey,

diff --git a/golang/producer_test.go b/golang/producer_test.go
@@ -52,7 +52,6 @@ func TestProducer(t *testing.T) {
 	endpoints := fmt.Sprintf("%s:%d", fakeHost, fakePort)
 	p, err := NewProducer(&Config{
 		Endpoint:    endpoints,
-		Group:       MOCK_GROUP,
 		Credentials: &credentials.SessionCredentials{},
 	})
 	if err != nil {

diff --git a/golang/simple_consumer.go b/golang/simple_consumer.go
@@ -320,14 +320,17 @@ var NewSimpleConsumer = func(config *Config, opts ...SimpleConsumerOption) (Simp
 	for _, opt := range opts {
 		opt.apply(scOpts)
 	}
+	if len(config.ConsumerGroup) == 0 {
+		return nil, fmt.Errorf("consumerGroup could not be nil")
+	}
 	cli, err := scOpts.clientFunc(config)
 	if err != nil {
 		return nil, err
 	}
 	sc := &defaultSimpleConsumer{
 		scOpts:    *scOpts,
 		cli:       cli.(*defaultClient),
-		groupName: config.Group,
+		groupName: config.ConsumerGroup,
 
 		awaitDuration:           scOpts.awaitDuration,
 		subscriptionExpressions: scOpts.subscriptionExpressions,