fix(tls): change tls info format

Author: duanhongyi

api/tls.go

@@ -32,7 +32,15 @@ func NewTLS() *TLS {
 }
 
 func (t TLS) String() string {
-	tpl := `HTTPSEnforced: %d
-CertsAutoEnabled: %s`
-	return fmt.Sprintf(tpl, *(t.HTTPSEnforced) == true, *(t.CertsAutoEnabled) == true)
+	tpl := `HTTPS Enforced: %s
+Certs Auto: %s`
+	httpsEnforced := "not set"
+	if t.HTTPSEnforced != nil {
+		httpsEnforced = fmt.Sprintf("%t", *(t.HTTPSEnforced))
+	}
+	certsAutoEnabled := "not set"
+	if t.CertsAutoEnabled != nil {
+		certsAutoEnabled = fmt.Sprintf("%t", *(t.CertsAutoEnabled))
+	}
+	return fmt.Sprintf(tpl, httpsEnforced, certsAutoEnabled)
 }

api/tls_test.go

@@ -8,15 +8,15 @@ import (
 func TestTLSString(t *testing.T) {
 	tls := &TLS{}
 
-	expected := "HTTPS Enforced: not set"
+	expected := "HTTPS Enforced: not set\nCerts Auto: not set"
 
 	if strings.TrimSpace(tls.String()) != expected {
 		t.Errorf("Expected:\n\n%s\n\nGot:\n\n%s", expected, tls.String())
 	}
 
 	tls = NewTLS()
 
-	expected = "HTTPS Enforced: false"
+	expected = "HTTPS Enforced: false\nCerts Auto: false"
 
 	if strings.TrimSpace(tls.String()) != expected {
 		t.Errorf("Expected:\n\n%s\n\nGot:\n\n%s", expected, tls.String())
@@ -25,7 +25,7 @@ func TestTLSString(t *testing.T) {
 	b := true
 	tls.HTTPSEnforced = &b
 
-	expected = "HTTPS Enforced: true"
+	expected = "HTTPS Enforced: true\nCerts Auto: false"
 
 	if strings.TrimSpace(tls.String()) != expected {
 		t.Errorf("Expected:\n\n%s\n\nGot:\n\n%s", expected, tls.String())

tls/tls_test.go

@@ -19,15 +19,17 @@ const (
 	"owner": "test",
 	"created": "2016-08-22T17:40:16Z",
 	"updated": "2016-08-22T17:40:16Z",
-	"https_enforced": false
+	"https_enforced": false,
+	"certs_auto_enabled": false
 }`
 	tlsEnabledFixture string = `{
 	"uuid": "c4aed81c-d1ca-4ff1-ab89-d2151264e1a3",
 	"app": "foo",
 	"owner": "test",
 	"created": "2016-08-22T17:40:16Z",
 	"updated": "2016-08-22T17:40:16Z",
-	"https_enforced": true
+	"https_enforced": true,
+	"certs_auto_enabled": null
 }`
 	tlsEnableExpected  string = `{"https_enforced":true}`
 	tlsDisableExpected string = `{"https_enforced":false}`
@@ -123,12 +125,13 @@ func TestTLSInfo(t *testing.T) {
 	t.Parallel()
 
 	expected := api.TLS{
-		Created:       "2016-08-22T17:40:16Z",
-		Updated:       "2016-08-22T17:40:16Z",
-		App:           "foo",
-		Owner:         "test",
-		UUID:          "c4aed81c-d1ca-4ff1-ab89-d2151264e1a3",
-		HTTPSEnforced: new(bool),
+		Created:          "2016-08-22T17:40:16Z",
+		Updated:          "2016-08-22T17:40:16Z",
+		App:              "foo",
+		Owner:            "test",
+		UUID:             "c4aed81c-d1ca-4ff1-ab89-d2151264e1a3",
+		HTTPSEnforced:    new(bool),
+		CertsAutoEnabled: new(bool),
 	}
 
 	handler := fakeHTTPServer{}
@@ -187,7 +190,7 @@ func TestTLSEnable(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	actual, err := Enable(dClient, "foo")
+	actual, err := EnableHTTPSEnforced(dClient, "foo")
 
 	if err != nil {
 		t.Fatal(err)
@@ -207,7 +210,7 @@ func TestTLSEnable(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if _, err = Enable(dClient, "foo"); err != nil {
+	if _, err = EnableHTTPSEnforced(dClient, "foo"); err != nil {
 		t.Errorf("Expected Enable() with poorly JSON response to fail")
 	}
 }
@@ -234,7 +237,7 @@ func TestTLSDisable(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	actual, err := Disable(dClient, "foo")
+	actual, err := DisableHTTPSEnforced(dClient, "foo")
 
 	if err != nil {
 		t.Fatal(err)
@@ -254,7 +257,7 @@ func TestTLSDisable(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	if _, err = Disable(dClient, "foo"); err != nil {
+	if _, err = DisableHTTPSEnforced(dClient, "foo"); err != nil {
 		t.Errorf("Expected Disable() with poorly JSON response to fail")
 	}
 }