Sync WindowsMigration Feature branch

.gitignore

@@ -29,6 +29,7 @@ _testmain.go
 *.exe
 *.test
 *.prof
+mrseq
 
 # Dont ignore VMWATCH Binary
 !vmwatch_windows_*.exe

.vscode/launch.json

@@ -17,37 +17,29 @@
             "preLaunchTask": "make devcontainer"
         },
         {
-            "name": "devcontainer run - enable",
+            "name": "devcontainer run - uninstall",
             "type": "go",
             "request": "launch",
             "mode": "exec",
             "program": "/var/lib/waagent/Extension/bin/applicationhealth-extension",
             "cwd": "${workspaceFolder}",
             "args" : [
-                "enable"
+                "uninstall"
             ],
             "preLaunchTask": "make devcontainer"
         },
         {
-            "name": "devcontainer run - uninstall",
+            "name": "devcontainer run - enable",
             "type": "go",
             "request": "launch",
             "mode": "exec",
             "program": "/var/lib/waagent/Extension/bin/applicationhealth-extension",
             "cwd": "${workspaceFolder}",
             "args" : [
-                "uninstall"
+                "enable"
             ],
             "preLaunchTask": "make devcontainer"
         },
-        {
-            "name": "Run integration tests",
-            "type": "node-terminal",
-            "request": "launch",
-            "command": "./integration-test/run.sh",
-            "cwd": "${workspaceFolder}",
-            "preLaunchTask": "make binary - linux"
-        },
         {
             "name": "devcontainer run - enable NOBUILD",
             "type": "go",
@@ -60,16 +52,12 @@
             ]
         },
         {
-            "name": "devcontainer run - uninstall",
-            "type": "go",
+            "name": "Run integration tests",
+            "type": "node-terminal",
             "request": "launch",
-            "mode": "exec",
-            "program": "/var/lib/waagent/Extension/bin/applicationhealth-extension",
+            "command": "./integration-test/run.sh",
             "cwd": "${workspaceFolder}",
-            "args" : [
-                "uninstall"
-            ],
-            "preLaunchTask": "make devcontainer"
-        }
+            "preLaunchTask": "make binary - linux"
+        },
     ]
 }

go.mod

@@ -1,35 +1,40 @@
 module github.com/Azure/applicationhealth-extension-linux
 
+go 1.22
 go 1.22
 
 require (
 	github.com/Azure/azure-docker-extension v0.0.0-20160802215703-0dd2f199467d
-	github.com/Azure/azure-extension-platform v0.0.0-20240327184133-73b5b3b55955
+	github.com/Azure/azure-extension-platform v0.0.0-20240521173920-6b2acfda81e9
 	github.com/containerd/cgroups/v3 v3.0.2
 	github.com/opencontainers/runtime-spec v1.0.2
 	github.com/pkg/errors v0.9.1
-	github.com/samber/slog-formatter v1.0.0
 	github.com/stretchr/testify v1.8.0
 	github.com/xeipuuv/gojsonschema v0.0.0-20160623135812-c539bca196be
 	golang.org/x/sys v0.20.0
 )
 
