From 1dcf9f9aeb826b44ba38126e2291971690c5f97b Mon Sep 17 00:00:00 2001
From: Hunter Morris <4218+hntrmrrs@users.noreply.github.com>
Date: Thu, 24 Mar 2022 15:19:37 +0000
Subject: [PATCH 1/2] Add AWS EC2 instance-life-cycle from metadata to client
 fingerprint

---
 client/fingerprint/env_aws.go                  |  1 +
 client/fingerprint/env_aws_test.go             | 16 ++++++++++++++++
 website/content/docs/runtime/interpolation.mdx |  6 ++++++
 3 files changed, 23 insertions(+)

diff --git a/client/fingerprint/env_aws.go b/client/fingerprint/env_aws.go
index 95af1cf87fa..b39317d1ac7 100644
--- a/client/fingerprint/env_aws.go
+++ b/client/fingerprint/env_aws.go
@@ -91,6 +91,7 @@ func (f *EnvAWSFingerprint) Fingerprint(request *FingerprintRequest, response *F
 		"ami-id":                      false,
 		"hostname":                    true,
 		"instance-id":                 true,
+		"instance-life-cycle":         false,
 		"instance-type":               false,
 		"local-hostname":              true,
 		"local-ipv4":                  true,
diff --git a/client/fingerprint/env_aws_test.go b/client/fingerprint/env_aws_test.go
index caca5f4bae1..c346b788da0 100644
--- a/client/fingerprint/env_aws_test.go
+++ b/client/fingerprint/env_aws_test.go
@@ -52,6 +52,7 @@ func TestEnvAWSFingerprint_aws(t *testing.T) {
 		"platform.aws.ami-id",
 		"unique.platform.aws.hostname",
 		"unique.platform.aws.instance-id",
+		"platform.aws.instance-life-cycle",
 		"platform.aws.instance-type",
 		"unique.platform.aws.local-hostname",
 		"unique.platform.aws.local-ipv4",
@@ -334,6 +335,11 @@ var awsStubs = []endpoint{
 		ContentType: "text/plain",
 		Body:        "i-b3ba3875",
 	},
+	{
+		Uri:         "/latest/meta-data/instance-life-cycle",
+		ContentType: "text/plain",
+		Body:        "on-demand",
+	},
 	{
 		Uri:         "/latest/meta-data/instance-type",
 		ContentType: "text/plain",
@@ -387,6 +393,11 @@ var unknownInstanceType = []endpoint{
 		ContentType: "text/plain",
 		Body:        "i-b3ba3875",
 	},
+	{
+		Uri:         "/latest/meta-data/instance-life-cycle",
+		ContentType: "text/plain",
+		Body:        "on-demand",
+	},
 	{
 		Uri:         "/latest/meta-data/instance-type",
 		ContentType: "text/plain",
@@ -417,6 +428,11 @@ var noNetworkAWSStubs = []endpoint{
 		ContentType: "text/plain",
 		Body:        "i-b3ba3875",
 	},
+	{
+		Uri:         "/latest/meta-data/instance-life-cycle",
+		ContentType: "text/plain",
+		Body:        "on-demand",
+	},
 	{
 		Uri:         "/latest/meta-data/instance-type",
 		ContentType: "text/plain",
diff --git a/website/content/docs/runtime/interpolation.mdx b/website/content/docs/runtime/interpolation.mdx
index 31da7917f41..a1c28f1c79d 100644
--- a/website/content/docs/runtime/interpolation.mdx
+++ b/website/content/docs/runtime/interpolation.mdx
@@ -235,6 +235,12 @@ Below is a table documenting common node properties:
       </td>
       <td>AMI ID of the client (if on AWS EC2)</td>
     </tr>
+    <tr>
+      <td>
+        <code>{'${attr.platform.aws.instance-life-cycle}'}</code>
+      </td>
+      <td>Instance lifecycle (e.g. spot, on-demand) of the client (if on AWS EC2)</td>
+    </tr>
     <tr>
       <td>
         <code>{'${attr.platform.aws.instance-type}'}</code>

From f53cd83a25d2866ab67b8ce3c169a18e5f0fb8b2 Mon Sep 17 00:00:00 2001
From: Luiz Aoqui <luiz@hashicorp.com>
Date: Fri, 25 Mar 2022 11:20:00 -0400
Subject: [PATCH 2/2] chagelog: add entry for #12371

---
 .changelog/12371.txt | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 .changelog/12371.txt

diff --git a/.changelog/12371.txt b/.changelog/12371.txt
new file mode 100644
index 00000000000..e621c787ff2
--- /dev/null
+++ b/.changelog/12371.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+client: fingerprint AWS instance life cycle option
+```