refactor: form to json review

go.mod

@@ -6,7 +6,8 @@ require (
 	github.com/ajg/form v0.0.0-20160822230020-523a5da1a92f
 	github.com/antihax/optional v0.0.0-20180407024304-ca021399b1a6
 	github.com/digitalocean/godo v1.1.1 // indirect
-	github.com/docker/docker v20.10.8+incompatible
+	github.com/docker/distribution v2.7.1+incompatible // indirect
+	github.com/docker/docker v20.10.9+incompatible
 	github.com/docker/go-connections v0.4.0
 	github.com/docker/machine v0.16.1
 	github.com/exoscale/egoscale v0.9.31 // indirect
@@ -18,13 +19,16 @@ require (
 	github.com/sethvargo/go-password v0.1.1
 	github.com/tsuru/config v0.0.0-20201023175036-375aaee8b560
 	github.com/tsuru/gnuflag v0.0.0-20151217162021-86b8c1b864aa
-	github.com/tsuru/go-tsuruclient v0.0.0-20210426181646-b7774d33597a
+	github.com/tsuru/go-tsuruclient v0.0.0-20210820124232-e0cdf446d41d
 	github.com/tsuru/tablecli v0.0.0-20190131152944-7ded8a3383c6
-	github.com/tsuru/tsuru v0.0.0-20210831124236-38cab1d28262
-	golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
+	github.com/tsuru/tsuru v0.0.0-20210706143918-b89a484dc93f
+	golang.org/x/crypto v0.0.0-20201012173705-84dcc777aaee
+	google.golang.org/api v0.7.0 // indirect
+	google.golang.org/appengine v1.6.1 // indirect
 	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/apimachinery v0.20.6
+	k8s.io/apimachinery v0.18.9
+	k8s.io/client-go v11.0.1-0.20190805182715-88a2adca7e76+incompatible // indirect
 )
 
 replace (

tsuru/admin/cluster.go

@@ -30,7 +30,6 @@ type ClusterAdd struct {
 	addresses  cmd.StringSliceFlag
 	pools      cmd.StringSliceFlag
 	customData cmd.MapFlag
-	createData cmd.MapFlag
 	isDefault  bool
 }
 
@@ -51,16 +50,14 @@ func (c *ClusterAdd) Flags() *gnuflag.FlagSet {
 		c.fs.Var(&c.pools, "pool", desc)
 		desc = "Custom provisioner specific data."
 		c.fs.Var(&c.customData, "custom", desc)
-		desc = "Create data, if set an iaas will be called with this data to create a new machine."
-		c.fs.Var(&c.createData, "create-data", desc)
 	}
 	return c.fs
 }
 
 func (c *ClusterAdd) Info() *cmd.Info {
 	return &cmd.Info{
 		Name:    "cluster-add",
-		Usage:   "cluster add <name> <provisioner> [--addr address...] [--pool poolname]... [--cacert cacertfile] [--clientcert clientcertfile] [--clientkey clientkeyfile] [--custom key=value]... [--create-data key=value]... [--default]",
+		Usage:   "cluster add <name> <provisioner> [--addr address...] [--pool poolname]... [--cacert cacertfile] [--clientcert clientcertfile] [--clientkey clientkeyfile] [--custom key=value]...  [--default]",
 		Desc:    `Creates a provisioner cluster definition.`,
 		MinArgs: 2,
 		MaxArgs: 2,
@@ -84,7 +81,6 @@ func (c *ClusterAdd) Run(ctx *cmd.Context, cli *cmd.Client) error {
 		CustomData:  c.customData,
 		Default:     c.isDefault,
 		Provisioner: provisioner,
-		CreateData:  c.createData,
 	}
 	var data []byte
 	if c.cacert != "" {
@@ -134,8 +130,6 @@ type ClusterUpdate struct {
 	removePool       cmd.StringSliceFlag
 	addCustomData    cmd.MapFlag
 	removeCustomData cmd.StringSliceFlag
-	addCreateData    cmd.MapFlag
-	removeCreateData cmd.StringSliceFlag
 }
 
 func (c *ClusterUpdate) Flags() *gnuflag.FlagSet {
@@ -165,18 +159,14 @@ func (c *ClusterUpdate) Flags() *gnuflag.FlagSet {
 		c.fs.Var(&c.addCustomData, "add-custom", desc)
 		desc = "Remove custom provisioner specific data."
 		c.fs.Var(&c.removeCustomData, "remove-custom", desc)
-		desc = "Create data, if set an iaas will be called with this data to re-create the machine."
-		c.fs.Var(&c.addCreateData, "add-create-data", desc)
-		desc = "Remove create data"
-		c.fs.Var(&c.removeCreateData, "remove-create-data", desc)
 	}
 	return c.fs
 }
 
 func (c *ClusterUpdate) Info() *cmd.Info {
 	return &cmd.Info{
 		Name:    "cluster-update",
-		Usage:   "cluster update <name> <provisioner> [--addr address]... [--add-pool poolname]... [--remove-pool poolname]... [--cacert cacertfile] [--remove-cacert] [--clientcert clientcertfile] [--remove-clientcert] [--clientkey clientkeyfile] [--remove-clientkey] [--add-custom key=value]... [--remove-custom key]... [--add-create-data key=value]... [--remove-create-data key]... [--default=true|false]",
+		Usage:   "cluster update <name> <provisioner> [--addr address]... [--add-pool poolname]... [--remove-pool poolname]... [--cacert cacertfile] [--remove-cacert] [--clientcert clientcertfile] [--remove-clientcert] [--clientkey clientkeyfile] [--remove-clientkey] [--add-custom key=value]... [--remove-custom key]...  [--default=true|false]",
 		Desc:    `Updates a provisioner cluster definition.`,
 		MinArgs: 2,
 		MaxArgs: 2,
@@ -223,9 +213,6 @@ func (c *ClusterUpdate) mergeCluster(cluster *tsuru.Cluster) error {
 	if err := c.updateClientKey(cluster); err != nil {
 		return err
 	}
-	if err := c.updateCreateData(cluster); err != nil {
-		return err
-	}
 	if err := c.updateCustomData(cluster); err != nil {
 		return err
 	}
@@ -313,26 +300,6 @@ func (c *ClusterUpdate) updateCustomData(cluster *tsuru.Cluster) error {
 	}
 	return nil
 }
-
-func (c *ClusterUpdate) updateCreateData(cluster *tsuru.Cluster) error {
-	if cluster == nil {
-		return fmt.Errorf("cannot update a nil cluster")
-	}
-	if cluster.CreateData == nil {
-		cluster.CreateData = make(map[string]string)
-	}
-	for key, value := range c.addCreateData {
-		cluster.CreateData[key] = value
-	}
-	for _, key := range c.removeCreateData {
-		if _, hasKey := cluster.CreateData[key]; !hasKey {
-			return fmt.Errorf("cannot unset create data entry: key %q not found", key)
-		}
-		delete(cluster.CreateData, key)
-	}
-	return nil
-}
-
 func (c *ClusterUpdate) updatePools(cluster *tsuru.Cluster) error {
 	if cluster == nil {
 		return fmt.Errorf("cannot update a nil cluster")
@@ -534,15 +501,6 @@ func (c *ProvisionerInfo) Run(ctx *cmd.Context, cli *cmd.Client) error {
 	tbl.Sort()
 	fmt.Fprint(ctx.Stdout, tbl.String())
 
-	fmt.Fprintf(ctx.Stdout, "\nCreate Data:\n")
-	tbl = tablecli.NewTable()
-	tbl.LineSeparator = true
-	tbl.Headers = tablecli.Row{"Name", "Usage"}
-	for key, value := range provisioner.ClusterHelp.CreateDataHelp {
-		tbl.AddRow(tablecli.Row{key, value})
-	}
-	tbl.Sort()
-	fmt.Fprint(ctx.Stdout, tbl.String())
 	return nil
 }
 

tsuru/admin/cluster_test.go

@@ -49,7 +49,6 @@ func (s *S) TestClusterAddRun(c *check.C) {
 				Pools:       []string{"p1", "p2"},
 				Default:     true,
 				Provisioner: "myprov",
-				CreateData:  map[string]string{"iaas": "dockermachine"},
 			})
 			return true
 		},
@@ -76,7 +75,7 @@ func (s *S) TestClusterAddRun(c *check.C) {
 		"--pool", "p2",
 		"--custom", "a=b",
 		"--custom", "c=d",
-		"--create-data", "iaas=dockermachine",
+		"iaas=dockermachine",
 		"--default",
 	})
 	c.Assert(err, check.IsNil)
@@ -199,7 +198,6 @@ func (s *S) TestClusterUpdateMergeCluster(c *check.C) {
 			Clientkey:   []byte("client key"),
 			Pools:       []string{"pool1", "pool2"},
 			CustomData:  map[string]string{"key": "value"},
-			CreateData:  map[string]string{"key": "value"},
 			Default:     false,
 		}
 	}
@@ -241,13 +239,6 @@ func (s *S) TestClusterUpdateMergeCluster(c *check.C) {
 			cluster:     getCluster(),
 			errorString: "cannot unset custom data entry: key \"some-not-found-key\" not found",
 		},
-		{
-			command: ClusterUpdate{
-				removeCreateData: cmd.StringSliceFlag{"some-not-found-key"},
-			},
-			cluster:     getCluster(),
-			errorString: "cannot unset create data entry: key \"some-not-found-key\" not found",
-		},
 		{
 			command: ClusterUpdate{
 				isDefault: "true",
@@ -281,7 +272,6 @@ func (s *S) TestClusterUpdateMergeCluster(c *check.C) {
 				Clientkey:   []byte("client key"),
 				Pools:       []string{"pool1", "pool2"},
 				CustomData:  map[string]string{"key": "value"},
-				CreateData:  map[string]string{"key": "value"},
 				Default:     false,
 			},
 		},
@@ -299,7 +289,6 @@ func (s *S) TestClusterUpdateMergeCluster(c *check.C) {
 				Clientkey:   []byte("client key"),
 				Pools:       []string{},
 				CustomData:  map[string]string{"key": "value"},
-				CreateData:  map[string]string{"key": "value"},
 				Default:     true,
 			},
 		},
@@ -319,13 +308,11 @@ func (s *S) TestClusterUpdateMergeCluster(c *check.C) {
 				Clientkey:   nil,
 				Pools:       []string{"pool1", "pool2"},
 				CustomData:  map[string]string{"key": "value"},
-				CreateData:  map[string]string{"key": "value"},
 				Default:     false,
 			},
 		},
 		{
 			command: ClusterUpdate{
-				removeCreateData: cmd.StringSliceFlag{"key"},
 				removeCustomData: cmd.StringSliceFlag{"key"},
 			},
 			cluster: getCluster(),
@@ -338,7 +325,6 @@ func (s *S) TestClusterUpdateMergeCluster(c *check.C) {
 				Clientkey:   []byte("client key"),
 				Pools:       []string{"pool1", "pool2"},
 				CustomData:  map[string]string{},
-				CreateData:  map[string]string{},
 				Default:     false,
 			},
 		},
@@ -358,7 +344,6 @@ func (s *S) TestClusterUpdateMergeCluster(c *check.C) {
 				Clientkey:   []byte("ANOTHER CLIENT KEY"),
 				Pools:       []string{"pool1", "pool2"},
 				CustomData:  map[string]string{"key": "value"},
-				CreateData:  map[string]string{"key": "value"},
 				Default:     false,
 			},
 		},
@@ -554,12 +539,5 @@ Custom Data:
 +------+--------+
 | key2 | value2 |
 +------+--------+
-
-Create Data:
-+-------------+---------------+
-| Name        | Usage         |
-+-------------+---------------+
-| create key2 | create value2 |
-+-------------+---------------+
 `)
 }