feat(rdb): rename ACL add/delete arguments

cmd/scw/testdata/test-all-usage-rdb-acl-add-usage.golden

@@ -13,6 +13,7 @@ ARGS:
 
 FLAGS:
   -h, --help   help for add
+  -w, --wait   wait until the acl is ready
 
 GLOBAL FLAGS:
   -c, --config string    The path to the config file

cmd/scw/testdata/test-all-usage-rdb-acl-delete-usage.golden

@@ -6,12 +6,13 @@ USAGE:
   scw rdb acl delete [arg=value ...]
 
 ARGS:
-  instance-id            UUID of the instance you want to delete an ACL rules from
-  acl-rule-ips.{index}   ACL rules IP present on the instance
-  [region=fr-par]        Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
+  instance-id        UUID of the instance you want to delete an ACL rules from
+  rules.{index}.ip   ACL rules IP present on the instance
+  [region=fr-par]    Region to target. If none is passed will use default region from the config (fr-par | nl-ams | pl-waw)
 
 FLAGS:
   -h, --help   help for delete
+  -w, --wait   wait until the acl is ready
 
 GLOBAL FLAGS:
   -c, --config string    The path to the config file

docs/commands/rdb.md

@@ -111,7 +111,7 @@ scw rdb acl delete [arg=value ...]
 | Name |   | Description |
 |------|---|-------------|
 | instance-id | Required | UUID of the instance you want to delete an ACL rules from |
-| acl-rule-ips.{index} | Required | ACL rules IP present on the instance |
+| rules.{index}.ip | Required | ACL rules IP present on the instance |
 | region | Default: `fr-par`<br />One of: `fr-par`, `nl-ams`, `pl-waw` | Region to target. If none is passed will use default region from the config |
 
 

internal/namespaces/rdb/v1/custom_acl.go

@@ -2,11 +2,13 @@ package rdb
 
 import (
 	"context"
+	"reflect"
 
 	"github.com/fatih/color"
 	"github.com/scaleway/scaleway-cli/v2/internal/core"
 	"github.com/scaleway/scaleway-cli/v2/internal/human"
 	"github.com/scaleway/scaleway-sdk-go/api/rdb/v1"
+	"github.com/scaleway/scaleway-sdk-go/scw"
 )
 
 var (
@@ -17,30 +19,101 @@ var (
 )
 
 func aclAddBuilder(c *core.Command) *core.Command {
+	type customAddACLRequest struct {
+		*rdb.AddInstanceACLRulesRequest
+		Rules []*rdb.ACLRuleRequest
+	}
+
+	c.ArgSpecs.GetByName("rules.{index}.ip").Name = "rules.{index}.ip"
+	c.ArgSpecs.GetByName("rules.{index}.description").Name = "rules.{index}.description"
+
+	c.ArgsType = reflect.TypeOf(customAddACLRequest{})
+
 	c.Interceptor = func(ctx context.Context, argsI interface{}, runner core.CommandRunner) (interface{}, error) {
-		aclAddResponseI, err := runner(ctx, argsI)
+		args := argsI.(*customAddACLRequest)
+
+		request := args.AddInstanceACLRulesRequest
+		request.Rules = args.Rules
+
+		aclAddResponseI, err := runner(ctx, request)
 		if err != nil {
 			return nil, err
 		}
+
 		aclAddResponse := aclAddResponseI.(*rdb.AddInstanceACLRulesResponse)
 		return aclAddResponse.Rules, nil
 	}
 
+	c.WaitFunc = func(ctx context.Context, argsI, respI interface{}) (interface{}, error) {
+		args := argsI.(*customAddACLRequest)
+
+		api := rdb.NewAPI(core.ExtractClient(ctx))
+		_, err := api.WaitForInstance(&rdb.WaitForInstanceRequest{
+			InstanceID:    args.InstanceID,
+			Region:        args.Region,
+			Timeout:       scw.TimeDurationPtr(instanceActionTimeout),
+			RetryInterval: core.DefaultRetryInterval,
+		})
+		if err != nil {
+			return nil, err
+		}
+
+		return respI.([]*rdb.ACLRule), nil
+	}
+
 	return c
 }
 
 func aclDeleteBuilder(c *core.Command) *core.Command {
+	type deleteRules struct {
+		IP string `json:"ip"`
+	}
+
+	type customDeleteACLRequest struct {
+		*rdb.DeleteInstanceACLRulesRequest
+		Rules []deleteRules
+	}
+
+	c.ArgSpecs.GetByName("acl-rule-ips.{index}").Name = "rules.{index}.ip"
+
+	c.ArgsType = reflect.TypeOf(customDeleteACLRequest{})
+
 	c.Interceptor = func(ctx context.Context, argsI interface{}, runner core.CommandRunner) (interface{}, error) {
-		aclDeleteResponseI, err := runner(ctx, argsI)
+		args := argsI.(*customDeleteACLRequest)
+
+		request := args.DeleteInstanceACLRulesRequest
+		for _, ip := range args.Rules {
+			request.ACLRuleIPs = append(request.ACLRuleIPs, ip.IP)
+		}
+
+		aclDeleteResponseI, err := runner(ctx, request)
 		if err != nil {
 			return nil, err
 		}
+
 		aclDeleteResponse := aclDeleteResponseI.(*rdb.DeleteInstanceACLRulesResponse)
 		return rdb.ListInstanceACLRulesResponse{
 			Rules:      aclDeleteResponse.Rules,
 			TotalCount: uint32(len(aclDeleteResponse.Rules)),
 		}, nil
 	}
 
+	c.WaitFunc = func(ctx context.Context, argsI, respI interface{}) (interface{}, error) {
+		args := argsI.(*customDeleteACLRequest)
+
+		api := rdb.NewAPI(core.ExtractClient(ctx))
+		_, err := api.WaitForInstance(&rdb.WaitForInstanceRequest{
+			InstanceID:    args.InstanceID,
+			Region:        args.Region,
+			Timeout:       scw.TimeDurationPtr(instanceActionTimeout),
+			RetryInterval: core.DefaultRetryInterval,
+		})
+		if err != nil {
+			return nil, err
+		}
+
+		return respI.(rdb.ListInstanceACLRulesResponse), nil
+	}
+
 	return c
 }

internal/namespaces/rdb/v1/custom_acl_test.go

@@ -10,7 +10,7 @@ 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",
+		Cmd:        "scw rdb acl add instance-id={{ .Instance.ID }} rules.0.ip=4.2.3.4 --wait",
 		Check:      core.TestCheckGolden(),
 		AfterFunc:  deleteInstance(),
 	}))
@@ -21,9 +21,9 @@ func Test_DeleteACL(t *testing.T) {
 		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"),
+			core.ExecBeforeCmd("scw rdb acl add instance-id={{ .Instance.ID }} rules.0.ip=1.2.3.4 --wait"),
 		),
-		Cmd:       "scw rdb acl remove instance-id={{ .Instance.ID }} acl-rule-ips.0=1.2.3.4",
+		Cmd:       "scw rdb acl delete instance-id={{ .Instance.ID }} rules.0.ip=1.2.3.4 --wait",
 		Check:     core.TestCheckGolden(),
 		AfterFunc: deleteInstance(),
 	}))