Skip warnings in web index

grafana · Jun 17, 2024 · 5692b42 · 5692b42
1 parent 3c36e7e
commit 5692b42
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 3 deletions.
diff --git a/pkg/grizzly/embed/templates/proxy/index.html.tmpl b/pkg/grizzly/embed/templates/proxy/index.html.tmpl
@@ -8,16 +8,17 @@
 <body dir="ltr">
 {{ template "proxy/header.html.tmpl" . }}
 
-
 <main>
     <div>
     {{ if ne (len .ParseErrors) 0 }}
         <h1>Errors</h1>
 
         {{ range .ParseErrors }}
+          {{ if not (IsWarning .) }}
             <li>
                 <code>{{ . }}</code>
             </li>
+          {{ end }}
         {{ end }}
     {{ end }}
     <h1>Available dashboards</h1>

diff --git a/pkg/grizzly/errors.go b/pkg/grizzly/errors.go
@@ -39,3 +39,20 @@ func NewUnrecognisedFormatError(file string) UnrecognisedFormatError {
 		File: file,
 	}
 }
+
+type Warning struct {
+	Err error
+}
+
+func NewWarning(err error) Warning {
+	return Warning{err}
+}
+
+func (w Warning) Error() string {
+	return w.Err.Error()
+}
+
+func IsWarning(err any) bool {
+	_, ok := err.(Warning)
+	return ok
+}
diff --git a/pkg/grizzly/parsing.go b/pkg/grizzly/parsing.go
@@ -161,7 +161,7 @@ func (parser *ChainParser) parseFile(file string, options ParserOptions) (Resour
 		return resources, nil
 	}
 
-	return Resources{}, NewUnrecognisedFormatError(file)
+	return Resources{}, NewWarning(NewUnrecognisedFormatError(file))
 }
 
 func parseAny(registry Registry, data any, resourceKind, folderUID string, source Source) (Resources, error) {

diff --git a/pkg/grizzly/tmpl.go b/pkg/grizzly/tmpl.go
@@ -44,7 +44,13 @@ func findAndParseTemplates(vfs fs.FS, rootTmpl *template.Template, rootDir strin
 		}
 
 		templateName := strings.TrimPrefix(strings.TrimPrefix(path, rootDir), "/")
-		t := rootTmpl.New(templateName)
+		t := rootTmpl.New(templateName).Funcs(
+			template.FuncMap{
+				"IsWarning": func(i any) bool {
+					return IsWarning(i)
+				},
+			},
+		)
 		_, err = t.Parse(string(contents))
 
 		return err