Merge pull request #17 from ibuildthecloud/random

Random

.drone.yml

@@ -1,4 +1,9 @@
-image: rancher/dind:v1.10.0-rancher1
-script:
- - wrapdocker
- - make ci
+---
+pipeline:
+  build:
+    privileged: true
+    image: rancher/dapper:1.10.3
+    volumes:
+    - /var/run/docker.sock:/var/run/docker.sock
+    commands:
+    - dapper ci

cmd/common.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"github.com/rancher/go-rancher/v2"
 	"io"
 	"os"
 	"os/exec"
@@ -12,7 +13,6 @@ import (
 	"text/template"
 
 	"github.com/docker/docker/pkg/namesgenerator"
-	"github.com/rancher/go-rancher/client"
 	"github.com/urfave/cli"
 )
 
@@ -129,12 +129,12 @@ func LookupEnvironment(c *client.RancherClient, name string) (*client.Project, e
 	return c.Project.ById(env.Id)
 }
 
-func GetOrCreateDefaultStack(c *client.RancherClient, name string) (*client.Environment, error) {
+func GetOrCreateDefaultStack(c *client.RancherClient, name string) (*client.Stack, error) {
 	if name == "" {
 		name = "Default"
 	}
 
-	resp, err := c.Environment.List(&client.ListOpts{
+	resp, err := c.Stack.List(&client.ListOpts{
 		Filters: map[string]interface{}{
 			"name":         name,
 			"removed_null": 1,
@@ -148,7 +148,7 @@ func GetOrCreateDefaultStack(c *client.RancherClient, name string) (*client.Envi
 		return &resp.Data[0], nil
 	}
 
-	return c.Environment.Create(&client.Environment{
+	return c.Stack.Create(&client.Stack{
 		Name: name,
 	})
 }
@@ -175,12 +175,12 @@ func RandomName() string {
 
 func getServiceByName(c *client.RancherClient, name string) (client.ResourceCollection, error) {
 	var result client.ResourceCollection
-	env, serviceName, err := ParseName(c, name)
+	stack, serviceName, err := ParseName(c, name)
 
 	services, err := c.Service.List(&client.ListOpts{
 		Filters: map[string]interface{}{
-			"environmentId": env.Id,
-			"name":          serviceName,
+			"stackId": stack.Id,
+			"name":    serviceName,
 		},
 	})
 	if err != nil {

cmd/config.go

@@ -10,8 +10,9 @@ import (
 	"path"
 	"strings"
 
+	"github.com/rancher/go-rancher/v2"
+
 	"github.com/Sirupsen/logrus"
-	"github.com/rancher/go-rancher/client"
 	"github.com/urfave/cli"
 )
 
@@ -24,7 +25,7 @@ type Config struct {
 }
 
 func baseURL(fullURL string) (string, error) {
-	idx := strings.LastIndex(fullURL, "/v1")
+	idx := strings.LastIndex(fullURL, "/v2-beta")
 	if idx == -1 {
 		u, err := url.Parse(fullURL)
 		if err != nil {
@@ -61,7 +62,7 @@ func (c Config) EnvironmentURL() (string, error) {
 	if err != nil {
 		return "", err
 	}
-	url = url + "/v1/projects/" + projectID + "/schemas"
+	url = url + "/v2-beta/projects/" + projectID + "/schemas"
 	return url, nil
 }
 

cmd/docker.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/rancher/go-rancher/client"
+	"github.com/rancher/go-rancher/v2"
 	"github.com/rancher/rancher-docker-api-proxy"
 	"github.com/urfave/cli"
 )

cmd/env.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/rancher/go-rancher/client"
+	"github.com/rancher/go-rancher/v2"
 	"github.com/urfave/cli"
 )
 

cmd/events.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/rancher/cli/monitor"
+	"github.com/rancher/go-rancher/v2"
 	"github.com/urfave/cli"
 )
 
@@ -17,10 +18,10 @@ func EventsCommand() cli.Command {
 		ArgsUsage:   "None",
 		Action:      events,
 		Flags: []cli.Flag{
-			//cli.StringFlag{
-			//	Name:  "format",
-			//	Usage: "'json' or Custom format: {{.Id}} {{.Name}}",
-			//},
+			cli.StringFlag{
+				Name:  "format",
+				Usage: "'json' or Custom format: {{.Id}} {{.Name}}",
+			},
 			cli.BoolFlag{
 				Name:  "reconnect,r",
 				Usage: "Reconnect on error",
@@ -29,40 +30,63 @@ func EventsCommand() cli.Command {
 	}
 }
 
-func events(ctx *cli.Context) error {
-	c, err := GetClient(ctx)
-	if err != nil {
-		return err
+func getClientForSubscribe(ctx *cli.Context) (*client.RancherClient, error) {
+	if ctx.Bool("all") {
+		return GetRawClient(ctx)
 	}
+	return GetClient(ctx)
+}
 
-	m := monitor.New(c)
-	sub := m.Subscribe()
-	go func() {
-		if ctx.Bool("reconnect") {
-			for {
-				if err := m.Start(); err != nil {
-					logrus.Error(err)
-				}
+func events(ctx *cli.Context) error {
+	reconnect := ctx.Bool("reconnect")
+
+	for {
+		c, err := getClientForSubscribe(ctx)
+		if err != nil {
+			if reconnect {
+				logrus.Error(err)
 				time.Sleep(time.Second)
+				continue
+			} else {
+				return err
 			}
-		} else {
-			logrus.Fatal(m.Start())
 		}
-	}()
 
-	for event := range sub.C {
-		resource, _ := event.Data["resource"].(map[string]interface{})
-		state, _ := resource["state"].(string)
-		name, _ := resource["name"].(string)
+		m := monitor.New(c)
+		sub := m.Subscribe()
+		go func() {
+			if ctx.Bool("reconnect") {
+				for {
+					if err := m.Start(); err != nil {
+						logrus.Error(err)
+					}
+					time.Sleep(time.Second)
+				}
+			} else {
+				logrus.Fatal(m.Start())
+			}
+		}()
+
+		format := ctx.String("format")
+		for event := range sub.C {
+			if format == "" {
+				resource, _ := event.Data["resource"].(map[string]interface{})
+				name, _ := resource["name"].(string)
+				state, _ := resource["state"].(string)
+
+				if name == "ping" {
+					continue
+				}
 
-		if len(state) > 0 {
-			message := resource["transitioningMessage"]
-			if message == nil {
-				message = ""
+				message, _ := resource["transitioningMessage"].(string)
+				fmt.Printf("%s %s %s [%s] %v\n", event.ResourceType, event.ResourceID, state, name, message)
+			} else {
+				writer := NewTableWriter(nil, ctx)
+				writer.Write(event)
+				if err := writer.Err(); err != nil {
+					logrus.Error(err)
+				}
 			}
-			fmt.Printf("%s %s %s [%s] %v\n", event.ResourceType, event.ResourceID, state, name, message)
 		}
 	}
-
-	return nil
 }

cmd/exec.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/rancher/go-rancher/client"
+	"github.com/rancher/go-rancher/v2"
 	"github.com/urfave/cli"
 )
 

cmd/export.go

@@ -48,12 +48,12 @@ func exportService(ctx *cli.Context) error {
 		return err
 	}
 
-	env, err := c.Environment.ById(resource.Id)
+	env, err := c.Stack.ById(resource.Id)
 	if err != nil {
 		return err
 	}
 
-	config, err := c.Environment.ActionExportconfig(env, nil)
+	config, err := c.Stack.ActionExportconfig(env, nil)
 	if err != nil {
 		return err
 	}

cmd/format.go

@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/rancher/go-rancher/client"
+	"github.com/rancher/go-rancher/v2"
 )
 
 func FormatEndpoint(data interface{}) string {

cmd/host.go

@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/rancher/go-rancher/client"
+	"github.com/rancher/go-rancher/v2"
 	"github.com/urfave/cli"
 )
 

cmd/host_create.go

@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/rancher/go-rancher/client"
+	"github.com/rancher/go-rancher/v2"
 	"github.com/urfave/cli"
 )
 

cmd/inspect.go

@@ -3,12 +3,12 @@ package cmd
 import (
 	"strings"
 
-	"github.com/rancher/go-rancher/client"
+	"github.com/rancher/go-rancher/v2"
 	"github.com/urfave/cli"
 )
 
 var (
-	inspectTypes = []string{"service", "container", "host", "project", "environment"}
+	inspectTypes = []string{"service", "container", "host", "project", "stack"}
 )
 
 func InspectCommand() cli.Command {
@@ -44,14 +44,14 @@ func inspectResources(ctx *cli.Context) error {
 		mapResource := map[string]interface{}{}
 		err := c.ById(resource.Type, resource.Id, &mapResource)
 		if err != nil {
-			return "", err
+			return "-", err
 		}
 		if !ctx.Bool("links") {
 			delete(mapResource, "links")
 			delete(mapResource, "actions")
 		}
 		writer.Write(mapResource)
-		return "", nil
+		return "-", nil
 	})
 	return writer.Err()
 }