vendor: update go-tsuruclient and fixes for new version

tsuru · Dec 20, 2018 · 12d698d · 12d698d
1 parent 4ae3f4e
commit 12d698d
Show file tree

Hide file tree

Showing 150 changed files with 10,624 additions and 6,548 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/tsuru/admin/broker.go b/tsuru/admin/broker.go
@@ -158,12 +158,10 @@ func (c *BrokerList) Run(ctx *cmd.Context, cli *cmd.Client) error {
 	}
 	for _, b := range brokerList.Brokers {
 		authMethod := "None"
-		if b.Config.AuthConfig != nil {
-			if b.Config.AuthConfig.BasicAuthConfig != nil {
-				authMethod = "Basic\n"
-			} else if b.Config.AuthConfig.BearerConfig != nil {
-				authMethod = "Bearer\n"
-			}
+		if b.Config.AuthConfig.BasicAuthConfig.Username != "" {
+			authMethod = "Basic\n"
+		} else if b.Config.AuthConfig.BearerConfig.Token != "" {
+			authMethod = "Bearer\n"
 		}
 		var contexts []string
 		for k, v := range b.Config.Context {
@@ -185,15 +183,6 @@ func (c *BrokerList) Run(ctx *cmd.Context, cli *cmd.Client) error {
 func flagsForServiceBroker(broker *tsuru.ServiceBroker, cacheExpiration *string) *gnuflag.FlagSet {
 	fs := gnuflag.NewFlagSet("", gnuflag.ExitOnError)
 
-	if broker.Config == nil {
-		broker.Config = &tsuru.ServiceBrokerConfig{
-			AuthConfig: &tsuru.ServiceBrokerConfigAuthConfig{
-				BasicAuthConfig: &tsuru.ServiceBrokerConfigAuthConfigBasicAuthConfig{},
-				BearerConfig:    &tsuru.ServiceBrokerConfigAuthConfigBearerConfig{},
-			},
-		}
-	}
-
 	insecure := "Ignore TLS errors in the broker request."
 	fs.BoolVar(&broker.Config.Insecure, "insecure", false, insecure)
 	fs.BoolVar(&broker.Config.Insecure, "i", false, insecure)
@@ -222,12 +211,6 @@ func flagsForServiceBroker(broker *tsuru.ServiceBroker, cacheExpiration *string)
 
 func parseServiceBroker(broker *tsuru.ServiceBroker, ctx *cmd.Context, cacheExpiration string) error {
 	broker.Name, broker.URL = ctx.Args[0], ctx.Args[1]
-	if broker.Config.AuthConfig.BearerConfig.Token == "" {
-		broker.Config.AuthConfig.BearerConfig = nil
-	}
-	if broker.Config.AuthConfig.BasicAuthConfig.Password == "" && broker.Config.AuthConfig.BasicAuthConfig.Username == "" {
-		broker.Config.AuthConfig.BasicAuthConfig = nil
-	}
 	if len(cacheExpiration) > 0 {
 		duration, err := time.ParseDuration(cacheExpiration)
 		if err != nil {

diff --git a/tsuru/admin/broker_test.go b/tsuru/admin/broker_test.go
@@ -34,13 +34,13 @@ func (s *S) TestBrokerAdd(c *check.C) {
 			c.Assert(ret, check.DeepEquals, tsuru.ServiceBroker{
 				Name: "br1",
 				URL:  "http://x.com",
-				Config: &tsuru.ServiceBrokerConfig{
-					AuthConfig: &tsuru.ServiceBrokerConfigAuthConfig{
-						BasicAuthConfig: &tsuru.ServiceBrokerConfigAuthConfigBasicAuthConfig{
+				Config: tsuru.ServiceBrokerConfig{
+					AuthConfig: tsuru.ServiceBrokerConfigAuthConfig{
+						BasicAuthConfig: tsuru.ServiceBrokerConfigAuthConfigBasicAuthConfig{
 							Password: "password",
 							Username: "username",
 						},
-						BearerConfig: &tsuru.ServiceBrokerConfigAuthConfigBearerConfig{
+						BearerConfig: tsuru.ServiceBrokerConfigAuthConfigBearerConfig{
 							Token: "ABCDE",
 						},
 					},
@@ -85,11 +85,7 @@ func (s *S) TestBrokerAddEmptyAuth(c *check.C) {
 			c.Assert(ret, check.DeepEquals, tsuru.ServiceBroker{
 				Name: "br1",
 				URL:  "http://x.com",
-				Config: &tsuru.ServiceBrokerConfig{
-					AuthConfig: &tsuru.ServiceBrokerConfigAuthConfig{
-						BasicAuthConfig: nil,
-						BearerConfig:    nil,
-					},
+				Config: tsuru.ServiceBrokerConfig{
 					Context: map[string]string{
 						"p1": "v1",
 						"p2": "v2",
@@ -159,13 +155,13 @@ func (s *S) TestBrokerUpdate(c *check.C) {
 			c.Assert(ret, check.DeepEquals, tsuru.ServiceBroker{
 				Name: "br1",
 				URL:  "http://x.com",
-				Config: &tsuru.ServiceBrokerConfig{
-					AuthConfig: &tsuru.ServiceBrokerConfigAuthConfig{
-						BasicAuthConfig: &tsuru.ServiceBrokerConfigAuthConfigBasicAuthConfig{
+				Config: tsuru.ServiceBrokerConfig{
+					AuthConfig: tsuru.ServiceBrokerConfigAuthConfig{
+						BasicAuthConfig: tsuru.ServiceBrokerConfigAuthConfigBasicAuthConfig{
 							Password: "password",
 							Username: "username",
 						},
-						BearerConfig: &tsuru.ServiceBrokerConfigAuthConfigBearerConfig{
+						BearerConfig: tsuru.ServiceBrokerConfigAuthConfigBearerConfig{
 							Token: "ABCDE",
 						},
 					},
@@ -210,11 +206,7 @@ func (s *S) TestBrokerUpdateEmptyAuth(c *check.C) {
 			c.Assert(ret, check.DeepEquals, tsuru.ServiceBroker{
 				Name: "br1",
 				URL:  "http://x.com",
-				Config: &tsuru.ServiceBrokerConfig{
-					AuthConfig: &tsuru.ServiceBrokerConfigAuthConfig{
-						BasicAuthConfig: nil,
-						BearerConfig:    nil,
-					},
+				Config: tsuru.ServiceBrokerConfig{
 					Context: map[string]string{
 						"p1": "v1",
 						"p2": "v2",
@@ -324,10 +316,10 @@ func (s *S) TestBrokerList(c *check.C) {
 		{
 			Name: "aws",
 			URL:  "https://192.168.99.100:31767/aws-service-broker",
-			Config: &tsuru.ServiceBrokerConfig{
+			Config: tsuru.ServiceBrokerConfig{
 				Insecure: true,
-				AuthConfig: &tsuru.ServiceBrokerConfigAuthConfig{
-					BearerConfig: &tsuru.ServiceBrokerConfigAuthConfigBearerConfig{
+				AuthConfig: tsuru.ServiceBrokerConfigAuthConfig{
+					BearerConfig: tsuru.ServiceBrokerConfigAuthConfigBearerConfig{
 						Token: "xpto",
 					},
 				},
@@ -340,9 +332,9 @@ func (s *S) TestBrokerList(c *check.C) {
 		{
 			Name: "azure",
 			URL:  "https://localhost:9090",
-			Config: &tsuru.ServiceBrokerConfig{
-				AuthConfig: &tsuru.ServiceBrokerConfigAuthConfig{
-					BasicAuthConfig: &tsuru.ServiceBrokerConfigAuthConfigBasicAuthConfig{
+			Config: tsuru.ServiceBrokerConfig{
+				AuthConfig: tsuru.ServiceBrokerConfigAuthConfig{
+					BasicAuthConfig: tsuru.ServiceBrokerConfigAuthConfigBasicAuthConfig{
 						Password: "pass",
 						Username: "user",
 					},

diff --git a/tsuru/admin/cluster.go b/tsuru/admin/cluster.go
@@ -79,7 +79,7 @@ func (c *ClusterAdd) Run(ctx *cmd.Context, cli *cmd.Client) error {
 		Addresses:   c.addresses,
 		Pools:       c.pools,
 		CustomData:  c.customData,
-		Default_:    c.isDefault,
+		Default:     c.isDefault,
 		Provisioner: provisioner,
 		CreateData:  c.createData,
 	}
@@ -89,21 +89,21 @@ func (c *ClusterAdd) Run(ctx *cmd.Context, cli *cmd.Client) error {
 		if err != nil {
 			return err
 		}
-		clus.Cacert = string(data)
+		clus.Cacert = data
 	}
 	if c.clientcert != "" {
 		data, err = ioutil.ReadFile(c.clientcert)
 		if err != nil {
 			return err
 		}
-		clus.Clientcert = string(data)
+		clus.Clientcert = data
 	}
 	if c.clientkey != "" {
 		data, err = ioutil.ReadFile(c.clientkey)
 		if err != nil {
 			return err
 		}
-		clus.Clientkey = string(data)
+		clus.Clientkey = data
 	}
 	response, err := apiClient.ClusterApi.ClusterCreate(context.TODO(), clus)
 	if err != nil {
@@ -171,7 +171,7 @@ func (c *ClusterUpdate) Run(ctx *cmd.Context, cli *cmd.Client) error {
 		Addresses:   c.addresses,
 		Pools:       c.pools,
 		CustomData:  c.customData,
-		Default_:    c.isDefault,
+		Default:     c.isDefault,
 		Provisioner: provisioner,
 	}
 	var data []byte
@@ -180,21 +180,21 @@ func (c *ClusterUpdate) Run(ctx *cmd.Context, cli *cmd.Client) error {
 		if err != nil {
 			return err
 		}
-		clus.Cacert = string(data)
+		clus.Cacert = data
 	}
 	if c.clientcert != "" {
 		data, err = ioutil.ReadFile(c.clientcert)
 		if err != nil {
 			return err
 		}
-		clus.Clientcert = string(data)
+		clus.Clientcert = data
 	}
 	if c.clientkey != "" {
 		data, err = ioutil.ReadFile(c.clientkey)
 		if err != nil {
 			return err
 		}
-		clus.Clientkey = string(data)
+		clus.Clientkey = data
 	}
 	resp, err := apiClient.ClusterApi.ClusterUpdate(context.TODO(), name, clus)
 	if err != nil {
@@ -242,7 +242,7 @@ func (c *ClusterList) Run(ctx *cmd.Context, cli *cmd.Client) error {
 		for k, v := range c.CustomData {
 			custom = append(custom, fmt.Sprintf("%s=%s", k, v))
 		}
-		tbl.AddRow(tablecli.Row{c.Name, c.Provisioner, strings.Join(c.Addresses, "\n"), strings.Join(custom, "\n"), strconv.FormatBool(c.Default_), strings.Join(c.Pools, "\n")})
+		tbl.AddRow(tablecli.Row{c.Name, c.Provisioner, strings.Join(c.Addresses, "\n"), strings.Join(custom, "\n"), strconv.FormatBool(c.Default), strings.Join(c.Pools, "\n")})
 	}
 	fmt.Fprint(ctx.Stdout, tbl.String())
 	return nil

diff --git a/tsuru/admin/cluster_test.go b/tsuru/admin/cluster_test.go
@@ -40,13 +40,13 @@ func (s *S) TestClusterAddRun(c *check.C) {
 			c.Assert(err, check.IsNil)
 			c.Assert(clus, check.DeepEquals, tsuru.Cluster{
 				Name:        "c1",
-				Cacert:      "cadata",
-				Clientcert:  "certdata",
-				Clientkey:   "keydata",
+				Cacert:      []byte("cadata"),
+				Clientcert:  []byte("certdata"),
+				Clientkey:   []byte("keydata"),
 				CustomData:  map[string]string{"a": "b", "c": "d"},
 				Addresses:   []string{"addr1", "addr2"},
 				Pools:       []string{"p1", "p2"},
-				Default_:    true,
+				Default:     true,
 				Provisioner: "myprov",
 				CreateData:  map[string]string{"iaas": "dockermachine"},
 			})
@@ -105,13 +105,13 @@ func (s *S) TestClusterUpdateRun(c *check.C) {
 			c.Assert(err, check.IsNil)
 			c.Assert(clus, check.DeepEquals, tsuru.Cluster{
 				Name:        "c1",
-				Cacert:      "cadata",
-				Clientcert:  "certdata",
-				Clientkey:   "keydata",
+				Cacert:      []byte("cadata"),
+				Clientcert:  []byte("certdata"),
+				Clientkey:   []byte("keydata"),
 				CustomData:  map[string]string{"a": "b", "c": "d"},
 				Addresses:   []string{"addr1", "addr2"},
 				Pools:       []string{"p1", "p2"},
-				Default_:    true,
+				Default:     true,
 				Provisioner: "myprov",
 			})
 			return true
@@ -156,16 +156,16 @@ func (s *S) TestClusterListRun(c *check.C) {
 	clusters := []tsuru.Cluster{{
 		Name:        "c1",
 		Addresses:   []string{"addr1", "addr2"},
-		Cacert:      "cacert",
-		Clientcert:  "clientcert",
-		Clientkey:   "clientkey",
+		Cacert:      []byte("cacert"),
+		Clientcert:  []byte("clientcert"),
+		Clientkey:   []byte("clientkey"),
 		CustomData:  map[string]string{"namespace": "ns1"},
-		Default_:    true,
+		Default:     true,
 		Provisioner: "prov1",
 	}, {
 		Name:        "c2",
 		Addresses:   []string{"addr3"},
-		Default_:    false,
+		Default:     false,
 		Pools:       []string{"p1", "p2"},
 		Provisioner: "prov2",
 	}}

diff --git a/tsuru/client/auth.go b/tsuru/client/auth.go
@@ -188,7 +188,7 @@ func (c *TeamCreate) Run(ctx *cmd.Context, cli *cmd.Client) error {
 		return err
 	}
 	team := ctx.Args[0]
-	_, err = apiClient.TeamApi.TeamCreate(context.TODO(), tsuru.TeamData{
+	_, err = apiClient.TeamApi.TeamCreate(context.TODO(), tsuru.TeamCreateArgs{
 		Name: team,
 		Tags: c.tags,
 	})
@@ -236,7 +236,7 @@ func (t *TeamUpdate) Run(ctx *cmd.Context, cli *cmd.Client) error {
 		return err
 	}
 	team := ctx.Args[0]
-	_, err = apiClient.TeamApi.TeamUpdate(context.TODO(), team, tsuru.UpdateData{
+	_, err = apiClient.TeamApi.TeamUpdate(context.TODO(), team, tsuru.TeamUpdateArgs{
 		Newname: t.newName,
 		Tags:    t.tags,
 	})

diff --git a/tsuru/client/auth_test.go b/tsuru/client/auth_test.go
@@ -39,10 +39,10 @@ func (s *S) TestTeamCreate(c *check.C) {
 			c.Assert(r.Header.Get("Content-Type"), check.Equals, "application/json")
 			data, err := ioutil.ReadAll(r.Body)
 			c.Assert(err, check.IsNil)
-			var ret tsuru.TeamData
+			var ret tsuru.TeamCreateArgs
 			err = json.Unmarshal(data, &ret)
 			c.Assert(err, check.IsNil)
-			c.Assert(ret, check.DeepEquals, tsuru.TeamData{Name: "core", Tags: []string{"tag1", "tag2"}})
+			c.Assert(ret, check.DeepEquals, tsuru.TeamCreateArgs{Name: "core", Tags: []string{"tag1", "tag2"}})
 			c.Assert(r.URL.Path, check.DeepEquals, "/1.0/teams")
 			return true
 		},
@@ -72,10 +72,10 @@ func (s *S) TestTeamUpdate(c *check.C) {
 			c.Assert(r.Header.Get("Content-Type"), check.Equals, "application/json")
 			data, err := ioutil.ReadAll(r.Body)
 			c.Assert(err, check.IsNil)
-			var ret tsuru.UpdateData
+			var ret tsuru.TeamUpdateArgs
 			err = json.Unmarshal(data, &ret)
 			c.Assert(err, check.IsNil)
-			c.Assert(ret, check.DeepEquals, tsuru.UpdateData{Newname: "new-team", Tags: []string{"tag1", "tag2"}})
+			c.Assert(ret, check.DeepEquals, tsuru.TeamUpdateArgs{Newname: "new-team", Tags: []string{"tag1", "tag2"}})
 			c.Assert(strings.HasSuffix(r.URL.Path, "/teams/my-team"), check.Equals, true)
 			c.Assert(r.Method, check.Equals, http.MethodPut)
 			return true

diff --git a/tsuru/client/webhook.go b/tsuru/client/webhook.go
@@ -75,7 +75,7 @@ func flagsForWebhook(webhook *tsuru.Webhook) *gnuflag.FlagSet {
 
 	fs.BoolVar(&webhook.Insecure, "insecure", false, "Ignore TLS errors in the webhook request.")
 
-	webhook.EventFilter = &tsuru.WebhookEventFilter{}
+	webhook.EventFilter = tsuru.WebhookEventFilter{}
 	fs.Var(cmd.StringSliceFlagWrapper{Dst: &webhook.EventFilter.TargetTypes}, "target-type",
 		"Target Type for matching events.")
 	fs.Var(cmd.StringSliceFlagWrapper{Dst: &webhook.EventFilter.TargetValues}, "target-value",
@@ -220,9 +220,6 @@ func (c *WebhookUpdate) mergeWebhooks(existing tsuru.Webhook) tsuru.Webhook {
 	} else if c.noHeader {
 		existing.Headers = nil
 	}
-	if existing.EventFilter == nil {
-		existing.EventFilter = &tsuru.WebhookEventFilter{}
-	}
 	if len(new.EventFilter.KindNames) != 0 {
 		existing.EventFilter.KindNames = new.EventFilter.KindNames
 	} else if c.noKindName {
@@ -316,10 +313,7 @@ func (c *WebhookList) Run(ctx *cmd.Context, cli *cmd.Client) error {
 	return nil
 }
 
-func filterToStr(f *tsuru.WebhookEventFilter) string {
-	if f == nil {
-		return ""
-	}
+func filterToStr(f tsuru.WebhookEventFilter) string {
 	var strs []string
 	for _, v := range f.KindTypes {
 		strs = append(strs, fmt.Sprintf("kind-type == %s", v))

diff --git a/tsuru/client/webhook_test.go b/tsuru/client/webhook_test.go
@@ -38,7 +38,7 @@ func (s *S) TestWebhookCreate(c *check.C) {
 			c.Assert(ret, check.DeepEquals, tsuru.Webhook{
 				Name:        "wh1",
 				Url:         "http://x.com",
-				EventFilter: &tsuru.WebhookEventFilter{},
+				EventFilter: tsuru.WebhookEventFilter{},
 			})
 			return true
 		},
@@ -82,7 +82,7 @@ func (s *S) TestWebhookCreateFlags(c *check.C) {
 					"b": {"d"},
 				},
 				Insecure: true,
-				EventFilter: &tsuru.WebhookEventFilter{
+				EventFilter: tsuru.WebhookEventFilter{
 					TargetTypes:  []string{"a1", "b1"},
 					TargetValues: []string{"a2", "b2"},
 					KindTypes:    []string{"k1"},
@@ -145,7 +145,7 @@ func (s *S) TestWebhookList(c *check.C) {
 			"b": {"d"},
 		},
 		Insecure: true,
-		EventFilter: &tsuru.WebhookEventFilter{
+		EventFilter: tsuru.WebhookEventFilter{
 			TargetTypes:  []string{"a1", "b1"},
 			TargetValues: []string{"a2", "b2"},
 			KindTypes:    []string{"k1"},
@@ -236,7 +236,7 @@ func (s *S) TestWebhookUpdate(c *check.C) {
 				Name:        "wh1",
 				Url:         "http://x.com",
 				Method:      "GET",
-				EventFilter: &tsuru.WebhookEventFilter{},
+				EventFilter: tsuru.WebhookEventFilter{},
 				Headers:     map[string][]string{"a": {"b", "c"}},
 			})
 			return true
@@ -290,7 +290,7 @@ func (s *S) TestWebhookUpdateWithFlags(c *check.C) {
 				Name:   "wh1",
 				Url:    "http://y.com",
 				Method: "GET",
-				EventFilter: &tsuru.WebhookEventFilter{
+				EventFilter: tsuru.WebhookEventFilter{
 					KindNames: []string{"app.deploy"},
 				},
 			})

diff --git a/vendor/github.com/antihax/optional/LICENSE b/vendor/github.com/antihax/optional/LICENSE