Repository: getmoto/moto
Pull request #7575 (2024-04-07 06:08:56)

chore: update EC2 Instance Offerings
Automated changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action


Patch:
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json
index 5b7040268..36627e708 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-1.json
@@ -703,6 +703,46 @@
   "InstanceType": "g5g.xlarge",
   "Location": "use1-az1"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "use1-az1"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "use1-az1"
+ },
  {
   "InstanceType": "i2.2xlarge",
   "Location": "use1-az1"
@@ -3539,6 +3579,46 @@
   "InstanceType": "g5g.xlarge",
   "Location": "use1-az2"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "use1-az2"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "use1-az2"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "use1-az2"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "use1-az2"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "use1-az2"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "use1-az2"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "use1-az2"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "use1-az2"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "use1-az2"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "use1-az2"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "use1-az2"
@@ -6807,6 +6887,46 @@
   "InstanceType": "g5g.xlarge",
   "Location": "use1-az4"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "use1-az4"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "use1-az4"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "use1-az4"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "use1-az4"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "use1-az4"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "use1-az4"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "use1-az4"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "use1-az4"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "use1-az4"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "use1-az4"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "use1-az4"
@@ -12387,6 +12507,46 @@
   "InstanceType": "g5g.xlarge",
   "Location": "use1-az6"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "use1-az6"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "use1-az6"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "use1-az6"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "use1-az6"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "use1-az6"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "use1-az6"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "use1-az6"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "use1-az6"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "use1-az6"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "use1-az6"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "use1-az6"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json
index d4c001cdf..b495cae94 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-east-2.json
@@ -803,6 +803,46 @@
   "InstanceType": "g5.xlarge",
   "Location": "use2-az1"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "use2-az1"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "use2-az1"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "use2-az1"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "use2-az1"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "use2-az1"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "use2-az1"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "use2-az1"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "use2-az1"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "use2-az1"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "use2-az1"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "use2-az1"
@@ -3643,6 +3683,46 @@
   "InstanceType": "g5.xlarge",
   "Location": "use2-az2"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "use2-az2"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "use2-az2"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "use2-az2"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "use2-az2"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "use2-az2"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "use2-az2"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "use2-az2"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "use2-az2"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "use2-az2"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "use2-az2"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "use2-az2"
@@ -6463,6 +6543,46 @@
   "InstanceType": "g5.xlarge",
   "Location": "use2-az3"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "use2-az3"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "use2-az3"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "use2-az3"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "use2-az3"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "use2-az3"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "use2-az3"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "use2-az3"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "use2-az3"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "use2-az3"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "use2-az3"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "use2-az3"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json
index 32d47b03b..ded3e9bc1 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-2.json
@@ -871,6 +871,46 @@
   "InstanceType": "g5g.xlarge",
   "Location": "usw2-az1"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "usw2-az1"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "usw2-az1"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "usw2-az1"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "usw2-az1"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "usw2-az1"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "usw2-az1"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "usw2-az1"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "usw2-az1"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "usw2-az1"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "usw2-az1"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "usw2-az1"
@@ -5575,6 +5615,50 @@
   "InstanceType": "r7gd.xlarge",
   "Location": "usw2-az2"
  },
