From 2df518830e17a0a41f9032786c46f39cdd3d20bf Mon Sep 17 00:00:00 2001
From: hc-github-team-nomad-core
 <82989552+hc-github-team-nomad-core@users.noreply.github.com>
Date: Fri, 7 Jul 2023 11:12:25 -0400
Subject: [PATCH] backport of commit c3f1decbd4b187d5293ec7644580744ca2bedf25
 (#17836)

This pull request was automerged via backport-assistant
---
 client/fingerprint/env_aws_cpu.go | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/client/fingerprint/env_aws_cpu.go b/client/fingerprint/env_aws_cpu.go
index 5c188458a0e..e76f4b57219 100644
--- a/client/fingerprint/env_aws_cpu.go
+++ b/client/fingerprint/env_aws_cpu.go
@@ -164,6 +164,7 @@ var instanceTypeCPU = map[string]CPU{
 	"c6in.4xlarge":      newCPU(16, 3.5),
 	"c6in.8xlarge":      newCPU(32, 3.5),
 	"c6in.large":        newCPU(2, 3.5),
+	"c6in.metal":        newCPU(128, 3.5),
 	"c6in.xlarge":       newCPU(4, 3.5),
 	"c7g.12xlarge":      newCPU(48, 2.6),
 	"c7g.16xlarge":      newCPU(64, 2.6),
@@ -174,6 +175,14 @@ var instanceTypeCPU = map[string]CPU{
 	"c7g.medium":        newCPU(1, 2.6),
 	"c7g.metal":         newCPU(64, 2.6),
 	"c7g.xlarge":        newCPU(4, 2.6),
+	"c7gn.12xlarge":     newCPU(48, 2.6),
+	"c7gn.16xlarge":     newCPU(64, 2.6),
+	"c7gn.2xlarge":      newCPU(8, 2.6),
+	"c7gn.4xlarge":      newCPU(16, 2.6),
+	"c7gn.8xlarge":      newCPU(32, 2.6),
+	"c7gn.large":        newCPU(2, 2.6),
+	"c7gn.medium":       newCPU(1, 2.6),
+	"c7gn.xlarge":       newCPU(4, 2.6),
 	"d2.2xlarge":        newCPU(8, 2.4),
 	"d2.4xlarge":        newCPU(16, 2.4),
 	"d2.8xlarge":        newCPU(36, 2.4),
@@ -230,6 +239,9 @@ var instanceTypeCPU = map[string]CPU{
 	"h1.8xlarge":        newCPU(32, 2.3),
 	"hpc6a.48xlarge":    newCPU(96, 3.6),
 	"hpc6id.32xlarge":   newCPU(64, 3.5),
+	"hpc7g.16xlarge":    newCPU(64, 2.6),
+	"hpc7g.4xlarge":     newCPU(16, 2.6),
+	"hpc7g.8xlarge":     newCPU(32, 2.6),
 	"i2.2xlarge":        newCPU(8, 2.5),
 	"i2.4xlarge":        newCPU(16, 2.5),
 	"i2.8xlarge":        newCPU(32, 2.5),
@@ -249,6 +261,12 @@ var instanceTypeCPU = map[string]CPU{
 	"i3en.large":        newCPU(2, 3.1),
 	"i3en.metal":        newCPU(96, 3.1),
 	"i3en.xlarge":       newCPU(4, 3.1),
+	"i4g.16xlarge":      newCPU(64, 2.5),
+	"i4g.2xlarge":       newCPU(8, 2.5),
+	"i4g.4xlarge":       newCPU(16, 2.5),
+	"i4g.8xlarge":       newCPU(32, 2.5),
+	"i4g.large":         newCPU(2, 2.5),
+	"i4g.xlarge":        newCPU(4, 2.5),
 	"i4i.16xlarge":      newCPU(64, 3.5),
 	"i4i.2xlarge":       newCPU(8, 3.5),
 	"i4i.32xlarge":      newCPU(128, 3.5),
@@ -267,6 +285,10 @@ var instanceTypeCPU = map[string]CPU{
 	"inf1.2xlarge":      newCPU(8, 2.5),
 	"inf1.6xlarge":      newCPU(24, 2.5),
 	"inf1.xlarge":       newCPU(4, 2.5),
+	"inf2.24xlarge":     newCPU(96, 3.6),
+	"inf2.48xlarge":     newCPU(192, 3.6),
+	"inf2.8xlarge":      newCPU(32, 3.6),
+	"inf2.xlarge":       newCPU(4, 3.6),
 	"is4gen.2xlarge":    newCPU(8, 2.5),
 	"is4gen.4xlarge":    newCPU(16, 2.5),
 	"is4gen.8xlarge":    newCPU(32, 2.5),
@@ -399,6 +421,7 @@ var instanceTypeCPU = map[string]CPU{
 	"m6idn.4xlarge":     newCPU(16, 3.5),
 	"m6idn.8xlarge":     newCPU(32, 3.5),
 	"m6idn.large":       newCPU(2, 3.5),
+	"m6idn.metal":       newCPU(128, 3.5),
 	"m6idn.xlarge":      newCPU(4, 3.5),
 	"m6in.12xlarge":     newCPU(48, 3.5),
 	"m6in.16xlarge":     newCPU(64, 3.5),
@@ -408,6 +431,7 @@ var instanceTypeCPU = map[string]CPU{
 	"m6in.4xlarge":      newCPU(16, 3.5),
 	"m6in.8xlarge":      newCPU(32, 3.5),
 	"m6in.large":        newCPU(2, 3.5),
+	"m6in.metal":        newCPU(128, 3.5),
 	"m6in.xlarge":       newCPU(4, 3.5),
 	"m7g.12xlarge":      newCPU(48, 2.6),
 	"m7g.16xlarge":      newCPU(64, 2.6),
@@ -557,6 +581,7 @@ var instanceTypeCPU = map[string]CPU{
 	"r6idn.4xlarge":     newCPU(16, 3.5),
 	"r6idn.8xlarge":     newCPU(32, 3.5),
 	"r6idn.large":       newCPU(2, 3.5),
+	"r6idn.metal":       newCPU(128, 3.5),
 	"r6idn.xlarge":      newCPU(4, 3.5),
 	"r6in.12xlarge":     newCPU(48, 3.5),
 	"r6in.16xlarge":     newCPU(64, 3.5),
@@ -566,6 +591,7 @@ var instanceTypeCPU = map[string]CPU{
 	"r6in.4xlarge":      newCPU(16, 3.5),
 	"r6in.8xlarge":      newCPU(32, 3.5),
 	"r6in.large":        newCPU(2, 3.5),
+	"r6in.metal":        newCPU(128, 3.5),
 	"r6in.xlarge":       newCPU(4, 3.5),
 	"r7g.12xlarge":      newCPU(48, 2.6),
 	"r7g.16xlarge":      newCPU(64, 2.6),
@@ -606,6 +632,7 @@ var instanceTypeCPU = map[string]CPU{
 	"t4g.xlarge":        newCPU(4, 2.5),
 	"trn1.2xlarge":      newCPU(8, 3.5),
 	"trn1.32xlarge":     newCPU(128, 3.5),
+	"trn1n.32xlarge":    newCPU(128, 3.5),
 	"u-12tb1.112xlarge": newCPU(448, 2.1),
 	"u-18tb1.112xlarge": newCPU(448, 2.7),
 	"u-24tb1.112xlarge": newCPU(448, 2.7),