fix: improve deb.arch_variant

Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>

Author: caarlos0

deb/deb.go

@@ -60,6 +60,14 @@ func ensureValidArch(info *nfpm.Info) *nfpm.Info {
 		info.Arch = arch
 	}
 
+	switch info.Deb.ArchVariant {
+	case "", "amd64v1", "amd64v2", "amd64v3", "amd64v4":
+		// ignore empty, ignore already valid
+	case "v1", "v2", "v3", "v4":
+		// prefix 'amd64' to valid versions
+		info.Deb.ArchVariant = "amd64" + info.Deb.ArchVariant
+	}
+
 	return info
 }
 

deb/deb_test.go

@@ -529,24 +529,27 @@ func TestDebEpoch(t *testing.T) {
 
 func TestDebRules(t *testing.T) {
 	var w bytes.Buffer
-	require.NoError(t, writeControl(&w, controlData{
-		Info: nfpm.WithDefaults(&nfpm.Info{
-			Name:        "lala",
-			Arch:        "arm64",
-			Description: "Has rules script",
-			Priority:    "extra",
-			Epoch:       "2",
-			Version:     "1.2.0",
-			Section:     "default",
-			Maintainer:  "maintainer",
-			Overridables: nfpm.Overridables{
-				Deb: nfpm.Deb{
-					Scripts: nfpm.DebScripts{
-						Rules: "foo.sh",
-					},
+	info := nfpm.WithDefaults(&nfpm.Info{
+		Name:        "lala",
+		Arch:        "arm64",
+		Description: "Has rules script",
+		Priority:    "extra",
+		Epoch:       "2",
+		Version:     "1.2.0",
+		Section:     "default",
+		Maintainer:  "maintainer",
+		Overridables: nfpm.Overridables{
+			Deb: nfpm.Deb{
+				ArchVariant: "v2",
+				Scripts: nfpm.DebScripts{
+					Rules: "foo.sh",
 				},
 			},
-		}),
+		},
+	})
+	ensureValidArch(info)
+	require.NoError(t, writeControl(&w, controlData{
+		Info: info,
 	}))
 	golden := "testdata/rules.golden"
 	if *update {

deb/testdata/rules.golden

@@ -3,6 +3,7 @@ Version: 2:1.2.0
 Section: default
 Priority: extra
 Architecture: arm64
+Architecture-Variant: amd64v2
 Maintainer: maintainer
 Installed-Size: 0
 Description: Has rules script