mirror of
https://github.com/moby/moby.git
synced 2026-01-11 18:51:37 +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>
42 lines
938 B
Go
42 lines
938 B
Go
package client
|
|
|
|
import (
|
|
"bytes"
|
|
"context"
|
|
"encoding/json"
|
|
"io"
|
|
|
|
"github.com/moby/moby/api/types/swarm"
|
|
)
|
|
|
|
// NodeInspectOptions holds parameters to inspect nodes with.
|
|
type NodeInspectOptions struct{}
|
|
|
|
type NodeInspectResult struct {
|
|
Node swarm.Node
|
|
Raw json.RawMessage
|
|
}
|
|
|
|
// NodeInspect returns the node information.
|
|
func (cli *Client) NodeInspect(ctx context.Context, nodeID string, options NodeInspectOptions) (NodeInspectResult, error) {
|
|
nodeID, err := trimID("node", nodeID)
|
|
if err != nil {
|
|
return NodeInspectResult{}, err
|
|
}
|
|
resp, err := cli.get(ctx, "/nodes/"+nodeID, nil, nil)
|
|
defer ensureReaderClosed(resp)
|
|
if err != nil {
|
|
return NodeInspectResult{}, err
|
|
}
|
|
|
|
body, err := io.ReadAll(resp.Body)
|
|
if err != nil {
|
|
return NodeInspectResult{}, err
|
|
}
|
|
|
|
var response swarm.Node
|
|
rdr := bytes.NewReader(body)
|
|
err = json.NewDecoder(rdr).Decode(&response)
|
|
return NodeInspectResult{Node: response, Raw: body}, err
|
|
}
|