Merge pull request #9 from shivjm/small-fixes

Small fixes

.github/workflows/publish.yaml

@@ -5,8 +5,8 @@ on:
 
 env:
   image: ghcr.io/shivjm/helm-kubeconform-action
-  go: "1.18.3"
-  helm: "v3.9.4"
+  go: "1.19.2"
+  helm: "v3.10.1"
   schema: "master"
   kubeconform: "v0.4.14"
 

Dockerfile

@@ -1,6 +1,6 @@
-ARG GO_VERSION=1.16.5
+ARG GO_VERSION
 
-ARG KUBECONFORM_VERSION=v0.4.11
+ARG KUBECONFORM_VERSION
 
 FROM golang:$GO_VERSION-alpine AS builder
 
@@ -14,11 +14,10 @@ FROM ghcr.io/yannh/kubeconform:$KUBECONFORM_VERSION-alpine AS kubeconform
 # for curl & unzip
 FROM alpine:3.14 AS downloader
 
-ARG HELM_VERSION=v3.7.0
+ARG HELM_VERSION
 
 RUN apk add -q --no-cache curl
 
-# https://get.helm.sh/helm-v3.7.0-linux-amd64.tar.gz
 RUN mkdir /helm && cd /helm && curl -sSL https://get.helm.sh/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar xzf -
 
 FROM gcr.io/distroless/static@sha256:912bd2c2b9704ead25ba91b631e3849d940f9d533f0c15cf4fc625099ad145b1

README.md

@@ -1,6 +1,10 @@
 # Helm Kubeconform Action
 
-A flexible GitHub Action to validate [Helm charts](https://helm.sh/docs/topics/charts/) with [Kubeconform](https://github.com/yannh/kubeconform/).
+A flexible GitHub Action to validate [Helm
+charts](https://helm.sh/docs/topics/charts/) with
+[Kubeconform](https://github.com/yannh/kubeconform/). The target may
+be either a single chart directory or a directory containing multiple
+charts, at any level.
 
 ## Usage
 

main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	"bytes"
+	"encoding/json"
 	"errors"
 	"io/fs"
 	"os"
@@ -61,7 +62,7 @@ func main() {
 	level, err := zerolog.ParseLevel(cfg.LogLevel)
 
 	if err != nil {
-		log.Fatal().Stack().Err(err).Msgf("%+v\n", err)
+		log.Fatal().Err(err).Msgf("Could not parse log level")
 		return
 	}
 
@@ -128,7 +129,16 @@ func run(cfg Config, additionalSchemaPaths []string, updateDependencies bool) er
 			// <https://github.com/yannh/kubeconform/blob/dcc77ac3a39ed1fb538b54fab57bbe87d1ece490/cmd/kubeconform/main.go#L47>,
 			// so instead we shell out to it
 			output, err := runKubeconform(manifests, cfg.Kubeconform.path, cfg.Strict, additionalSchemaPaths, cfg.KubernetesVersion)
-			logger.Err(err).RawJSON("kubeconform", output).Msg("")
+
+			// if kubeconform could not be executed, the output will not be
+			// in JSON format
+			var js json.RawMessage
+			if json.Unmarshal([]byte(output), &js) == nil {
+				logger.Err(err).RawJSON("kubeconform", output).Msg("")
+			} else {
+				logger.Err(err).Msgf("kubeconform failed: %s", output)
+			}
+
 			if err != nil {
 				validationsErrors = append(validationsErrors, err)
 			}
@@ -143,6 +153,7 @@ func run(cfg Config, additionalSchemaPaths []string, updateDependencies bool) er
 	if validationsErrors != nil {
 		return errors.New("Validation failed")
 	}
+
 	return nil
 }