Merge pull request #90 from mutablelogic/v5

V5

Author: djthorpe

pkg/pgmanager/config/config.go

@@ -18,10 +18,10 @@ type Config struct {
 	User     string            `env:"PG_USER" default:"${USER}" help:"Database user"`
 	Pass     string            `env:"PG_PASSWORD" help:"User password"`
 	Database string            `env:"PG_DATABASE" help:"Database name, uses username if not set"`
-	SSLMode  string            `default:"default" enum:"default,disable,allow,prefer,require,verify-ca,verify-full" help:"SSL mode"`
+	SSLMode  string            `env:"PG_SSLMODE" enum:"default,disable,allow,prefer,require,verify-ca,verify-full" help:"SSL mode"`
 	Trace    pg.TraceFn        `json:"-" kong:"-"`
-	Router   server.HTTPRouter `json:"-" kong:"-"`                         // Which HTTP router to use
-	Prefix   string            `default:"${PG_PREFIX}" help:"Path prefix"` // HTTP Path Prefix
+	Router   server.HTTPRouter `json:"-" kong:"-"`  // Which HTTP router to use
+	Prefix   string            `help:"Path prefix"` // HTTP Path Prefix
 }
 
 var _ server.Plugin = Config{}

pkg/provider/meta/meta.go

@@ -173,23 +173,21 @@ var (
 )
 
 func setValue(rv reflect.Value, str string) error {
+	// Zero value
+	if str == "" {
+		rv.SetZero()
+		return nil
+	}
+
 	switch rv.Kind() {
 	case reflect.Bool:
-		// Zero value
-		if str == "" {
-			rv.SetZero()
-		}
 		// Bool
 		if v, err := strconv.ParseBool(str); err != nil {
 			return httpresponse.ErrBadRequest.Withf("invalid value for %s: %q", rv.Type(), str)
 		} else {
 			rv.SetBool(v)
 		}
 	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		// Zero value
-		if str == "" {
-			rv.SetZero()
-		}
 		// Duration
 		if rv.Type() == durationType {
 			if v, err := time.ParseDuration(str); err != nil {
@@ -205,21 +203,13 @@ func setValue(rv reflect.Value, str string) error {
 			rv.SetInt(v)
 		}
 	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		// Zero value
-		if str == "" {
-			rv.SetZero()
-		}
 		// Uint
 		if v, err := strconv.ParseUint(str, 10, 64); err != nil {
 			return httpresponse.ErrBadRequest.Withf("invalid value for %s: %q", rv.Type(), str)
 		} else {
 			rv.SetUint(v)
 		}
 	case reflect.Float32, reflect.Float64:
-		// Zero value
-		if str == "" {
-			rv.SetZero()
-		}
 		// Float
 		if v, err := strconv.ParseFloat(str, 64); err != nil {
 			return httpresponse.ErrBadRequest.Withf("invalid value for %s: %q", rv.Type(), str)
@@ -229,8 +219,13 @@ func setValue(rv reflect.Value, str string) error {
 	case reflect.String:
 		// String
 		rv.SetString(str)
+	default:
+		// TODO URL and Datetime
+		return httpresponse.ErrBadRequest.Withf("invalid value for %s: %q", rv.Type(), str)
 	}
-	return httpresponse.ErrBadRequest.Withf("invalid value for %s: %q", rv.Type(), str)
+
+	// Return success
+	return nil
 }
 
 func typeName(rt reflect.Type) string {