-
Notifications
You must be signed in to change notification settings - Fork 452
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: support JSON output in
talosctl get, event types
This adds support for `-o json` (easier to use `jq` to query additional data), and prints event name in `--watch` mode. Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
- Loading branch information
Showing
7 changed files
with
84 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/. | ||
|
|
||
| package output | ||
|
|
||
| import ( | ||
| "encoding/json" | ||
| "os" | ||
| "strings" | ||
|
|
||
| "github.com/talos-systems/os-runtime/pkg/resource" | ||
| "github.com/talos-systems/os-runtime/pkg/state" | ||
| "gopkg.in/yaml.v3" | ||
| ) | ||
|
|
||
| // JSON outputs resources in JSON format. | ||
| type JSON struct { | ||
| withEvents bool | ||
| } | ||
|
|
||
| // NewJSON initializes JSON resource output. | ||
| func NewJSON() *JSON { | ||
| return &JSON{} | ||
| } | ||
|
|
||
| // WriteHeader implements output.Writer interface. | ||
| func (j *JSON) WriteHeader(definition resource.Resource, withEvents bool) error { | ||
| j.withEvents = withEvents | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // WriteResource implements output.Writer interface. | ||
| func (j *JSON) WriteResource(node string, r resource.Resource, event state.EventType) error { | ||
| out, err := resource.MarshalYAML(r) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| yamlBytes, err := yaml.Marshal(out) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| var data map[string]interface{} | ||
|
|
||
| err = yaml.Unmarshal(yamlBytes, &data) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| data["node"] = node | ||
|
|
||
| if j.withEvents { | ||
| data["event"] = strings.ToLower(event.String()) | ||
| } | ||
|
|
||
| enc := json.NewEncoder(os.Stdout) | ||
| enc.SetIndent("", " ") | ||
|
|
||
| return enc.Encode(data) | ||
| } | ||
|
|
||
| // Flush implements output.Writer interface. | ||
| func (j *JSON) Flush() error { | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters