fix bug with triggers encoded in triggers file (#1358)

Signed-off-by: Jason Hall <[email protected]>
chainguard-dev · Oct 28, 2024 · 524bf6e · 524bf6e
1 parent dfd80b4
commit 524bf6e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/apk/apk/installed.go b/pkg/apk/apk/installed.go
@@ -216,7 +216,7 @@ func (a *APK) updateTriggers(pkg *Package, controlTarGz io.Reader) error {
 	}
 
 	for _, value := range values {
-		if _, err := triggers.Write([]byte(fmt.Sprintf("%s %s\n", base64.StdEncoding.EncodeToString(pkg.Checksum), value))); err != nil {
+		if _, err := triggers.Write([]byte(fmt.Sprintf("Q1%s %s\n", base64.StdEncoding.EncodeToString(pkg.Checksum), value))); err != nil {
 			return fmt.Errorf("unable to write triggers file %s: %w", triggersFilePath, err)
 		}
 	}

diff --git a/pkg/apk/apk/installed_test.go b/pkg/apk/apk/installed_test.go
@@ -256,7 +256,7 @@ func TestUpdateTriggers(t *testing.T) {
 	readTriggers, err := a.readTriggers()
 	require.NoError(t, err, "unable to read triggers: %v", err)
 	defer readTriggers.Close()
-	cksum := base64.StdEncoding.EncodeToString(pkg.Checksum)
+	cksum := "Q1" + base64.StdEncoding.EncodeToString(pkg.Checksum)
 	// read every line in triggers, looking for one with our comment
 	scanner := bufio.NewScanner(readTriggers)
 	for scanner.Scan() {
@@ -271,7 +271,7 @@ func TestUpdateTriggers(t *testing.T) {
 		return
 	}
 	//nolint:forbidigo // this is a valid use case
-	t.Errorf("could not find entry for commit: %s", cksum)
+	t.Errorf("could not find entry for checksum: %s", cksum)
 }
 
 func TestSortTarHeaders(t *testing.T) {