Skip to content

Commit 5a35195

Browse files
hysyeahhysyeah
authored
fix: change cfgfile field name (#24)
1 parent 6f122e5 commit 5a35195

File tree

8 files changed

+23
-23
lines changed

8 files changed

+23
-23
lines changed

‎cmd/devbox/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ func main() {
3434
rootCmd := &cobra.Command{
3535
Use: "devbox",
3636
Short: "DevBox",
37-
Long: `The DevBox is a Terminus App dev tools`,
37+
Long: `The DevBox is a Olares App dev tools`,
3838
}
3939

4040
serverCmd := &cobra.Command{

‎pkg/api/server/handlers_api.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (h *handlers) getAppConfig(ctx *fiber.Ctx) error {
4343
klog.Error("read app cfg error, ", err, ", ", app, ", ", appCfgPath)
4444
return ctx.JSON(fiber.Map{
4545
"code": http.StatusBadRequest,
46-
"message": fmt.Sprintf("Read TerminusManifest.yaml failed: %v", err),
46+
"message": fmt.Sprintf("Read OlaresManifest.yaml failed: %v", err),
4747
})
4848
}
4949

@@ -54,7 +54,7 @@ func (h *handlers) getAppConfig(ctx *fiber.Ctx) error {
5454
klog.Error(string(data))
5555
return ctx.JSON(fiber.Map{
5656
"code": http.StatusBadRequest,
57-
"message": fmt.Sprintf("Parse TerminusManifest.yaml failed: %v", err),
57+
"message": fmt.Sprintf("Parse OlaresManifest.yaml failed: %v", err),
5858
})
5959
}
6060

@@ -82,20 +82,20 @@ func (h *handlers) updateAppConfig(ctx *fiber.Ctx) error {
8282
klog.Error("read app cfg post data error, ", err)
8383
return ctx.JSON(fiber.Map{
8484
"code": http.StatusBadRequest,
85-
"message": fmt.Sprintf("TerminusManifest.yaml has errors: %v", err),
85+
"message": fmt.Sprintf("OlaresManifest.yaml has errors: %v", err),
8686
})
8787
}
8888
data, err := yaml.Marshal(&appcfg)
8989
if err != nil {
9090
klog.Error("parse post app cfg error, ", err)
9191
return ctx.JSON(fiber.Map{
9292
"code": http.StatusBadRequest,
93-
"message": fmt.Sprintf("TerminusManifest.yaml has errors: %v", err),
93+
"message": fmt.Sprintf("OlaresManifest.yaml has errors: %v", err),
9494
})
9595
}
9696
appCfg := filepath.Join(path, constants.AppCfgFileName)
9797
uniquePath := uuid.NewString()
98-
appCfgBak := filepath.Join("/tmp", uniquePath, "TerminusManifest.yaml.bak")
98+
appCfgBak := filepath.Join("/tmp", uniquePath, "OlaresManifest.yaml.bak")
9999
chartDeferFunc, err := command.BackupAndRestoreFile(appCfg, appCfgBak)
100100
if err != nil {
101101
return ctx.JSON(fiber.Map{
@@ -109,15 +109,15 @@ func (h *handlers) updateAppConfig(ctx *fiber.Ctx) error {
109109
klog.Error("save app cfg to file error, ", err, ", ", appCfgPath)
110110
return ctx.JSON(fiber.Map{
111111
"code": http.StatusBadRequest,
112-
"message": fmt.Sprintf("Save TerminusManifest.yaml error: %v", err),
112+
"message": fmt.Sprintf("Save OlaresManifest.yaml error: %v", err),
113113
})
114114
}
115115
output, err := command.CheckCfg().WithDir(BaseDir).Run(ctx.Context(), app)
116116
if err != nil {
117117
klog.Error("check app cfg error, ", err)
118118
return ctx.JSON(fiber.Map{
119119
"code": http.StatusBadRequest,
120-
"message": fmt.Sprintf("TerminusManifest.yaml has errors: %v", err),
120+
"message": fmt.Sprintf("OlaresManifest.yaml has errors: %v", err),
121121
})
122122
}
123123
if len(output) > 0 {
@@ -406,7 +406,7 @@ func (h *handlers) listAppContainersInChart(ctx *fiber.Ctx) error {
406406
klog.Error("read app cfg error, ", err, ", ", app, ", ", appCfgPath)
407407
return ctx.JSON(fiber.Map{
408408
"code": http.StatusBadRequest,
409-
"message": fmt.Sprintf("Read TerminusManifest.yaml failed: %v", err),
409+
"message": fmt.Sprintf("Read OlaresManifest.yaml failed: %v", err),
410410
})
411411
}
412412

@@ -417,7 +417,7 @@ func (h *handlers) listAppContainersInChart(ctx *fiber.Ctx) error {
417417
klog.Error(string(data))
418418
return ctx.JSON(fiber.Map{
419419
"code": http.StatusBadRequest,
420-
"message": fmt.Sprintf("Parse TerminusManifest.yaml failed: %v", err),
420+
"message": fmt.Sprintf("Parse OlaresManifest.yaml failed: %v", err),
421421
})
422422
}
423423

‎pkg/api/server/handlers_cmd.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ func (h *handlers) createDevApp(ctx *fiber.Ctx) error {
6666
output, err := command.CheckCfg().WithDir(BaseDir).Run(ctx.Context(), config.Name)
6767
if err != nil {
6868

69-
klog.Error("check TerminusManifest.yaml error, ", err, ", ", config)
69+
klog.Error("check OlaresManifest.yaml error, ", err, ", ", config)
7070
return ctx.JSON(fiber.Map{
7171
"code": http.StatusBadRequest,
72-
"message": fmt.Sprintf("TerminusManifest.yaml has error: %v", err),
72+
"message": fmt.Sprintf("OlaresManifest.yaml has error: %v", err),
7373
})
7474
}
7575
if len(output) > 0 {

‎pkg/api/server/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func readCfgFromFile(chartDir string) (*application.AppConfiguration, error) {
4646
cfgFile := findAppCfgFile(chartDir)
4747
klog.Infof("readCfgFromFile: %s", cfgFile)
4848
if len(cfgFile) == 0 {
49-
return nil, errors.New("not found TerminusManifest.yaml file")
49+
return nil, errors.New("not found OlaresManifest.yaml file")
5050
}
5151
appcfg, err := readAppInfo(cfgFile)
5252
if err != nil {

‎pkg/constants/constants.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
const (
99
DevOwnerLabel = "dev.bytetrade.io/dev-owner"
10-
AppCfgFileName = "TerminusManifest.yaml"
10+
AppCfgFileName = "OlaresManifest.yaml"
1111
)
1212

1313
var (

‎pkg/development/application/cfg.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ type AppMetaData struct {
1313
}
1414

1515
type AppConfiguration struct {
16-
ConfigVersion string `yaml:"terminusManifest.version" json:"terminusManifest.version"`
17-
ConfigType string `yaml:"terminusManifest.type" json:"terminusManifest.type"`
16+
ConfigVersion string `yaml:"olaresManifest.version" json:"olaresManifest.version"`
17+
ConfigType string `yaml:"olaresManifest.type" json:"olaresManifest.type"`
1818
Metadata AppMetaData `yaml:"metadata" json:"metadata"`
1919
Entrances []Entrance `yaml:"entrances" json:"entrances"`
2020
Spec AppSpec `yaml:"spec" json:"spec"`

‎pkg/development/command/updaterepo.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ func (c *updateRepo) Run(ctx context.Context, app string, notExist bool) error {
9999
if !notExist {
100100
err = helm.UpdateAppCfgVersion(realPath, &newVersion)
101101
if err != nil {
102-
klog.Error("update TerminusManifest.yaml metadata.version error, ", err)
102+
klog.Error("update OlaresManifest.yaml metadata.version error, ", err)
103103
return err
104104
}
105105
}
106106

107107
appcfg := filepath.Join(realPath, constants.AppCfgFileName)
108-
appcfgBak := filepath.Join(realPath, "TerminusManifest.yaml.bak")
108+
appcfgBak := filepath.Join(realPath, "OlaresManifest.yaml.bak")
109109
appcfgDeferFunc, err := backupAndRestoreFile(appcfg, appcfgBak)
110110
if err != nil {
111111
return err

‎pkg/development/helm/chart.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func UpdateAppCfgVersion(path string, version *semver.Version) error {
136136
}
137137
err = os.WriteFile(appCfgYaml, data, 0644)
138138
if err != nil {
139-
klog.Error("write file TerminusManifest.yaml error, ", err)
139+
klog.Error("write file OlaresManifest.yaml error, ", err)
140140
return err
141141
}
142142

@@ -155,7 +155,7 @@ func UpdateAppCfgName(name, path string) error {
155155
var appCfg application.AppConfiguration
156156
err = yaml.Unmarshal(data, &appCfg)
157157
if err != nil {
158-
klog.Error("parse TerminusManifest.yaml error, ", err)
158+
klog.Error("parse OlaresManifest.yaml error, ", err)
159159
return err
160160
}
161161

@@ -178,7 +178,7 @@ func UpdateAppCfgName(name, path string) error {
178178

179179
err = os.WriteFile(appCfgYaml, data, 0644)
180180
if err != nil {
181-
klog.Error("write file TerminusManifest.yaml error, ", err)
181+
klog.Error("write file OlaresManifest.yaml error, ", err)
182182
return err
183183
}
184184

@@ -398,14 +398,14 @@ func GetAppCfg(app string, baseDir string) (*application.AppConfiguration, error
398398
appCfgYaml := filepath.Join(realPath, constants.AppCfgFileName)
399399
data, err := os.ReadFile(appCfgYaml)
400400
if err != nil {
401-
klog.Error("read TerminusManifest.yaml error, ", err, ", ", appCfgYaml)
401+
klog.Error("read OlaresManifest.yaml error, ", err, ", ", appCfgYaml)
402402
return nil, err
403403
}
404404

405405
var appCfg application.AppConfiguration
406406
err = yaml.Unmarshal(data, &appCfg)
407407
if err != nil {
408-
klog.Error("parse TerminusManifest.yaml error, ", err)
408+
klog.Error("parse OlaresManifest.yaml error, ", err)
409409
return nil, err
410410
}
411411

0 commit comments

Comments
 (0)