From 69f064b1ed6009c04880e5e8905f6b3fe15a4e81 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Tue, 2 Aug 2022 13:45:38 +0000 Subject: [PATCH] fix: Use "virtual_machine_id" for instance identity with Azure This was using the wrong property, causing automatic auth to break. --- provisioner/terraform/resources.go | 4 ++-- provisioner/terraform/resources_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go index 23b2278af9854..95cf93ad9418b 100644 --- a/provisioner/terraform/resources.go +++ b/provisioner/terraform/resources.go @@ -310,8 +310,8 @@ func applyAutomaticInstanceID(resource *tfjson.StateResource, agents []*proto.Ag key, isValid := map[string]string{ "google_compute_instance": "instance_id", "aws_instance": "id", - "azurerm_linux_virtual_machine": "id", - "azurerm_windows_virtual_machine": "id", + "azurerm_linux_virtual_machine": "virtual_machine_id", + "azurerm_windows_virtual_machine": "virtual_machine_id", }[resource.Type] if !isValid { return diff --git a/provisioner/terraform/resources_test.go b/provisioner/terraform/resources_test.go index 7999d04b98cd2..5e6e849c9eecf 100644 --- a/provisioner/terraform/resources_test.go +++ b/provisioner/terraform/resources_test.go @@ -222,11 +222,11 @@ func TestInstanceIDAssociation(t *testing.T) { }, { Auth: "azure-instance-identity", ResourceType: "azurerm_linux_virtual_machine", - InstanceIDKey: "id", + InstanceIDKey: "virtual_machine_id", }, { Auth: "azure-instance-identity", ResourceType: "azurerm_windows_virtual_machine", - InstanceIDKey: "id", + InstanceIDKey: "virtual_machine_id", }} { tc := tc t.Run(tc.ResourceType, func(t *testing.T) {