Merge pull request #359 from secrethub/feature/account-inspect-for-services

account inspect for service accounts

Author: Marton6

internals/secrethub/account_inspect.go

@@ -10,6 +10,9 @@ import (
 	"github.com/secrethub/secrethub-go/internals/api"
 )
 
+const accountTypeUser string = "user"
+const accountTypeService string = "service"
+
 // AccountInspectCommand is a command to inspect account details.
 type AccountInspectCommand struct {
 	io            ui.IO
@@ -40,38 +43,81 @@ func (cmd *AccountInspectCommand) Run() error {
 		return err
 	}
 
-	user, err := client.Users().Me()
+	account, err := client.Accounts().Me()
 	if err != nil {
 		return err
 	}
-
-	output, err := cli.PrettyJSON(newOutputUser(user, cmd.timeFormatter))
-	if err != nil {
-		return err
+	var output string
+	if account.AccountType == accountTypeUser {
+		user, err := client.Users().Me()
+		if err != nil {
+			return err
+		}
+		output, err = cli.PrettyJSON(newOutputUser(user, cmd.timeFormatter))
+		if err != nil {
+			return err
+		}
+	} else if account.AccountType == accountTypeService {
+		service, err := client.Services().Get(account.Name.String())
+		if err != nil {
+			return err
+		}
+		output, err = cli.PrettyJSON(newOutputService(service, account, cmd.timeFormatter))
+		if err != nil {
+			return err
+		}
 	}
-
 	fmt.Fprintln(cmd.io.Output(), output)
 
 	return nil
 }
 
-// outputUser is a user friendly JSON representation of a user account.
-type outputUser struct {
-	Username         string
-	FullName         string
-	Email            string `json:",omitempty"`
-	EmailVerified    bool   `json:",omitempty"`
+// outputAccount contains the fields common in both outputUser and outputService
+type outputAccount struct {
+	AccountType      string
+	AccountName      string
 	CreatedAt        string `json:",omitempty"`
 	PublicAccountKey []byte `json:",omitempty"`
 }
 
+// outputUser is a user friendly JSON representation of a user account.
+type outputUser struct {
+	Username      string
+	FullName      string
+	Email         string `json:",omitempty"`
+	EmailVerified bool   `json:",omitempty"`
+	outputAccount
+}
+
 func newOutputUser(user *api.User, timeFormatter TimeFormatter) *outputUser {
 	return &outputUser{
-		Username:         user.Username,
-		FullName:         user.FullName,
-		Email:            user.Email,
-		EmailVerified:    user.EmailVerified,
-		CreatedAt:        timeFormatter.Format(user.CreatedAt.Local()),
-		PublicAccountKey: user.PublicKey,
+		Username:      user.Username,
+		FullName:      user.FullName,
+		Email:         user.Email,
+		EmailVerified: user.EmailVerified,
+		outputAccount: outputAccount{
+			AccountType:      accountTypeUser,
+			AccountName:      user.Username,
+			CreatedAt:        timeFormatter.Format(user.CreatedAt.Local()),
+			PublicAccountKey: user.PublicKey,
+		},
+	}
+}
+
+// outputService is a user friendly JSON representation of a service account.
+type outputService struct {
+	Description string
+	outputAccount
+}
+
+func newOutputService(service *api.Service, account *api.Account, timeFormatter TimeFormatter) *outputService {
+	return &outputService{
+		Description: service.Description,
+		outputAccount: outputAccount{
+			AccountType:      accountTypeService,
+			AccountName:      service.ServiceID,
+			CreatedAt:        timeFormatter.Format(service.CreatedAt.Local()),
+			PublicAccountKey: account.PublicKey,
+		},
 	}
 }

internals/secrethub/account_inspect_test.go

@@ -1,6 +1,7 @@
 package secrethub
 
 import (
+	"errors"
 	"testing"
 	"time"
 
@@ -24,10 +25,17 @@ func TestAccountInspect(t *testing.T) {
 		err error
 		out string
 	}{
-		"success": {
+		"success user": {
 			cmd: AccountInspectCommand{
 				newClient: func() (secrethub.ClientInterface, error) {
 					return &fakeclient.Client{
+						AccountService: &fakeclient.AccountService{
+							MeFunc: func() (*api.Account, error) {
+								return &api.Account{
+									AccountType: accountTypeUser,
+								}, nil
+							},
+						},
 						UserService: &fakeclient.UserService{
 							MeFunc: func() (*api.User, error) {
 								return &api.User{
@@ -52,6 +60,49 @@ func TestAccountInspect(t *testing.T) {
     "FullName": "Developer Uno",
     "Email": "dev1@keylocker.eu",
     "EmailVerified": true,
+    "AccountType": "user",
+    "AccountName": "dev1",
+    "CreatedAt": "2018-07-30T10:49:18Z",
+    "PublicAccountKey": "YWJjZGU="
+}
+`,
+		},
+		"success service": {
+			cmd: AccountInspectCommand{
+				newClient: func() (secrethub.ClientInterface, error) {
+					return &fakeclient.Client{
+						AccountService: &fakeclient.AccountService{
+							MeFunc: func() (*api.Account, error) {
+								return &api.Account{
+									AccountType: accountTypeService,
+									Name:        "dev1",
+									PublicKey:   []byte("abcde"),
+								}, nil
+							},
+						},
+						ServiceService: &fakeclient.ServiceService{
+							GetFunc: func(id string) (*api.Service, error) {
+								if id == "dev1" {
+									return &api.Service{
+										ServiceID:   "s-abcdefghijkl",
+										Description: "Test description.",
+										CreatedAt:   time.Date(2020, 12, 12, 12, 12, 12, 0, time.UTC),
+									}, nil
+								}
+								return nil, errors.New(`expected id to be "dev1"`)
+							},
+						},
+					}, nil
+				},
+				timeFormatter: &fakes.TimeFormatter{
+					Response: "2018-07-30T10:49:18Z",
+				},
+			},
+			err: nil,
+			out: `{
+    "Description": "Test description.",
+    "AccountType": "service",
+    "AccountName": "s-abcdefghijkl",
     "CreatedAt": "2018-07-30T10:49:18Z",
     "PublicAccountKey": "YWJjZGU="
 }
@@ -61,6 +112,13 @@ func TestAccountInspect(t *testing.T) {
 			cmd: AccountInspectCommand{
 				newClient: func() (secrethub.ClientInterface, error) {
 					return fakeclient.Client{
+						AccountService: &fakeclient.AccountService{
+							MeFunc: func() (*api.Account, error) {
+								return &api.Account{
+									AccountType: accountTypeUser,
+								}, nil
+							},
+						},
 						UserService: &fakeclient.UserService{
 							MeFunc: func() (*api.User, error) {
 								return nil, api.ErrSignatureNotVerified