Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
1 change: 1 addition & 0 deletions pkg/microservice/aslan/core/environment/service/product.go
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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,
})
}
Expand Down Expand Up @@ -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,
})
}
Expand Down
Loading