Update doctl to support Spaces Keys API Updated (#1671)

* Update doctl to support Spaces Keys API

* Update commands/spaces.go

Co-authored-by: Andrew Starr-Bochicchio <[email protected]>

* add spaces get key by access key id support

* Update commands/spaces_keys.go

Co-authored-by: Andrew Starr-Bochicchio <[email protected]>

---------

Co-authored-by: Aaron Lee <[email protected]>
Co-authored-by: Aaron Lee <[email protected]>
Co-authored-by: Andrew Starr-Bochicchio <[email protected]>

Author: 3 people

commands/command_config.go

@@ -76,6 +76,7 @@ type CmdConfig struct {
 	Serverless             func() do.ServerlessService
 	OAuth                  func() do.OAuthService
 	PartnerNetworkConnects func() do.PartnerNetworkConnectsService
+	SpacesKeys             func() do.SpacesKeysService
 }
 
 // NewCmdConfig creates an instance of a CmdConfig.
@@ -135,6 +136,7 @@ func NewCmdConfig(ns string, dc doctl.Config, out io.Writer, args []string, init
 			c.PartnerNetworkConnects = func() do.PartnerNetworkConnectsService {
 				return do.NewPartnerNetworkConnectsService(godoClient)
 			}
+			c.SpacesKeys = func() do.SpacesKeysService { return do.NewSpacesKeysService(godoClient) }
 
 			return nil
 		},

commands/commands_test.go

@@ -256,6 +256,7 @@ type tcMocks struct {
 	appDockerEngineClient  *builder.MockDockerEngineClient
 	oauth                  *domocks.MockOAuthService
 	partnerNetworkConnects *domocks.MockPartnerNetworkConnectsService
+	spacesKeys             *domocks.MockSpacesKeysService
 }
 
 func withTestClient(t *testing.T, tFn testFn) {
@@ -306,6 +307,7 @@ func withTestClient(t *testing.T, tFn testFn) {
 		appDockerEngineClient:  builder.NewMockDockerEngineClient(ctrl),
 		oauth:                  domocks.NewMockOAuthService(ctrl),
 		partnerNetworkConnects: domocks.NewMockPartnerNetworkConnectsService(ctrl),
+		spacesKeys:             domocks.NewMockSpacesKeysService(ctrl),
 	}
 
 	testConfig := doctl.NewTestConfig()
@@ -364,6 +366,7 @@ func withTestClient(t *testing.T, tFn testFn) {
 		Serverless:             func() do.ServerlessService { return tm.serverless },
 		OAuth:                  func() do.OAuthService { return tm.oauth },
 		PartnerNetworkConnects: func() do.PartnerNetworkConnectsService { return tm.partnerNetworkConnects },
+		SpacesKeys:             func() do.SpacesKeysService { return tm.spacesKeys },
 	}
 
 	tFn(config, tm)

commands/displayers/spaces_keys.go

@@ -0,0 +1,72 @@
+/*
+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 SpacesKey struct {
+	SpacesKeys []do.SpacesKey
+}
+
+var _ Displayable = &SpacesKey{}
+
+// ColMap implements Displayable.
+func (s *SpacesKey) ColMap() map[string]string {
+	return map[string]string{
+		"Name":      "Name",
+		"AccessKey": "Access Key",
+		"SecretKey": "Secret Key",
+		"Grants":    "Grants",
+		"CreatedAt": "Created At",
+	}
+}
+
+// Cols implements Displayable.
+func (s *SpacesKey) Cols() []string {
+	return []string{
+		"Name",
+		"AccessKey",
+		"SecretKey",
+		"Grants",
+		"CreatedAt",
+	}
+}
+
+// JSON implements Displayable.
+func (s *SpacesKey) JSON(out io.Writer) error {
+	return writeJSON(s.SpacesKeys, out)
+}
+
+// KV implements Displayable.
+func (s *SpacesKey) KV() []map[string]any {
+	out := make([]map[string]any, 0, len(s.SpacesKeys))
+
+	for _, key := range s.SpacesKeys {
+		m := map[string]any{
+			"Name":      key.Name,
+			"AccessKey": key.AccessKey,
+			"SecretKey": key.SecretKey,
+			"Grants":    key.GrantString(),
+			"CreatedAt": key.CreatedAt,
+		}
+
+		out = append(out, m)
+	}
+
+	return out
+}

commands/doit.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"github.com/digitalocean/doctl"
+
 	"github.com/fatih/color"
 	"github.com/mattn/go-isatty"
 	"github.com/spf13/cobra"
@@ -188,6 +189,7 @@ func addCommands() {
 	DoitCmd.AddCommand(OneClicks())
 	DoitCmd.AddCommand(Monitoring())
 	DoitCmd.AddCommand(Serverless())
+	DoitCmd.AddCommand(Spaces())
 }
 
 func computeCmd() *Command {

commands/spaces.go

@@ -0,0 +1,32 @@
+/*
+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 "github.com/spf13/cobra"
+
+func Spaces() *Command {
+	cmd := &Command{
+		Command: &cobra.Command{
+			Use:     "spaces",
+			Aliases: []string{"sp"},
+			Short:   "Display commands that manage DigitalOcean Spaces.",
+			Long:    "The subcommands of `doctl spaces` allow you to access and manage Spaces.",
+			GroupID: manageResourcesGroup,
+		},
+	}
+
+	cmd.AddCommand(SpacesKeys())
+
+	return cmd
+}