From 5801b86ffbede583f135471d84ec942318571943 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Thu, 4 Aug 2022 13:40:42 +0000 Subject: [PATCH] fix: Associate spot instances with their instance IDs for auth Fixes #2162. --- go.mod | 2 +- provisioner/terraform/resources.go | 1 + provisioner/terraform/resources_test.go | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 21fd753d45fec..3ae89cc77f273 100644 --- a/go.mod +++ b/go.mod @@ -185,7 +185,7 @@ require ( github.com/godbus/dbus/v5 v5.1.0 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/protobuf v1.5.2 github.com/google/btree v1.0.1 // indirect github.com/google/go-cmp v0.5.8 // indirect github.com/google/go-querystring v1.1.0 // indirect diff --git a/provisioner/terraform/resources.go b/provisioner/terraform/resources.go index 95cf93ad9418b..8e931c752d8b6 100644 --- a/provisioner/terraform/resources.go +++ b/provisioner/terraform/resources.go @@ -310,6 +310,7 @@ func applyAutomaticInstanceID(resource *tfjson.StateResource, agents []*proto.Ag key, isValid := map[string]string{ "google_compute_instance": "instance_id", "aws_instance": "id", + "aws_spot_instance_request": "spot_instance_id", "azurerm_linux_virtual_machine": "virtual_machine_id", "azurerm_windows_virtual_machine": "virtual_machine_id", }[resource.Type] diff --git a/provisioner/terraform/resources_test.go b/provisioner/terraform/resources_test.go index 5e6e849c9eecf..5ad6f49669300 100644 --- a/provisioner/terraform/resources_test.go +++ b/provisioner/terraform/resources_test.go @@ -219,6 +219,10 @@ func TestInstanceIDAssociation(t *testing.T) { Auth: "aws-instance-identity", ResourceType: "aws_instance", InstanceIDKey: "id", + }, { + Auth: "aws-instance-identity", + ResourceType: "aws_spot_instance_request", + InstanceIDKey: "spot_instance_id", }, { Auth: "azure-instance-identity", ResourceType: "azurerm_linux_virtual_machine",