[NETPROD-3585] Added name filter in doctl for certificates (#1509)

* added support for getting certificate by name * updated listbyname method * added tests and updated vendor code * Update commands/certificates.go --------- Co-authored-by: Andrew Starr-Bochicchio <[email protected]>
digitalocean · Feb 29, 2024 · 0554380 · 0554380
1 parent 4a1686e
commit 0554380
Show file tree

Hide file tree

Showing 16 changed files with 582 additions and 33 deletions.
diff --git a/commands/certificates.go b/commands/certificates.go
@@ -78,6 +78,8 @@ To upload a custom certificate, you need to provide a certificate name, the path
 	cmdCertificateList := CmdBuilder(cmd, RunCertificateList, "list", "Retrieve list of the account's stored certificates", `This command retrieves a list of all certificates associated with the account. The following details are shown for each certificate:`+certDetails, Writer,
 		aliasOpt("ls"), displayerType(&displayers.Certificate{}))
 	cmdCertificateList.Example = `The following example retrieves a list of all certificates associated with your account and uses the ` + "`" + `--format` + "`" + ` flag return only the IDs, names, and the domains associated with each ticket: doctl compute certificate list --format ID,Name,DNSNames`
+	AddStringFlag(cmdCertificateList, doctl.ArgCertificateName, "", "",
+		"Filter certificates by the specified name")
 
 	cmdCertificateDelete := CmdBuilder(cmd, RunCertificateDelete, "delete <id>",
 		"Delete the specified certificate", `Deletes the specified certificate.
@@ -184,8 +186,20 @@ func RunCertificateCreate(c *CmdConfig) error {
 
 // RunCertificateList lists certificates.
 func RunCertificateList(c *CmdConfig) error {
+
+	name, err := c.Doit.GetString(c.NS, doctl.ArgCertificateName)
+	if err != nil {
+		return err
+	}
+
 	cs := c.Certificates()
-	list, err := cs.List()
+	var list do.Certificates
+
+	if name == "" {
+		list, err = cs.List()
+	} else {
+		list, err = cs.ListByName(name)
+	}
 	if err != nil {
 		return err
 	}

diff --git a/commands/certificates_test.go b/commands/certificates_test.go
@@ -165,6 +165,17 @@ func TestCertificateList(t *testing.T) {
 	})
 }
 
+func TestCertificateListByName(t *testing.T) {
+	withTestClient(t, func(config *CmdConfig, tm *tcMocks) {
+		name := "web-cert-01"
+		tm.certificates.EXPECT().ListByName(name).Return(testCertificateList, nil)
+
+		config.Doit.Set(config.NS, doctl.ArgCertificateName, name)
+		err := RunCertificateList(config)
+		assert.NoError(t, err)
+	})
+}
+
 func TestCertificateDelete(t *testing.T) {
 	withTestClient(t, func(config *CmdConfig, tm *tcMocks) {
 		cID := "892071a0-bb95-49bc-8021-3afd67a210bf"

diff --git a/do/certificates.go b/do/certificates.go
@@ -32,6 +32,7 @@ type CertificatesService interface {
 	Get(cID string) (*Certificate, error)
 	Create(cr *godo.CertificateRequest) (*Certificate, error)
 	List() (Certificates, error)
+	ListByName(cName string) (Certificates, error)
 	Delete(cID string) error
 }
 
@@ -95,6 +96,17 @@ func (cs *certificatesService) List() (Certificates, error) {
 	return list, nil
 }
 
+func (cs *certificatesService) ListByName(cName string) (Certificates, error) {
+	c, _, err := cs.client.Certificates.ListByName(context.TODO(), cName, nil)
+
+	list := make([]Certificate, len(c))
+	for i := range c {
+		list[i] = Certificate{Certificate: &c[i]}
+	}
+
+	return list, err
+}
+
 func (cs *certificatesService) Delete(cID string) error {
 	_, err := cs.client.Certificates.Delete(context.TODO(), cID)
 	return err

diff --git a/do/mocks/CDNsService.go b/do/mocks/CDNsService.go
diff --git a/do/mocks/CertificatesService.go b/do/mocks/CertificatesService.go
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.21
 require (
 	github.com/blang/semver v3.5.1+incompatible
 	github.com/creack/pty v1.1.11
-	github.com/digitalocean/godo v1.107.0
+	github.com/digitalocean/godo v1.109.1-0.20240228180303-16a4709be517
 	github.com/docker/cli v24.0.5+incompatible
 	github.com/docker/docker v24.0.7+incompatible
 	github.com/docker/docker-credential-helpers v0.7.0 // indirect

diff --git a/go.sum b/go.sum
@@ -86,8 +86,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/digitalocean/godo v1.107.0 h1:P72IbmGFQvKOvyjVLyT59bmHxilA4E5hWi40rF4zNQc=
-github.com/digitalocean/godo v1.107.0/go.mod h1:R6EmmWI8CT1+fCtjWY9UCB+L5uufuZH13wk3YhxycCs=
+github.com/digitalocean/godo v1.109.1-0.20240228180303-16a4709be517 h1:vj0Sh/Ghq4MCkE+IM84lsA+9vMfnPpsacX7PRUJ0oh4=
+github.com/digitalocean/godo v1.109.1-0.20240228180303-16a4709be517/go.mod h1:R6EmmWI8CT1+fCtjWY9UCB+L5uufuZH13wk3YhxycCs=
 github.com/docker/cli v24.0.5+incompatible h1:WeBimjvS0eKdH4Ygx+ihVq1Q++xg36M/rMi4aXAvodc=
 github.com/docker/cli v24.0.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
 github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8=

diff --git a/vendor/github.com/digitalocean/godo/CHANGELOG.md b/vendor/github.com/digitalocean/godo/CHANGELOG.md
diff --git a/vendor/github.com/digitalocean/godo/apps.gen.go b/vendor/github.com/digitalocean/godo/apps.gen.go
diff --git a/vendor/github.com/digitalocean/godo/apps.go b/vendor/github.com/digitalocean/godo/apps.go