Fixup small issues with regards to deploying (#110)

* Fix any inconsistencies in README.md
* Add extra debug output
* Add roadmap items
* Bump chart version

Author: berndtj

README.md

@@ -43,7 +43,7 @@ $ sudo sh -c 'echo "$(minikube ip) dev.dispatch.vmware.com api.dev.dispatch.vmwa
 
 Get the dispatch command:
 ```
-$ curl -OL https://github.com/vmware/dispatch/releases/download/v0.1.1/dispatch-darwin
+$ curl -OL https://github.com/vmware/dispatch/releases/download/v0.1.2/dispatch-darwin
 $ chmod +x dispatch-darwin
 ```
 
@@ -62,7 +62,7 @@ dispatch:
   port: 443
   image:
     host: vmware
-    tag: v0.1.1
+    tag: v0.1.2
   debug: true
   openfaasRepository:
     host: <docker repo>
@@ -135,9 +135,24 @@ $ ./dispatch-darwin get functions
 Execute a function:
 ```
 $ ./dispatch-darwin exec hello-py --input '{"name": "Jon", "place": "Winterfell"}' --wait
-Function hello-py finished successfully.
 {
-    "myField": "Hello, Jon from Winterfell"
+    "blocking": true,
+    "executedTime": 1515624222,
+    "finishedTime": 1515624222,
+    "functionId": "5138d918-e78f-41d6-aece-769addd3eed7",
+    "functionName": "hello-py",
+    "input": {
+        "name": "Jon",
+        "place": "Winterfell"
+    },
+    "logs": null,
+    "name": "b5b3c1f5-fa8a-4b38-b7d1-475c44b76114",
+    "output": {
+        "myField": "Hello, Jon from Winterfell"
+    },
+    "reason": null,
+    "secrets": [],
+    "status": "READY"
 }
 ```
 

charts/dispatch/Chart.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 description: A platform for deploying serverless applications
 name: dispatch
-version: 0.1.1
+version: 0.1.2

charts/dispatch/values.yaml

@@ -5,7 +5,7 @@ global:
   pullPolicy: IfNotPresent
   organization: dispatch
   image:
-    tag: v0.1.1
+    tag: v0.1.2
     host: vmware
   debug: true
   trace: false

docs/_front/roadmap.md

@@ -74,4 +74,12 @@ feature description.
 Dispatch is a multi-tenant serverless framework.  The top unit of tenancy is "organization".  Because, Dispatch only
 supports a single IDP per installation, organization is akin to a business unit with a larger enterprise.  Currently,
 a single organization is hard-coded at installation time, however organization is expected to become a configurable
-resource.
+resource.
+
+## 1.6 Scale Dispatch Components
+
+Currently the Dispatch deployment specifies a single instance of each component.  This is fine for development, but
+production deployments must scale.  We need to understand how load effects Dispatch and ensure that Dispatch can scale
+within reason.  This may require some architectural changes to ensure that work is only done once.
+
+## 1.7 Function Chaining through Events

pkg/dispatchcli/cmd/install.go

@@ -310,7 +310,11 @@ func readConfig(out, errOut io.Writer, file string) (*installConfig, error) {
 	if err != nil {
 		return nil, errors.Wrapf(err, "Error decoding default install config yaml file")
 	}
-
+	if installDebug {
+		b, _ := json.MarshalIndent(config, "", "    ")
+		fmt.Fprintln(out, "Config before merge")
+		fmt.Fprintln(out, string(b))
+	}
 	err = mergo.Merge(&config, defaultInstallConfig)
 	if err != nil {
 		return nil, errors.Wrapf(err, "Error merging default values")

pkg/dispatchcli/cmd/install_config.go

@@ -52,7 +52,7 @@ dispatch:
   certSecret: dispatch-tls
   image:
     host: vmware
-    tag: dev-xxxx
+    tag: v0.1.2
   database: postgres
   debug: true
   trace: true

pkg/dispatchcli/cmd/login.go

@@ -27,6 +27,7 @@ var (
 
 	// TODO: Add examples
 	loginExample = i18n.T(``)
+	loginDebug   = false
 )
 
 // NewCmdLogin creates a command to login to VMware Dispatch.
@@ -41,6 +42,9 @@ func NewCmdLogin(in io.Reader, out, errOut io.Writer) *cobra.Command {
 			CheckErr(err)
 		},
 	}
+
+	cmd.Flags().BoolVar(&loginDebug, "debug", false, "Extra debug output")
+
 	return cmd
 }
 
@@ -96,7 +100,13 @@ func login(in io.Reader, out, errOut io.Writer, cmd *cobra.Command, args []strin
 			}.Encode()),
 		},
 	}
-	requestURL := fmt.Sprintf("https://%s:%d%s?%s", dispatchConfig.Host, dispatchConfig.Port, oauth2Path, vals.Encode())
+	requestURL := fmt.Sprintf("https://%s%s?%s", dispatchConfig.Host, oauth2Path, vals.Encode())
+	if dispatchConfig.Port != 443 {
+		requestURL = fmt.Sprintf("https://%s:%d%s?%s", dispatchConfig.Host, dispatchConfig.Port, oauth2Path, vals.Encode())
+	}
+	if loginDebug {
+		fmt.Fprintf(out, "Logging into: %s\n", requestURL)
+	}
 	err := webbrowser.Open(requestURL)
 	if err != nil {
 		return errors.Wrap(err, "error opening web browser")