Merge pull request #777 from viola/vpc-support

Add support for vpcs command

Author: Verolop

args.go

@@ -285,4 +285,11 @@ const (
 	ArgObjectName = "name"
 	// ArgObjectNamespace is the Kubernetes object namespace
 	ArgObjectNamespace = "namespace"
+
+	// ArgVPCName is a name of the VPC.
+	ArgVPCName = "name"
+	// ArgVPCDescription is a VPC description.
+	ArgVPCDescription = "description"
+	// ArgVPCIPRange is a VPC range of IP addresses in CIDR notation.
+	ArgVPCIPRange = "ip-range"
 )

commands/command_config.go

@@ -62,6 +62,7 @@ type CmdConfig struct {
 	Kubernetes        func() do.KubernetesService
 	Databases         func() do.DatabasesService
 	Registry          func() do.RegistryService
+	VPCs              func() do.VPCsService
 }
 
 // NewCmdConfig creates an instance of a CmdConfig.
@@ -107,6 +108,7 @@ func NewCmdConfig(ns string, dc doctl.Config, out io.Writer, args []string, init
 			c.Kubernetes = func() do.KubernetesService { return do.NewKubernetesService(godoClient) }
 			c.Databases = func() do.DatabasesService { return do.NewDatabasesService(godoClient) }
 			c.Registry = func() do.RegistryService { return do.NewRegistryService(godoClient) }
+			c.VPCs = func() do.VPCsService { return do.NewVPCsService(godoClient) }
 
 			return nil
 		},

commands/commands_test.go

@@ -174,6 +174,7 @@ type tcMocks struct {
 	kubernetes        *domocks.MockKubernetesService
 	registry          *domocks.MockRegistryService
 	sshRunner         *domocks.MockRunner
+	vpcs              *domocks.MockVPCsService
 }
 
 func withTestClient(t *testing.T, tFn testFn) {
@@ -209,6 +210,7 @@ func withTestClient(t *testing.T, tFn testFn) {
 		databases:         domocks.NewMockDatabasesService(ctrl),
 		registry:          domocks.NewMockRegistryService(ctrl),
 		sshRunner:         domocks.NewMockRunner(ctrl),
+		vpcs:              domocks.NewMockVPCsService(ctrl),
 	}
 
 	config := &CmdConfig{
@@ -252,6 +254,7 @@ func withTestClient(t *testing.T, tFn testFn) {
 		Kubernetes:        func() do.KubernetesService { return tm.kubernetes },
 		Databases:         func() do.DatabasesService { return tm.databases },
 		Registry:          func() do.RegistryService { return tm.registry },
+		VPCs:              func() do.VPCsService { return tm.vpcs },
 	}
 
 	tFn(config, tm)

commands/displayers/vpc.go

@@ -0,0 +1,76 @@
+/*
+Copyright 2018 The Doctl Authors All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package displayers
+
+import (
+	"io"
+
+	"github.com/digitalocean/doctl/do"
+)
+
+type VPC struct {
+	VPCs do.VPCs
+}
+
+var _ Displayable = &VPC{}
+
+func (v *VPC) JSON(out io.Writer) error {
+	return writeJSON(v.VPCs, out)
+}
+
+func (v *VPC) Cols() []string {
+	return []string{
+		"ID",
+		"URN",
+		"Name",
+		"Description",
+		"IPRange",
+		"Region",
+		"Created",
+		"Default",
+	}
+}
+
+func (v *VPC) ColMap() map[string]string {
+	return map[string]string{
+		"ID":          "ID",
+		"URN":         "URN",
+		"Name":        "Name",
+		"Description": "Description",
+		"IPRange":     "IP Range",
+		"Region":      "Region",
+		"Created":     "Created At",
+		"Default":     "Default",
+	}
+}
+
+func (v *VPC) KV() []map[string]interface{} {
+	out := []map[string]interface{}{}
+
+	for _, v := range v.VPCs {
+		o := map[string]interface{}{
+			"ID":          v.ID,
+			"URN":         v.URN,
+			"Name":        v.Name,
+			"Description": v.Description,
+			"IPRange":    v.IPRange,
+			"Created":     v.CreatedAt,
+			"Region":      v.RegionSlug,
+			"Default":     v.Default,
+		}
+		out = append(out, o)
+	}
+
+	return out
+}

commands/doit.go

@@ -138,6 +138,7 @@ func addCommands() {
 	DoitCmd.AddCommand(Projects())
 	DoitCmd.AddCommand(Version())
 	DoitCmd.AddCommand(Registry())
+	DoitCmd.AddCommand(VPCs())
 }
 
 func computeCmd() *Command {

commands/vpcs.go

@@ -0,0 +1,197 @@
+/*
+Copyright 2018 The Doctl Authors All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+	http://www.apache.org/licenses/LICENSE-2.0
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package commands
+
+import (
+	"fmt"
+	"github.com/digitalocean/doctl"
+	"github.com/digitalocean/doctl/commands/displayers"
+	"github.com/digitalocean/doctl/do"
+	"github.com/digitalocean/godo"
+	"github.com/spf13/cobra"
+)
+
+// VPCs creates the vpcs command.
+func VPCs() *Command {
+
+	cmd := &Command{
+		Command: &cobra.Command{
+			Use:   "vpcs",
+			Short: "Display commands that manage VPCs",
+			Long: `The commands under ` + "`" + `doctl vpcs` + "`" + ` are for managing your VPCs.
+
+With the vpcs command, you can list, create, or delete VPCs, and manage their configuration details.`,
+		},
+	}
+
+	vpcDetail := `
+	- The VPC's ID
+	- The uniform resource name (URN) for the VPC
+	- The VPC's name
+	- The VPC's description
+	- The range of IP addresses in the VPC in CIDR notation
+	- The datacenter region slug the VPC is located in
+	- The VPC's default boolean value indicating whether or not the VPC is the default one for the region
+	- The VPC's creation date, in ISO8601 combined date and time format
+	`
+
+	CmdBuilder(cmd, RunVPCGet, "get <id>", "Retrieve a VPC", "Use this command to retrieve information about a VPC, including:"+vpcDetail, Writer,
+		aliasOpt("g"), displayerType(&displayers.VPC{}))
+
+	cmdRecordCreate := CmdBuilder(cmd, RunVPCCreate, "create",
+		"Create a new VPC", "Use this command to create a new VPC on your account.", Writer, aliasOpt("c"))
+	AddStringFlag(cmdRecordCreate, doctl.ArgVPCName, "", "",
+		"The VPC's name", requiredOpt())
+	AddStringFlag(cmdRecordCreate, doctl.ArgVPCDescription, "", "", "The VPC's name")
+	AddStringFlag(cmdRecordCreate, doctl.ArgVPCIPRange, "", "",
+		"The range of IP addresses in the VPC in CIDR notation, e.g.: `10.116.0.0/20`")
+	AddStringFlag(cmdRecordCreate, doctl.ArgRegionSlug, "", "", "The VPC's region slug, e.g.: `nyc1`", requiredOpt())
+
+	cmdRecordUpdate := CmdBuilder(cmd, RunVPCUpdate, "update <id>",
+		"Update a VPC's configuration", `Use this command to update the configuration of a specified VPC.`, Writer, aliasOpt("u"))
+	AddStringFlag(cmdRecordUpdate, doctl.ArgVPCName, "", "",
+		"The VPC's name", requiredOpt())
+	AddStringFlag(cmdRecordUpdate, doctl.ArgVPCDescription, "", "",
+		"The VPC's description")
+
+	CmdBuilder(cmd, RunVPCList, "list", "List VPCs", "Use this command to get a list of the VPCs on your account, including the following information for each:"+vpcDetail, Writer,
+		aliasOpt("ls"), displayerType(&displayers.VPC{}))
+
+	cmdRunRecordDelete := CmdBuilder(cmd, RunVPCDelete, "delete <id>",
+		"Permanently delete a VPC", `Use this command to permanently delete the specified VPC. This is irreversible.`, Writer, aliasOpt("d", "rm"))
+	AddBoolFlag(cmdRunRecordDelete, doctl.ArgForce, doctl.ArgShortForce, false,
+		"Delete the VPC without a confirmation prompt")
+
+	return cmd
+}
+
+// RunVPCGet retrieves an existing VPC by its identifier.
+func RunVPCGet(c *CmdConfig) error {
+	if len(c.Args) != 1 {
+		return doctl.NewMissingArgsErr(c.NS)
+	}
+	vpcUUID := c.Args[0]
+
+	vpcs := c.VPCs()
+	vpc, err := vpcs.Get(vpcUUID)
+	if err != nil {
+		return err
+	}
+
+	item := &displayers.VPC{VPCs: do.VPCs{*vpc}}
+	return c.Display(item)
+}
+
+// RunVPCList lists VPCs.
+func RunVPCList(c *CmdConfig) error {
+	vpcs := c.VPCs()
+	list, err := vpcs.List()
+	if err != nil {
+		return err
+	}
+
+	item := &displayers.VPC{VPCs: list}
+	return c.Display(item)
+}
+
+// RunVPCCreate creates a new VPC with a given configuration.
+func RunVPCCreate(c *CmdConfig) error {
+	r := new(godo.VPCCreateRequest)
+	name, err := c.Doit.GetString(c.NS, doctl.ArgVPCName)
+	if err != nil {
+		return err
+	}
+	r.Name = name
+
+	desc, err := c.Doit.GetString(c.NS, doctl.ArgVPCDescription)
+	if err != nil {
+		return err
+	}
+	r.Description = desc
+
+	ipRange, err := c.Doit.GetString(c.NS, doctl.ArgVPCIPRange)
+	if err != nil {
+		return err
+	}
+	r.IPRange = ipRange
+
+	rSlug, err := c.Doit.GetString(c.NS, doctl.ArgRegionSlug)
+	if err != nil {
+		return err
+	}
+	r.RegionSlug = rSlug
+
+	vpcs := c.VPCs()
+	vpc, err := vpcs.Create(r)
+	if err != nil {
+		return err
+	}
+
+	item := &displayers.VPC{VPCs: do.VPCs{*vpc}}
+	return c.Display(item)
+}
+
+// RunVPCUpdate updates an existing VPC with new configuration.
+func RunVPCUpdate(c *CmdConfig) error {
+	if len(c.Args) == 0 {
+		return doctl.NewMissingArgsErr(c.NS)
+	}
+	vpcUUID := c.Args[0]
+
+	r := new(godo.VPCUpdateRequest)
+	name, err := c.Doit.GetString(c.NS, doctl.ArgVPCName)
+	if err != nil {
+		return err
+	}
+	r.Name = name
+
+	desc, err := c.Doit.GetString(c.NS, doctl.ArgVPCDescription)
+	if err != nil {
+		return err
+	}
+	r.Description = desc
+
+	vpcs := c.VPCs()
+	vpc, err := vpcs.Update(vpcUUID, r)
+	if err != nil {
+		return err
+	}
+
+	item := &displayers.VPC{VPCs: do.VPCs{*vpc}}
+	return c.Display(item)
+}
+
+// RunVPCDelete deletes a VPC by its identifier.
+func RunVPCDelete(c *CmdConfig) error {
+	if len(c.Args) != 1 {
+		return doctl.NewMissingArgsErr(c.NS)
+	}
+	vpcUUID := c.Args[0]
+
+	force, err := c.Doit.GetBool(c.NS, doctl.ArgForce)
+	if err != nil {
+		return err
+	}
+
+	if force || AskForConfirm("Delete this VPC?") == nil {
+		vpcs := c.VPCs()
+		if err := vpcs.Delete(vpcUUID); err != nil {
+			return err
+		}
+	} else {
+		return fmt.Errorf("operation aborted")
+	}
+
+	return nil
+}