"...scaffolding/templates/git@git.gitsec.cn:baidan/clutch.git" did not exist on "9d2c1e04e5bf1a2f0187f7403666c7ba723cc987"
Commit f5b5f9d2 authored by lilianzhu's avatar lilianzhu
Browse files

fix typo

Signed-off-by: default avatarlilianzhu <zhujiali@koderover.com>
parent 61b3cbd4
Showing with 29 additions and 29 deletions
+29 -29
......@@ -77,7 +77,7 @@ func DeleteProduct(username, envName, productName, requestID string, log *zap.Su
err = commonrepo.NewProductColl().UpdateStatus(envName, productName, setting.ProductStatusDeleting)
if err != nil {
log.Errorf("[%s][%s] update product status error: %v", username, productInfo.Namespace, err)
return e.ErrDeleteEnv.AddDesc("更新集成环境状态失败: " + err.Error())
return e.ErrDeleteEnv.AddDesc("更新环境状态失败: " + err.Error())
}
log.Infof("[%s] delete product %s", username, productInfo.Namespace)
......
......@@ -55,7 +55,7 @@ func UpdateConfigMap(c *gin.Context) {
if err = json.Unmarshal(data, args); err != nil {
log.Errorf("UpdateConfigMap json.Unmarshal err : %v", err)
}
internalhandler.InsertOperationLog(c, ctx.UserName, args.ProductName, "更新", "集成环境-服务-configMap", fmt.Sprintf("环境名称:%s,服务名称:%s", args.EnvName, args.ServiceName), string(data), ctx.Logger)
internalhandler.InsertOperationLog(c, ctx.UserName, args.ProductName, "更新", "环境-服务-configMap", fmt.Sprintf("环境名称:%s,服务名称:%s", args.EnvName, args.ServiceName), string(data), ctx.Logger)
c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data))
if err := c.BindJSON(args); err != nil {
......@@ -89,7 +89,7 @@ func RollBackConfigMap(c *gin.Context) {
if err = json.Unmarshal(data, args); err != nil {
log.Errorf("RollBackConfigMap json.Unmarshal err : %v", err)
}
internalhandler.InsertOperationLog(c, ctx.UserName, args.ProductName, "回滚", "集成环境-服务-configMap", fmt.Sprintf("环境名称:%s,服务名称:%s", args.EnvName, args.ServiceName), string(data), ctx.Logger)
internalhandler.InsertOperationLog(c, ctx.UserName, args.ProductName, "回滚", "环境-服务-configMap", fmt.Sprintf("环境名称:%s,服务名称:%s", args.EnvName, args.ServiceName), string(data), ctx.Logger)
c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data))
if err := c.BindJSON(args); err != nil {
......
......@@ -104,7 +104,7 @@ func UpdateMultiProducts(c *gin.Context) {
}
}
internalhandler.InsertOperationLog(c, ctx.UserName, c.Query("projectName"), "自动更新", "集成环境", strings.Join(args.EnvNames, ","), string(data), ctx.Logger)
internalhandler.InsertOperationLog(c, ctx.UserName, c.Query("projectName"), "自动更新", "环境", strings.Join(args.EnvNames, ","), string(data), ctx.Logger)
c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data))
if err := c.BindJSON(args); err != nil {
......@@ -145,7 +145,7 @@ func createHelmProduct(c *gin.Context, ctx *internalhandler.Context) {
envNameList = append(envNameList, arg.EnvName)
}
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "新增", "集成环境", strings.Join(envNameList, "-"), string(data), ctx.Logger)
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "新增", "环境", strings.Join(envNameList, "-"), string(data), ctx.Logger)
ctx.Err = service.CreateHelmProduct(
projectName, ctx.UserName, ctx.RequestID, createArgs, ctx.Logger,
......@@ -181,7 +181,7 @@ func copyHelmProduct(c *gin.Context, ctx *internalhandler.Context) {
envNameCopyList = append(envNameCopyList, arg.BaseEnvName+"-->"+arg.EnvName)
}
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "复制", "集成环境", strings.Join(envNameCopyList, ","), string(data), ctx.Logger)
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "复制", "环境", strings.Join(envNameCopyList, ","), string(data), ctx.Logger)
ctx.Err = service.CopyHelmProduct(
projectName, ctx.UserName, ctx.RequestID, createArgs, ctx.Logger,
......@@ -223,7 +223,7 @@ func CreateProduct(c *gin.Context) {
}
}
internalhandler.InsertOperationLog(c, ctx.UserName, args.ProductName, "新增", "集成环境", args.EnvName, string(data), ctx.Logger)
internalhandler.InsertOperationLog(c, ctx.UserName, args.ProductName, "新增", "环境", args.EnvName, string(data), ctx.Logger)
c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data))
if err := c.BindJSON(args); err != nil {
......@@ -259,7 +259,7 @@ func UpdateProduct(c *gin.Context) {
ctx.Err = e.ErrInvalidParam.AddDesc(err.Error())
return
}
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "更新", "集成环境", envName, string(data), ctx.Logger)
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "更新", "环境", envName, string(data), ctx.Logger)
c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data))
if err := c.BindJSON(args); err != nil {
......@@ -292,7 +292,7 @@ func UpdateProductRegistry(c *gin.Context) {
ctx.Err = e.ErrInvalidParam.AddDesc(err.Error())
return
}
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "更新", "集成环境", envName, string(data), ctx.Logger)
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "更新", "环境", envName, string(data), ctx.Logger)
c.Request.Body = ioutil.NopCloser(bytes.NewBuffer(data))
if err := c.BindJSON(args); err != nil {
......@@ -313,7 +313,7 @@ func UpdateProductRecycleDay(c *gin.Context) {
projectName := c.Query("projectName")
recycleDayStr := c.Query("recycleDay")
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "更新", "集成环境-环境回收", envName, "", ctx.Logger)
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "更新", "环境-环境回收", envName, "", ctx.Logger)
var (
recycleDay int
......@@ -418,7 +418,7 @@ func updateMultiHelmEnv(c *gin.Context, ctx *internalhandler.Context) {
}
}
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "更新", "集成环境", strings.Join(args.EnvNames, ","), string(data), ctx.Logger)
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "更新", "环境", strings.Join(args.EnvNames, ","), string(data), ctx.Logger)
ctx.Resp, ctx.Err = service.UpdateMultipleHelmEnv(
ctx.RequestID, args, ctx.Logger,
......@@ -486,7 +486,7 @@ func DeleteProduct(c *gin.Context) {
envName := c.Param("name")
projectName := c.Query("projectName")
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "删除", "集成环境", envName, "", ctx.Logger)
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "删除", "环境", envName, "", ctx.Logger)
ctx.Err = commonservice.DeleteProduct(ctx.UserName, envName, projectName, ctx.RequestID, ctx.Logger)
}
......
......@@ -50,7 +50,7 @@ func UpdateStatefulSetContainerImage(c *gin.Context) {
internalhandler.InsertOperationLog(
c, ctx.UserName, args.ProductName,
"更新", "集成环境-服务镜像",
"更新", "环境-服务镜像",
fmt.Sprintf("环境名称:%s,服务名称:%s,StatefulSet:%s", args.EnvName, args.ServiceName, args.Name),
string(data), ctx.Logger)
......@@ -81,7 +81,7 @@ func UpdateDeploymentContainerImage(c *gin.Context) {
internalhandler.InsertOperationLog(
c, ctx.UserName, args.ProductName,
"更新", "集成环境-服务镜像",
"更新", "环境-服务镜像",
fmt.Sprintf("环境名称:%s,服务名称:%s,Deployment:%s", args.EnvName, args.ServiceName, args.Name),
string(data), ctx.Logger)
......
......@@ -85,7 +85,7 @@ func DeletePod(c *gin.Context) {
envName := c.Query("envName")
productName := c.Query("projectName")
internalhandler.InsertOperationLog(c, ctx.UserName, c.Query("projectName"), "重启", "集成环境-服务实例", fmt.Sprintf("环境名称:%s,pod名称:%s", c.Query("envName"), c.Param("podName")), "", ctx.Logger)
internalhandler.InsertOperationLog(c, ctx.UserName, c.Query("projectName"), "重启", "环境-服务实例", fmt.Sprintf("环境名称:%s,pod名称:%s", c.Query("envName"), c.Param("podName")), "", ctx.Logger)
ctx.Err = service.DeletePod(envName, productName, podName, ctx.Logger)
}
......
......@@ -90,7 +90,7 @@ func (*Router) Inject(router *gin.RouterGroup) {
}
// ---------------------------------------------------------------------------------------
// 产品管理接口(集成环境)
// 产品管理接口(环境)
// ---------------------------------------------------------------------------------------
environments := router.Group("environments")
{
......
......@@ -49,7 +49,7 @@ func RestartService(c *gin.Context) {
ServiceName: c.Param("serviceName"),
}
internalhandler.InsertOperationLog(c, ctx.UserName, c.Query("projectName"), "重启", "集成环境-服务", fmt.Sprintf("环境名称:%s,服务名称:%s", c.Param("name"), c.Param("serviceName")), "", ctx.Logger)
internalhandler.InsertOperationLog(c, ctx.UserName, c.Query("projectName"), "重启", "环境-服务", fmt.Sprintf("环境名称:%s,服务名称:%s", c.Param("name"), c.Param("serviceName")), "", ctx.Logger)
ctx.Err = service.RestartService(args.EnvName, args, ctx.Logger)
}
......@@ -59,7 +59,7 @@ func UpdateService(c *gin.Context) {
envName := c.Param("name")
projectName := c.Query("projectName")
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "更新", "集成环境-单服务", fmt.Sprintf("环境名称:%s,服务名称:%s", envName, c.Param("serviceName")), "", ctx.Logger)
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "更新", "环境-单服务", fmt.Sprintf("环境名称:%s,服务名称:%s", envName, c.Param("serviceName")), "", ctx.Logger)
svcRev := new(service.SvcRevision)
if err := c.BindJSON(svcRev); err != nil {
......@@ -95,7 +95,7 @@ func RestartNewService(c *gin.Context) {
c, ctx.UserName,
c.Query("projectName"),
"重启",
"集成环境-服务",
"环境-服务",
fmt.Sprintf(
"环境名称:%s,服务名称:%s,%s:%s", args.EnvName, args.ServiceName, args.Type, args.Name,
),
......@@ -122,7 +122,7 @@ func ScaleNewService(c *gin.Context) {
c, ctx.UserName,
projectName,
"伸缩",
"集成环境-服务",
"环境-服务",
fmt.Sprintf("环境名称:%s,%s:%s", envName, resourceType, name),
"", ctx.Logger)
......@@ -148,7 +148,7 @@ func ScaleService(c *gin.Context) {
envName := c.Param("name")
projectName := c.Query("projectName")
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "伸缩", "集成环境-服务", fmt.Sprintf("环境名称:%s,服务名称:%s", envName, c.Param("serviceName")), "", ctx.Logger)
internalhandler.InsertOperationLog(c, ctx.UserName, projectName, "伸缩", "环境-服务", fmt.Sprintf("环境名称:%s,服务名称:%s", envName, c.Param("serviceName")), "", ctx.Logger)
number, err := strconv.Atoi(c.Query("number"))
if err != nil {
......
......@@ -303,7 +303,7 @@ func CleanProducts() {
for _, prod := range products {
_, err := templaterepo.NewProductColl().Find(prod.ProductName)
if err != nil && err.Error() == "not found" {
logger.Errorf("集成环境所属的项目不存在,准备删除此集成环境, namespace:%s, 项目:%s\n", prod.Namespace, prod.ProductName)
logger.Errorf("环境所属的项目不存在,准备删除此环境, namespace:%s, 项目:%s\n", prod.Namespace, prod.ProductName)
err = commonservice.DeleteProduct("CleanProducts", prod.EnvName, prod.ProductName, "", logger)
if err != nil {
logger.Errorf("delete product failed, namespace:%s, err:%v\n", prod.Namespace, err)
......
......@@ -219,7 +219,7 @@ func UpdateProductTemplate(name string, args *template.Product, log *zap.Sugared
}
for _, envVars := range args.EnvVars {
//创建集成环境变量
//创建环境变量
if err = commonservice.CreateRenderSet(&commonmodels.RenderSet{
EnvName: envVars.EnvName,
Name: args.ProductName,
......
......@@ -135,7 +135,7 @@ var (
// ErrGetProductRevision ...
ErrGetProductRevision = NewHTTPError(6067, "获取产品版本失败")
// ErrFindProduct ...
ErrFindProduct = NewHTTPError(6068, "获取集成环境失败")
ErrFindProduct = NewHTTPError(6068, "获取环境失败")
// ErrGetProductAuth ...
ErrGetProductAuth = NewHTTPError(6069, "获取产品权限失败")
// ErrUpdateProductAuth ...
......@@ -145,15 +145,15 @@ var (
// ErrStopPatchProduct ...
ErrStopPatchProduct = NewHTTPError(6072, "产品收集集成测试覆盖率失败")
// ErrCreateEnv ...
ErrCreateEnv = NewHTTPError(6074, "创建集成环境失败")
ErrCreateEnv = NewHTTPError(6074, "创建环境失败")
// ErrListEnvs ...
ErrListEnvs = NewHTTPError(6075, "列出集成环境失败")
ErrListEnvs = NewHTTPError(6075, "列出环境失败")
// ErrUpdateEnv ...
ErrUpdateEnv = NewHTTPError(6076, "更新集成环境失败")
ErrUpdateEnv = NewHTTPError(6076, "更新环境失败")
// ErrDeleteEnv ...
ErrDeleteEnv = NewHTTPError(6077, "删除集成环境失败")
ErrDeleteEnv = NewHTTPError(6077, "删除环境失败")
// ErrGetEnv ...
ErrGetEnv = NewHTTPError(6078, "获取集成环境失败")
ErrGetEnv = NewHTTPError(6078, "获取环境失败")
// ErrFindProductTmpl ...
ErrFindProductTmpl = NewHTTPError(6079, "项目已删除,环境正在回收中")
// TODO: max error code reached, sharing error code with create product
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment