diff --git a/metadata/report/etcd/report.go b/metadata/report/etcd/report.go index 489de103f7..2828362947 100644 --- a/metadata/report/etcd/report.go +++ b/metadata/report/etcd/report.go @@ -54,12 +54,12 @@ type etcdMetadataReport struct { // GetAppMetadata get metadata info from etcd func (e *etcdMetadataReport) GetAppMetadata(metadataIdentifier *identifier.SubscriberMetadataIdentifier) (*common.MetadataInfo, error) { key := e.getNodeKey(metadataIdentifier) - _data, err := e.client.Get(key) + data, err := e.client.Get(key) if err != nil { return nil, err } info := &common.MetadataInfo{} - err = json.Unmarshal([]byte(_data), info) + err = json.Unmarshal([]byte(data), info) if err != nil { return nil, err } diff --git a/metadata/report/etcd/report_test.go b/metadata/report/etcd/report_test.go index acf3620a06..d0162ebd4b 100644 --- a/metadata/report/etcd/report_test.go +++ b/metadata/report/etcd/report_test.go @@ -94,14 +94,21 @@ func TestEtcdMetadataReport_CRUD(t *testing.T) { err = metadataReport.SaveSubscribedData(subMi, string(urls)) assert.Nil(t, err) - metadataInfo := common.NewMetadataInfWithApp(subMi.Application) + serviceUrl, _ = common.NewURL("dubbo://127.0.0.1:20000/com.ikurento.user.UserProvider?interface=com.ikurento.user.UserProvider&group=&version=2.6.0") + metadataInfo := common.NewMetadataInfo(subMi.Application, "", map[string]*common.ServiceInfo{ + "com.ikurento.user.UserProvider": common.NewServiceInfoWithURL(serviceUrl), + }) err = metadataReport.RemoveServiceMetadata(serviceMi) assert.Nil(t, err) err = metadataReport.PublishAppMetadata(subMi, metadataInfo) assert.Nil(t, err) - _, err = metadataReport.GetAppMetadata(subMi) + mdInfo, err := metadataReport.GetAppMetadata(subMi) assert.Nil(t, err) + assert.Equal(t, metadataInfo.App, mdInfo.App) + assert.Equal(t, metadataInfo.Revision, mdInfo.Revision) + assert.Equal(t, 1, len(mdInfo.Services)) + assert.NotNil(t, metadataInfo.Services["com.ikurento.user.UserProvider"]) e.Close() }