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

installer/errors.go

@@ -0,0 +1,19 @@
+package installer
+
+type validationError struct {
+	msg string
+}
+
+func (e *validationError) Error() string {
+	return e.msg
+}
+
+func IsValidationError(err error) bool {
+	_, ok := err.(*validationError)
+
+	return ok
+}
+
+func NewValidationError(msg string) error {
+	return &validationError{msg: msg}
+}

installer/installer.go

@@ -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
 

router/router_system.go

@@ -37,9 +37,14 @@ func postCreateServer(c *gin.Context) {
 
 	install, err := installer.New(buf.Bytes())
 	if err != nil {
-		TrackedError(err).
-			SetMessage("Failed to validate the data provided in the request.").
-			AbortWithStatus(http.StatusUnprocessableEntity, c)
+		if installer.IsValidationError(err) {
+			c.AbortWithStatusJSON(http.StatusUnprocessableEntity, gin.H{
+				"error": "The data provided in the request could not be validated.",
+			})
+			return
+		}
+
+		TrackedError(err).AbortWithServerError(c)
 		return
 	}