Version command shows server version (#13)

Author: trueleo

cmd/about.go

@@ -0,0 +1,62 @@
+// Copyright (c) 2023 Cloudnatively Services Pvt Ltd
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package cmd
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"io"
+)
+
+type About struct {
+	Commit          string `json:"commit"`
+	DeploymentID    string `json:"deploymentId"`
+	LatestVersion   any    `json:"latestVersion"`
+	License         string `json:"license"`
+	Mode            string `json:"mode"`
+	Staging         string `json:"staging"`
+	Store           string `json:"store"`
+	UpdateAvailable bool   `json:"updateAvailable"`
+	Version         string `json:"version"`
+}
+
+func FetchAbout(client *HTTPClient) (about About, err error) {
+	req, err := client.NewRequest("GET", "about", nil)
+	if err != nil {
+		return
+	}
+
+	resp, err := client.client.Do(req)
+	if err != nil {
+		return
+	}
+
+	bytes, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode == 200 {
+		err = json.Unmarshal(bytes, &about)
+	} else {
+		body := string(bytes)
+		body = fmt.Sprintf("Request Failed\nStatus Code: %s\nResponse: %s\n", resp.Status, body)
+		err = errors.New(body)
+	}
+	return
+}

cmd/pre.go

@@ -29,6 +29,10 @@ var DefaultProfile config.Profile
 // PreRunDefaultProfile if a profile exists.
 // This is required by mostly all commands except profile
 func PreRunDefaultProfile(_ *cobra.Command, _ []string) error {
+	return PreRun()
+}
+
+func PreRun() error {
 	conf, err := config.ReadConfigFromFile()
 	if os.IsNotExist(err) {
 		return errors.New("no config found to run this command. add a profile using pb profile command")

cmd/version.go

@@ -31,7 +31,21 @@ var VersionCmd = &cobra.Command{
 
 // PrintVersion prints version information
 func PrintVersion(version, commit string) {
-	fmt.Printf("\n%s \n\n", standardStyleAlt.Render("pb version"))
-	fmt.Printf("  %s %s\n", standardStyleBold.Render("version: "), version)
-	fmt.Printf("  %s %s\n\n", standardStyleBold.Render("commit:  "), commit)
+	client := DefaultClient()
+
+	fmt.Printf("\n%s \n", standardStyleAlt.Render("pb version"))
+	fmt.Printf("- %s %s\n", standardStyleBold.Render("version: "), version)
+	fmt.Printf("- %s %s\n\n", standardStyleBold.Render("commit:  "), commit)
+
+	if err := PreRun(); err != nil {
+		return
+	}
+	about, err := FetchAbout(&client)
+	if err != nil {
+		return
+	}
+
+	fmt.Printf("%s %s \n", standardStyleAlt.Render("Connected to"), standardStyleBold.Render(DefaultProfile.URL))
+	fmt.Printf("- %s %s\n", standardStyleBold.Render("version: "), about.Version)
+	fmt.Printf("- %s %s\n\n", standardStyleBold.Render("commit:  "), about.Commit)
 }

main.go

@@ -17,6 +17,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"os"
 	"pb/cmd"
@@ -28,8 +29,8 @@ import (
 	"github.com/spf13/cobra"
 )
 
+// populated at build time
 var (
-	// populated at build time
 	Version string
 	Commit  string
 )
@@ -55,10 +56,13 @@ var cli = &cobra.Command{
 	Use:   "pb",
 	Short: "\nParseable command line tool",
 	Long:  "\npb is a command line tool for Parseable",
-	Run: func(command *cobra.Command, args []string) {
+	RunE: func(command *cobra.Command, args []string) error {
 		if p, _ := command.Flags().GetBool(versionFlag); p {
 			cmd.PrintVersion(Version, Commit)
+			return nil
 		}
+
+		return errors.New("No command or flag supplied\n")
 	},
 }