etcd app level service discovery implement

apache · May 27, 2021 · a030216 · a030216
1 parent cbbbd8d
commit a030216
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/metadata/report/delegate/delegate_report.go b/metadata/report/delegate/delegate_report.go
@@ -148,13 +148,13 @@ func NewMetadataReport() (*MetadataReport, error) {
 	return bmr, nil
 }
 
-// GetAppMetadata delegate get metadata info
+// PublishAppMetadata delegate publish metadata info
 func (mr *MetadataReport) PublishAppMetadata(identifier *identifier.SubscriberMetadataIdentifier, info *common.MetadataInfo) error {
 	report := instance.GetMetadataReportInstance()
 	return report.PublishAppMetadata(identifier, info)
 }
 
-// PublishAppMetadata delegate publish metadata info
+// GetAppMetadata delegate get metadata info
 func (mr *MetadataReport) GetAppMetadata(identifier *identifier.SubscriberMetadataIdentifier) (*common.MetadataInfo, error) {
 	report := instance.GetMetadataReportInstance()
 	return report.GetAppMetadata(identifier)

diff --git a/metadata/report/etcd/report.go b/metadata/report/etcd/report.go
@@ -18,6 +18,7 @@
 package etcd
 
 import (
+	"encoding/json"
 	"strings"
 	"time"
 )
@@ -52,14 +53,28 @@ type etcdMetadataReport struct {
 
 // GetAppMetadata get metadata info from etcd
 func (e *etcdMetadataReport) GetAppMetadata(metadataIdentifier *identifier.SubscriberMetadataIdentifier) (*common.MetadataInfo, error) {
-	// TODO will implement
-	panic("implement me")
+	key := e.getNodeKey(metadataIdentifier)
+	_data, err := e.client.Get(key)
+	if err != nil {
+		return nil, err
+	}
+	info := &common.MetadataInfo{}
+	err = json.Unmarshal([]byte(_data), info)
+	if err != nil {
+		return nil, err
+	}
+	return info, nil
 }
 
 // PublishAppMetadata publish metadata info to etcd
 func (e *etcdMetadataReport) PublishAppMetadata(metadataIdentifier *identifier.SubscriberMetadataIdentifier, info *common.MetadataInfo) error {
-	// TODO will implement
-	panic("implement me")
+	key := e.getNodeKey(metadataIdentifier)
+	value, err := json.Marshal(info)
+	if err != nil {
+		return err
+	}
+	err = e.client.Put(key, string(value))
+	return err
 }
 
 // StoreProviderMetadata will store the metadata

diff --git a/metadata/report/etcd/report_test.go b/metadata/report/etcd/report_test.go
@@ -94,8 +94,14 @@ func TestEtcdMetadataReport_CRUD(t *testing.T) {
 	err = metadataReport.SaveSubscribedData(subMi, string(urls))
 	assert.Nil(t, err)
 
+	metadataInfo := common.NewMetadataInfWithApp(subMi.Application)
 	err = metadataReport.RemoveServiceMetadata(serviceMi)
 	assert.Nil(t, err)
+	err = metadataReport.PublishAppMetadata(subMi, metadataInfo)
+	assert.Nil(t, err)
+
+	_, err = metadataReport.GetAppMetadata(subMi)
+	assert.Nil(t, err)
 
 	e.Close()
 }