cli: add multiple modes (interactive, text, json) (#378)

* session: add Mode and helpers to interact
* add-pkg: cmd/akash/deployment
* select the key as default signer when a single key is present locally

Author: gosuri

_integration/cmp/account.go

@@ -9,10 +9,10 @@ import (
 )
 
 func accountBalance(key key, amount int64) gestalt.Component {
-	parse := js.Do(js.Int(amount, "balance"))
+	parse := js.Do(js.Int(amount, "result", "[0]", "balance"))
 
 	return akash("account-balance",
-		"query", "account", key.addr.Var()).
+		"query", "account", "-m", "json", key.addr.Var()).
 		FN(parse).
 		WithMeta(g.Require(key.addr.Name()))
 }

_integration/cmp/key.go

@@ -4,23 +4,16 @@ import (
 	"github.com/ovrclk/gestalt"
 	g "github.com/ovrclk/gestalt/builder"
 	gx "github.com/ovrclk/gestalt/exec"
+	"github.com/ovrclk/gestalt/exec/js"
 	"github.com/ovrclk/gestalt/vars"
 )
 
-func keyCreate(root vars.Ref, key key) gestalt.Component {
-	return akash_(root, "key-create", "key", "create", key.name.Name()).
-		FN(gx.Capture(key.addr.Name())).
-		WithMeta(g.Export(key.addr.Name()))
-}
-
 func keyList(root vars.Ref, key key) gestalt.Component {
-
 	parse := gx.ParseColumns("name", "address").
 		GrepField("name", key.name.Name()).
 		GrepField("address", key.addr.Var()).
 		EnsureCount(1).
 		Done()
-
 	return akash_(root, "key-list", "key", "list").
 		FN(parse).
 		WithMeta(g.Require(key.addr.Name()))
@@ -36,3 +29,11 @@ func groupKey_(root vars.Ref, key key) gestalt.Component {
 		Run(keyList(root, key)).
 		WithMeta(g.Export(key.addr.Name()))
 }
+
+func keyCreate(root vars.Ref, key key) gestalt.Component {
+	return akash_(root, "key-create", "key", "create", "-m", "json", key.name.Name()).
+		FN(js.Do(
+			js.Str(key.name.Name(), "result", "[0]", "name"),
+			js.Any("result", "[0]", "public_key_address").Export(key.addr.Name()),
+		)).WithMeta(g.Export(key.addr.Name()))
+}

_run/multi/akash-provider/templates/deployment.yaml

@@ -28,6 +28,10 @@ spec:
           env:
             - name: AKASH_DATA
               value: /data
+            - name: AKASH_DEPLOYMENT_SERVICE_TYPE
+              value: ClusterIP
+            - name: AKASH_DEPLOYMENT_INGRESS_STATIC_HOSTS
+              value: "false"
           ports:
             - containerPort: {{ .Values.provider.port }}
               name: http

_run/multi/dep-global.yml

@@ -0,0 +1,31 @@
+---
+version: "1.0"
+
+services:
+  web:
+    image: quay.io/ovrclk/demo-app
+    expose:
+      - port: 80
+        as: 80
+        accept:
+          - hello.192.168.99.100.nip.io
+          - hello.192.168.99.101.nip.io
+        to:
+          - global: true
+
+profiles:
+  compute:
+    web:
+      cpu: "0.25"
+      memory: "128Mi"
+      disk: "1Gi"
+  placement:
+    global:
+      pricing:
+        web: 1000u
+
+deployment:
+  web:
+    global:
+      profile: web
+      count: 2

_run/multi/dep-test.yml

@@ -0,0 +1,41 @@
+---
+version: "1.0"
+
+services:
+  web:
+    image: quay.io/ovrclk/demo-app
+    expose:
+      - port: 80
+        as: 80
+        accept:
+          - hello.192.168.99.100.nip.io
+          - hello.192.168.99.101.nip.io
+        to:
+          - global: true
+
+profiles:
+  compute:
+    web:
+      cpu: "0.25"
+      memory: "128Mi"
+      disk: "1Gi"
+  placement:
+    westcoast:
+      attributes:
+        region: us-west
+      pricing:
+        web: 100u
+    eastcoast:
+      attributes:
+        region: us-east
+      pricing:
+        web: 100u
+
+deployment:
+  web:
+    westcoast:
+      profile: web
+      count: 1
+    eastcoast:
+      profile: web
+      count: 1

_run/multi/deployment.yml

@@ -10,6 +10,7 @@ services:
         accept:
           - hello.192.168.99.100.nip.io
           - hello.192.168.99.101.nip.io
+          - hello.192.168.99.127.nip.io
         to:
           - global: true
 

_run/multi/run.sh

@@ -8,9 +8,10 @@ do_init(){
   mkdir -p "$AKASH_DIR"
   mkdir -p "$AKASHD_DIR"
 
-  _akash key create master | grep "Public Key" | awk '{print $3}' > "$DATA_ROOT/master.key"
-  _akash key create other | grep "Public Key" | awk '{print $3}'  > "$DATA_ROOT/other.key"
-
+	eval $(akash key create master -m shell)
+	echo $akash_create_key_0_public_key > "$DATA_ROOT/master.key"
+	eval $(akash key create other -m shell)
+	echo $akash_create_key_0_public_key > "$DATA_ROOT/other.key"
   _akashd init "$(cat "$DATA_ROOT/master.key")" -t helm -c "${HELM_NODE_COUNT:-4}"
 }
 
@@ -31,8 +32,14 @@ case "$1" in
   deploy)
     akash deployment create deployment.yml -k master
     ;;
