From e63ea58a54b6753874a74bb518888e6f317935e6 Mon Sep 17 00:00:00 2001 From: Daniele Rossi Date: Tue, 8 Oct 2024 21:23:14 +0200 Subject: [PATCH 1/3] fix: manage podman inspect result as a list also --- pkg/podman/inspect.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/podman/inspect.go b/pkg/podman/inspect.go index d90ba754e77..21fc83be6c2 100644 --- a/pkg/podman/inspect.go +++ b/pkg/podman/inspect.go @@ -34,8 +34,12 @@ func (o *PodmanCli) PodInspect(podname string) (PodInspectData, error) { return PodInspectData{}, err } - var result PodInspectData + var result []PodInspectData + if err := json.Unmarshal(out, &result); err != nil { + var singleResult PodInspectData + err = json.Unmarshal(out, &singleResult) + return singleResult, err + } - err = json.Unmarshal(out, &result) - return result, err + return result[0], err } From e76fb24c4663bf4c82fbd76d90d015826143aeea Mon Sep 17 00:00:00 2001 From: Daniele Rossi Date: Wed, 9 Oct 2024 22:11:17 +0200 Subject: [PATCH 2/3] fix: variable shadowing --- pkg/podman/inspect.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/podman/inspect.go b/pkg/podman/inspect.go index 21fc83be6c2..4786d0e62ad 100644 --- a/pkg/podman/inspect.go +++ b/pkg/podman/inspect.go @@ -35,7 +35,8 @@ func (o *PodmanCli) PodInspect(podname string) (PodInspectData, error) { } var result []PodInspectData - if err := json.Unmarshal(out, &result); err != nil { + err = json.Unmarshal(out, &result) + if err != nil { var singleResult PodInspectData err = json.Unmarshal(out, &singleResult) return singleResult, err From 74f5ae4db8ee3ad24593e42f743d1d6352cf2a0e Mon Sep 17 00:00:00 2001 From: Daniele Rossi Date: Fri, 11 Oct 2024 18:50:42 +0200 Subject: [PATCH 3/3] Update pkg/podman/inspect.go Co-authored-by: Armel Soro --- pkg/podman/inspect.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/podman/inspect.go b/pkg/podman/inspect.go index 4786d0e62ad..3d025b0d65c 100644 --- a/pkg/podman/inspect.go +++ b/pkg/podman/inspect.go @@ -42,5 +42,8 @@ func (o *PodmanCli) PodInspect(podname string) (PodInspectData, error) { return singleResult, err } - return result[0], err + if len(result) == 0 { + return PodInspectData{}, nil + } + return result[0], nil }