From ffcc35b0b9f815985cfc06cf62d34a68c80c9848 Mon Sep 17 00:00:00 2001 From: YuTang Song <2313186065@qq.com> Date: Tue, 12 May 2026 10:05:16 +0800 Subject: [PATCH 1/2] feat: add hostenv alias name operation Signed-off-by: YuTang Song <2313186065@qq.com> --- .../aslan/core/environment/service/environment_define.go | 1 + pkg/microservice/aslan/core/environment/service/product.go | 1 + 2 files changed, 2 insertions(+) diff --git a/pkg/microservice/aslan/core/environment/service/environment_define.go b/pkg/microservice/aslan/core/environment/service/environment_define.go index 622d9e8e58..3ebf3cc098 100644 --- a/pkg/microservice/aslan/core/environment/service/environment_define.go +++ b/pkg/microservice/aslan/core/environment/service/environment_define.go @@ -88,6 +88,7 @@ type ProductResp struct { Status string `json:"status"` Error string `json:"error"` EnvName string `json:"env_name"` + Alias string `json:"alias"` UpdateBy string `json:"update_by"` UpdateTime int64 `json:"update_time"` Services [][]*commonmodels.ProductService `json:"services"` diff --git a/pkg/microservice/aslan/core/environment/service/product.go b/pkg/microservice/aslan/core/environment/service/product.go index feeb6af977..0e78c5f8b3 100644 --- a/pkg/microservice/aslan/core/environment/service/product.go +++ b/pkg/microservice/aslan/core/environment/service/product.go @@ -218,6 +218,7 @@ func buildProductResp(envName string, prod *commonmodels.Product, log *zap.Sugar Namespace: prod.Namespace, Status: setting.PodUnstable, EnvName: prod.EnvName, + Alias: prod.Alias, UpdateTime: prod.UpdateTime, UpdateBy: prod.UpdateBy, Render: prod.Render, From 4c18cd1e328b084c30c6ad833204600b8775378d Mon Sep 17 00:00:00 2001 From: YuTang Song <2313186065@qq.com> Date: Tue, 12 May 2026 11:59:32 +0800 Subject: [PATCH 2/2] feat: add alias name into host deploy tasks environment Signed-off-by: YuTang Song <2313186065@qq.com> --- .../aslan/core/common/repository/models/workflow_v4.go | 1 + .../workflow/service/workflow/controller/job/job_vm_deploy.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkg/microservice/aslan/core/common/repository/models/workflow_v4.go b/pkg/microservice/aslan/core/common/repository/models/workflow_v4.go index 144d071d56..12a674d289 100644 --- a/pkg/microservice/aslan/core/common/repository/models/workflow_v4.go +++ b/pkg/microservice/aslan/core/common/repository/models/workflow_v4.go @@ -908,6 +908,7 @@ type ZadigBlueGreenDeployEnvInformation struct { type ZadigVMDeployEnvInformation struct { Env string `json:"env" yaml:"env"` + Alias string `json:"alias" yaml:"alias"` Services []*ServiceAndVMDeploy `json:"services" yaml:"services"` } diff --git a/pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_vm_deploy.go b/pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_vm_deploy.go index 35a7eee908..db1ea64638 100644 --- a/pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_vm_deploy.go +++ b/pkg/microservice/aslan/core/workflow/service/workflow/controller/job/job_vm_deploy.go @@ -197,6 +197,7 @@ func (j VMDeployJobController) Update(useUserInput bool, ticket *commonmodels.Ap func (j VMDeployJobController) SetOptions(ticket *commonmodels.ApprovalTicket) error { envOptions := make([]*commonmodels.ZadigVMDeployEnvInformation, 0) + envMap := make(map[string]*commonmodels.Product) if j.jobSpec.EnvSource == config.ParamSourceFixed { if ticket.IsAllowedEnv(j.workflow.Project, j.jobSpec.Env) { info, err := generateVMDeployServiceInfo(j.workflow.Project, j.jobSpec.Env, j.jobSpec.ServiceAndVMDeploysOptions, ticket) @@ -207,6 +208,7 @@ func (j VMDeployJobController) SetOptions(ticket *commonmodels.ApprovalTicket) e envOptions = append(envOptions, &commonmodels.ZadigVMDeployEnvInformation{ Env: j.jobSpec.Env, + Alias: commonutil.GetEnvAlias(commonutil.GetEnvInfoNoErr(j.workflow.Project, j.jobSpec.Env, envMap)), Services: info, }) } @@ -236,6 +238,7 @@ func (j VMDeployJobController) SetOptions(ticket *commonmodels.ApprovalTicket) e envOptions = append(envOptions, &commonmodels.ZadigVMDeployEnvInformation{ Env: env.EnvName, + Alias: env.Alias, Services: info, }) }