fix(cdsctl): display list-encrypted-data (#5215)

yesnault · web-flow · commit 486820adbdce · 2020-05-28T09:37:13.000+02:00
diff --git a/cli/cdsctl/admin_database.go b/cli/cdsctl/admin_database.go
@@ -1,6 +1,8 @@
 package main
 
 import (
+	"fmt"
+
 	"github.com/spf13/cobra"
 
 	"github.com/ovh/cds/cli"
@@ -18,7 +20,7 @@ func adminDatabase() *cobra.Command {
 		cli.NewListCommand(adminDatabaseMigrationsList, adminDatabaseMigrationsListFunc, nil),
 		cli.NewGetCommand(adminDatabaseSignatureResume, adminDatabaseSignatureResumeFunc, nil),
 		cli.NewCommand(adminDatabaseSignatureRoll, adminDatabaseSignatureRollFunc, nil),
-		cli.NewGetCommand(adminDatabaseEncryptionResume, adminDatabaseEncryptionResumeFunc, nil),
+		cli.NewCommand(adminDatabaseEncryptionResume, adminDatabaseEncryptionResumeFunc, nil),
 		cli.NewCommand(adminDatabaseEncryptionRoll, adminDatabaseEncryptionRollFunc, nil),
 	})
 }
@@ -78,7 +80,6 @@ var adminDatabaseSignatureRoll = cli.Command{
 }
 
 func adminDatabaseSignatureRollFunc(args cli.Values) error {
-
 	entities := args.GetStringSlice("entity")
 	if len(entities) == 0 {
 		return client.AdminDatabaseSignaturesRollAllEntities()
@@ -91,16 +92,19 @@ func adminDatabaseSignatureRollFunc(args cli.Values) error {
 	}
 
 	return nil
-
 }
 
 var adminDatabaseEncryptionResume = cli.Command{
 	Name:  "list-encrypted-data",
 	Short: "List all encrypted data in database",
 }
 
-func adminDatabaseEncryptionResumeFunc(_ cli.Values) (interface{}, error) {
-	return client.AdminDatabaseListEncryptedEntities()
+func adminDatabaseEncryptionResumeFunc(_ cli.Values) error {
+	entities, err := client.AdminDatabaseListEncryptedEntities()
+	for _, e := range entities {
+		fmt.Println(e)
+	}
+	return err
 }
 
 var adminDatabaseEncryptionRoll = cli.Command{
@@ -122,7 +126,5 @@ func adminDatabaseEncryptionRollFunc(args cli.Values) error {
 			return err
 		}
 	}
-
 	return nil
-
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,8 @@`
`1`	`1`	`package main`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "fmt"`
	`5`	`+`
`4`	`6`	`"github.com/spf13/cobra"`
`5`	`7`
`6`	`8`	`"github.com/ovh/cds/cli"`
`@@ -18,7 +20,7 @@ func adminDatabase() *cobra.Command {`
`18`	`20`	`cli.NewListCommand(adminDatabaseMigrationsList, adminDatabaseMigrationsListFunc, nil),`
`19`	`21`	`cli.NewGetCommand(adminDatabaseSignatureResume, adminDatabaseSignatureResumeFunc, nil),`
`20`	`22`	`cli.NewCommand(adminDatabaseSignatureRoll, adminDatabaseSignatureRollFunc, nil),`
`21`		`- cli.NewGetCommand(adminDatabaseEncryptionResume, adminDatabaseEncryptionResumeFunc, nil),`
	`23`	`+ cli.NewCommand(adminDatabaseEncryptionResume, adminDatabaseEncryptionResumeFunc, nil),`
`22`	`24`	`cli.NewCommand(adminDatabaseEncryptionRoll, adminDatabaseEncryptionRollFunc, nil),`
`23`	`25`	`})`
`24`	`26`	`}`
`@@ -78,7 +80,6 @@ var adminDatabaseSignatureRoll = cli.Command{`
`78`	`80`	`}`
`79`	`81`
`80`	`82`	`func adminDatabaseSignatureRollFunc(args cli.Values) error {`
`81`		`-`
`82`	`83`	`entities := args.GetStringSlice("entity")`
`83`	`84`	`if len(entities) == 0 {`
`84`	`85`	`return client.AdminDatabaseSignaturesRollAllEntities()`
`@@ -91,16 +92,19 @@ func adminDatabaseSignatureRollFunc(args cli.Values) error {`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`return nil`
`94`		`-`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`var adminDatabaseEncryptionResume = cli.Command{`
`98`	`98`	`Name: "list-encrypted-data",`
`99`	`99`	`Short: "List all encrypted data in database",`
`100`	`100`	`}`
`101`	`101`
`102`		`-func adminDatabaseEncryptionResumeFunc(_ cli.Values) (interface{}, error) {`
`103`		`- return client.AdminDatabaseListEncryptedEntities()`
	`102`	`+func adminDatabaseEncryptionResumeFunc(_ cli.Values) error {`
	`103`	`+ entities, err := client.AdminDatabaseListEncryptedEntities()`
	`104`	`+ for _, e := range entities {`
	`105`	`+ fmt.Println(e)`
	`106`	`+ }`
	`107`	`+ return err`
`104`	`108`	`}`
`105`	`109`
`106`	`110`	`var adminDatabaseEncryptionRoll = cli.Command{`
`@@ -122,7 +126,5 @@ func adminDatabaseEncryptionRollFunc(args cli.Values) error {`
`122`	`126`	`return err`
`123`	`127`	`}`
`124`	`128`	`}`
`125`		`-`
`126`	`129`	`return nil`
`127`		`-`
`128`	`130`	`}`