Squashed 'tools/' changes from e9e7e6b..b990f48

b990f48 Merge pull request #42 from kinvolk/lorenzo/fix-git-diff
224a145 Check if SHA1 exists before calling `git diff`
1c3000d Add auto_apply config for wcloud
0ebf5c0 Fix wcloud -serivice
4fe078a Merge pull request #39 from weaveworks/fix-wrong-subtree-use
3f4934d Remove generate_latest_map
48beb60 Sync changes done directly in scope/tools
45dcdd5 Merge pull request #37 from weaveworks/fix-mflag-missing
b895344 Use mflag package from weaveworks fork until we find a better solution
e030008 Merge pull request #36 from weaveworks/wcloud-service-flags
9cbab40 Add wcloud Makefile
ef55901 Review feedback, and build wcloud in circle.
3fe92f5 Add wcloud deploy --service flag
3527b56 Merge pull request #34 from weaveworks/repo-branch
92cd0b8 [wcloud] Add support for repo_branch option
9f760ab Allow wcloud users to override username
38037f8 Merge pull request #33 from weaveworks/wcloud-templates
7acfbd7 Propagate the local username
e6876d1 Add template fields to wcloud config.
f1bb537 Merge pull request #30 from weaveworks/mike/shell-lint/dont-error-if-empty
e60f5df Merge pull request #31 from weaveworks/mike/fix-shell-lint-errors
e8e2b69 integrations: Fix a shellcheck linter error
a781575 shell-lint: Don't fail if no shell scripts found
db5efc0 Merge pull request #28 from weaveworks/mike/add-image-tag
5312c40 Import image-tag script into build tools so it can be shared
7e850f8 Fix logs path
dda9785 Update deploy api
f2f4e5b Fix the wcloud client
3925eb6 Merge pull request #27 from weaveworks/wcloud-events
77355b9 Lint
d9a1c6c Add wcloud events, update flags and error nicely when there is no config

git-subtree-dir: tools
git-subtree-split: b990f488bdc7909b62d9245bc4b4caf58f5ae7ea

cmd/wcloud/cli.go

@@ -7,6 +7,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
+	"os/user"
 	"path/filepath"
 	"strings"
 	"time"
@@ -15,6 +16,19 @@ import (
 	"gopkg.in/yaml.v2"
 )
 
+// ArrayFlags allows you to collect repeated flags
+type ArrayFlags []string
+
+func (a *ArrayFlags) String() string {
+	return strings.Join(*a, ",")
+}
+
+// Set implements flags.Value
+func (a *ArrayFlags) Set(value string) error {
+	*a = append(*a, value)
+	return nil
+}
+
 func env(key, def string) string {
 	if val, ok := os.LookupEnv(key); ok {
 		return val
@@ -52,6 +66,8 @@ func main() {
 		config(c, os.Args[2:])
 	case "logs":
 		logs(c, os.Args[2:])
+	case "events":
+		events(c, os.Args[2:])
 	case "help":
 		usage()
 	default:
@@ -60,6 +76,17 @@ func main() {
 }
 
 func deploy(c Client, args []string) {
+	var (
+		flags    = flag.NewFlagSet("", flag.ContinueOnError)
+		username = flags.String("u", "", "Username to report to deploy service (default with be current user)")
+		services ArrayFlags
+	)
+	flags.Var(&services, "service", "Service to update (can be repeated)")
+	if err := flags.Parse(args); err != nil {
+		usage()
+		return
+	}
+	args = flags.Args()
 	if len(args) != 1 {
 		usage()
 		return
@@ -69,9 +96,19 @@ func deploy(c Client, args []string) {
 		usage()
 		return
 	}
+	if *username == "" {
+		user, err := user.Current()
+		if err != nil {
+			fmt.Println(err.Error())
+			os.Exit(1)
+		}
+		*username = user.Username
+	}
 	deployment := Deployment{
-		ImageName: parts[0],
-		Version:   parts[1],
+		ImageName:        parts[0],
+		Version:          parts[1],
+		TriggeringUser:   *username,
+		IntendedServices: services,
 	}
 	if err := c.Deploy(deployment); err != nil {
 		fmt.Println(err.Error())
@@ -80,14 +117,17 @@ func deploy(c Client, args []string) {
 }
 
 func list(c Client, args []string) {
-	flags := flag.NewFlagSet("list", flag.ContinueOnError)
-	page := flags.Int("page", 0, "Zero based index of page to list.")
-	pagesize := flags.Int("page-size", 10, "Number of results per page")
+	var (
+		flags = flag.NewFlagSet("", flag.ContinueOnError)
+		since = flags.Duration("since", 7*24*time.Hour, "How far back to fetch results")
+	)
 	if err := flags.Parse(args); err != nil {
 		usage()
 		return
 	}
-	deployments, err := c.GetDeployments(*page, *pagesize)
+	through := time.Now()
+	from := through.Add(-*since)
+	deployments, err := c.GetDeployments(from.Unix(), through.Unix())
 	if err != nil {
 		fmt.Println(err.Error())
 		os.Exit(1)
@@ -109,6 +149,26 @@ func list(c Client, args []string) {
 	table.Render()
 }
 
+func events(c Client, args []string) {
+	var (
+		flags = flag.NewFlagSet("", flag.ContinueOnError)
+		since = flags.Duration("since", 7*24*time.Hour, "How far back to fetch results")
+	)
+	if err := flags.Parse(args); err != nil {
+		usage()
+		return
+	}
+	through := time.Now()
+	from := through.Add(-*since)
+	events, err := c.GetEvents(from.Unix(), through.Unix())
+	if err != nil {
+		fmt.Println(err.Error())
+		os.Exit(1)
+	}
+
+	fmt.Println("events: ", string(events))
+}
+
 func loadConfig(filename string) (*Config, error) {
 	extension := filepath.Ext(filename)
 	var config Config