Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions internal/namespaces/instance/v1/custom.go
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ func GetCommands() *core.Commands {
cmds.MustFind("instance", "user-data", "delete").Override(userDataDeleteBuilder)
cmds.MustFind("instance", "user-data", "set").Override(userDataSetBuilder)
cmds.MustFind("instance", "user-data", "get").Override(userDataGetBuilder)
cmds.MustFind("instance", "user-data", "list").Override(userDataListBuilder)

return cmds
}
Expand Down
37 changes: 37 additions & 0 deletions internal/namespaces/instance/v1/custom_user_data.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ package instance
import (
"context"
"fmt"
"io"
"net/http"
"strings"

"github.com/scaleway/scaleway-cli/internal/core"
"github.com/scaleway/scaleway-sdk-go/api/instance/v1"
Expand Down Expand Up @@ -53,3 +55,38 @@ func userDataGetBuilder(c *core.Command) *core.Command {

return c
}

func userDataListBuilder(c *core.Command) *core.Command {
type userDataRow struct {
Key string `json:"key"`
Value string `json:"value"`
}
c.AddInterceptors(func(ctx context.Context, argsI interface{}, runner core.CommandRunner) (interface{}, error) {
client := core.ExtractClient(ctx)
api := instance.NewAPI(client)
args := argsI.(*instance.ListServerUserDataRequest)
res, err := api.GetAllServerUserData(&instance.GetAllServerUserDataRequest{
Zone: args.Zone,
ServerID: args.ServerID,
})
if err != nil {
return nil, err
}
var r []userDataRow
for a, v := range res.UserData {
buf := new(strings.Builder)
_, err := io.Copy(buf, v)
if err != nil {
return nil, err
}
r = append(r, userDataRow{
Key: a,
Value: buf.String(),
})
}

return r, nil
})

return c
}
17 changes: 17 additions & 0 deletions internal/namespaces/instance/v1/custom_user_data_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,20 @@ func Test_UserDataGet(t *testing.T) {
),
}))
}

func Test_UserDataList(t *testing.T) {
t.Run("Simple", core.Test(&core.TestConfig{
BeforeFunc: core.BeforeFuncCombine(
createServer("Server"),
core.ExecBeforeCmd("scw instance user-data set {{ .Server.ID }} key=foo content=bar"),
core.ExecBeforeCmd("scw instance user-data set {{ .Server.ID }} key=bar content=foo"),
),
Commands: GetCommands(),
Cmd: "scw instance user-data list server-id={{ .Server.ID }}",
AfterFunc: deleteServer("Server"),
Check: core.TestCheckCombine(
core.TestCheckGolden(),
core.TestCheckExitCode(0),
),
}))
}
Loading