refactor(cli): move scheduler status and update module name and imports.

platonic-io · Jan 6, 2021 · 7ea97b6 · 7ea97b6
1 parent 4510c52
commit 7ea97b6
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 35 deletions.
diff --git a/src/cli/cmd/db.go b/src/cli/cmd/db.go
@@ -6,7 +6,7 @@ import (
 	"os/exec"
 
 	"github.com/spf13/cobra"
-	"github.com/symbiont-io/detsys-testkit/lib"
+	"github.com/symbiont-io/detsys-testkit/src/lib"
 )
 
 var dbCmd = &cobra.Command{

diff --git a/src/cli/cmd/debug.go b/src/cli/cmd/debug.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
-	"github.com/symbiont-io/detsys-testkit/lib"
+	"github.com/symbiont-io/detsys-testkit/src/lib"
 )
 
 var debugCmd = &cobra.Command{

diff --git a/src/cli/cmd/root.go b/src/cli/cmd/root.go
@@ -14,7 +14,6 @@ var rootCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(statusCmd)
 	rootCmd.AddCommand(dbCmd)
 	dbCmd.AddCommand(dbInitCmd)
 	dbCmd.AddCommand(dbDropTablesCmd)
@@ -24,6 +23,7 @@ func init() {
 	rootCmd.AddCommand(schedulerCmd)
 	schedulerCmd.AddCommand(schedulerUpCmd)
 	schedulerCmd.AddCommand(schedulerDownCmd)
+	schedulerCmd.AddCommand(schedulerStatusCmd)
 	rootCmd.AddCommand(generateCmd)
 	rootCmd.AddCommand(versionsCmd)
 }

diff --git a/src/cli/cmd/scheduler.go b/src/cli/cmd/scheduler.go
@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"os"
@@ -9,6 +10,7 @@ import (
 	"strconv"
 
 	"github.com/spf13/cobra"
+	"github.com/symbiont-io/detsys-testkit/src/lib"
 )
 
 var schedulerCmd = &cobra.Command{
@@ -95,3 +97,18 @@ var schedulerDownCmd = &cobra.Command{
 		}
 	},
 }
+
+var schedulerStatusCmd = &cobra.Command{
+	Use:   "status",
+	Short: "Show the status of the scheduler",
+	Long:  ``,
+	Args:  cobra.NoArgs,
+	Run: func(cmd *cobra.Command, args []string) {
+		json, err := json.Marshal(lib.Status())
+		if err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+		fmt.Println(string(json))
+	},
+}
diff --git a/src/cli/cmd/status.go b/src/cli/cmd/status.go
diff --git a/src/cli/default.nix b/src/cli/default.nix
@@ -11,16 +11,16 @@ let
 in
 
 buildGoModule rec {
-  pname = "detsys";
+  pname = "cli";
   version = "latest";
-  goPackagePath = "github.com/symbiont-io/detsys-testkit/${pname}";
+  goPackagePath = "github.com/symbiont-io/detsys-testkit/src/${pname}";
 
   src = gitignoreSource ./.;
   buildInputs = [ detsysLib ];
 
   # This hash should be the output of:
   #   go mod vendor && nix-hash --base32 --type sha256 vendor
-  vendorSha256 = "1yirdqkwnaz0iikcipn1nxcgv2ywrg0zhwjklzf6xns8w038bylp";
+  vendorSha256 = "0d7nwxx0i834w0kvixl4map8wb6kw4cz30ckvk394cxm4sblzipd";
 
   buildFlagsArray =
     [ "-ldflags=-X main.version=${lib.commitIdFromGitRepo ./../../.git}" ];
@@ -33,4 +33,10 @@ buildGoModule rec {
     # Static linking.
     export CGO_ENABLED=0
   '';
+
+  # Rename the resulting binary. (We can't use buildFlags with `-o`, because
+  # that also gets passed to `go install` which does not recognise that flag.)
+  postBuild = ''
+    mv $GOPATH/bin/cli $GOPATH/bin/detsys
+  '';
 }
diff --git a/src/cli/go.mod b/src/cli/go.mod
@@ -1,10 +1,10 @@
-module github.com/symbiont-io/detsys-testkit/detsys
+module github.com/symbiont-io/detsys-testkit/src/cli
 
 go 1.15
 
-replace github.com/symbiont-io/detsys-testkit/lib => ../lib
+replace github.com/symbiont-io/detsys-testkit/src/lib => ../lib
 
 require (
 	github.com/spf13/cobra v1.1.1
-	github.com/symbiont-io/detsys-testkit/lib v0.0.0-00010101000000-000000000000
+	github.com/symbiont-io/detsys-testkit/src/lib v0.0.0-00010101000000-000000000000
 )
diff --git a/src/cli/go.sum b/src/cli/go.sum
@@ -150,7 +150,6 @@ github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkU
 github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4=
 github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
-github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=

diff --git a/src/cli/main.go b/src/cli/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/symbiont-io/detsys-testkit/detsys/cmd"
+	"github.com/symbiont-io/detsys-testkit/src/cli/cmd"
 )
 
 var version = "unknown"