-require github.com/go-kit/log v0.2.0
+require (
+	github.com/go-kit/log v0.2.0
+	go.uber.org/mock v0.4.0
+)
 
 require (
 	github.com/cilium/ebpf v0.9.1 // indirect
 	github.com/coreos/go-systemd/v22 v22.3.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/go-logfmt/logfmt v0.5.1 // indirect
+	github.com/go-logfmt/logfmt v0.5.1 // indirect
 	github.com/godbus/dbus/v5 v5.0.4 // indirect
+	github.com/google/go-cmp v0.5.8 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/samber/lo v1.38.1 // indirect
 	github.com/samber/slog-multi v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.9.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20151027082146-e0fe6f683076 // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20150808065054-e02fc20de94c // indirect
-	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
+	golang.org/x/sys v0.2.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -19,6 +19,11 @@ github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw=
 github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
 github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
 github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
+github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og=
+github.com/go-kit/log v0.2.0 h1:7i2K3eKTos3Vc0enKCfnVcgHh2olr/MyfboYq7cAcFw=
+github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0=
+github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA=
+github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
 github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
@@ -33,6 +38,8 @@ github.com/opencontainers/runtime-spec v1.0.2 h1:UfAcuLBJB9Coz72x1hgl8O5RVzTdNia
 github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/rogpeppe/go-internal v1.6.1 h1:/FiVV8dS/e+YqF2JvO3yXRFbBLTIuSDkuC7aBOAvL+k=
@@ -59,8 +66,8 @@ github.com/xeipuuv/gojsonschema v0.0.0-20160623135812-c539bca196be h1:sRGd3e18iz
 github.com/xeipuuv/gojsonschema v0.0.0-20160623135812-c539bca196be/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
 go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA=
 go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
-golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 h1:k/i9J1pBpvlfR+9QsetwPyERsqu1GIbi967PQMq3Ivc=
-golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w=
+go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
+go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=

integration-test/env/Extension/bin/upload-zip.sh

@@ -30,4 +30,4 @@ cd /tmp/linux_artifact/caps/ApplicationHealthLinuxTest/v2/ServiceGroupRoot/unzip
 
 # upload it to the storage account
 echo "Uploading linux.zip to container: $container"
-az storage blob upload --account-name vmwatchtest --subscription $subscription --container-name $container --name linux.zip --file /tmp/vmwatch.zip --overwrite
+az storage blob upload --account-name vmwatchtestpackages --subscription $subscription --container-name $container --name linux.zip --file /tmp/vmwatch.zip --overwrite --auth-mode login

integration-test/test/parallel/2_handler-commands.bats

@@ -1,6 +1,7 @@
 #!/usr/bin/env bats
 
 setup(){
+    load "../test_helper"
     load "../test_helper"
     build_docker_image
     container_name="handler-command_$BATS_TEST_NUMBER"

integration-test/test/parallel/7_vmwatch.bats

@@ -1,6 +1,8 @@
 #!/usr/bin/env bats
 
 setup(){
+    load "../test_helper"
+    _load_bats_libs
     load "../test_helper"
     _load_bats_libs
     build_docker_image
@@ -12,6 +14,7 @@ setup(){
 teardown(){
     rm -rf "$certs_dir"
     cleanup
+    cleanup
 }
 
 @test "handler command: enable - vm watch disabled - vmwatch settings omitted" {

integration-test/test/test_helper.bash

@@ -13,12 +13,20 @@ build_docker_image_nocache() {
     docker build --no-cache -q -f $DOCKERFILE -t $IMAGE . 1>&2
 }
 
+# This function builds a Docker image for testing purposes, if it already doesn't exist.
+# This function builds a Docker image for testing purposes, if it already doesn't exist.
+build_docker_image_nocache() {
+    # Check if the image already exists
+    echo "Building test image $IMAGE..."
+    docker build --no-cache -q -f $DOCKERFILE -t $IMAGE . 1>&2
+}
+
 # This function builds a Docker image for testing purposes, if it already doesn't exist.
 build_docker_image() {
     # Check if the image already exists
     if [ -z "$(docker images -q $IMAGE)" ]; then
-        echo "Building test image $IMAGE..."
-        docker build -q -f $DOCKERFILE -t $IMAGE . 1>&2
+    echo "Building test image $IMAGE..."
+    docker build -q -f $DOCKERFILE -t $IMAGE . 1>&2
     else
         echo "Test image $IMAGE already exists. Skipping build."
     fi
@@ -205,7 +213,7 @@ verify_state_change_timestamps() {
                 [[ "$diff" -ge "${expectedTimeDifferences[$index-1]}" ]]
             fi
         index=$index+1
-        prevDate=$currentDate
+        prevDate=$currentDate     
         done
     done <<< "$1"
 }

internal/seqno/seqno.go

@@ -0,0 +1,65 @@
+package seqno
+
+import (
+	"log/slog"
+
+	"github.com/Azure/applicationhealth-extension-linux/pkg/logging"
+	"github.com/Azure/azure-extension-platform/pkg/extensionerrors"
+	"github.com/Azure/azure-extension-platform/pkg/seqno"
+)
+
+type SequenceNumberManager interface {
+	// GetCurrentSequenceNumber returns the current sequence number the extension is using
+	GetCurrentSequenceNumber(el *slog.Logger, name, version string) (uint, error)
+
+	// GetSequenceNumber retrieves the sequence number from the MRSEQ file
+	GetSequenceNumber(name, version string) (uint, error)
+
+	// SetSequenceNumber sets the sequence number to the MRSEQ file.
+	SetSequenceNumber(name, version string, seqNo uint) error
+
+	// FindSeqNum returns the requested the sequence number from either the environment variable or
+	// the most recently used file under the config folder.
+	// Note that this is different than just choosing the highest number, which may be incorrect
+	FindSeqNum(configFolder string) (uint, error)
+}
+
+type SeqNumManager struct {
+}
+
+func (s *SeqNumManager) GetSequenceNumber(name string, version string) (uint, error) {
+	retriever := &seqno.ProdSequenceNumberRetriever{}
+	return retriever.GetSequenceNumber(name, version)
+}
+
+// SetSequenceNumber sets the sequence number for the given extension name and version.
+// It takes the extension name, extension version, and sequence number as parameters.
+// The sequence number is an integer that represents the order in which the extension was installed.
+// It returns an error if there was a problem setting the sequence number.
+func (s *SeqNumManager) SetSequenceNumber(name, version string, seqNo uint) error {
+	return seqno.SetSequenceNumber(name, version, seqNo)
+}
+
+// FindSeqNum returns the requested the sequence number from either the environment variable or
+// the most recently used file under the config folder.
+// Note that this is different than just choosing the highest number, which may be incorrect
+func (s *SeqNumManager) FindSeqNum(configFolder string) (uint, error) {
+	return seqno.FindSeqNum(logging.NewNopLogger(), configFolder)
+}
+
+// GetCurrentSequenceNumber returns the current sequence number the extension is using
+func (s *SeqNumManager) GetCurrentSequenceNumber(el *slog.Logger, name, version string) (sn uint, _ error) {
+	sequenceNumber, err := s.GetSequenceNumber(name, version)
+	if err == extensionerrors.ErrNotFound || err == extensionerrors.ErrNoMrseqFile {
+		// If we can't find the sequence number, then it's possible that the extension
+		// hasn't been installed yet. Go back to 0.
+		el.Info("Couldn't find current sequence number, likely first execution of the extension, returning sequence number 0")
+		return 0, nil
+	}
+
+	return sequenceNumber, err
+}
+
+func New() SequenceNumberManager {
+	return &SeqNumManager{}
+}