Merge pull request #87 from GrantBirki/bug-fixes

bug: `allow_multiple_documents` crashes the action in certain JSON parsing cases

Author: GrantBirki

.github/workflows/acceptance-test.yml

@@ -77,3 +77,12 @@ jobs:
           json_schema: ./__tests__/fixtures/schemas/schema1.json
           files: |
             __tests__/fixtures/yaml_as_json/valid_multi/yaml1.yaml
+
+      - name: acceptance test - excluding helm charts
+        uses: ./
+        id: json-yaml-validate-exclude-helm-charts-test
+        with:
+          comment: "true"
+          yaml_exclude_regex: "(charts/external-dns/templates.*|mkdocs.yml)"
+          allow_multiple_documents: "true"
+          base_dir: __tests__/acceptance

__tests__/acceptance/charts/external-dns/templates/service.yaml

@@ -0,0 +1,36 @@
+{{- $providerName := include "external-dns.providerName" . }}
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ include "external-dns.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "external-dns.labels" . | nindent 4 }}
+  {{- with .Values.service.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+{{- with .Values.service.ipFamilies }}
+  ipFamilies:
+    {{- toYaml . | nindent 4 }}
+{{- end }}
+{{- with .Values.service.ipFamilyPolicy }}
+  ipFamilyPolicy: {{ . }}
+{{- end }}
+  type: ClusterIP
+  selector:
+    {{- include "external-dns.selectorLabels" . | nindent 4 }}
+  ports:
+    - name: http
+      port: {{ .Values.service.port }}
+      targetPort: http
+      protocol: TCP
+    {{- if eq $providerName "webhook" }}
+    {{- with .Values.provider.webhook.service }}
+    - name: http-webhook
+      port: {{ .port }}
+      targetPort: http-webhook
+      protocol: TCP
+    {{- end }}
+    {{- end }}

__tests__/acceptance/charts/external-dns/templates/serviceaccount.yaml

@@ -0,0 +1,19 @@
+{{- if .Values.serviceAccount.create -}}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ include "external-dns.serviceAccountName" . }}
+  namespace: {{ .Release.Namespace }}
+  labels:
+    {{- include "external-dns.labels" . | nindent 4 }}
+  {{- with .Values.serviceAccount.labels }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.serviceAccount.annotations }}
+  annotations:
+    {{- range $k, $v := . }}
+      {{- printf "%s: %s" (toYaml (tpl $k $)) (toYaml (tpl $v $)) | nindent 4 }}
+    {{- end }}
+  {{- end }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
+{{- end }}

dist/index.js

@@ -244,8 +244,8 @@ export async function jsonValidator(exclude) {
         newData.push(doc.toJS())
       })
       data = newData
-    }
-    if (allowMultipleDocuments !== true) {
+    } else {
+      // For JSON files or single YAML documents, wrap in array
       data = [data]
     }