sources/azure: ensure instance id is always correct (#1727)

Currently, get_instance_id() assumes that the instance ID is in the metadata.
If not found, it falls back to a hardcoded string "iid-datasource".

Override this behavior to query the instance id as needed.

Signed-off-by: Chris Patterson cpatterson@microsoft.com

cloudinit/sources/DataSourceAzure.py

@@ -825,6 +825,11 @@ def get_imds_data_with_api_fallback(
             )
             return {}
 
+    def get_instance_id(self):
+        if not self.metadata or "instance-id" not in self.metadata:
+            return self._iid()
+        return str(self.metadata["instance-id"])
+
     def device_name_to_device(self, name):
         return self.ds_cfg["disk_aliases"].get(name)
 

tests/unittests/sources/test_azure.py

@@ -4030,6 +4030,20 @@ def test_will_not_retry_errors(
         ]
 
 
+class TestInstanceId:
+    def test_metadata(self, azure_ds, mock_dmi_read_dmi_data):
+        azure_ds.metadata = {"instance-id": "test-id"}
+
+        id = azure_ds.get_instance_id()
+
+        assert id == "test-id"
+
+    def test_fallback(self, azure_ds, mock_dmi_read_dmi_data):
+        id = azure_ds.get_instance_id()
+
+        assert id == "fake-system-uuid"
+
+
 class TestProvisioning:
     @pytest.fixture(autouse=True)
     def provisioning_setup(