Skip to content

Commit ce3da76

Browse files
committed
better error & suggestion message
1 parent 7abe5df commit ce3da76

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

pkg/skaffold/parser/config.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ func getConfigs(ctx context.Context, cfgOpts configOpts, opts config.SkaffoldOpt
136136
for _, cfg := range parsed {
137137
config, ok := cfg.(*latest.SkaffoldConfig)
138138
if !ok {
139-
return nil, nil, sErrors.SkaffoldConfigUpgradeErr(cfg.GetVersion())
139+
return nil, nil, sErrors.SkaffoldConfigUpgradeErr(cfg.GetVersion(), latest.Version)
140140
}
141141

142142
for _, profile := range config.Profiles {
@@ -159,7 +159,7 @@ func getConfigs(ctx context.Context, cfgOpts configOpts, opts config.SkaffoldOpt
159159
for i, cfg := range parsed {
160160
config, ok := cfg.(*latest.SkaffoldConfig)
161161
if !ok {
162-
return nil, nil, sErrors.SkaffoldConfigUpgradeErr(cfg.GetVersion())
162+
return nil, nil, sErrors.SkaffoldConfigUpgradeErr(cfg.GetVersion(), latest.Version)
163163
}
164164

165165
processed, err := processEachConfig(ctx, config, cfgOpts, opts, r, i, fieldsOverrodeByProfile)

pkg/skaffold/schema/errors/errors.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -202,16 +202,16 @@ func ConfigUnknownAPIVersionErr(version string) error {
202202
}
203203

204204
// SkaffoldConfigUpgradeErr specifies that skaffold config needs to be upgraded to the latest version.
205-
func SkaffoldConfigUpgradeErr(version string) error {
206-
msg := fmt.Sprintf("skaffold config version is %s not *latest.SkaffoldConfig", version)
205+
func SkaffoldConfigUpgradeErr(currentVersion, targetVersion string) error {
206+
msg := fmt.Sprintf("skaffold cannot auto-upgrade the config from version %s to version %s", currentVersion, targetVersion)
207207
return sErrors.NewError(fmt.Errorf(msg),
208208
&proto.ActionableErr{
209209
Message: msg,
210210
ErrCode: proto.StatusCode_CONFIG_UPGRADE_ERR,
211211
Suggestions: []*proto.Suggestion{
212212
{
213213
SuggestionCode: proto.SuggestionCode_CONFIG_FIX_SKAFFOLD_CONFIG_VERSION,
214-
Action: "Upgrade skaffold config version to the latest",
214+
Action: fmt.Sprintf("Upgrade skaffold config version to %s manually", targetVersion),
215215
},
216216
},
217217
})

0 commit comments

Comments
 (0)