Merge pull request #42 from buildkite/keithduncan/fix-zero-data

Check env data length before indexing
buildkite · Jul 16, 2021 · 7c42323 · 7c42323
2 parents 5f59864 + 0b33277
commit 7c42323
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/s3secrets-helper/secrets/secrets.go b/s3secrets-helper/secrets/secrets.go
@@ -180,12 +180,15 @@ func handleEnvs(conf Config, results <-chan getResult) error {
 			continue
 		}
 		data := r.data
-		if data[len(data)-1] != '\n' {
-			data = append(data, '\n')
-		}
-		log.Printf("Loading %s/%s (%d bytes) of env", r.bucket, r.key, len(r.data))
-		if _, err := bytes.NewReader(data).WriteTo(conf.EnvSink); err != nil {
-			return fmt.Errorf("copying env: %w", err)
+
+		if len(data) > 0 {
+			if data[len(data)-1] != '\n' {
+				data = append(data, '\n')
+			}
+			log.Printf("Loading %s/%s (%d bytes) of env", r.bucket, r.key, len(r.data))
+			if _, err := bytes.NewReader(data).WriteTo(conf.EnvSink); err != nil {
+				return fmt.Errorf("copying env: %w", err)
+			}
 		}
 	}
 	return nil