Clean up errors

Author: deliahu

pkg/operator/api/userconfig/config.go

@@ -158,7 +158,7 @@ func (config *Config) Validate(envName string) error {
 	}
 
 	if config.App == nil {
-		return ErrorUndefinedConfig(resource.AppType)
+		return ErrorMissingAppDefinition()
 	}
 
 	// Check for duplicate names across types that must have unique names

pkg/operator/api/userconfig/errors.go

@@ -31,13 +31,11 @@ type ErrorKind int
 const (
 	ErrUnknown ErrorKind = iota
 	ErrDuplicateResourceName
-	ErrDuplicateResourceValue
 	ErrDuplicateConfig
 	ErrMalformedConfig
 	ErrParseConfig
 	ErrReadConfig
 	ErrMissingAppDefinition
-	ErrUndefinedConfig
 	ErrRawColumnNotInEnv
 	ErrUndefinedResource
 	ErrResourceWrongType
@@ -81,13 +79,11 @@ const (
 var errorKinds = []string{
 	"err_unknown",
 	"err_duplicate_resource_name",
-	"err_duplicate_resource_value",
 	"err_duplicate_config",
 	"err_malformed_config",
 	"err_parse_config",
 	"err_read_config",
 	"err_missing_app_definition",
-	"err_undefined_config",
 	"err_raw_column_not_in_env",
 	"err_undefined_resource",
 	"err_resource_wrong_type",
@@ -214,13 +210,6 @@ func ErrorDuplicateResourceName(resources ...Resource) error {
 	}
 }
 
-func ErrorDuplicateResourceValue(value string, keys ...string) error {
-	return Error{
-		Kind:    ErrDuplicateResourceValue,
-		message: fmt.Sprintf("%s is defined in %s, but may only be specified in one", s.UserStr(value), s.StrsAnd(keys)),
-	}
-}
-
 func ErrorDuplicateConfig(resourceType resource.Type) error {
 	return Error{
 		Kind:    ErrDuplicateConfig,
@@ -260,13 +249,6 @@ func ErrorMissingAppDefinition() error {
 	}
 }
 
-func ErrorUndefinedConfig(resourceType resource.Type) error {
-	return Error{
-		Kind:    ErrUndefinedConfig,
-		message: fmt.Sprintf("%s resource is not defined", resourceType.String()),
-	}
-}
-
 func ErrorRawColumnNotInEnv(envName string) error {
 	return Error{
 		Kind:    ErrRawColumnNotInEnv,