Merge pull request #77 from kmala/health

ref(routable): move routable from config to appsettings

Author: kmala

api/appsettings.go

@@ -14,5 +14,12 @@ type AppSettings struct {
 	// It changes every time the application settings is changed and cannot be updated.
 	UUID string `json:"uuid,omitempty"`
 	// Maintenance determines if the application is taken down for maintenance or not.
-	Maintenance *bool `json:"maintenance"`
+	Maintenance *bool `json:"maintenance,omitempty"`
+	// Routable determines if the application should be exposed by the router.
+	Routable *bool `json:"routable,omitempty"`
+}
+
+func NewRoutable() *bool {
+	b := true
+	return &b
 }

api/config.go

@@ -44,13 +44,6 @@ type Config struct {
 	// UUID is a unique string reflecting the configuration in its current state.
 	// It changes every time the configuration is changed and cannot be updated.
 	UUID string `json:"uuid,omitempty"`
-	// Routable determines if the application should be exposed by the router.
-	Routable *bool `json:"routable,omitempty"`
-}
-
-func NewRoutable() *bool {
-	b := true
-	return &b
 }
 
 // ConfigHookRequest defines the request for configuration from the config hook.

appsettings/appsettings_test.go

@@ -17,6 +17,7 @@ const appSettingsFixture string = `
     "owner": "test",
     "app": "example-go",
     "maintenance": true,
+    "routable": true,
     "created": "2014-01-01T00:00:00UTC",
     "updated": "2014-01-01T00:00:00UTC",
     "uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"
@@ -28,14 +29,15 @@ const appSettingsUnsetFixture string = `
     "owner": "test",
     "app": "unset-test",
 	  "maintenance": true,
+    "routable": true,
     "created": "2014-01-01T00:00:00UTC",
     "updated": "2014-01-01T00:00:00UTC",
     "uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"
 }
 `
 
-const appSettingsSetExpected string = `{"maintenance":true}`
-const appSettingsUnsetExpected string = `{"maintenance":true}`
+const appSettingsSetExpected string = `{"maintenance":true,"routable":true}`
+const appSettingsUnsetExpected string = `{"maintenance":true,"routable":true}`
 
 var trueVar = true
 
@@ -122,6 +124,7 @@ func TestAppSettingsSet(t *testing.T) {
 	expected := api.AppSettings{
 		Owner:       "test",
 		App:         "example-go",
+		Routable:    api.NewRoutable(),
 		Maintenance: &trueVar,
 		Created:     "2014-01-01T00:00:00UTC",
 		Updated:     "2014-01-01T00:00:00UTC",
@@ -130,6 +133,7 @@ func TestAppSettingsSet(t *testing.T) {
 
 	appSettingsVars := api.AppSettings{
 		Maintenance: &trueVar,
+		Routable:    api.NewRoutable(),
 	}
 
 	actual, err := Set(deis, "example-go", appSettingsVars)
@@ -159,13 +163,15 @@ func TestAppSettingsUnset(t *testing.T) {
 		Owner:       "test",
 		App:         "unset-test",
 		Maintenance: &trueVar,
+		Routable:    api.NewRoutable(),
 		Created:     "2014-01-01T00:00:00UTC",
 		Updated:     "2014-01-01T00:00:00UTC",
 		UUID:        "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
 	}
 
 	appSettingsVars := api.AppSettings{
 		Maintenance: &trueVar,
+		Routable:    api.NewRoutable(),
 	}
 
 	actual, err := Set(deis, "unset-test", appSettingsVars)
@@ -195,6 +201,7 @@ func TestAppSettingsList(t *testing.T) {
 		Owner:       "test",
 		App:         "example-go",
 		Maintenance: &trueVar,
+		Routable:    api.NewRoutable(),
 		Created:     "2014-01-01T00:00:00UTC",
 		Updated:     "2014-01-01T00:00:00UTC",
 		UUID:        "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",

config/config_test.go

@@ -32,7 +32,6 @@ const configFixture string = `
     "registry": {
       "username": "bob"
     },
-    "routable": true,
     "created": "2014-01-01T00:00:00UTC",
     "updated": "2014-01-01T00:00:00UTC",
     "uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"
@@ -48,15 +47,14 @@ const configUnsetFixture string = `
     "cpu": {},
     "tags": {},
 	"registry": {},
-	"routable": true,
     "created": "2014-01-01T00:00:00UTC",
     "updated": "2014-01-01T00:00:00UTC",
     "uuid": "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75"
 }
 `
 
-const configSetExpected string = `{"values":{"FOO":"bar","TEST":"testing"},"memory":{"web":"1G"},"cpu":{"web":"1000"},"tags":{"test":"tests"},"registry":{"username":"bob"},"routable":true}`
-const configUnsetExpected string = `{"values":{"FOO":null,"TEST":null},"memory":{"web":null},"cpu":{"web":null},"tags":{"test":null},"registry":{"username":null},"routable":true}`
+const configSetExpected string = `{"values":{"FOO":"bar","TEST":"testing"},"memory":{"web":"1G"},"cpu":{"web":"1000"},"tags":{"test":"tests"},"registry":{"username":"bob"}}`
+const configUnsetExpected string = `{"values":{"FOO":null,"TEST":null},"memory":{"web":null},"cpu":{"web":null},"tags":{"test":null},"registry":{"username":null}}`
 
 type fakeHTTPServer struct{}
 
@@ -146,10 +144,9 @@ func TestConfigSet(t *testing.T) {
 		Registry: map[string]interface{}{
 			"username": "bob",
 		},
-		Routable: api.NewRoutable(),
-		Created:  "2014-01-01T00:00:00UTC",
-		Updated:  "2014-01-01T00:00:00UTC",
-		UUID:     "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
+		Created: "2014-01-01T00:00:00UTC",
+		Updated: "2014-01-01T00:00:00UTC",
+		UUID:    "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
 	}
 
 	configVars := api.Config{
@@ -169,7 +166,6 @@ func TestConfigSet(t *testing.T) {
 		Registry: map[string]interface{}{
 			"username": "bob",
 		},
-		Routable: api.NewRoutable(),
 	}
 
 	actual, err := Set(deis, "example-go", configVars)
@@ -203,7 +199,6 @@ func TestConfigUnset(t *testing.T) {
 		CPU:      map[string]interface{}{},
 		Tags:     map[string]interface{}{},
 		Registry: map[string]interface{}{},
-		Routable: api.NewRoutable(),
 		Created:  "2014-01-01T00:00:00UTC",
 		Updated:  "2014-01-01T00:00:00UTC",
 		UUID:     "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
@@ -226,7 +221,6 @@ func TestConfigUnset(t *testing.T) {
 		Registry: map[string]interface{}{
 			"username": nil,
 		},
-		Routable: api.NewRoutable(),
 	}
 
 	actual, err := Set(deis, "unset-test", configVars)
@@ -271,10 +265,9 @@ func TestConfigList(t *testing.T) {
 		Registry: map[string]interface{}{
 			"username": "bob",
 		},
-		Routable: api.NewRoutable(),
-		Created:  "2014-01-01T00:00:00UTC",
-		Updated:  "2014-01-01T00:00:00UTC",
-		UUID:     "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
+		Created: "2014-01-01T00:00:00UTC",
+		Updated: "2014-01-01T00:00:00UTC",
+		UUID:    "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
 	}
 
 	actual, err := List(deis, "example-go")