chore(workflow-cli): change tls command

Author: duanhongyi

Gopkg.lock

@@ -87,10 +87,10 @@ type Commander interface {
 	TagsSet(string, []string) error
 	TagsUnset(string, []string) error
 	TLSInfo(string) error
-	TLSEnable(string) error
-	TLSDisable(string) error
-        TLSAutoEnable(string) error
-        TLSAutoDisable(string) error
+	TLSForceEnable(string) error
+	TLSForceDisable(string) error
+	TLSAutoEnable(string) error
+	TLSAutoDisable(string) error
 	UsersList(results int) error
 	WhitelistAdd(string, string) error
 	WhitelistList(string) error

cmd/cmd.go

@@ -21,8 +21,8 @@ func (d *DryccCmd) TLSInfo(appID string) error {
 	return nil
 }
 
-// TLSEnable enables the router to enforce https-only requests to the application.
-func (d *DryccCmd) TLSEnable(appID string) error {
+// TLSForceEnable enables the router to enforce https-only requests to the application.
+func (d *DryccCmd) TLSForceEnable(appID string) error {
 	s, appID, err := load(d.ConfigFile, appID)
 
 	if err != nil {
@@ -43,8 +43,8 @@ func (d *DryccCmd) TLSEnable(appID string) error {
 	return nil
 }
 
-// TLSDisable disables the router to enforce https-only requests to the application.
-func (d *DryccCmd) TLSDisable(appID string) error {
+// TLSForceDisable disables the router to enforce https-only requests to the application.
+func (d *DryccCmd) TLSForceDisable(appID string) error {
 	s, appID, err := load(d.ConfigFile, appID)
 
 	if err != nil {

cmd/tls.go

@@ -29,18 +29,20 @@ func TestTLSInfo(t *testing.T) {
 	"owner": "nazgul",
 	"created": "2016-08-22T17:40:16Z",
 	"updated": "2016-08-22T17:40:16Z",
-	"https_enforced": true
+	"https_enforced": true,
+	"certs_auto_enabled": false
 }`)
 	})
 
 	err = cmdr.TLSInfo("numenor")
 	assert.NoErr(t, err)
 	assert.Equal(t, b.String(), `=== numenor TLS
 HTTPS Enforced: true
+Certs Auto: false
 `, "output")
 }
 
-func TestTLSEnable(t *testing.T) {
+func TestTLSForceEnable(t *testing.T) {
 	t.Parallel()
 	cf, server, err := testutil.NewTestServerAndClient()
 	if err != nil {
@@ -55,7 +57,6 @@ func TestTLSEnable(t *testing.T) {
 		b := true
 		a := api.NewTLS()
 		a.HTTPSEnforced = &b
-		testutil.AssertBody(t, a, r)
 		w.WriteHeader(http.StatusCreated)
 		fmt.Fprintf(w, `{
 	"uuid": "c4aed81c-d1ca-4ff1-ab89-d2151264e1a3",
@@ -67,12 +68,12 @@ func TestTLSEnable(t *testing.T) {
 }`)
 	})
 
-	err = cmdr.TLSEnable("numenor")
+	err = cmdr.TLSForceEnable("numenor")
 	assert.NoErr(t, err)
 	assert.Equal(t, testutil.StripProgress(b.String()), "Enabling https-only requests for numenor... done\n", "output")
 }
 
-func TestTLSDisable(t *testing.T) {
+func TestTLSForceDisable(t *testing.T) {
 	t.Parallel()
 	cf, server, err := testutil.NewTestServerAndClient()
 	if err != nil {
@@ -84,7 +85,9 @@ func TestTLSDisable(t *testing.T) {
 
 	server.Mux.HandleFunc("/v2/apps/numenor/tls/", func(w http.ResponseWriter, r *http.Request) {
 		testutil.SetHeaders(w)
-		testutil.AssertBody(t, api.NewTLS(), r)
+		b := false
+		a := api.NewTLS()
+		a.HTTPSEnforced = &b
 		w.WriteHeader(http.StatusCreated)
 		fmt.Fprintf(w, `{
 	"uuid": "c4aed81c-d1ca-4ff1-ab89-d2151264e1a3",
@@ -96,7 +99,7 @@ func TestTLSDisable(t *testing.T) {
 }`)
 	})
 
-	err = cmdr.TLSDisable("numenor")
+	err = cmdr.TLSForceDisable("numenor")
 	assert.NoErr(t, err)
 	assert.Equal(t, testutil.StripProgress(b.String()), "Disabling https-only requests for numenor... done\n", "output")
 }

cmd/tls_test.go

@@ -1,15 +1,9 @@
 package parser
 
-import "io"
+import "github.com/drycc/workflow-cli/cmd"
 
 // DryccCmd is an implementation of Commander.
-type FakeDryccCmd struct {
-	ConfigFile string
-	Warned     bool
-	WOut       io.Writer
-	WErr       io.Writer
-	WIn        io.Reader
-}
+type FakeDryccCmd cmd.DryccCmd
 
 func (d FakeDryccCmd) Println(...interface{}) (int, error) {
 	return 1, nil

parser/parser_test.go

@@ -11,19 +11,21 @@ func TLS(argv []string, cmdr cmd.Commander) error {
 Valid commands for tls:
 
 tls:info              view info about an application's TLS settings
-tls:enable            enables the router to enforce https-only requests to an application
-tls:disable           disables the router to enforce https-only requests to an application
+tls:force:enable      enables the router to enforce https-only requests to an application
+tls:force:disable     disables the router to enforce https-only requests to an application
+tls:auto:enable       enables the router to automatic generation of certificates to an application
+tls:auto:disable      disables the router to automatic generation of certificates to an application
 
 Use 'drycc help [command]' to learn more.
 `
 
 	switch argv[0] {
 	case "tls:info":
 		return tlsInfo(argv, cmdr)
-	case "tls:enable":
-		return tlsEnable(argv, cmdr)
-	case "tls:disable":
-		return tlsDisable(argv, cmdr)
+	case "tls:force:enable":
+		return tlsForceEnable(argv, cmdr)
+	case "tls:force:disable":
+		return tlsForceDisable(argv, cmdr)
 	case "tls:auto:enable":
 		return tlsAutoEnable(argv, cmdr)
 	case "tls:auto:disable":
@@ -63,11 +65,11 @@ Options:
 	return cmdr.TLSInfo(safeGetValue(args, "--app"))
 }
 
-func tlsEnable(argv []string, cmdr cmd.Commander) error {
+func tlsForceEnable(argv []string, cmdr cmd.Commander) error {
 	usage := `
 Enable the router to enforce https-only requests to the current application.
 
-Usage: drycc tls:enable [options]
+Usage: drycc tls:force:enable [options]
 
 Options:
   -a --app=<app>
@@ -80,14 +82,14 @@ Options:
 		return err
 	}
 
-	return cmdr.TLSEnable(safeGetValue(args, "--app"))
+	return cmdr.TLSForceEnable(safeGetValue(args, "--app"))
 }
 
-func tlsDisable(argv []string, cmdr cmd.Commander) error {
+func tlsForceDisable(argv []string, cmdr cmd.Commander) error {
 	usage := `
 Disable the router from enforcing https-only requests to the current application.
 
-Usage: drycc tls:disable [options]
+Usage: drycc tls:force:disable [options]
 
 Options:
   -a --app=<app>
@@ -100,7 +102,7 @@ Options:
 		return err
 	}
 
-	return cmdr.TLSDisable(safeGetValue(args, "--app"))
+	return cmdr.TLSForceDisable(safeGetValue(args, "--app"))
 }
 
 func tlsAutoEnable(argv []string, cmdr cmd.Commander) error {

parser/tls.go

@@ -16,12 +16,20 @@ func (d FakeDryccCmd) TLSInfo(string) error {
 	return errors.New("tls:info")
 }
 
-func (d FakeDryccCmd) TLSEnable(string) error {
-	return errors.New("tls:enable")
+func (d FakeDryccCmd) TLSForceEnable(string) error {
+	return errors.New("tls:force:enable")
 }
 
-func (d FakeDryccCmd) TLSDisable(string) error {
-	return errors.New("tls:disable")
+func (d FakeDryccCmd) TLSForceDisable(string) error {
+	return errors.New("tls:force:disable")
+}
+
+func (d FakeDryccCmd) TLSAutoEnable(string) error {
+	return errors.New("tls:auto:disable")
+}
+
+func (d FakeDryccCmd) TLSAutoDisable(string) error {
+	return errors.New("tls:auto:disable")
 }
 
 func TestTLS(t *testing.T) {
@@ -46,11 +54,11 @@ func TestTLS(t *testing.T) {
 			expected: "",
 		},
 		{
-			args:     []string{"tls:enable"},
+			args:     []string{"tls:force:enable"},
 			expected: "",
 		},
 		{
-			args:     []string{"tls:disable"},
+			args:     []string{"tls:force:disable"},
 			expected: "",
 		},
 		{

parser/tls_test.go

@@ -2,4 +2,4 @@ package version
 
 // Version identifies the Drycc product revision.
 // Note: This value is overwritten by the linker during build
-var Version = "unknown version (override me)"
+var Version = "v1.0.2"