+ {
+  "InstanceType": "r7i.12xlarge",
+  "Location": "usw2-az2"
+ },
+ {
+  "InstanceType": "r7i.16xlarge",
+  "Location": "usw2-az2"
+ },
+ {
+  "InstanceType": "r7i.24xlarge",
+  "Location": "usw2-az2"
+ },
+ {
+  "InstanceType": "r7i.2xlarge",
+  "Location": "usw2-az2"
+ },
+ {
+  "InstanceType": "r7i.48xlarge",
+  "Location": "usw2-az2"
+ },
+ {
+  "InstanceType": "r7i.4xlarge",
+  "Location": "usw2-az2"
+ },
+ {
+  "InstanceType": "r7i.8xlarge",
+  "Location": "usw2-az2"
+ },
+ {
+  "InstanceType": "r7i.large",
+  "Location": "usw2-az2"
+ },
+ {
+  "InstanceType": "r7i.metal-24xl",
+  "Location": "usw2-az2"
+ },
+ {
+  "InstanceType": "r7i.metal-48xl",
+  "Location": "usw2-az2"
+ },
+ {
+  "InstanceType": "r7i.xlarge",
+  "Location": "usw2-az2"
+ },
  {
   "InstanceType": "r7iz.12xlarge",
   "Location": "usw2-az2"
@@ -6787,6 +6871,46 @@
   "InstanceType": "g5g.xlarge",
   "Location": "usw2-az3"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "usw2-az3"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "usw2-az3"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "usw2-az3"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "usw2-az3"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "usw2-az3"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "usw2-az3"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "usw2-az3"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "usw2-az3"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "usw2-az3"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "usw2-az3"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "usw2-az3"
@@ -9527,6 +9651,46 @@
   "InstanceType": "dl2q.24xlarge",
   "Location": "usw2-az4"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "usw2-az4"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "usw2-az4"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "usw2-az4"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "usw2-az4"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "usw2-az4"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "usw2-az4"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "usw2-az4"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "usw2-az4"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "usw2-az4"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "usw2-az4"
+ },
  {
   "InstanceType": "i3.16xlarge",
   "Location": "usw2-az4"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json
index f0c1c6dfa..5d7c63036 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-1.json
@@ -703,6 +703,46 @@
   "InstanceType": "g5g.xlarge",
   "Location": "us-east-1a"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "us-east-1a"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "us-east-1a"
+ },
  {
   "InstanceType": "i2.2xlarge",
   "Location": "us-east-1a"
@@ -3539,6 +3579,46 @@
   "InstanceType": "g5g.xlarge",
   "Location": "us-east-1b"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "us-east-1b"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "us-east-1b"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "us-east-1b"
@@ -6551,6 +6631,46 @@
   "InstanceType": "g5g.xlarge",
   "Location": "us-east-1c"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "us-east-1c"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "us-east-1c"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "us-east-1c"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "us-east-1c"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "us-east-1c"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "us-east-1c"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "us-east-1c"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "us-east-1c"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "us-east-1c"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "us-east-1c"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "us-east-1c"
@@ -9551,6 +9671,46 @@
   "InstanceType": "g5g.xlarge",
   "Location": "us-east-1d"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "us-east-1d"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "us-east-1d"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "us-east-1d"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json
index 40505ded6..f7582ecfe 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-east-2.json
@@ -803,6 +803,46 @@
   "InstanceType": "g5.xlarge",
   "Location": "us-east-2a"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "us-east-2a"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "us-east-2a"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "us-east-2a"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "us-east-2a"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "us-east-2a"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "us-east-2a"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "us-east-2a"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "us-east-2a"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "us-east-2a"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "us-east-2a"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "us-east-2a"
@@ -3643,6 +3683,46 @@
   "InstanceType": "g5.xlarge",
   "Location": "us-east-2b"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "us-east-2b"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "us-east-2b"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "us-east-2b"
@@ -6463,6 +6543,46 @@
   "InstanceType": "g5.xlarge",
   "Location": "us-east-2c"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "us-east-2c"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "us-east-2c"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "us-east-2c"
diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json
index 537a3365c..abfb5ba7c 100644
--- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json
+++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-2.json
@@ -871,6 +871,46 @@
   "InstanceType": "g5g.xlarge",
   "Location": "us-west-2a"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "us-west-2a"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "us-west-2a"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "us-west-2a"
@@ -5575,6 +5615,50 @@
   "InstanceType": "r7gd.xlarge",
   "Location": "us-west-2b"
  },
