This is an automated email from the ASF dual-hosted git repository.
littlecui pushed a change to branch master
in repository
https://gitbox.apache.org/repos/asf/servicecomb-service-center.git.
discard 9fb4479 Refactor plugin/discovery & registry pkg (#721)
This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.
* -- * -- N refs/heads/master (9215840)
\
O -- O -- O (9fb4479)
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
datasource/datasource.go | 1 -
datasource/engine.go | 33 ---
datasource/etcd/account.go | 22 +-
datasource/etcd/account_test.go | 15 +-
datasource/etcd/bootstrap/bootstrap.go | 33 ---
datasource/etcd/config.go | 71 -------
datasource/etcd/dep.go | 6 +-
datasource/etcd/engine.go | 231 ---------------------
datasource/etcd/etcd.go | 52 +----
datasource/etcd/kv/addon.go | 47 -----
datasource/etcd/kv/instance_event_handler.go | 194 -----------------
datasource/etcd/kv/instance_event_handler_test.go | 224 --------------------
datasource/etcd/kv/kv.go | 230 --------------------
datasource/etcd/kv/kv_test.go | 164 ---------------
datasource/etcd/kv/lease_task.go | 96 ---------
datasource/etcd/kv/lease_task_test.go | 61 ------
datasource/etcd/kv/metrics.go | 76 -------
datasource/etcd/kv/registry.go | 151 --------------
datasource/etcd/kv/types.go | 97 ---------
datasource/etcd/ms.go | 32 +--
datasource/etcd/registry/client.go | 42 ----
datasource/etcd/registry/common.go | 64 ------
datasource/etcd/registry/config.go | 76 -------
datasource/etcd/registry/metrics.go | 76 -------
datasource/etcd/registry/options.go | 214 -------------------
datasource/etcd/registry/types.go | 127 -----------
datasource/etcd/sd/cache.go | 53 -----
datasource/etcd/sd/cache_kv.go | 194 -----------------
datasource/etcd/sd/cache_null.go | 42 ----
datasource/etcd/sd/cache_test.go | 161 --------------
datasource/etcd/sd/cacher.go | 78 -------
datasource/etcd/sd/cacher_test.go | 62 ------
datasource/etcd/sd/common.go | 26 ---
datasource/etcd/sd/config.go | 96 ---------
datasource/etcd/sd/config_test.go | 82 --------
datasource/etcd/sd/defer.go | 23 --
datasource/etcd/sd/discovery.go | 34 ---
datasource/etcd/sd/event_proxy.go | 72 -------
datasource/etcd/sd/event_proxy_test.go | 62 ------
datasource/etcd/sd/indexer.go | 35 ----
datasource/etcd/sd/indexer_cache.go | 90 --------
datasource/etcd/sd/indexer_test.go | 96 ---------
datasource/etcd/sd/manager.go | 65 ------
datasource/etcd/sd/manager_test.go | 74 -------
datasource/etcd/sd/metrics.go | 60 ------
datasource/etcd/sd/service.go | 23 --
datasource/etcd/sd/types.go | 106 ----------
datasource/etcd/sd/types_test.go | 51 -----
datasource/etcd/util.go | 19 +-
datasource/etcd/version.go | 103 ---------
datasource/manager.go | 11 -
datasource/ms.go | 2 +-
datasource/options.go | 8 +-
pkg/etcdsync/mutex.go | 13 +-
pkg/etcdsync/mutex_test.go | 2 +-
server/bootstrap/bootstrap.go | 24 ++-
server/core/backend/lease_test.go | 10 +-
server/core/proto/{service_ex.go => services.go} | 0
server/core/proto/{service.go => services.pb.go} | 0
server/handler/auth/auth.go | 4 +-
server/handler/tracing/tracing.go | 6 +-
{datasource/etcd => server}/mux/mux.go | 0
server/notify/websocket_test.go | 4 +-
server/plugin/auditlog/auditlog.go | 11 +-
server/plugin/auth/auth.go | 13 +-
server/plugin/auth/buildin/buidlin_test.go | 20 +-
server/plugin/auth/buildin/buildin.go | 3 +-
server/plugin/common.go | 4 +-
.../plugin/discovery}/aggregate/adaptor.go | 36 ++--
.../plugin/discovery}/aggregate/cache.go | 32 +--
.../plugin/discovery}/aggregate/common.go | 4 +-
.../discovery}/aggregate/conflict_checker.go | 20 +-
.../plugin/discovery}/aggregate/indexer.go | 36 ++--
.../plugin/discovery}/aggregate/repo.go | 14 +-
.../sd => server/plugin/discovery}/etcd/adaptor.go | 26 +--
.../plugin/discovery}/etcd/adaptor_test.go | 12 +-
.../plugin/discovery}/etcd/cacher_kv.go | 74 +++----
.../plugin/discovery}/etcd/cacher_kv_test.go | 42 ++--
.../sd => server/plugin/discovery}/etcd/common.go | 6 +-
.../plugin/discovery}/etcd/indexer_cache.go | 16 +-
.../plugin/discovery}/etcd/indexer_etcd.go | 20 +-
.../plugin/discovery}/etcd/indexer_test.go | 12 +-
.../plugin/discovery}/etcd/listwatch.go | 2 +-
.../plugin/discovery}/etcd/listwatch_inner.go | 2 +-
.../plugin/discovery}/etcd/listwatch_test.go | 4 +-
.../sd => server/plugin/discovery}/etcd/metrics.go | 0
.../plugin/discovery}/etcd/metrics_test.go | 0
.../sd => server/plugin/discovery}/etcd/repo.go | 19 +-
.../sd => server/plugin/discovery}/etcd/watcher.go | 2 +-
.../plugin/discovery}/etcd/watcher_inner.go | 2 +-
.../plugin/discovery}/etcd/watcher_test.go | 2 +-
.../plugin/discovery}/k8s/adaptor/adaptor.go | 22 +-
.../plugin/discovery}/k8s/adaptor/cacher.go | 14 +-
.../plugin/discovery}/k8s/adaptor/cacher_index.go | 6 +-
.../discovery}/k8s/adaptor/cacher_instance.go | 16 +-
.../discovery}/k8s/adaptor/cacher_service.go | 6 +-
.../plugin/discovery}/k8s/adaptor/common.go | 3 +-
.../plugin/discovery}/k8s/adaptor/convertor.go | 8 +-
.../plugin/discovery}/k8s/adaptor/kube_client.go | 0
.../plugin/discovery}/k8s/adaptor/listwatcher.go | 0
.../sd => server/plugin/discovery}/k8s/nok8s.go | 0
.../sd => server/plugin/discovery}/k8s/repo.go | 11 +-
.../plugin/discovery}/servicecenter/adaptor.go | 30 +--
.../plugin/discovery}/servicecenter/aggregate.go | 45 ++--
.../discovery}/servicecenter/aggregate_test.go | 6 +-
.../plugin/discovery}/servicecenter/cacher.go | 10 +-
.../plugin/discovery}/servicecenter/common.go | 0
.../plugin/discovery}/servicecenter/indexer.go | 36 ++--
.../plugin/discovery}/servicecenter/repo.go | 16 +-
.../plugin/discovery}/servicecenter/syncer.go | 54 ++---
.../plugin/discovery}/servicecenter/syncer_test.go | 104 +++++-----
server/plugin/export.go | 39 +++-
server/plugin/plugin.go | 54 ++---
server/plugin/plugin_test.go | 19 +-
server/plugin/quota/buildin/buildin.go | 6 +-
server/plugin/quota/buildin/common.go | 3 +-
server/plugin/quota/quota.go | 11 -
server/plugin/quota/unlimit/unlimit.go | 2 +-
.../plugin}/registry/buildin/buildin.go | 7 +-
.../plugin}/registry/embededetcd/embededetcd.go | 32 +--
.../etcd => server/plugin}/registry/etcd/common.go | 0
.../etcd => server/plugin}/registry/etcd/etcd.go | 34 +--
.../plugin}/registry/etcd/etcd_test.go | 115 +++++-----
.../etcd => server/plugin}/registry/etcd/logger.go | 0
.../plugin}/registry/etcd/logger_test.go | 0
.../plugin}/registry/etcd/tracing.go | 9 +-
.../security/{cipher => }/buildin/buildin.go | 7 +-
server/plugin/security/cipher/cipher.go | 32 ---
server/plugin/security/tlsconf/tlsconf.go | 38 ----
.../{security/tlsconf => tls}/buildin/buildin.go | 7 +-
.../buildin/tlsconf.go => tls/buildin/tls.go} | 2 +-
.../tlsconf_test.go => tls/buildin/tls_test.go} | 4 +-
.../etcd/sd/options.go => server/plugin/tls/tls.go | 11 +-
server/plugin/tracing/pzipkin/buildin.go | 2 +-
server/plugin/tracing/tracing.go | 27 +--
server/plugin/types.go | 27 ++-
server/plugin/uuid/buildin/buildin.go | 7 +-
server/plugin/uuid/context/context.go | 2 +-
server/plugin/uuid/uuid.go | 12 +-
server/rest/admin/service_test.go | 13 +-
server/rest/server.go | 4 +-
server/server.go | 108 ++++++++--
.../admin/admin.go => service/cipher/cipher.go} | 15 +-
server/service/event/dependency_event_handler.go | 2 +-
server/service/instance.go | 6 +-
server/service/kv/store_test.go | 15 +-
.../service/lock/datasource.go | 6 +-
.../mutex.go => server/service/lock/etcd/etcd.go | 96 +++++----
server/service/lock/etcd/etcd_test.go | 57 +++++
.../{plugin/common.go => service/lock/manager.go} | 44 ++--
.../service/lock/options.go | 8 +-
.../k8s/nok8s.go => server/service/lock/types.go | 9 +-
server/service/microservice.go | 5 +-
server/service/rbac/dao/account_dao_test.go | 15 +-
server/service/rbac/rbac.go | 2 +-
server/service/rule.go | 3 +-
server/service/schema.go | 7 +-
server/service/tag.go | 3 +-
server/service/util/microservice_util.go | 5 +-
server/service/util/util_suite_test.go | 4 +-
server/task/clear_service.go | 123 +++++++++++
.../task/clear_service_test.go | 40 ++--
.../etcd/registry/manager.go => server/version.go | 61 +++---
163 files changed, 1179 insertions(+), 5028 deletions(-)
delete mode 100644 datasource/engine.go
delete mode 100644 datasource/etcd/bootstrap/bootstrap.go
delete mode 100644 datasource/etcd/config.go
delete mode 100644 datasource/etcd/engine.go
delete mode 100644 datasource/etcd/kv/addon.go
delete mode 100644 datasource/etcd/kv/instance_event_handler.go
delete mode 100644 datasource/etcd/kv/instance_event_handler_test.go
delete mode 100644 datasource/etcd/kv/kv.go
delete mode 100644 datasource/etcd/kv/kv_test.go
delete mode 100644 datasource/etcd/kv/lease_task.go
delete mode 100644 datasource/etcd/kv/lease_task_test.go
delete mode 100644 datasource/etcd/kv/metrics.go
delete mode 100644 datasource/etcd/kv/registry.go
delete mode 100644 datasource/etcd/kv/types.go
delete mode 100644 datasource/etcd/registry/client.go
delete mode 100644 datasource/etcd/registry/common.go
delete mode 100644 datasource/etcd/registry/config.go
delete mode 100644 datasource/etcd/registry/metrics.go
delete mode 100644 datasource/etcd/registry/options.go
delete mode 100644 datasource/etcd/registry/types.go
delete mode 100644 datasource/etcd/sd/cache.go
delete mode 100644 datasource/etcd/sd/cache_kv.go
delete mode 100644 datasource/etcd/sd/cache_null.go
delete mode 100644 datasource/etcd/sd/cache_test.go
delete mode 100644 datasource/etcd/sd/cacher.go
delete mode 100644 datasource/etcd/sd/cacher_test.go
delete mode 100644 datasource/etcd/sd/common.go
delete mode 100644 datasource/etcd/sd/config.go
delete mode 100644 datasource/etcd/sd/config_test.go
delete mode 100644 datasource/etcd/sd/defer.go
delete mode 100644 datasource/etcd/sd/discovery.go
delete mode 100644 datasource/etcd/sd/event_proxy.go
delete mode 100644 datasource/etcd/sd/event_proxy_test.go
delete mode 100644 datasource/etcd/sd/indexer.go
delete mode 100644 datasource/etcd/sd/indexer_cache.go
delete mode 100644 datasource/etcd/sd/indexer_test.go
delete mode 100644 datasource/etcd/sd/manager.go
delete mode 100644 datasource/etcd/sd/manager_test.go
delete mode 100644 datasource/etcd/sd/metrics.go
delete mode 100644 datasource/etcd/sd/service.go
delete mode 100644 datasource/etcd/sd/types.go
delete mode 100644 datasource/etcd/sd/types_test.go
delete mode 100644 datasource/etcd/version.go
rename server/core/proto/{service_ex.go => services.go} (100%)
rename server/core/proto/{service.go => services.pb.go} (100%)
rename {datasource/etcd => server}/mux/mux.go (100%)
rename {datasource/etcd/sd => server/plugin/discovery}/aggregate/adaptor.go
(75%)
rename {datasource/etcd/sd => server/plugin/discovery}/aggregate/cache.go (69%)
rename {datasource/etcd/sd => server/plugin/discovery}/aggregate/common.go
(91%)
rename {datasource/etcd/sd =>
server/plugin/discovery}/aggregate/conflict_checker.go (74%)
rename {datasource/etcd/sd => server/plugin/discovery}/aggregate/indexer.go
(79%)
rename {datasource/etcd/sd => server/plugin/discovery}/aggregate/repo.go (66%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/adaptor.go (71%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/adaptor_test.go
(82%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/cacher_kv.go (83%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/cacher_kv_test.go
(90%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/common.go (83%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/indexer_cache.go
(79%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/indexer_etcd.go
(79%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/indexer_test.go
(94%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/listwatch.go (94%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/listwatch_inner.go
(97%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/listwatch_test.go
(95%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/metrics.go (100%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/metrics_test.go
(100%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/repo.go (60%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/watcher.go (92%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/watcher_inner.go
(96%)
rename {datasource/etcd/sd => server/plugin/discovery}/etcd/watcher_test.go
(97%)
rename {datasource/etcd/sd => server/plugin/discovery}/k8s/adaptor/adaptor.go
(67%)
rename {datasource/etcd/sd => server/plugin/discovery}/k8s/adaptor/cacher.go
(72%)
rename {datasource/etcd/sd =>
server/plugin/discovery}/k8s/adaptor/cacher_index.go (91%)
rename {datasource/etcd/sd =>
server/plugin/discovery}/k8s/adaptor/cacher_instance.go (92%)
rename {datasource/etcd/sd =>
server/plugin/discovery}/k8s/adaptor/cacher_service.go (92%)
rename {datasource/etcd/sd => server/plugin/discovery}/k8s/adaptor/common.go
(96%)
rename {datasource/etcd/sd =>
server/plugin/discovery}/k8s/adaptor/convertor.go (93%)
rename {datasource/etcd/sd =>
server/plugin/discovery}/k8s/adaptor/kube_client.go (100%)
rename {datasource/etcd/sd =>
server/plugin/discovery}/k8s/adaptor/listwatcher.go (100%)
copy {datasource/etcd/sd => server/plugin/discovery}/k8s/nok8s.go (100%)
rename {datasource/etcd/sd => server/plugin/discovery}/k8s/repo.go (68%)
rename {datasource/etcd/sd =>
server/plugin/discovery}/servicecenter/adaptor.go (62%)
rename {datasource/etcd/sd =>
server/plugin/discovery}/servicecenter/aggregate.go (82%)
rename {datasource/etcd/sd =>
server/plugin/discovery}/servicecenter/aggregate_test.go (83%)
rename {datasource/etcd/sd => server/plugin/discovery}/servicecenter/cacher.go
(75%)
rename {datasource/etcd/sd => server/plugin/discovery}/servicecenter/common.go
(100%)
rename {datasource/etcd/sd =>
server/plugin/discovery}/servicecenter/indexer.go (78%)
rename {datasource/etcd/sd => server/plugin/discovery}/servicecenter/repo.go
(63%)
rename {datasource/etcd/sd => server/plugin/discovery}/servicecenter/syncer.go
(80%)
rename {datasource/etcd/sd =>
server/plugin/discovery}/servicecenter/syncer_test.go (56%)
rename {datasource/etcd => server/plugin}/registry/buildin/buildin.go (89%)
rename {datasource/etcd => server/plugin}/registry/embededetcd/embededetcd.go
(94%)
rename {datasource/etcd => server/plugin}/registry/etcd/common.go (100%)
rename {datasource/etcd => server/plugin}/registry/etcd/etcd.go (96%)
rename {datasource/etcd => server/plugin}/registry/etcd/etcd_test.go (88%)
rename {datasource/etcd => server/plugin}/registry/etcd/logger.go (100%)
rename {datasource/etcd => server/plugin}/registry/etcd/logger_test.go (100%)
rename {datasource/etcd => server/plugin}/registry/etcd/tracing.go (77%)
rename server/plugin/security/{cipher => }/buildin/buildin.go (77%)
delete mode 100644 server/plugin/security/cipher/cipher.go
delete mode 100644 server/plugin/security/tlsconf/tlsconf.go
rename server/plugin/{security/tlsconf => tls}/buildin/buildin.go (79%)
rename server/plugin/{security/tlsconf/buildin/tlsconf.go =>
tls/buildin/tls.go} (98%)
rename server/plugin/{security/tlsconf/buildin/tlsconf_test.go =>
tls/buildin/tls_test.go} (95%)
rename datasource/etcd/sd/options.go => server/plugin/tls/tls.go (86%)
copy server/{rest/admin/admin.go => service/cipher/cipher.go} (75%)
copy pkg/lb/loadbalancer.go => server/service/lock/datasource.go (88%)
copy pkg/etcdsync/mutex.go => server/service/lock/etcd/etcd.go (77%)
create mode 100644 server/service/lock/etcd/etcd_test.go
copy server/{plugin/common.go => service/lock/manager.go} (50%)
copy pkg/lb/loadbalancer.go => server/service/lock/options.go (86%)
rename datasource/etcd/sd/k8s/nok8s.go => server/service/lock/types.go (86%)
create mode 100644 server/task/clear_service.go
rename datasource/etcd/engine_test.go => server/task/clear_service_test.go
(79%)
rename datasource/etcd/registry/manager.go => server/version.go (50%)
