MCorange/wings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correctly handle validation errors vs. errors from the panel during installation

Browse Source
This commit is contained in:
Dane Everitt
2020-04-11 17:55:00 -07:00
parent 13fc464508
commit 7d7766e4cb
3 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
installer/installer.go
View File

@@ -22,11 +22,11 @@ type Installer struct {
// calling Execute().
func New(data []byte) (*Installer, error) {
if !govalidator.IsUUIDv4(getString(data, "uuid")) {
return nil, errors.New("uuid provided was not in a valid format")
return nil, NewValidationError("uuid provided was not in a valid format")
}
if !govalidator.IsUUIDv4(getString(data, "service", "egg")) {
return nil, errors.New("service egg provided was not in a valid format")
return nil, NewValidationError("service egg provided was not in a valid format")
}
s := &server.Server{
@@ -82,11 +82,6 @@ func New(data []byte) (*Installer, error) {
return nil, errors.New(rerr.String())
}
/*b, err := s.WriteConfigurationToDisk()
if err != nil {
return nil, err
}*/
// Destroy the temporary server instance.
s = nil