+ {
+  "InstanceType": "r7i.12xlarge",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "r7i.16xlarge",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "r7i.24xlarge",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "r7i.2xlarge",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "r7i.48xlarge",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "r7i.4xlarge",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "r7i.8xlarge",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "r7i.large",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "r7i.metal-24xl",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "r7i.metal-48xl",
+  "Location": "us-west-2b"
+ },
+ {
+  "InstanceType": "r7i.xlarge",
+  "Location": "us-west-2b"
+ },
  {
   "InstanceType": "r7iz.12xlarge",
   "Location": "us-west-2b"
@@ -6787,6 +6871,46 @@
   "InstanceType": "g5g.xlarge",
   "Location": "us-west-2c"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "us-west-2c"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "us-west-2c"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "us-west-2c"
@@ -9527,6 +9651,46 @@
   "InstanceType": "dl2q.24xlarge",
   "Location": "us-west-2d"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "us-west-2d"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "us-west-2d"
+ },
  {
   "InstanceType": "i3.16xlarge",
   "Location": "us-west-2d"
diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json
index 04283e40f..37058dc94 100644
--- a/moto/ec2/resources/instance_type_offerings/region/us-east-1.json
+++ b/moto/ec2/resources/instance_type_offerings/region/us-east-1.json
@@ -895,6 +895,46 @@
   "InstanceType": "g5g.xlarge",
   "Location": "us-east-1"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "us-east-1"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "us-east-1"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "us-east-1"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "us-east-1"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "us-east-1"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "us-east-1"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "us-east-1"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "us-east-1"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "us-east-1"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "us-east-1"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "us-east-1"
diff --git a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json
index a4a93c0be..c5a84b209 100644
--- a/moto/ec2/resources/instance_type_offerings/region/us-east-2.json
+++ b/moto/ec2/resources/instance_type_offerings/region/us-east-2.json
@@ -803,6 +803,46 @@
   "InstanceType": "g5.xlarge",
   "Location": "us-east-2"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "us-east-2"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "us-east-2"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "us-east-2"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "us-east-2"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "us-east-2"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "us-east-2"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "us-east-2"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "us-east-2"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "us-east-2"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "us-east-2"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "us-east-2"
diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json
index 24819dbd3..077700b30 100644
--- a/moto/ec2/resources/instance_type_offerings/region/us-west-2.json
+++ b/moto/ec2/resources/instance_type_offerings/region/us-west-2.json
@@ -899,6 +899,46 @@
   "InstanceType": "g5g.xlarge",
   "Location": "us-west-2"
  },
+ {
+  "InstanceType": "g6.12xlarge",
+  "Location": "us-west-2"
+ },
+ {
+  "InstanceType": "g6.16xlarge",
+  "Location": "us-west-2"
+ },
+ {
+  "InstanceType": "g6.24xlarge",
+  "Location": "us-west-2"
+ },
+ {
+  "InstanceType": "g6.2xlarge",
+  "Location": "us-west-2"
+ },
+ {
+  "InstanceType": "g6.48xlarge",
+  "Location": "us-west-2"
+ },
+ {
+  "InstanceType": "g6.4xlarge",
+  "Location": "us-west-2"
+ },
+ {
+  "InstanceType": "g6.8xlarge",
+  "Location": "us-west-2"
+ },
+ {
+  "InstanceType": "g6.xlarge",
+  "Location": "us-west-2"
+ },
+ {
+  "InstanceType": "gr6.4xlarge",
+  "Location": "us-west-2"
+ },
+ {
+  "InstanceType": "gr6.8xlarge",
+  "Location": "us-west-2"
+ },
  {
   "InstanceType": "h1.16xlarge",
   "Location": "us-west-2"
diff --git a/moto/sqs/models.py b/moto/sqs/models.py
index 3b6f3efb6..17b4384df 100644
--- a/moto/sqs/models.py
+++ b/moto/sqs/models.py
@@ -314,6 +314,22 @@ class Queue(CloudFormationModel):
         ):
             raise InvalidAttributeValue("MaximumMessageSize")
 
