fix: drop the double invalid '+' in layer media-type

For a layer media-type, we add the fstype+compression+verity_present. Only one '+' is allowed as per following RFC. https://datatracker.ietf.org/doc/html/rfc6838#section-4.2 Instead just rely on "root_hash" annotation. Signed-off-by: Ramkumar Chinchani <[email protected]>
project-machine · Dec 4, 2024 · 68b0328 · 68b0328
1 parent e5a0e91
commit 68b0328
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 18 deletions.
diff --git a/pkg/erofs/erofs.go b/pkg/erofs/erofs.go
@@ -111,7 +111,7 @@ func MakeErofs(tempdir string, rootfs string, eps *common.ExcludePaths, verity v
 		return nil, "", rootHash, errors.WithStack(err)
 	}
 
-	return blob, GenerateErofsMediaType(compression, verity), rootHash, nil
+	return blob, GenerateErofsMediaType(compression), rootHash, nil
 }
 
 func findErofsFuseInfo() {

diff --git a/pkg/erofs/mediatype.go b/pkg/erofs/mediatype.go
@@ -3,8 +3,6 @@ package erofs
 import (
 	"fmt"
 	"strings"
-
-	vrty "machinerun.io/atomfs/pkg/verity"
 )
 
 type ErofsCompression string
@@ -21,10 +19,6 @@ func IsErofsMediaType(mediaType string) bool {
 	return strings.HasPrefix(mediaType, BaseMediaTypeLayerErofs)
 }
 
-func GenerateErofsMediaType(comp ErofsCompression, verity vrty.VerityMetadata) string {
-	verityString := ""
-	if verity {
-		verityString = fmt.Sprintf("+%s", vrty.VeritySuffix)
-	}
-	return fmt.Sprintf("%s+%s%s", BaseMediaTypeLayerErofs, comp, verityString)
+func GenerateErofsMediaType(comp ErofsCompression) string {
+	return fmt.Sprintf("%s+%s", BaseMediaTypeLayerErofs, comp)
 }
diff --git a/pkg/squashfs/mediatype.go b/pkg/squashfs/mediatype.go
@@ -3,8 +3,6 @@ package squashfs
 import (
 	"fmt"
 	"strings"
-
-	vrty "machinerun.io/atomfs/pkg/verity"
 )
 
 type SquashfsCompression string
@@ -20,10 +18,6 @@ func IsSquashfsMediaType(mediaType string) bool {
 	return strings.HasPrefix(mediaType, BaseMediaTypeLayerSquashfs)
 }
 
-func GenerateSquashfsMediaType(comp SquashfsCompression, verity vrty.VerityMetadata) string {
-	verityString := ""
-	if verity {
-		verityString = fmt.Sprintf("+%s", vrty.VeritySuffix)
-	}
-	return fmt.Sprintf("%s+%s%s", BaseMediaTypeLayerSquashfs, comp, verityString)
+func GenerateSquashfsMediaType(comp SquashfsCompression) string {
+	return fmt.Sprintf("%s+%s", BaseMediaTypeLayerSquashfs, comp)
 }
diff --git a/pkg/squashfs/squashfs.go b/pkg/squashfs/squashfs.go
@@ -105,7 +105,7 @@ func MakeSquashfs(tempdir string, rootfs string, eps *common.ExcludePaths, verit
 		return nil, "", rootHash, errors.WithStack(err)
 	}
 
-	return blob, GenerateSquashfsMediaType(compression, verity), rootHash, nil
+	return blob, GenerateSquashfsMediaType(compression), rootHash, nil
 }
 
 func findSquashFuseInfo() {