Add nil check to support bundle printer that prints remotecfg & local…

… sources
grafana · Jan 8, 2025 · 74b294a · 74b294a
1 parent 0a3e6df
commit 74b294a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 14 deletions.
diff --git a/internal/service/http/http.go b/internal/service/http/http.go
@@ -661,6 +661,10 @@ func remoteCfgRedactedCachedConfig(host service.Host) ([]byte, error) {
 }
 
 func printFileRedacted(f *ast.File) ([]byte, error) {
+	if f == nil {
+		return []byte{}, nil
+	}
+
 	c := printer.Config{
 		RedactSecrets: true,
 	}

diff --git a/internal/service/http/supportbundle.go b/internal/service/http/supportbundle.go
@@ -212,20 +212,23 @@ func ServeSupportBundle(rw http.ResponseWriter, b *Bundle, logsBuf *bytes.Buffer
 	rw.Header().Set("Content-Disposition", "attachment; filename=\"alloy-support-bundle.zip\"")
 
 	zipStructure := map[string][]byte{
-		"alloy-metadata.yaml":                b.meta,
-		"alloy-components.json":              b.components,
-		"alloy-peers.json":                   b.peers,
-		"alloy-metrics-sample-start.txt":     b.alloyMetricsStart,
-		"alloy-metrics-sample-end.txt":       b.alloyMetricsEnd,
-		"alloy-runtime-flags.txt":            b.runtimeFlags,
-		"alloy-environment.txt":              b.environmentVariables,
-		"alloy-logs.txt":                     logsBuf.Bytes(),
-		"sources/remote-config/remote.alloy": b.remoteCfg,
-		"pprof/cpu.pprof":                    b.cpuBuf.Bytes(),
-		"pprof/heap.pprof":                   b.heapBuf.Bytes(),
-		"pprof/goroutine.pprof":              b.goroutineBuf.Bytes(),
-		"pprof/mutex.pprof":                  b.mutexBuf.Bytes(),
-		"pprof/block.pprof":                  b.blockBuf.Bytes(),
+		"alloy-metadata.yaml":            b.meta,
+		"alloy-components.json":          b.components,
+		"alloy-peers.json":               b.peers,
+		"alloy-metrics-sample-start.txt": b.alloyMetricsStart,
+		"alloy-metrics-sample-end.txt":   b.alloyMetricsEnd,
+		"alloy-runtime-flags.txt":        b.runtimeFlags,
+		"alloy-environment.txt":          b.environmentVariables,
+		"alloy-logs.txt":                 logsBuf.Bytes(),
+		"pprof/cpu.pprof":                b.cpuBuf.Bytes(),
+		"pprof/heap.pprof":               b.heapBuf.Bytes(),
+		"pprof/goroutine.pprof":          b.goroutineBuf.Bytes(),
+		"pprof/mutex.pprof":              b.mutexBuf.Bytes(),
+		"pprof/block.pprof":              b.blockBuf.Bytes(),
+	}
+
+	if len(b.remoteCfg) > 0 {
+		zipStructure["sources/remote-config/remote.alloy"] = b.remoteCfg
 	}
 
 	for p, s := range b.sources {