Merge branch 'main' into bcrm

Author: ZhangSetSail

api/api/api_interface.go

@@ -118,6 +118,8 @@ type ServiceInterface interface {
 	CreateService(w http.ResponseWriter, r *http.Request)
 	UpdateService(w http.ResponseWriter, r *http.Request)
 	Dependency(w http.ResponseWriter, r *http.Request)
+	Dependencys(w http.ResponseWriter, r *http.Request)
+
 	Env(w http.ResponseWriter, r *http.Request)
 	Ports(w http.ResponseWriter, r *http.Request)
 	PutPorts(w http.ResponseWriter, r *http.Request)
@@ -295,3 +297,9 @@ type PodInterface interface {
 type RegistryAuthSecretInterface interface {
 	RegistryAuthSecret(w http.ResponseWriter, r *http.Request)
 }
+
+// RegistryInterface registry  interface
+type RegistryInterface interface {
+	GetAllRepo(w http.ResponseWriter, r *http.Request)
+	GetTagsByRepoName(w http.ResponseWriter, r *http.Request)
+}

api/api_routers/version2/v2Routers.go

@@ -63,6 +63,15 @@ func (v2 *V2) Routes() chi.Router {
 	r.Mount("/enterprise/{enterprise_id}", v2.enterpriseRouter())
 	r.Mount("/monitor", v2.monitorRouter())
 	r.Mount("/helm", v2.helmRouter())
+	r.Mount("/proxy-pass", v2.proxyRoute())
+
+	return r
+}
+
+func (v2 *V2) proxyRoute() chi.Router {
+	r := chi.NewRouter()
+	r.Post("/registry/repos", controller.GetManager().GetAllRepo)
+	r.Post("/registry/tags", controller.GetManager().GetTagsByRepoName)
 	return r
 }
 
@@ -310,6 +319,8 @@ func (v2 *V2) serviceRouter() chi.Router {
 
 	//应用依赖关系增加与删除(source)
 	r.Post("/dependency", middleware.WrapEL(controller.GetManager().Dependency, dbmodel.TargetTypeService, "add-service-dependency", dbmodel.SYNEVENTTYPE))
+	r.Post("/dependencys", middleware.WrapEL(controller.GetManager().Dependencys, dbmodel.TargetTypeService, "add-service-dependency", dbmodel.SYNEVENTTYPE))
+
 	r.Delete("/dependency", middleware.WrapEL(controller.GetManager().Dependency, dbmodel.TargetTypeService, "delete-service-dependency", dbmodel.SYNEVENTTYPE))
 	//环境变量增删改(source)
 	r.Post("/env", middleware.WrapEL(controller.GetManager().Env, dbmodel.TargetTypeService, "add-service-env", dbmodel.SYNEVENTTYPE))

api/controller/manager.go

@@ -22,11 +22,9 @@ import (
 	"net/http"
 
 	"github.com/goodrain/rainbond/api/api"
-	"github.com/goodrain/rainbond/api/discover"
 	"github.com/goodrain/rainbond/api/proxy"
 	"github.com/goodrain/rainbond/cmd/api/option"
 	mqclient "github.com/goodrain/rainbond/mq/client"
-	etcdutil "github.com/goodrain/rainbond/util/etcd"
 	"github.com/goodrain/rainbond/worker/client"
 )
 
@@ -53,6 +51,7 @@ type V2Manager interface {
 	api.ApplicationInterface
 	api.RegistryAuthSecretInterface
 	api.HelmInterface
+	api.RegistryInterface
 }
 
 var defaultV2Manager V2Manager
@@ -70,13 +69,7 @@ func GetManager() V2Manager {
 
 // NewManager new manager
 func NewManager(conf option.Config, statusCli *client.AppRuntimeSyncClient) (*V2Routes, error) {
-	etcdClientArgs := &etcdutil.ClientArgs{
-		Endpoints: conf.EtcdEndpoint,
-		CaFile:    conf.EtcdCaFile,
-		CertFile:  conf.EtcdCertFile,
-		KeyFile:   conf.EtcdKeyFile,
-	}
-	mqClient, err := mqclient.NewMqClient(etcdClientArgs, conf.MQAPI)
+	mqClient, err := mqclient.NewMqClient(conf.MQAPI)
 	if err != nil {
 		return nil, err
 	}
@@ -87,7 +80,7 @@ func NewManager(conf option.Config, statusCli *client.AppRuntimeSyncClient) (*V2
 	v2r.GatewayStruct.cfg = &conf
 	v2r.LabelController.optconfig = &conf
 	eventServerProxy := proxy.CreateProxy("eventlog", "http", []string{"local=>rbd-eventlog:6363"})
-	discover.GetEndpointDiscover().AddProject("event_log_event_http", eventServerProxy)
+	//discover.GetEndpointDiscover().AddProject("event_log_event_http", eventServerProxy)
 	v2r.EventLogStruct.EventlogServerProxy = eventServerProxy
 	return &v2r, nil
 }

api/controller/registry.go

@@ -0,0 +1,59 @@
+package controller
+
+import (
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util/bcode"
+	"github.com/goodrain/rainbond/builder/sources/registry"
+	httputil "github.com/goodrain/rainbond/util/http"
+	"github.com/sirupsen/logrus"
+	"net/http"
+)
+
+// Registry -
+type Registry struct {
+}
+
+// GetAllRepo 根据镜像仓库账号密码 获取所有的镜像仓库
+func (r2 *Registry) GetAllRepo(w http.ResponseWriter, r *http.Request) {
+	var req api_model.SearchByDomainRequest
+	ok := httputil.ValidatorRequestStructAndErrorResponse(r, w, &req, nil)
+	if !ok {
+		return
+	}
+	c, err := registry.NewInsecure(req.Domain, req.UserName, req.Password)
+	if err != nil {
+		httputil.ReturnBcodeError(r, w, bcode.NewBadRequest(err.Error()))
+		logrus.Errorf("get repositories error %s", err.Error())
+		return
+	}
+	repositories, err := c.Repositories()
+	if err != nil {
+		httputil.ReturnBcodeError(r, w, bcode.NewBadRequest(err.Error()))
+		logrus.Errorf("get repositories error %s", err.Error())
+		return
+	}
+	httputil.ReturnSuccess(r, w, repositories)
+}
+
+// GetTagsByRepoName 根据镜像仓库账号密码 获取镜像tags
+func (r2 *Registry) GetTagsByRepoName(w http.ResponseWriter, r *http.Request) {
+	var req api_model.SearchByDomainRequest
+	ok := httputil.ValidatorRequestStructAndErrorResponse(r, w, &req, nil)
+	if !ok {
+		return
+	}
+	c, err := registry.NewInsecure(req.Domain, req.UserName, req.Password)
+	if err != nil {
+		httputil.ReturnBcodeError(r, w, bcode.NewBadRequest(err.Error()))
+		logrus.Errorf("get tags error %s", err.Error())
+		return
+	}
+
+	tags, err := c.Tags(r.URL.Query().Get("repo"))
+	if err != nil {
+		httputil.ReturnBcodeError(r, w, bcode.NewBadRequest(err.Error()))
+		logrus.Errorf("get tags error %s", err.Error())
+		return
+	}
+	httputil.ReturnSuccess(r, w, tags)
+}

api/controller/resources.go

@@ -65,6 +65,7 @@ type V2Routes struct {
 	RegistryAuthSecretStruct
 	K8sAttributeController
 	HelmStruct
+	Registry
 }
 
 // Show test
@@ -1049,6 +1050,14 @@ func (t *TenantStruct) Dependency(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+// Dependencys Dependencys batch add dependency
+func (t *TenantStruct) Dependencys(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case "POST":
+		t.AddDependencys(w, r)
+	}
+}
+
 // AddDependency AddDependency
 // swagger:operation POST /v2/tenants/{tenant_name}/services/{service_alias}/dependency v2 addDependency
 //
@@ -1094,6 +1103,59 @@ func (t *TenantStruct) AddDependency(w http.ResponseWriter, r *http.Request) {
 	httputil.ReturnSuccess(r, w, nil)
 }
 
+// AddDependencys AddDependencys
+// swagger:operation POST /v2/tenants/{tenant_name}/services/{service_alias}/dependencys v2 addDependencys
+//
+// 批量增加应用依赖关系
+//
+// add dependency
+//
+// ---
+// consumes:
+// - application/json
+// - application/x-protobuf
+//
+// produces:
+// - application/json
+// - application/xml
+//
+// responses:
+//
+//	default:
+//	  schema:
+//	    "$ref": "#/responses/commandResponse"
+//	  description: 统一返回格式
+
+// AddDependencys -
+func (t *TenantStruct) AddDependencys(w http.ResponseWriter, r *http.Request) {
+	rules := validator.MapData{
+		"be_dep_service_ids": []string{"required"}, //被依赖的id列表
+		"dep_service_type":   []string{"required"},
+		"dep_order":          []string{},
+	}
+	data, ok := httputil.ValidatorRequestMapAndErrorResponse(r, w, rules, nil)
+	if !ok {
+		httputil.ReturnError(r, w, 500, "add dependency error")
+		return
+	}
+	var relations []*dbmodel.TenantServiceRelation
+	for _, beDepServiceID := range strings.Split(data["be_dep_service_ids"].(string), ",") {
+		relations = append(relations, &dbmodel.TenantServiceRelation{
+			TenantID:          r.Context().Value(ctxutil.ContextKey("tenant_id")).(string),
+			ServiceID:         beDepServiceID,
+			DependServiceID:   r.Context().Value(ctxutil.ContextKey("service_id")).(string),
+			DependServiceType: data["dep_service_type"].(string),
+			DependOrder:       1,
+		})
+	}
+	err := db.GetManager().TenantServiceRelationDao().CreateOrUpdateRelationsInBatch(relations)
+	if err != nil {
+		httputil.ReturnError(r, w, 500, fmt.Sprintf("add dependency error, %v", err))
+		return
+	}
+	httputil.ReturnSuccess(r, w, nil)
+}
+
 // DeleteDependency DeleteDependency
 // swagger:operation DELETE /v2/tenants/{tenant_name}/services/{service_alias}/dependency v2 deleteDependency
 //