+  minikube-start)
+    minikube start --cpus 4 --memory 4096 --kubernetes-version v1.12.2
+    minikube addons enable ingress
+    minikube addons enable metrics-server
+    kubectl create -f rbac.yml
+    ;;
   *)
-    echo "USAGE: $0 <init|send|query|marketplace|deploy>" >&2
+    echo "USAGE: $0 <init|send|query|marketplace|deploy|minikube-start>" >&2
     exit 1
     ;;
 esac

_run/single/run.sh

@@ -8,11 +8,10 @@ do_init() {
   mkdir -p "$AKASH_DIR"
   mkdir -p "$AKASHD_DIR"
 
-  akash key create master | grep "Public Key" | awk '{print $3}' > "$DATA_ROOT/master.key"
-  akash key create other | grep "Public Key" | awk '{print $3}' > "$DATA_ROOT/other.key"
+  eval $(akash key create master -m text); echo $PUBLIC_KEY_ADDRESS > "$DATA_ROOT/master.key"
+  eval $(akash key create other -m text); echo $PUBLIC_KEY_ADDRESS > "$DATA_ROOT/other.key"
   akashd init "$(cat "$DATA_ROOT/master.key")"
-
-  akash_provider key create master | grep "Public Key" | awk '{print $3}' > "$DATA_ROOT/provider-master.key"
+  eval $(akash_provider key create master -m text); echo $PUBLIC_KEY_ADDRESS > "$DATA_ROOT/provider-master.key"
 }
 
 case "$1" in

cmd/akash/base.go

@@ -7,10 +7,18 @@ import (
 
 func baseCommand() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:          "akash",
-		Short:        "Akash client",
-		SilenceUsage: true,
+		Use:           "akash",
+		Short:         "Akash CLI Utility",
+		Long:          baseLongDesc,
+		SilenceUsage:  true,
+		SilenceErrors: false,
 	}
 	session.SetupBaseCommand(cmd)
 	return cmd
 }
+
+var baseLongDesc = `Akash CLI Utility. 
+
+Akash is a peer-to-peer marketplace for computing resources and 
+a deployment platform for heavily distributed applications. 
+Find out more at https://akash.network`