Allows storagedriver parameter values to be of type interface{}

This enables use of nil, booleans, numeric types, and even complex structures for parameter values, assuming they can be parsed from yaml.

configuration/configuration.go

@@ -103,7 +103,7 @@ func (storage Storage) Parameters() Parameters {
 }
 
 // setParameter changes the parameter at the provided key to the new value
-func (storage Storage) setParameter(key, value string) {
+func (storage Storage) setParameter(key string, value interface{}) {
 	storage[storage.Type()][key] = value
 }
 
@@ -143,7 +143,7 @@ func (storage Storage) MarshalYAML() (interface{}, error) {
 }
 
 // Parameters defines a key-value parameters mapping
-type Parameters map[string]string
+type Parameters map[string]interface{}
 
 // Reporting defines error reporting methods.
 type Reporting struct {

configuration/configuration_test.go

@@ -21,12 +21,12 @@ var configStruct = Configuration{
 			"region":    "us-east-1",
 			"bucket":    "my-bucket",
 			"rootpath":  "/registry",
-			"encrypt":   "true",
-			"secure":    "false",
+			"encrypt":   true,
+			"secure":    false,
 			"accesskey": "SAMPLEACCESSKEY",
 			"secretkey": "SUPERSECRET",
-			"host":      "",
-			"port":      "",
+			"host":      nil,
+			"port":      42,
 		},
 	},
 	Reporting: Reporting{
@@ -50,7 +50,7 @@ storage:
     accesskey: SAMPLEACCESSKEY
     secretkey: SUPERSECRET
     host: ~
-    port: ~
+    port: 42
 reporting:
   bugsnag:
     apikey: BugsnagApiKey
@@ -142,7 +142,7 @@ func (suite *ConfigSuite) TestParseWithSameEnvStorage(c *C) {
 // Configuration struct
 func (suite *ConfigSuite) TestParseWithDifferentEnvStorageParams(c *C) {
 	suite.expectedConfig.Storage.setParameter("region", "us-west-1")
-	suite.expectedConfig.Storage.setParameter("secure", "true")
+	suite.expectedConfig.Storage.setParameter("secure", true)
 	suite.expectedConfig.Storage.setParameter("newparam", "some Value")
 
 	os.Setenv("REGISTRY_STORAGE_S3_REGION", "us-west-1")