chore: Add conditional configuration

Signed-off-by: Matthias Glastra <[email protected]>
matglas · May 10, 2024 · 3539103 · 3539103
1 parent 4c21b2f
commit 3539103
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/attestation/material/material.go b/attestation/material/material.go
@@ -173,10 +173,17 @@ func (a *Attestor) Attest(ctx *attestation.AttestationContext) error {
 func (a *Attestor) MarshalJSON() ([]byte, error) {
 	output := attestorJson{
 		Materials: a.materials,
-		Configuration: attestorConfiguration{
-			IncludeGlob: a.includeGlob,
-			ExcludeGlob: a.excludeGlob,
-		},
+	}
+
+	if a.includeGlob != "" || a.excludeGlob != "" {
+		config := attestorConfiguration{}
+
+		if a.includeGlob != "" {
+			config.IncludeGlob = a.includeGlob
+		}
+		if a.excludeGlob != "" {
+			config.ExcludeGlob = a.excludeGlob
+		}
 	}
 
 	return json.Marshal(output)

diff --git a/attestation/product/product.go b/attestation/product/product.go
@@ -209,10 +209,17 @@ func (a *Attestor) Attest(ctx *attestation.AttestationContext) error {
 func (a *Attestor) MarshalJSON() ([]byte, error) {
 	output := attestorJson{
 		Products: a.products,
-		Configuration: &attestorConfiguration{
-			IncludeGlob: a.includeGlob,
-			ExcludeGlob: a.excludeGlob,
-		},
+	}
+
+	if a.includeGlob != "" || a.excludeGlob != "" {
+		config := attestorConfiguration{}
+
+		if a.includeGlob != "" {
+			config.IncludeGlob = a.includeGlob
+		}
+		if a.excludeGlob != "" {
+			config.ExcludeGlob = a.excludeGlob
+		}
 	}
 
 	return json.Marshal(output)