[ckecli] add sabakan enable subcommand

"ckecli sabakan disable" no longer removes sabakan URL.

Author: ymmt2005

docs/ckecli.md

@@ -215,18 +215,23 @@ Copy files between hosts via scp.
 
 Control [sabakan integration feature](sabakan-integration.md).
 
+### `ckecli sabakan enable|disable`
+
+Enables/Disables sabakan integration.
+
+The integration will run when:
+- It is *not* disabled, and
+- URL of sabakan is set with `ckecli sabakan set-url`, and
+- Cluster configuration template is set with `ckecli sabakan set-template`.
+
 ### `ckecli sabakan set-url URL`
 
-Set URL of sabakan.  This enables sabakan integration.
+Set URL of sabakan.
 
 ### `ckecli sabakan get-url`
 
 Show stored URL of sabakan.
 
-### `ckecli sabakan disable`
-
-Disables sabakan integration and removes sabakan URL.
-
 ### `ckecli sabakan set-template FILE`
 
 Set the cluster configuration template.

docs/schema.md

@@ -76,6 +76,10 @@ Non-namespace resources omit `/<NAMESPACE>` part.
 
 Configurations for [sabakan integration](sabakan-integration.md).
 
+### `sabakan/disabled`
+
+If this key exists and its value is `true`, sabakan integration is disabled.
+
 ### `sabakan/query-variables`
 
 User-specified variables for the GraphQL query.

mtest/ckecli.go

@@ -103,4 +103,11 @@ func TestCKECLI() {
 			execSafeAt(host1, "rm", "-f", srcFile, dstFile)
 		}
 	})
+
+	It("should invoke sabakan subcommand successfully", func() {
+		ckecliSafe("sabakan", "set-url", "http://localhost:10080")
+		ckecliSafe("sabakan", "disable")
+		ckecliSafe("sabakan", "enable")
+		ckecliSafe("sabakan", "get-url")
+	})
 }

pkg/ckecli/cmd/sabakan_disable.go

@@ -1,18 +1,21 @@
 package cmd
 
 import (
+	"context"
+
 	"github.com/cybozu-go/well"
 	"github.com/spf13/cobra"
 )
 
-// sabakanDisableCmd represents the "sabakan disable" command
 var sabakanDisableCmd = &cobra.Command{
 	Use:   "disable",
 	Short: "disable sabakan integration",
-	Long:  `Disable sabakan integration by removing stored sabakan URL.`,
+	Long:  `Disable sabakan integration.`,
 
 	RunE: func(cmd *cobra.Command, args []string) error {
-		well.Go(storage.DeleteSabakanURL)
+		well.Go(func(ctx context.Context) error {
+			return storage.EnableSabakan(ctx, false)
+		})
 		well.Stop()
 		return well.Wait()
 	},

pkg/ckecli/cmd/sabakan_enable.go

@@ -0,0 +1,26 @@
+package cmd
+
+import (
+	"context"
+
+	"github.com/cybozu-go/well"
+	"github.com/spf13/cobra"
+)
+
+var sabakanEnableCmd = &cobra.Command{
+	Use:   "enable",
+	Short: "enable sabakan integration",
+	Long:  `Enable sabakan integration.`,
+
+	RunE: func(cmd *cobra.Command, args []string) error {
+		well.Go(func(ctx context.Context) error {
+			return storage.EnableSabakan(ctx, true)
+		})
+		well.Stop()
+		return well.Wait()
+	},
+}
+
+func init() {
+	sabakanCmd.AddCommand(sabakanEnableCmd)
+}

sabakan/integrate.go

@@ -51,6 +51,14 @@ func (ig integrator) StartWatch(ctx context.Context, ch chan<- struct{}) error {
 func (ig integrator) Do(ctx context.Context, leaderKey string) error {
 	st := cke.Storage{Client: ig.etcd}
 
+	disabled, err := st.IsSabakanDisabled(ctx)
+	if err != nil {
+		return err
+	}
+	if disabled {
+		return nil
+	}
+
 	tmpl, rev, err := st.GetSabakanTemplate(ctx)
 	switch err {
 	case cke.ErrNotFound:

storage.go

@@ -1,6 +1,7 @@
 package cke
 
 import (
+	"bytes"
 	"context"
 	"encoding/json"
 	"errors"
@@ -31,6 +32,7 @@ const (
 	KeyRecords               = "records/"
 	KeyRecordID              = "records"
 	KeyResourcePrefix        = "resource/"
+	KeySabakanDisabled       = "sabakan/disabled"
 	KeySabakanQueryVariables = "sabakan/query-variables"
 	KeySabakanTemplate       = "sabakan/template"
 	KeySabakanURL            = "sabakan/url"
@@ -573,6 +575,30 @@ func (s Storage) DeleteResource(ctx context.Context, key string) error {
 	return err
 }
 
+// IsSabakanDisabled returns true if sabakan integration is disabled.
+func (s Storage) IsSabakanDisabled(ctx context.Context) (bool, error) {
+	resp, err := s.Get(ctx, KeySabakanDisabled)
+	if err != nil {
+		return false, err
+	}
+	if resp.Count == 0 {
+		return false, nil
+	}
+
+	if bytes.Equal([]byte("true"), resp.Kvs[0].Value) {
+		return true, nil
+	}
+	return false, nil
+}
+
+// EnableSabakan enables sabakan integration when flag is true.
+// When flag is false, sabakan integration is disabled.
+func (s Storage) EnableSabakan(ctx context.Context, flag bool) error {
+	val := fmt.Sprint(!flag)
+	_, err := s.Put(ctx, KeySabakanDisabled, val)
+	return err
+}
+
 // SetSabakanQueryVariables sets query variables for Sabakan.
 // Caller must validate the contents.
 func (s Storage) SetSabakanQueryVariables(ctx context.Context, vars string) error {
@@ -646,9 +672,3 @@ func (s Storage) GetSabakanURL(ctx context.Context) (string, error) {
 	}
 	return string(resp.Kvs[0].Value), nil
 }
-
-// DeleteSabakanURL deletes URL of sabakan API.
-func (s Storage) DeleteSabakanURL(ctx context.Context) error {
-	_, err := s.Delete(ctx, KeySabakanURL)
-	return err
-}

storage_test.go

@@ -537,14 +537,30 @@ func testStorageSabakan(t *testing.T) {
 		t.Error(`u2 != u`, u2)
 	}
 
-	err = s.DeleteSabakanURL(ctx)
+	disabled, err := s.IsSabakanDisabled(ctx)
 	if err != nil {
 		t.Fatal(err)
 	}
+	if disabled {
+		t.Error("sabakan integration should not be disabled by default")
+	}
 
-	_, err = s.GetSabakanURL(ctx)
-	if err != ErrNotFound {
-		t.Error("URL was not removed")
+	err = s.EnableSabakan(ctx, false)
+	if err != nil {
+		t.Fatal(err)
+	}
+	disabled, err = s.IsSabakanDisabled(ctx)
+	if !disabled {
+		t.Error("sabakan integration could not be disabled")
+	}
+
+	err = s.EnableSabakan(ctx, true)
+	if err != nil {
+		t.Fatal(err)
+	}
+	disabled, err = s.IsSabakanDisabled(ctx)
+	if disabled {
+		t.Error("sabakan integration could not be re-enabled")
 	}
 }