feat:merge main

polarismesh · Nov 7, 2023 · cb3fd01 · cb3fd01
1 parent 597c449
commit cb3fd01
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/service/instance.go b/service/instance.go
@@ -1010,13 +1010,6 @@ type rawSvcName interface {
 	GetNamespace() string
 }
 
-func (s *Server) allowAutoCreate() bool {
-	if s.cfg == nil {
-		return false
-	}
-	return s.cfg.AutoCreate
-}
-
 // createWrapServiceIfAbsent 如果服务不存在，则进行创建，并返回服务的ID信息
 func (s *Server) createWrapServiceIfAbsent(ctx context.Context, instance wrapSvcName) (string, *apiservice.Response) {
 	return s.createServiceIfAbsent(ctx, instance.GetNamespace().GetValue(), instance.GetService().GetValue())

diff --git a/service/server.go b/service/server.go
@@ -67,6 +67,10 @@ func (s *Server) isSupportL5() bool {
 	return s.config.L5Open
 }
 
+func (s *Server) allowAutoCreate() bool {
+	return s.config.AutoCreate
+}
+
 // HealthServer 健康检查Server
 func (s *Server) HealthServer() *healthcheck.Server {
 	return s.healthServer