kairos/kairos-agent
1
0
Fork 0
mirror of https://github.com/kairos-io/kairos-agent.git synced 2025-10-22 03:49:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: dont try to unmarshal into JSON if data is empty (#996)

Browse Source
This commit is contained in:
Nianyu Shen
2025-10-15 00:11:59 -07:00
committed by GitHub
parent ce56d0c2e3
commit cb5cb9848c
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/agent/TUIcustomizationPage.go
View File

@@ -35,8 +35,10 @@ func runCustomizationPlugins() ([]YAMLPrompt, error) {
var r []YAMLPrompt var r []YAMLPrompt
bus.Manager.Response(sdk.EventInteractiveInstall, func(p *pluggable.Plugin, resp *pluggable.EventResponse) { bus.Manager.Response(sdk.EventInteractiveInstall, func(p *pluggable.Plugin, resp *pluggable.EventResponse) {
err := json.Unmarshal([]byte(resp.Data), &r) if resp.Data == "" {
if err != nil { return
}
if err := json.Unmarshal([]byte(resp.Data), &r); err != nil {
fmt.Println(err) fmt.Println(err)
} }
}) })

3
internal/agent/install.go
View File

@@ -96,6 +96,9 @@ func Install(sourceImgURL string, dir ...string) error {
}) })
bus.Manager.Response(events.EventInstall, func(p *pluggable.Plugin, resp *pluggable.EventResponse) { bus.Manager.Response(events.EventInstall, func(p *pluggable.Plugin, resp *pluggable.EventResponse) {
if resp.Data == "" {
return
}
err := json.Unmarshal([]byte(resp.Data), &r) err := json.Unmarshal([]byte(resp.Data), &r)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)

3
internal/agent/reset.go
View File

@@ -139,6 +139,9 @@ func sharedReset(reboot, unattended, resetOem bool, dir ...string) (c *config.Co
// This gets the options from an event that can be sent by anyone. // This gets the options from an event that can be sent by anyone.
// This should override the default config as it's much more dynamic // This should override the default config as it's much more dynamic
bus.Manager.Response(sdk.EventBeforeReset, func(p *pluggable.Plugin, r *pluggable.EventResponse) { bus.Manager.Response(sdk.EventBeforeReset, func(p *pluggable.Plugin, r *pluggable.EventResponse) {
if r.Data == "" {
return
}
err := json.Unmarshal([]byte(r.Data), &optionsFromEvent) err := json.Unmarshal([]byte(r.Data), &optionsFromEvent)
if err != nil { if err != nil {
fmt.Println(err) fmt.Println(err)