Merge pull request #353 from mchitten/feature/projects-api

projects API support
digitalocean · Oct 16, 2018 · e06eddd · e06eddd
2 parents 2af73d3 + 06ab2cc
commit e06eddd
Show file tree

Hide file tree

Showing 140 changed files with 3,924 additions and 1,403 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All changes to `doctl` will be documented in this file.
 
+## [1.11.0] - 2018-10-01
+
+- #348 Add support for projects API [beta] - @mchitten
+
 ## [1.10.0] - 2018-10-01
 
 - #348 Add support for tagging Images. - @hugocorbucci

diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.5
 
-ENV DOCTL_VERSION=1.10.0
+ENV DOCTL_VERSION=1.11.0
 
 RUN apk add --no-cache curl
 

diff --git a/README.md b/README.md
@@ -58,25 +58,25 @@ For example, with `wget`:
 
 ```
 cd ~
-wget https://github.com/digitalocean/doctl/releases/download/v1.10.0/doctl-1.10.0-linux-amd64.tar.gz
+wget https://github.com/digitalocean/doctl/releases/download/v1.11.0/doctl-1.11.0-linux-amd64.tar.gz
 ```
 
 Or with `curl`:
 
 ```
 cd ~
-curl -OL https://github.com/digitalocean/doctl/releases/download/v1.10.0/doctl-1.10.0-linux-amd64.tar.gz
+curl -OL https://github.com/digitalocean/doctl/releases/download/v1.11.0/doctl-1.11.0-linux-amd64.tar.gz
 ```
 
 Extract the binary. On GNU/Linux or OS X systems, you can use `tar`.
 
 ```
-tar xf ~/doctl-1.10.0-linux-amd64.tar.gz
+tar xf ~/doctl-1.11.0-linux-amd64.tar.gz
 ```
 
 Or download and extract with this oneliner:
 ```
-curl -sL https://github.com/digitalocean/doctl/releases/download/v1.10.0/doctl-1.10.0-linux-amd64.tar.gz | tar -xzv
+curl -sL https://github.com/digitalocean/doctl/releases/download/v1.11.0/doctl-1.11.0-linux-amd64.tar.gz | tar -xzv
 ```
 
 On Windows systems, you should be able to double-click the zip archive to extract the `doctl` executable.

diff --git a/args.go b/args.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Doctl Authors All rights reserved.
+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
@@ -187,6 +187,19 @@ const (
 	// ArgOutboundRules is a list of outbound rules for the firewall.
 	ArgOutboundRules = "outbound-rules"
 
+	// ArgProjectName is the name of a project.
+	ArgProjectName = "name"
+	// ArgProjectDescription is the description of a project.
+	ArgProjectDescription = "description"
+	// ArgProjectPurpose is the purpose of a project.
+	ArgProjectPurpose = "purpose"
+	// ArgProjectEnvironment is the environment of a project. Should be one of 'Development', 'Staging', 'Production'.
+	ArgProjectEnvironment = "environment"
+	// ArgProjectIsDefault is used to change the default project.
+	ArgProjectIsDefault = "is_default"
+	// ArgProjectResource is a flag for your resource URNs
+	ArgProjectResource = "resource"
+
 	// ArgForce forces confirmation on actions
 	ArgForce = "force"
 )
diff --git a/args_short.go b/args_short.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Doctl Authors All rights reserved.
+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

diff --git a/cmd/doctl-gen-doc/main.go b/cmd/doctl-gen-doc/main.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Doctl Authors All rights reserved.
+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

diff --git a/cmd/doctl/main.go b/cmd/doctl/main.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Doctl Authors All rights reserved.
+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

diff --git a/cmd/install-doctl/main.go b/cmd/install-doctl/main.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Doctl Authors All rights reserved.
+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

diff --git a/cmd/release-doctl/main.go b/cmd/release-doctl/main.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Doctl Authors All rights reserved.
+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

diff --git a/command.go b/command.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Doctl Authors All rights reserved.
+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

diff --git a/commands/account.go b/commands/account.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Doctl Authors All rights reserved.
+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
@@ -13,7 +13,10 @@ limitations under the License.
 
 package commands
 
