handle ports specified as numbers rather than strings

cloud-gov · Jan 15, 2017 · abda9e3 · abda9e3
1 parent a207bdc
commit abda9e3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/models/credentials.go b/models/credentials.go
@@ -39,7 +39,9 @@ type credentialsJSON struct {
 	Pass     string `json:"pass"`
 	///////////////////////////////////////////////////
 
-	Port string `json:"port"`
+	// can be an integer or a string
+	// http://igorsobreira.com/2015/04/11/decoding-json-numbers-into-strings-in-go.html
+	Port json.Number `json:"port"`
 }
 
 func (c credentialsJSON) GetDBName() string {
@@ -80,7 +82,7 @@ func (c credentialsJSON) GetPassword() string {
 }
 
 func (c credentialsJSON) GetPort() string {
-	return c.Port
+	return c.Port.String()
 }
 
 func CredentialsFromJSON(body string) (creds Credentials, err error) {

diff --git a/models/credentials_test.go b/models/credentials_test.go
@@ -70,6 +70,20 @@ func TestCredentialsFromJSON(t *testing.T) {
 			"user",
 			"pass",
 		},
+		{
+			`{
+				"host_name": "host.com",
+				"port": 5432,
+				"name": "name",
+				"user_name": "user",
+				"password": "pass"
+			}`,
+			"host.com",
+			"5432",
+			"name",
+			"user",
+			"pass",
+		},
 	}
 
 	for _, test := range tests {