feat(rdb): add nice human marshalling for add/delete rules (#1306)

internal/namespaces/rdb/v1/custom.go

@@ -35,6 +35,9 @@ func GetCommands() *core.Commands {
 		instanceConnectCommand(),
 		backupWaitCommand(),
 	))
+	cmds.MustFind("rdb", "acl", "add").Override(aclAddBuilder)
+	cmds.MustFind("rdb", "acl", "delete").Override(aclDeleteBuilder)
+
 	cmds.MustFind("rdb", "backup", "create").Override(backupCreateBuilder)
 	cmds.MustFind("rdb", "backup", "export").Override(backupExportBuilder)
 	cmds.MustFind("rdb", "backup", "restore").Override(backupRestoreBuilder)

internal/namespaces/rdb/v1/custom_acl.go

@@ -1,7 +1,10 @@
 package rdb
 
 import (
+	"context"
+
 	"github.com/fatih/color"
+	"github.com/scaleway/scaleway-cli/internal/core"
 	"github.com/scaleway/scaleway-cli/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
 )
@@ -12,3 +15,32 @@ var (
 		rdb.ACLRuleActionDeny:  &human.EnumMarshalSpec{Attribute: color.FgRed, Value: "deny"},
 	}
 )
+
+func aclAddBuilder(c *core.Command) *core.Command {
+	c.Interceptor = func(ctx context.Context, argsI interface{}, runner core.CommandRunner) (interface{}, error) {
+		aclAddResponseI, err := runner(ctx, argsI)
+		if err != nil {
+			return nil, err
+		}
+		aclAddResponse := aclAddResponseI.(*rdb.AddInstanceACLRulesResponse)
+		return aclAddResponse.Rules, nil
+	}
+
+	return c
+}
+
+func aclDeleteBuilder(c *core.Command) *core.Command {
+	c.Interceptor = func(ctx context.Context, argsI interface{}, runner core.CommandRunner) (interface{}, error) {
+		aclDeleteResponseI, err := runner(ctx, argsI)
+		if err != nil {
+			return nil, err
+		}
+		aclDeleteResponse := aclDeleteResponseI.(*rdb.DeleteInstanceACLRulesResponse)
+		return rdb.ListInstanceACLRulesResponse{
+			Rules:      aclDeleteResponse.Rules,
+			TotalCount: uint32(len(aclDeleteResponse.Rules)),
+		}, nil
+	}
+
+	return c
+}

internal/namespaces/rdb/v1/custom_acl_test.go

@@ -0,0 +1,30 @@
+package rdb
+
+import (
+	"testing"
+
+	"github.com/scaleway/scaleway-cli/internal/core"
+)
+
+func Test_AddACL(t *testing.T) {
+	t.Run("Simple", core.Test(&core.TestConfig{
+		Commands:   GetCommands(),
+		BeforeFunc: createInstance("PostgreSQL-12"),
+		Cmd:        "scw rdb acl add instance-id={{ .Instance.ID }} rules.0.ip=4.2.3.4",
+		Check:      core.TestCheckGolden(),
+		AfterFunc:  deleteInstance(),
+	}))
+}
+
+func Test_DeleteACL(t *testing.T) {
+	t.Run("Simple", core.Test(&core.TestConfig{
+		Commands: GetCommands(),
+		BeforeFunc: core.BeforeFuncCombine(
+			createInstance("PostgreSQL-12"),
+			core.ExecBeforeCmd("scw rdb acl add instance-id={{ .Instance.ID }} rules.0.ip=1.2.3.4"),
+		),
+		Cmd:       "scw rdb acl remove instance-id={{ .Instance.ID }} acl-rule-ips.0=1.2.3.4",
+		Check:     core.TestCheckGolden(),
+		AfterFunc: deleteInstance(),
+	}))
+}