-import "github.com/spf13/cobra"
+import (
+	"github.com/digitalocean/doctl/commands/displayers"
+	"github.com/spf13/cobra"
+)
 
 // Account creates the account commands heirarchy.
 func Account() *Command {
@@ -28,10 +31,10 @@ func Account() *Command {
 	}
 
 	CmdBuilder(cmd, RunAccountGet, "get", "get account", Writer,
-		aliasOpt("g"), displayerType(&account{}), docCategories("account"))
+		aliasOpt("g"), displayerType(&displayers.Account{}), docCategories("account"))
 
 	CmdBuilder(cmd, RunAccountRateLimit, "ratelimit", "get API rate limits", Writer,
-		aliasOpt("rl"), displayerType(&rateLimit{}), docCategories("account"))
+		aliasOpt("rl"), displayerType(&displayers.RateLimit{}), docCategories("account"))
 
 	return cmd
 }
@@ -43,7 +46,7 @@ func RunAccountGet(c *CmdConfig) error {
 		return err
 	}
 
-	return c.Display(&account{Account: a})
+	return c.Display(&displayers.Account{Account: a})
 }
 
 // RunAccountRateLimit retrieves API rate limits for the account.
@@ -53,5 +56,5 @@ func RunAccountRateLimit(c *CmdConfig) error {
 		return err
 	}
 
-	return c.Display(&rateLimit{RateLimit: rl})
+	return c.Display(&displayers.RateLimit{RateLimit: rl})
 }
diff --git a/commands/account_test.go b/commands/account_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Doctl Authors All rights reserved.
+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

diff --git a/commands/actions.go b/commands/actions.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Doctl Authors All rights reserved.
+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
@@ -19,6 +19,7 @@ import (
 	"time"
 
 	"github.com/digitalocean/doctl"
+	"github.com/digitalocean/doctl/commands/displayers"
 	"github.com/digitalocean/doctl/do"
 	"github.com/spf13/cobra"
 )
@@ -36,10 +37,10 @@ func Actions() *Command {
 	}
 
 	CmdBuilder(cmd, RunCmdActionGet, "get <action-id>", "get action", Writer,
-		aliasOpt("g"), displayerType(&action{}), docCategories("action"))
+		aliasOpt("g"), displayerType(&displayers.Action{}), docCategories("action"))
 
 	cmdActionList := CmdBuilder(cmd, RunCmdActionList, "list", "list actions", Writer,
-		aliasOpt("ls"), displayerType(&action{}), docCategories("action"))
+		aliasOpt("ls"), displayerType(&displayers.Action{}), docCategories("action"))
 	AddStringFlag(cmdActionList, doctl.ArgActionResourceType, "", "", "Action resource type")
 	AddStringFlag(cmdActionList, doctl.ArgActionRegion, "", "", "Action region")
 	AddStringFlag(cmdActionList, doctl.ArgActionAfter, "", "", "Action completed after in RFC3339 format")
@@ -48,7 +49,7 @@ func Actions() *Command {
 	AddStringFlag(cmdActionList, doctl.ArgActionType, "", "", "Action type")
 
 	cmdActionWait := CmdBuilder(cmd, RunCmdActionWait, "wait <action-id>", "wait for action to complete", Writer,
-		aliasOpt("w"), displayerType(&action{}), docCategories("action"))
+		aliasOpt("w"), displayerType(&displayers.Action{}), docCategories("action"))
 	AddIntFlag(cmdActionWait, doctl.ArgPollTime, "", 5, "Re-poll time in seconds")
 
 	return cmd
@@ -68,7 +69,7 @@ func RunCmdActionList(c *CmdConfig) error {
 
 	sort.Sort(actionsByCompletedAt(actions))
 
-	item := &action{actions: actions}
+	item := &displayers.Action{Actions: actions}
 	return c.Display(item)
 }
 
@@ -190,7 +191,7 @@ func RunCmdActionGet(c *CmdConfig) error {
 		return err
 	}
 
-	return c.Display(&action{actions: do.Actions{*a}})
+	return c.Display(&displayers.Action{Actions: do.Actions{*a}})
 }
 
 // RunCmdActionWait waits for an action to complete or error.
@@ -214,7 +215,7 @@ func RunCmdActionWait(c *CmdConfig) error {
 		return err
 	}
 
