mirror of
https://github.com/moby/moby.git
synced 2026-01-11 10:41:43 +00:00
ddbb503dc7
These fields store the raw JSON data that we received, and should
never container bytes that are non-JSON (as we'd error out when
failing to unmarshal).
Change the type to a json.RawMessage, which:
- Is more explicit on intent
- Can still be used as a regular []byte in all cases
And, while it's not expected to be marshaled to JSON, doing so will also
print the output in a readable format instead of base64 encoding;
package main
import (
"encoding/json"
"fmt"
)
func main() {
foo := struct {
Bytes []byte
Raw json.RawMessage
}{
Bytes: []byte(`{"hello": "world"}`),
Raw: json.RawMessage(`{"hello": "world"}`),
}
out, _ := json.MarshalIndent(foo, "", " ")
fmt.Println(string(out))
}
Will print:
{
"Bytes": "eyJoZWxsbyI6ICJ3b3JsZCJ9",
"Raw": {
"hello": "world"
}
}
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
38 lines
895 B
Go
38 lines
895 B
Go
package client
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
|
|
"github.com/moby/moby/api/types/swarm"
|
|
)
|
|
|
|
// TaskInspectOptions contains options for inspecting a task.
|
|
type TaskInspectOptions struct {
|
|
// Currently no options are defined.
|
|
}
|
|
|
|
// TaskInspectResult contains the result of a task inspection.
|
|
type TaskInspectResult struct {
|
|
Task swarm.Task
|
|
Raw json.RawMessage
|
|
}
|
|
|
|
// TaskInspect returns the task information and its raw representation.
|
|
func (cli *Client) TaskInspect(ctx context.Context, taskID string, options TaskInspectOptions) (TaskInspectResult, error) {
|
|
taskID, err := trimID("task", taskID)
|
|
if err != nil {
|
|
return TaskInspectResult{}, err
|
|
}
|
|
|
|
resp, err := cli.get(ctx, "/tasks/"+taskID, nil, nil)
|
|
defer ensureReaderClosed(resp)
|
|
if err != nil {
|
|
return TaskInspectResult{}, err
|
|
}
|
|
|
|
var out TaskInspectResult
|
|
out.Raw, err = decodeWithRaw(resp, &out.Task)
|
|
return out, err
|
|
}
|