Fix azure (#210)

* Add header with "conectix" value

To fix this error:

Message: The specified cookie value in VHD footer indicates that disk 'kairos-ubuntu-24.04-core-amd64-generic-3.3.1-88-g70ebc315.raw.vhd' with blob https://kairoscloudimages.blob.core.windows.net:8443/kairos-cloud-images/kairos-ubuntu-24.04-core-amd64-generic-3.3.1-88-g70ebc315.raw.vhd is not a supported VHD. Disk is expected to have cookie value 'conectix'.

Signed-off-by: Dimitris Karakasilis <[email protected]>

* Azure expect the file size without the header to be rounded to MB

Thus we don't have to remove 512 bytes (the "footer"/header size). We
just round the file up and we add the footer in the end.

Signed-off-by: Dimitris Karakasilis <[email protected]>

* Fix test

Signed-off-by: Dimitris Karakasilis <[email protected]>

---------

Signed-off-by: Dimitris Karakasilis <[email protected]>

Author: jimmykarily

e2e/disks_test.go

@@ -7,12 +7,13 @@ import (
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
-	"github.com/kairos-io/AuroraBoot/pkg/constants"
-	"github.com/kairos-io/AuroraBoot/pkg/ops"
 	"os"
 	"os/exec"
 	"path/filepath"
 
+	"github.com/kairos-io/AuroraBoot/pkg/constants"
+	"github.com/kairos-io/AuroraBoot/pkg/ops"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
@@ -141,8 +142,8 @@ var _ = Describe("Disk image generation", Label("raw-disks", "e2e"), Serial, Ord
 				f, _ := os.Open(filepath.Join(tempDir, "kairos-rockylinux-9-core-amd64-generic-v3.2.1.raw.vhd"))
 				defer f.Close()
 				info, _ := f.Stat()
-				// Should be divisible by 1024*1024
-				Expect(info.Size() % constants.MB).To(BeNumerically("==", 0))
+				// Should be divisible by 1024*1024 + 512 bytes header
+				Expect(info.Size() % constants.MB).To(BeNumerically("==", 512))
 				// Dump the header from the file into our VHDHeader
 				buff := make([]byte, 512)
 				_, _ = f.ReadAt(buff, info.Size()-512)

pkg/ops/rawDiskOutput.go

@@ -7,13 +7,14 @@ import (
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
-	"github.com/kairos-io/AuroraBoot/pkg/utils"
 	"io"
 	"io/fs"
 	"math"
 	"os"
 	"time"
 
+	"github.com/kairos-io/AuroraBoot/pkg/utils"
+
 	uuidPkg "github.com/gofrs/uuid"
 	"github.com/kairos-io/AuroraBoot/internal"
 	"github.com/kairos-io/AuroraBoot/pkg/constants"
@@ -44,8 +45,6 @@ func Raw2Azure(source string) (string, error) {
 	var finalSize int64
 	// Calculate the final size in bytes
 	finalSize = ((actualSize + constants.MB - 1) / constants.MB) * constants.MB
-	finalSize -= 512
-	// Remove the 512 bytes for the header that we are going to add afterwards
 
 	// If the actual size is different from the final size, we have to resize the image
 	if actualSize != finalSize {
@@ -88,7 +87,7 @@ func Raw2Azure(source string) (string, error) {
 	}
 	sizeFile := fileInfo.Size()
 
-	if sizeFile%constants.MB != 0 {
+	if int64(size)%constants.MB != 0 {
 		err = fmt.Errorf("The file %s size %d bytes is not divisible by 1 MB.\n", fileInfo.Name(), sizeFile)
 		internal.Log.Logger.Error().Err(err).Msg("Error validating file size")
 		return name, err
@@ -233,6 +232,7 @@ type VHDHeader struct {
 // Lots of magic numbers here, but they are all defined in the VHD format spec
 func newVHDFixed(size uint64) VHDHeader {
 	header := VHDHeader{}
+	hexToField("636f6e6563746978", header.Cookie[:])
 	hexToField("00000002", header.Features[:])
 	hexToField("00010000", header.FileFormatVersion[:])
 	hexToField("ffffffffffffffff", header.DataOffset[:])