-	return c.Display(&action{actions: do.Actions{*a}})
+	return c.Display(&displayers.Action{Actions: do.Actions{*a}})
 }
 
 func actionWait(c *CmdConfig, actionID, pollTime int) (*do.Action, error) {

diff --git a/commands/actions_test.go b/commands/actions_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Doctl Authors All rights reserved.
+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

diff --git a/commands/auth.go b/commands/auth.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Doctl Authors All rights reserved.
+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

diff --git a/commands/auth_test.go b/commands/auth_test.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Doctl Authors All rights reserved.
+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

diff --git a/commands/cdns.go b/commands/cdns.go
@@ -18,6 +18,7 @@ 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"
@@ -34,21 +35,21 @@ func CDN() *Command {
 	}
 
 	CmdBuilder(cmd, RunCDNList, "list", "list cdn", Writer,
-		aliasOpt("ls"), displayerType(&cdn{}))
+		aliasOpt("ls"), displayerType(&displayers.CDN{}))
 
 	cmdCDNCreate := CmdBuilder(cmd, RunCDNCreate, "create <cdn-origin>", "create a cdn", Writer,
-		aliasOpt("c"), displayerType(&cdn{}))
+		aliasOpt("c"), displayerType(&displayers.CDN{}))
 	AddIntFlag(cmdCDNCreate, doctl.ArgCDNTTL, "", 3600, "CDN ttl")
 
 	cmdRunCDNDelete := CmdBuilder(cmd, RunCDNDelete, "delete <cdn-id>", "delete a cdn", Writer,
 		aliasOpt("rm"))
 	AddBoolFlag(cmdRunCDNDelete, doctl.ArgForce, doctl.ArgShortForce, false, "Force cdn delete")
 
 	CmdBuilder(cmd, RunCDNGet, "get <cdn-id>", "get a cdn", Writer, aliasOpt("g"),
-		displayerType(&cdn{}))
+		displayerType(&displayers.CDN{}))
 
 	cmdCDNUpdate := CmdBuilder(cmd, RunCDNUpdateTTL, "update <cdn-id>", "update a cdn", Writer,
-		aliasOpt("u"), displayerType(&cdn{}))
+		aliasOpt("u"), displayerType(&displayers.CDN{}))
 	AddIntFlag(cmdCDNUpdate, doctl.ArgCDNTTL, "", 3600, "cdn ttl")
 
 	cmdCDNFlushCache := CmdBuilder(cmd, RunCDNFlushCache, "flush <cdn-id>", "flush cdn cache", Writer,
@@ -65,7 +66,7 @@ func RunCDNList(c *CmdConfig) error {
 		return err
 	}
 
-	return c.Display(&cdn{cdns: cdns})
+	return c.Display(&displayers.CDN{CDNs: cdns})
 }
 
 // RunCDNGet returns an individual CDN.
@@ -80,7 +81,7 @@ func RunCDNGet(c *CmdConfig) error {
 		return err
 	}
 
-	return c.Display(&cdn{cdns: []do.CDN{*item}})
+	return c.Display(&displayers.CDN{CDNs: []do.CDN{*item}})
 }
 
 // RunCDNCreate creates a cdn.
@@ -109,7 +110,7 @@ func RunCDNCreate(c *CmdConfig) error {
 		return err
 	}
 
-	return c.Display(&cdn{cdns: []do.CDN{*item}})
+	return c.Display(&displayers.CDN{CDNs: []do.CDN{*item}})
 }
 
 // RunCDNUpdateTTL updates an individual cdn ttl
@@ -137,7 +138,7 @@ func RunCDNUpdateTTL(c *CmdConfig) error {
 		return err
 	}
 
-	return c.Display(&cdn{cdns: []do.CDN{*item}})
+	return c.Display(&displayers.CDN{CDNs: []do.CDN{*item}})
 }
 
 // RunCDNDelete deletes a cdn.

diff --git a/commands/certificates.go b/commands/certificates.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2017 The Doctl Authors All rights reserved.
+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
@@ -18,6 +18,7 @@ import (
 	"io/ioutil"
 
 	"github.com/digitalocean/doctl"
+	"github.com/digitalocean/doctl/commands/displayers"
 	"github.com/digitalocean/doctl/do"
 	"github.com/digitalocean/godo"
 
@@ -65,7 +66,7 @@ func RunCertificateGet(c *CmdConfig) error {
 		return err
 	}
 
-	item := &certificate{certificates: do.Certificates{*cer}}
+	item := &displayers.Certificate{Certificates: do.Certificates{*cer}}
 	return c.Display(item)
 }
 
@@ -140,7 +141,7 @@ func RunCertificateCreate(c *CmdConfig) error {
 		return err
 	}
 
-	item := &certificate{certificates: do.Certificates{*cer}}
+	item := &displayers.Certificate{Certificates: do.Certificates{*cer}}
 	return c.Display(item)
 }
 
@@ -152,7 +153,7 @@ func RunCertificateList(c *CmdConfig) error {
 		return err
 	}
 
-	item := &certificate{certificates: list}
+	item := &displayers.Certificate{Certificates: list}
 	return c.Display(item)
 }
 

diff --git a/commands/command.go b/commands/command.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2016 The Doctl Authors All rights reserved.
+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