+    @property
+    def name(self) -> str:
+        return self._name
+
+    @name.setter
+    def name(self, value: str) -> None:
+        # https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_CreateQueue.html#SQS-CreateQueue-request-QueueName
+        if re.match(r"^[a-zA-Z0-9\_-]{1,80}$", value) or re.match(
+            r"^[a-zA-Z0-9\_-]{1,75}(\.fifo)?$", value
+        ):
+            self._name = value
+        else:
+            raise InvalidParameterValue(
+                "Can only include alphanumeric characters, hyphens, or underscores. 1 to 80 in length"
+            )
+
     @property
     def pending_messages(self) -> Set[Message]:
         return self._pending_messages
@@ -448,7 +464,9 @@ class Queue(CloudFormationModel):
         tags_dict = tags_from_cloudformation_tags_list(tags)
 
         # Could be passed as an integer - just treat it as a string
-        resource_name = str(resource_name)
+        # take first 80 characters of the q name, more is invalid
+        # https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_CreateQueue.html#SQS-CreateQueue-request-QueueName
+        resource_name = str(resource_name)[0:80]
 
         sqs_backend = sqs_backends[account_id][region_name]
         return sqs_backend.create_queue(


Test patch:
diff --git a/tests/test_cloudformation/test_stack_parsing.py b/tests/test_cloudformation/test_stack_parsing.py
index 5585d5c8e..0188adaee 100644
--- a/tests/test_cloudformation/test_stack_parsing.py
+++ b/tests/test_cloudformation/test_stack_parsing.py
@@ -105,7 +105,7 @@ sub_template = {
         "Queue1": {
             "Type": "AWS::SQS::Queue",
             "Properties": {
-                "QueueName": {"Fn::Sub": "${AWS::StackName}-queue-${!Literal}"},
+                "QueueName": {"Fn::Sub": "${AWS::StackName}-queue"},
                 "VisibilityTimeout": 60,
             },
         },
diff --git a/tests/test_sqs/test_sqs.py b/tests/test_sqs/test_sqs.py
index 7b6993fe5..c57286b23 100644
--- a/tests/test_sqs/test_sqs.py
+++ b/tests/test_sqs/test_sqs.py
@@ -60,6 +60,30 @@ def test_create_fifo_queue_fail():
         raise RuntimeError("Should have raised InvalidParameterValue Exception")
 
 
+@mock_aws
+@pytest.mark.parametrize(
+    "queue_name",
+    [
+        "",
+        "ppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp",
+        "/my/test",
+        "!@£$%^&*()queue",
+    ],
+)
+def test_create_fifo_queue_invalid_name(queue_name):
+    sqs = boto3.client("sqs", region_name=REGION)
+
+    with pytest.raises(ClientError) as ex:
+        sqs.create_queue(QueueName=queue_name)
+
+    err = ex.value.response["Error"]
+    assert err["Code"] == "InvalidParameterValue"
+    assert (
+        err["Message"]
+        == "Can only include alphanumeric characters, hyphens, or underscores. 1 to 80 in length"
+    )
+
+
 @mock_aws
 def test_create_queue_with_same_attributes():
     sqs = boto3.client("sqs", region_name=REGION)
@@ -171,10 +195,19 @@ def test_create_fifo_queue_with_high_throughput():
 
 
 @mock_aws
-def test_create_queue():
+@pytest.mark.parametrize(
+    "q_name",
+    [
+        str(uuid4())[0:6],
+        "name_with_underscores",
+        "name-with-hyphens",
+        "Name-with_all_the_THings",
+    ],
+    ids=["random", "underscores", "hyphens", "combined"],
+)
+def test_create_queue(q_name):
     sqs = boto3.resource("sqs", region_name=REGION)
 
-    q_name = str(uuid4())[0:6]
     new_queue = sqs.create_queue(QueueName=q_name)
     assert q_name in getattr(new_queue, "url")