style: key change to upper camel case

pkg/base/constant/key.go

@@ -9,4 +9,10 @@ const (
 	NacosKey = "nacos"
 	// FileKey
 	FileKey = "file"
+
+	Etcdv3Key                = "etcdv3"
+	Etcdv3RegistryPrefix     = "etcdv3-seata-" // according to seata java version
+	Etcdv3LeaseRenewInterval = 5               // according to seata java version
+	Etcdv3LeaseTtl           = 10              // according to seata java version
+	Etcdv3LeaseTtlCritical   = 6               // according to seata java version
 )

pkg/base/registry/etcdv3/registry.go

@@ -23,7 +23,7 @@ import (
 )
 
 func init() {
-	extension.SetRegistry(constant.ETCDV3_KEY, newETCDRegistry)
+	extension.SetRegistry(constant.Etcdv3Key, newETCDRegistry)
 }
 
 type etcdEventListener struct {
@@ -60,7 +60,7 @@ type leaseWrapper struct {
 
 // Lookup Service Discovery
 func (r *etcdRegistry) Lookup() ([]string, error) {
-	resp, err := r.client.Get(context.Background(), constant.ETCDV3_REGISTRY_PREFIX+r.clusterName, clientv3.WithPrefix())
+	resp, err := r.client.Get(context.Background(), constant.Etcdv3RegistryPrefix+r.clusterName, clientv3.WithPrefix())
 	if err != nil {
 		return nil, err
 	}
@@ -70,7 +70,7 @@ func (r *etcdRegistry) Lookup() ([]string, error) {
 		addrs = append(addrs, string(kv.Value))
 	}
 
-	err = r.Subscribe("", &etcdEventListener{})
+	err = r.Subscribe(&etcdEventListener{})
 	if err != nil {
 		return nil, err
 	}
@@ -98,13 +98,13 @@ func (r *etcdRegistry) UnRegister(addr *registry.Address) error {
 	return err
 }
 
-func (r *etcdRegistry) Subscribe(cluster string, listener registry.EventListener) error {
+func (r *etcdRegistry) Subscribe(listener registry.EventListener) error {
 	resp, err := r.client.Get(context.Background(), constant.ETCDV3_REGISTRY_PREFIX+r.clusterName, clientv3.WithPrefix())
 	if err != nil {
 		return err
 	}
 
-	wcCh := r.client.Watch(context.Background(), constant.ETCDV3_REGISTRY_PREFIX+r.clusterName, clientv3.WithPrefix(), clientv3.WithRev(resp.Header.Revision))
+	wcCh := r.client.Watch(context.Background(), constant.Etcdv3RegistryPrefix+r.clusterName, clientv3.WithPrefix(), clientv3.WithRev(resp.Header.Revision))
 	stopChan := make(chan struct{})
 	r.listenersChanMap.Store(r.clusterName, stopChan)
 	r.regWg.Add(1)
@@ -148,14 +148,14 @@ LOOP:
 	}
 }
 
-func (r *etcdRegistry) UnSubscribe(cluster string, listener registry.EventListener) error {
+func (r *etcdRegistry) UnSubscribe(listener registry.EventListener) error {
 	stopChanUnCast, ok := r.listenersChanMap.Load(constant.ETCDV3_REGISTRY_PREFIX + r.clusterName)
 	if !ok {
 		return errors.New("failed to unsubscribe, not matching key in the map")
 	}
 	stopChan, _ := stopChanUnCast.(chan struct{})
 	stopChan <- struct{}{}
-	r.listenersChanMap.Delete(constant.ETCDV3_REGISTRY_PREFIX + r.clusterName)
+	r.listenersChanMap.Delete(constant.Etcdv3RegistryPrefix + r.clusterName)
 	return nil
 }
 
@@ -184,14 +184,14 @@ LOOP:
 				continue
 			}
 
-			if ttl.TTL <= constant.ETCDV3_LEASE_TTL_CRITICAL {
+			if ttl.TTL <= constant.Etcdv3LeaseTtlCritical {
 				_, err := r.client.KeepAliveOnce(context.Background(), *r.leaseWrp.leaseId)
 				if err != nil {
 					log.Warnf("failed to renew ttl, %s", err.Error())
 				}
 			}
 
-			time.Sleep(time.Duration(constant.ETCDV3_LEASE_RENEW_INTERVAL) * time.Second)
+			time.Sleep(time.Duration(constant.Etcdv3LeaseRenewInterval) * time.Second)
 		} else {
 			break LOOP
 		}
@@ -235,7 +235,7 @@ func newETCDRegistry() (registry.Registry, error) {
 		return &etcdRegistry{}, err
 	}
 
-	resp, err := client.Grant(context.Background(), constant.ETCDV3_LEASE_TTL)
+	resp, err := client.Grant(context.Background(), constant.Etcdv3LeaseTtl)
 	if err != nil {
 		return &etcdRegistry{}, err
 	}
@@ -256,8 +256,3 @@ func newETCDRegistry() (registry.Registry, error) {
 
 	return r, nil
 }
-
-type pair struct {
-	key   interface{}
-	value interface{}
-}

pkg/base/registry/etcdv3/registry_test.go

@@ -31,8 +31,9 @@ etcdv3:
   cluster_name: test
 `
 	regCfg := config.RegistryConfig{}
-	defaults.Set(&regCfg)
-	err := yaml.Unmarshal([]byte(confStr), &regCfg)
+	err := defaults.Set(&regCfg)
+	assert.NoError(t, err)
+	err = yaml.Unmarshal([]byte(confStr), &regCfg)
 	assert.NoError(t, err)
 
 	etcdConfig, err := utils.ToEtcdConfig(regCfg.ETCDConfig, ctx)
@@ -42,7 +43,7 @@ etcdv3:
 	_, err = client.Delete(ctx, "", clientv3.WithPrefix())
 	assert.NoError(t, err)
 
-	resp, err := client.Grant(ctx, constant.ETCDV3_LEASE_TTL)
+	resp, err := client.Grant(ctx, constant.Etcdv3LeaseTtl)
 	assert.NoError(t, err, "failed to recv lease response")
 	assert.NotNil(t, resp)
 
@@ -109,7 +110,7 @@ func TestUnRegister(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Zero(t, resp.Count)
 
-	_, err = r.client.Delete(ctx, constant.ETCDV3_REGISTRY_PREFIX+r.clusterName, clientv3.WithLease(*r.leaseWrp.leaseId))
+	_, err = r.client.Delete(ctx, constant.Etcdv3RegistryPrefix+r.clusterName, clientv3.WithLease(*r.leaseWrp.leaseId))
 	assert.NoError(t, err)
 }
 
@@ -145,9 +146,9 @@ func TestSubscribe(t *testing.T) {
 
 	servicesMap := make(map[string]string)
 
-	prefixKey := constant.ETCDV3_REGISTRY_PREFIX + r.clusterName + "-"
+	prefixKey := constant.Etcdv3RegistryPrefix + r.clusterName + "-"
 	l := &mockListener{servicesMap: servicesMap, t: t, counter: 0}
-	err := r.Subscribe("", l)
+	err := r.Subscribe(l)
 	assert.NoError(t, err)
 
 	for _, service := range services {

pkg/util/etcdv3/utils.go

@@ -27,7 +27,7 @@ func IsAddressValid(addr registry.Address) bool {
 }
 
 func BuildRegistryKey(clusterName string, addr *registry.Address) string {
-	return constant.ETCDV3_REGISTRY_PREFIX + fmt.Sprintf("%s-%s", clusterName, addrToStr(addr))
+	return constant.Etcdv3RegistryPrefix + fmt.Sprintf("%s-%s", clusterName, addrToStr(addr))
 }
 
 func BuildRegistryValue(addr *registry.Address) string {