cmd/rofl/machine/show: Add JSON output

Author: matevz

cmd/rofl/build/artifacts.go

@@ -22,15 +22,18 @@ import (
 	"github.com/oasisprotocol/oasis-core/go/common/crypto/hash"
 
 	"github.com/oasisprotocol/cli/build/env"
+	"github.com/oasisprotocol/cli/cmd/common"
 )
 
 const artifactCacheDir = "build_cache"
 
 // maybeDownloadArtifact downloads the given artifact and optionally verifies its integrity against
 // the hash provided in the URI fragment.
 func maybeDownloadArtifact(kind, uri string) string {
-	fmt.Printf("Downloading %s artifact...\n", kind)
-	fmt.Printf("  URI: %s\n", uri)
+	if common.OutputFormat() != common.FormatJSON {
+		fmt.Printf("Downloading %s artifact...\n", kind)
+		fmt.Printf("  URI: %s\n", uri)
+	}
 
 	url, err := url.Parse(uri)
 	if err != nil {
@@ -49,7 +52,7 @@ func maybeDownloadArtifact(kind, uri string) string {
 	if url.Fragment != "" {
 		knownHash = url.Fragment
 	}
-	if knownHash != "" {
+	if knownHash != "" && common.OutputFormat() != common.FormatJSON {
 		fmt.Printf("  Hash: %s\n", knownHash)
 	}
 
@@ -77,7 +80,9 @@ func maybeDownloadArtifact(kind, uri string) string {
 		}
 		f.Close()
 
-		fmt.Printf("  (using cached artifact)\n")
+		if common.OutputFormat() != common.FormatJSON {
+			fmt.Printf("  (using cached artifact)\n")
+		}
 	case errors.Is(err, os.ErrNotExist):
 		// Does not exist in cache, download.
 		f, err = os.Create(cacheFn)

cmd/rofl/machine/show.go

@@ -3,6 +3,7 @@ package machine
 import (
 	"context"
 	"encoding/binary"
+	"encoding/json"
 	"fmt"
 	"net"
 	"strings"
@@ -63,10 +64,21 @@ var showCmd = &cobra.Command{
 		if err != nil {
 			// The "instance not found" error originates from Rust code, so we can't compare it nicely here.
 			if strings.Contains(err.Error(), "instance not found") {
-				cobra.CheckErr("Machine instance not found.\nTip: This often happens when instances expire. Run `oasis rofl deploy --replace-machine` to rent a new one.")
+				switch common.OutputFormat() {
+				case common.FormatJSON:
+					fmt.Printf("{ \"error\": \"%s\" }\n", err)
+				case common.FormatText:
+					cobra.CheckErr("Machine instance not found.\nTip: This often happens when instances expire. Run `oasis rofl deploy --replace-machine` to rent a new one.")
+				}
 			}
 			cobra.CheckErr(err)
 		}
+		if common.OutputFormat() == common.FormatJSON {
+			data, err := json.MarshalIndent(insDsc, "", "  ")
+			cobra.CheckErr(err)
+			fmt.Printf("%s\n", data)
+			return
+		}
 
 		insCmds, err := conn.Runtime(npa.ParaTime).ROFLMarket.InstanceCommands(ctx, client.RoundLatest, *providerAddr, machineID)
 		cobra.CheckErr(err)
@@ -236,5 +248,6 @@ func showMachinePorts(extraCfg *roflCmdBuild.AppExtraConfig, appID rofl.AppID, i
 
 func init() {
 	common.AddSelectorFlags(showCmd)
+	showCmd.Flags().AddFlagSet(common.FormatFlag)
 	showCmd.Flags().AddFlagSet(roflCommon.DeploymentFlags)
 }