Skip to content

Commit aa0a390

Browse files
authored
Merge pull request ActiveState#3362 from ActiveState/mitchell/dx-2911
Implement error interface instead of including error object field in struct.
2 parents 19a9e29 + 45c2343 commit aa0a390

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

internal/runners/initialize/init.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,13 @@ var errNoOwner = errs.New("Could not find organization")
7878
var errNoLanguage = errs.New("No language specified")
7979

8080
type errUnrecognizedLanguage struct {
81-
error
8281
Name string
8382
}
8483

84+
func (e errUnrecognizedLanguage) Error() string {
85+
return fmt.Sprintf("unrecognized language: %s", e.Name)
86+
}
87+
8588
// New returns a prepared ptr to Initialize instance.
8689
func New(prime primeable) *Initialize {
8790
return &Initialize{prime.Auth(), prime.Config(), prime.Output(), prime.Analytics(), prime.SvcModel()}
@@ -183,12 +186,12 @@ func (r *Initialize) Run(params *RunParams) (rerr error) {
183186

184187
// Require 'python', 'python@3', or 'python@2' instead of 'python3' or 'python2'.
185188
if languageName == language.Python3.String() || languageName == language.Python2.String() {
186-
return &errUnrecognizedLanguage{Name: languageName}
189+
return &errUnrecognizedLanguage{languageName}
187190
}
188191

189192
lang := language.MakeByNameAndVersion(languageName, languageVersion)
190193
if !lang.Recognized() {
191-
return &errUnrecognizedLanguage{Name: languageName}
194+
return &errUnrecognizedLanguage{languageName}
192195
}
193196

194197
version, err := deriveVersion(lang, languageVersion, r.auth)
@@ -327,7 +330,7 @@ func getKnownVersions(lang language.Language, auth *authentication.Auth) ([]stri
327330
}
328331

329332
if len(pkgs) == 0 {
330-
return nil, &errUnrecognizedLanguage{Name: lang.Requirement()}
333+
return nil, &errUnrecognizedLanguage{lang.Requirement()}
331334
}
332335

333336
knownVersions := make([]string, len(pkgs))

0 commit comments

Comments
 (0)