Skip to content

Commit 85c1bfb

Browse files
authored
feat(rdb): improve ACL deletion message (#2669)
1 parent 77ff45b commit 85c1bfb

File tree

3 files changed

+112
-248
lines changed

3 files changed

+112
-248
lines changed

internal/namespaces/rdb/v1/custom_acl.go

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ package rdb
22

33
import (
44
"context"
5+
"fmt"
56
"reflect"
7+
"strings"
68

79
"github.com/fatih/color"
810
"github.com/scaleway/scaleway-cli/v2/internal/core"
@@ -92,9 +94,14 @@ func aclDeleteBuilder(c *core.Command) *core.Command {
9294
}
9395

9496
aclDeleteResponse := aclDeleteResponseI.(*rdb.DeleteInstanceACLRulesResponse)
95-
return rdb.ListInstanceACLRulesResponse{
96-
Rules: aclDeleteResponse.Rules,
97-
TotalCount: uint32(len(aclDeleteResponse.Rules)),
97+
aclResult := make([]string, 0, len(aclDeleteResponse.Rules))
98+
99+
for i := 0; i < len(aclDeleteResponse.Rules); i++ {
100+
aclResult = append(aclResult, aclDeleteResponse.Rules[i].IP.String())
101+
}
102+
103+
return &core.SuccessResult{
104+
Message: fmt.Sprintf("ACL rule(s) %s successfully deleted", strings.Trim(fmt.Sprint(aclResult), "[]")),
98105
}, nil
99106
}
100107

@@ -112,7 +119,7 @@ func aclDeleteBuilder(c *core.Command) *core.Command {
112119
return nil, err
113120
}
114121

115-
return respI.(rdb.ListInstanceACLRulesResponse), nil
122+
return respI.(*core.SuccessResult), nil
116123
}
117124

118125
return c

0 commit comments

Comments
 (0)