From d500fadd5cf73a9e65e64325d80424cde3612135 Mon Sep 17 00:00:00 2001 From: jlandowner Date: Tue, 9 Apr 2024 23:37:07 +0900 Subject: [PATCH] Fix Unknown warning message Directly show stdout/stderr of helm template command output --- pkg/unstructured/__snapshots__/suite_test.snap | 11 +++-------- pkg/unstructured/unknown.go | 7 +------ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/pkg/unstructured/__snapshots__/suite_test.snap b/pkg/unstructured/__snapshots__/suite_test.snap index 1a34092..018ad09 100644 --- a/pkg/unstructured/__snapshots__/suite_test.snap +++ b/pkg/unstructured/__snapshots__/suite_test.snap @@ -264,12 +264,7 @@ SnapShot = """ SnapShot = """ WARN: failed to recognize a resource in stdout/stderr of helm template command output. snapshot it as Unknown: --- -object: - apiVersion: helm-chartsnap.jlandowner.dev/v1alpha1 - kind: Unknown - raw: |- - some: raw data - raw: - data: here - +some: raw data +raw: + data: here ---""" diff --git a/pkg/unstructured/unknown.go b/pkg/unstructured/unknown.go index 1ca5b99..47e50c3 100644 --- a/pkg/unstructured/unknown.go +++ b/pkg/unstructured/unknown.go @@ -5,7 +5,6 @@ import ( metaV1 "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/runtime/schema" - yaml "sigs.k8s.io/yaml/goyaml.v3" ) var ( @@ -22,11 +21,7 @@ type UnknownError struct { } func (e *UnknownError) Error() string { - out, err := yaml.Marshal(e.Unstructured()) - if err != nil { - panic(err) - } - return fmt.Sprintf("WARN: failed to recognize a resource in stdout/stderr of helm template command output. snapshot it as Unknown: \n---\n%s\n---", out) + return fmt.Sprintf("WARN: failed to recognize a resource in stdout/stderr of helm template command output. snapshot it as Unknown: \n---\n%s\n---", e.Raw) } func (e *UnknownError) Unstructured() *metaV1.Unstructured {