diff --git a/moto/config/resources/aws_managed_rules.json b/moto/config/resources/aws_managed_rules.json index e9c6a2026..ced36c39b 100644 --- a/moto/config/resources/aws_managed_rules.json +++ b/moto/config/resources/aws_managed_rules.json @@ -13,7 +13,7 @@ "Trigger type": "Periodic" }, "ACCOUNT_PART_OF_ORGANIZATIONS": { - "AWS Region": "All supported AWS regions except China (Beijing), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "MasterAccountId", @@ -35,18 +35,29 @@ ], "Trigger type": "Configuration changes" }, + "ALB_DESYNC_MODE_CHECK": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [ + { + "Name": "desyncMode", + "Optional": false, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, "ALB_HTTP_DROP_INVALID_HEADER_ENABLED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "ALB_HTTP_TO_HTTPS_REDIRECTION_CHECK": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Periodic" }, "ALB_WAF_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Name": "wafWebAclIds", @@ -57,7 +68,7 @@ "Trigger type": "Configuration changes" }, "API_GW_ASSOCIATED_WITH_WAF": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "WebAclArns", @@ -68,12 +79,12 @@ "Trigger type": "Configuration changes" }, "API_GW_CACHE_ENABLED_AND_ENCRYPTED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "API_GW_ENDPOINT_TYPE_CHECK": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Name": "endpointConfigurationTypes", @@ -84,7 +95,7 @@ "Trigger type": "Configuration changes" }, "API_GW_EXECUTION_LOGGING_ENABLED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Default": "ERROR,INFO", @@ -96,7 +107,7 @@ "Trigger type": "Configuration changes" }, "API_GW_SSL_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "CertificateIDs", @@ -107,7 +118,7 @@ "Trigger type": "Configuration changes" }, "API_GW_XRAY_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Configuration changes" }, @@ -134,19 +145,8 @@ ], "Trigger type": "Configuration changes" }, - "AURORA_MYSQL_BACKTRACKING_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Hong Kong), Asia Pacific (Osaka), Europe (Milan), Europe (Stockholm), Middle East (Bahrain), Africa (Cape Town), South America (Sao Paulo) Region", - "Parameters": [ - { - "Name": "BacktrackWindowInHours", - "Optional": true, - "Type": "double" - } - ], - "Trigger type": "Configuration changes" - }, - "AURORA_RESOURCES_PROTECTED_BY_BACKUP_PLAN": { - "AWS Region": "All supported AWS regions except China (Beijing), Africa (Cape Town), Asia Pacific (Osaka), Europe (Milan), AWS GovCloud (US-East), AWS GovCloud (US-West), US West (Oregon), and China (Ningxia) Region", + "AURORA_LAST_BACKUP_RECOVERY_POINT_CREATED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "resourceTags", @@ -157,22 +157,122 @@ "Name": "resourceId", "Optional": true, "Type": "String" + }, + { + "Default": "1", + "Name": "recoveryPointAgeValue", + "Optional": true, + "Type": "int" + }, + { + "Default": "days", + "Name": "recoveryPointAgeUnit", + "Optional": true, + "Type": "String" } ], "Trigger type": "Periodic" }, + "AURORA_MYSQL_BACKTRACKING_ENABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Hong Kong), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Europe (Stockholm), Middle East (Bahrain), Africa (Cape Town), South America (Sao Paulo) Region", + "Parameters": [ + { + "Name": "BacktrackWindowInHours", + "Optional": true, + "Type": "double" + } + ], + "Trigger type": "Configuration changes" + }, + "AURORA_RESOURCES_PROTECTED_BY_BACKUP_PLAN": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "resourceTags", + "Optional": true, + "Type": "String" + }, + { + "Name": "resourceId", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossRegionList", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossAccountList", + "Optional": true, + "Type": "String" + }, + { + "Name": "maxRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "minRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "backupVaultLockCheck", + "Optional": true, + "Type": "String" + } + ], + "Trigger type": "Periodic" + }, + "AUTOSCALING_CAPACITY_REBALANCING": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, "AUTOSCALING_GROUP_ELB_HEALTHCHECK_REQUIRED": { "AWS Region": "All supported AWS regions", "Parameters": [], "Trigger type": "Configuration changes" }, + "AUTOSCALING_LAUNCHCONFIG_REQUIRES_IMDSV2": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "AUTOSCALING_LAUNCH_CONFIG_HOP_LIMIT": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, "AUTOSCALING_LAUNCH_CONFIG_PUBLIC_IP_DISABLED": { - "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "AUTOSCALING_LAUNCH_TEMPLATE": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "AUTOSCALING_MULTIPLE_AZ": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West) Region", + "Parameters": [ + { + "Name": "minAvailabilityZones", + "Optional": true, + "Type": "int" + } + ], + "Trigger type": "Configuration changes" + }, + "AUTOSCALING_MULTIPLE_INSTANCE_TYPES": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "BACKUP_PLAN_MIN_FREQUENCY_AND_MIN_RETENTION_CHECK": { - "AWS Region": "All supported AWS regions except China (Beijing), Africa (Cape Town), Asia Pacific (Osaka), Europe (Milan), AWS GovCloud (US-East), AWS GovCloud (US-West), US West (Oregon), and China (Ningxia) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Default": "1", @@ -196,12 +296,12 @@ "Trigger type": "Configuration changes" }, "BACKUP_RECOVERY_POINT_ENCRYPTED": { - "AWS Region": "All supported AWS regions except China (Beijing), Africa (Cape Town), Asia Pacific (Osaka), Europe (Milan), AWS GovCloud (US-East), AWS GovCloud (US-West), US West (Oregon), and China (Ningxia) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "BACKUP_RECOVERY_POINT_MANUAL_DELETION_DISABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), Africa (Cape Town), Asia Pacific (Osaka), Europe (Milan), AWS GovCloud (US-East), AWS GovCloud (US-West), US West (Oregon), and China (Ningxia) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "principalArnList", @@ -212,7 +312,7 @@ "Trigger type": "Configuration changes" }, "BACKUP_RECOVERY_POINT_MINIMUM_RETENTION_CHECK": { - "AWS Region": "All supported AWS regions except China (Beijing), Africa (Cape Town), Asia Pacific (Osaka), Europe (Milan), AWS GovCloud (US-East), AWS GovCloud (US-West), US West (Oregon), and China (Ningxia) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Default": "35", @@ -224,12 +324,34 @@ "Trigger type": "Configuration changes" }, "BEANSTALK_ENHANCED_HEALTH_REPORTING_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Configuration changes" }, + "CLB_DESYNC_MODE_CHECK": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [ + { + "Name": "desyncMode", + "Optional": false, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, + "CLB_MULTIPLE_AZ": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West) Region", + "Parameters": [ + { + "Name": "minAvailabilityZones", + "Optional": true, + "Type": "int" + } + ], + "Trigger type": "Configuration changes" + }, "CLOUDFORMATION_STACK_DRIFT_DETECTION_CHECK": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Hong Kong), Asia Pacific (Osaka), Europe (Milan), Europe (Paris), Europe (Stockholm), Middle East (Bahrain), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Hong Kong), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Europe (Paris), Europe (Stockholm), Middle East (Bahrain), Africa (Cape Town) Region", "Parameters": [ { "Name": "cloudformationRoleArn", @@ -240,7 +362,7 @@ "Trigger type": "Configuration changes" }, "CLOUDFORMATION_STACK_NOTIFICATION_CHECK": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Hong Kong), Asia Pacific (Osaka), Europe (Milan), Europe (Paris), Europe (Stockholm), Middle East (Bahrain), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Hong Kong), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Europe (Paris), Europe (Stockholm), Middle East (Bahrain), Africa (Cape Town) Region", "Parameters": [ { "Name": "snsTopic1", @@ -302,6 +424,11 @@ "Parameters": [], "Trigger type": "Configuration changes" }, + "CLOUDFRONT_NO_DEPRECATED_SSL_PROTOCOLS": { + "AWS Region": "Only available in US East (N. Virginia) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, "CLOUDFRONT_ORIGIN_ACCESS_IDENTITY_ENABLED": { "AWS Region": "Only available in US East (N. Virginia) Region", "Parameters": [], @@ -317,13 +444,18 @@ "Parameters": [], "Trigger type": "Configuration changes" }, + "CLOUDFRONT_TRAFFIC_TO_ORIGIN_ENCRYPTED": { + "AWS Region": "Only available in US East (N. Virginia) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, "CLOUDFRONT_VIEWER_POLICY_HTTPS": { "AWS Region": "Only available in US East (N. Virginia) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "CLOUDTRAIL_S3_DATAEVENTS_ENABLED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "S3BucketNames", @@ -334,7 +466,7 @@ "Trigger type": "Periodic" }, "CLOUDTRAIL_SECURITY_TRAIL_ENABLED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Periodic" }, @@ -387,6 +519,11 @@ ], "Trigger type": "Configuration changes" }, + "CLOUDWATCH_ALARM_ACTION_ENABLED_CHECK": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, "CLOUDWATCH_ALARM_RESOURCE_CHECK": { "AWS Region": "All supported AWS regions", "Parameters": [ @@ -441,7 +578,7 @@ "Trigger type": "Configuration changes" }, "CLOUDWATCH_LOG_GROUP_ENCRYPTED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "KmsKeyId", @@ -498,18 +635,89 @@ "Parameters": [], "Trigger type": "Periodic" }, - "CODEBUILD_PROJECT_ENVVAR_AWSCRED_CHECK": { - "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "CODEBUILD_PROJECT_ARTIFACT_ENCRYPTION": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Configuration changes" }, + "CODEBUILD_PROJECT_ENVIRONMENT_PRIVILEGED_CHECK": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "exemptedProjects", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, + "CODEBUILD_PROJECT_ENVVAR_AWSCRED_CHECK": { + "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "CODEBUILD_PROJECT_LOGGING_ENABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "s3BucketNames", + "Optional": true, + "Type": "String" + }, + { + "Name": "cloudWatchGroupNames", + "Optional": true, + "Type": "String" + } + ], + "Trigger type": "Configuration changes" + }, + "CODEBUILD_PROJECT_S3_LOGS_ENCRYPTED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "exemptedProjects", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, "CODEBUILD_PROJECT_SOURCE_REPO_URL_CHECK": { - "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "CODEDEPLOY_AUTO_ROLLBACK_MONITOR_ENABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "CODEDEPLOY_EC2_MINIMUM_HEALTHY_HOSTS_CONFIGURED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [ + { + "Default": "66", + "Name": "minimumHealthyHostsFleetPercent", + "Optional": true, + "Type": "int" + }, + { + "Default": "1", + "Name": "minimumHealthyHostsHostCount", + "Optional": true, + "Type": "int" + } + ], + "Trigger type": "Configuration changes" + }, + "CODEDEPLOY_LAMBDA_ALLATONCE_TRAFFIC_SHIFT_DISABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "CODEPIPELINE_DEPLOYMENT_COUNT_CHECK": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Hong Kong), Asia Pacific (Osaka), Europe (Milan), Europe (Stockholm), Middle East (Bahrain), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Hong Kong), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Europe (Stockholm), Middle East (Bahrain), Africa (Cape Town) Region", "Parameters": [ { "Name": "deploymentLimit", @@ -520,7 +728,7 @@ "Trigger type": "Configuration changes" }, "CODEPIPELINE_REGION_FANOUT_CHECK": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Hong Kong), Asia Pacific (Osaka), Europe (Milan), Europe (Stockholm), Middle East (Bahrain), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Hong Kong), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Europe (Stockholm), Middle East (Bahrain), Africa (Cape Town) Region", "Parameters": [ { "Default": "3", @@ -532,7 +740,7 @@ "Trigger type": "Configuration changes" }, "CW_LOGGROUP_RETENTION_PERIOD_CHECK": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "LogGroupNames", @@ -548,7 +756,7 @@ "Trigger type": "Periodic" }, "DAX_ENCRYPTION_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Hong Kong), Asia Pacific (Osaka), Asia Pacific (Seoul), Canada (Central), Europe (Milan), Europe (Stockholm), Middle East (Bahrain), Africa (Cape Town) Region", + "AWS Region": "Only available in Asia Pacific (Mumbai), Europe (Paris), US East (Ohio), Europe (Ireland), Europe (Frankfurt), South America (Sao Paulo), US East (N. Virginia), Europe (London), Asia Pacific (Tokyo), US West (Oregon), US West (N. California), Asia Pacific (Singapore), Asia Pacific (Sydney) Region", "Parameters": [], "Trigger type": "Periodic" }, @@ -611,7 +819,7 @@ "Trigger type": "Configuration changes" }, "DMS_REPLICATION_NOT_PUBLIC": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Periodic" }, @@ -652,17 +860,12 @@ "Trigger type": "Periodic" }, "DYNAMODB_IN_BACKUP_PLAN": { - "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Periodic" }, - "DYNAMODB_PITR_ENABLED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", - "Parameters": [], - "Trigger type": "Configuration changes" - }, - "DYNAMODB_RESOURCES_PROTECTED_BY_BACKUP_PLAN": { - "AWS Region": "All supported AWS regions except China (Beijing), Africa (Cape Town), Asia Pacific (Osaka), Europe (Milan), AWS GovCloud (US-East), AWS GovCloud (US-West), US West (Oregon), and China (Ningxia) Region", + "DYNAMODB_LAST_BACKUP_RECOVERY_POINT_CREATED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "resourceTags", @@ -673,12 +876,70 @@ "Name": "resourceId", "Optional": true, "Type": "String" + }, + { + "Default": "1", + "Name": "recoveryPointAgeValue", + "Optional": true, + "Type": "int" + }, + { + "Default": "days", + "Name": "recoveryPointAgeUnit", + "Optional": true, + "Type": "String" + } + ], + "Trigger type": "Periodic" + }, + "DYNAMODB_PITR_ENABLED": { + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "DYNAMODB_RESOURCES_PROTECTED_BY_BACKUP_PLAN": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "resourceTags", + "Optional": true, + "Type": "String" + }, + { + "Name": "resourceId", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossRegionList", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossAccountList", + "Optional": true, + "Type": "String" + }, + { + "Name": "maxRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "minRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "backupVaultLockCheck", + "Optional": true, + "Type": "String" } ], "Trigger type": "Periodic" }, "DYNAMODB_TABLE_ENCRYPTED_KMS": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "kmsKeyArns", @@ -689,12 +950,12 @@ "Trigger type": "Configuration changes" }, "DYNAMODB_TABLE_ENCRYPTION_ENABLED": { - "AWS Region": "All supported AWS regions except China (Ningxia), Asia Pacific (Hong Kong), Asia Pacific (Osaka), Europe (Milan), Europe (Stockholm), Middle East (Bahrain), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Ningxia), Asia Pacific (Hong Kong), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Europe (Stockholm), Middle East (Bahrain), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "DYNAMODB_THROUGHPUT_LIMIT_CHECK": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Default": "80", @@ -712,17 +973,12 @@ "Trigger type": "Periodic" }, "EBS_IN_BACKUP_PLAN": { - "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Periodic" }, - "EBS_OPTIMIZED_INSTANCE": { - "AWS Region": "All supported AWS regions", - "Parameters": [], - "Trigger type": "Configuration changes" - }, - "EBS_RESOURCES_PROTECTED_BY_BACKUP_PLAN": { - "AWS Region": "All supported AWS regions except China (Beijing), Africa (Cape Town), Asia Pacific (Osaka), Europe (Milan), AWS GovCloud (US-East), AWS GovCloud (US-West), US West (Oregon), and China (Ningxia) Region", + "EBS_LAST_BACKUP_RECOVERY_POINT_CREATED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "resourceTags", @@ -733,22 +989,80 @@ "Name": "resourceId", "Optional": true, "Type": "String" + }, + { + "Default": "1", + "Name": "recoveryPointAgeValue", + "Optional": true, + "Type": "int" + }, + { + "Default": "days", + "Name": "recoveryPointAgeUnit", + "Optional": true, + "Type": "String" + } + ], + "Trigger type": "Periodic" + }, + "EBS_OPTIMIZED_INSTANCE": { + "AWS Region": "All supported AWS regions", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "EBS_RESOURCES_PROTECTED_BY_BACKUP_PLAN": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "resourceTags", + "Optional": true, + "Type": "String" + }, + { + "Name": "resourceId", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossRegionList", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossAccountList", + "Optional": true, + "Type": "String" + }, + { + "Name": "maxRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "minRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "backupVaultLockCheck", + "Optional": true, + "Type": "String" } ], "Trigger type": "Periodic" }, "EBS_SNAPSHOT_PUBLIC_RESTORABLE_CHECK": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Periodic" }, "EC2_EBS_ENCRYPTION_BY_DEFAULT": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Periodic" }, "EC2_IMDSV2_CHECK": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Configuration changes" }, @@ -758,12 +1072,12 @@ "Trigger type": "Configuration changes" }, "EC2_INSTANCE_MANAGED_BY_SSM": { - "AWS Region": "All supported AWS regions", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "EC2_INSTANCE_MULTIPLE_ENI_CHECK": { - "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "NetworkInterfaceIds", @@ -774,12 +1088,12 @@ "Trigger type": "Configuration changes" }, "EC2_INSTANCE_NO_PUBLIC_IP": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "EC2_INSTANCE_PROFILE_ATTACHED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "IamInstanceProfileArnList", @@ -789,6 +1103,34 @@ ], "Trigger type": "Configuration changes" }, + "EC2_LAST_BACKUP_RECOVERY_POINT_CREATED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "resourceTags", + "Optional": true, + "Type": "String" + }, + { + "Name": "resourceId", + "Optional": true, + "Type": "String" + }, + { + "Default": "1", + "Name": "recoveryPointAgeValue", + "Optional": true, + "Type": "int" + }, + { + "Default": "days", + "Name": "recoveryPointAgeUnit", + "Optional": true, + "Type": "String" + } + ], + "Trigger type": "Periodic" + }, "EC2_MANAGEDINSTANCE_APPLICATIONS_BLACKLISTED": { "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", "Parameters": [ @@ -822,7 +1164,7 @@ "Trigger type": "Configuration changes" }, "EC2_MANAGEDINSTANCE_ASSOCIATION_COMPLIANCE_STATUS_CHECK": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Configuration changes" }, @@ -843,7 +1185,7 @@ "Trigger type": "Configuration changes" }, "EC2_MANAGEDINSTANCE_PATCH_COMPLIANCE_STATUS_CHECK": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Middle East (Bahrain), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Middle East (Bahrain), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Configuration changes" }, @@ -873,8 +1215,18 @@ ], "Trigger type": "Configuration changes" }, + "EC2_NO_AMAZON_KEY_PAIR": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "EC2_PARAVIRTUAL_INSTANCE_CHECK": { + "AWS Region": "Only available in Europe (Ireland), Europe (Frankfurt), South America (Sao Paulo), US East (N. Virginia), Asia Pacific (Tokyo), US West (Oregon), US West (N. California), Asia Pacific (Singapore), Asia Pacific (Sydney) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, "EC2_RESOURCES_PROTECTED_BY_BACKUP_PLAN": { - "AWS Region": "All supported AWS regions except China (Beijing), Africa (Cape Town), Asia Pacific (Osaka), Europe (Milan), AWS GovCloud (US-East), AWS GovCloud (US-West), US West (Oregon), and China (Ningxia) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "resourceTags", @@ -885,17 +1237,47 @@ "Name": "resourceId", "Optional": true, "Type": "String" + }, + { + "Name": "crossRegionList", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossAccountList", + "Optional": true, + "Type": "String" + }, + { + "Name": "maxRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "minRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "backupVaultLockCheck", + "Optional": true, + "Type": "String" } ], "Trigger type": "Periodic" }, "EC2_SECURITY_GROUP_ATTACHED_TO_ENI": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Configuration changes" }, + "EC2_SECURITY_GROUP_ATTACHED_TO_ENI_PERIODIC": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [], + "Trigger type": "Periodic" + }, "EC2_STOPPED_INSTANCE": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Default": "30", @@ -906,6 +1288,22 @@ ], "Trigger type": "Periodic" }, + "EC2_TOKEN_HOP_LIMIT_CHECK": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [ + { + "Name": "tokenHopLimit", + "Optional": true, + "Type": "int" + } + ], + "Trigger type": "Configuration changes" + }, + "EC2_TRANSIT_GATEWAY_AUTO_VPC_ATTACH_DISABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Hong Kong), Asia Pacific (Jakarta), Asia Pacific (Osaka), Asia Pacific (Mumbai), Middle East (Bahrain) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, "EC2_VOLUME_INUSE_CHECK": { "AWS Region": "All supported AWS regions", "Parameters": [ @@ -917,6 +1315,77 @@ ], "Trigger type": "Configuration changes" }, + "ECR_PRIVATE_IMAGE_SCANNING_ENABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "ECR_PRIVATE_LIFECYCLE_POLICY_CONFIGURED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "ECR_PRIVATE_TAG_IMMUTABILITY_ENABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "ECS_AWSVPC_NETWORKING_ENABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "ECS_CONTAINERS_NONPRIVILEGED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "ECS_CONTAINERS_READONLY_ACCESS": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "ECS_CONTAINER_INSIGHTS_ENABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "ECS_FARGATE_LATEST_PLATFORM_VERSION": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "ECS_NO_ENVIRONMENT_SECRETS": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "secretKeys", + "Optional": false, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, + "ECS_TASK_DEFINITION_LOG_CONFIGURATION": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "ECS_TASK_DEFINITION_MEMORY_HARD_LIMIT": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "ECS_TASK_DEFINITION_NONROOT_USER": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "ECS_TASK_DEFINITION_PID_MODE_CHECK": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, "ECS_TASK_DEFINITION_USER_FOR_HOST_MODE_CHECK": { "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", "Parameters": [ @@ -928,8 +1397,35 @@ ], "Trigger type": "Configuration changes" }, + "EFS_ACCESS_POINT_ENFORCE_ROOT_DIRECTORY": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [ + { + "Name": "approvedDirectories", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, + "EFS_ACCESS_POINT_ENFORCE_USER_IDENTITY": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [ + { + "Name": "approvedUids", + "Optional": true, + "Type": "CSV" + }, + { + "Name": "approvedGids", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, "EFS_ENCRYPTED_CHECK": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Name": "KmsKeyId", @@ -940,12 +1436,12 @@ "Trigger type": "Periodic" }, "EFS_IN_BACKUP_PLAN": { - "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Periodic" }, - "EFS_RESOURCES_PROTECTED_BY_BACKUP_PLAN": { - "AWS Region": "All supported AWS regions except China (Beijing), Africa (Cape Town), Asia Pacific (Osaka), Europe (Milan), AWS GovCloud (US-East), AWS GovCloud (US-West), US West (Oregon), and China (Ningxia) Region", + "EFS_LAST_BACKUP_RECOVERY_POINT_CREATED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "resourceTags", @@ -956,6 +1452,59 @@ "Name": "resourceId", "Optional": true, "Type": "String" + }, + { + "Default": "1", + "Name": "recoveryPointAgeValue", + "Optional": true, + "Type": "int" + }, + { + "Default": "days", + "Name": "recoveryPointAgeUnit", + "Optional": true, + "Type": "String" + } + ], + "Trigger type": "Periodic" + }, + "EFS_RESOURCES_PROTECTED_BY_BACKUP_PLAN": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "resourceTags", + "Optional": true, + "Type": "String" + }, + { + "Name": "resourceId", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossRegionList", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossAccountList", + "Optional": true, + "Type": "String" + }, + { + "Name": "maxRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "minRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "backupVaultLockCheck", + "Optional": true, + "Type": "String" } ], "Trigger type": "Periodic" @@ -965,13 +1514,35 @@ "Parameters": [], "Trigger type": "Configuration changes" }, + "EKS_CLUSTER_OLDEST_SUPPORTED_VERSION": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "oldestVersionSupported", + "Optional": false, + "Type": "String" + } + ], + "Trigger type": "Configuration changes" + }, + "EKS_CLUSTER_SUPPORTED_VERSION": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "oldestVersionSupported", + "Optional": false, + "Type": "String" + } + ], + "Trigger type": "Configuration changes" + }, "EKS_ENDPOINT_NO_PUBLIC_ACCESS": { - "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka), Europe (Milan), US West (N. California), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), US West (N. California), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Periodic" }, "EKS_SECRETS_ENCRYPTED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), US West (N. California), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), US West (N. California), Africa (Cape Town) Region", "Parameters": [ { "Name": "kmsKeyArns", @@ -982,7 +1553,7 @@ "Trigger type": "Periodic" }, "ELASTICACHE_REDIS_CLUSTER_AUTOMATIC_BACKUP_CHECK": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Default": "15", @@ -994,12 +1565,12 @@ "Trigger type": "Periodic" }, "ELASTICSEARCH_ENCRYPTED_AT_REST": { - "AWS Region": "All supported AWS regions except China (Ningxia), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Ningxia), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Periodic" }, "ELASTICSEARCH_IN_VPC_ONLY": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Periodic" }, @@ -1015,12 +1586,12 @@ "Trigger type": "Configuration changes" }, "ELASTICSEARCH_NODE_TO_NODE_ENCRYPTION_CHECK": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "ELASTIC_BEANSTALK_MANAGED_UPDATES_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "UpdateLevel", @@ -1031,7 +1602,7 @@ "Trigger type": "Configuration changes" }, "ELBV2_ACM_CERTIFICATE_REQUIRED": { - "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "AcmCertificatesAllowed", @@ -1041,18 +1612,29 @@ ], "Trigger type": "Periodic" }, + "ELBV2_MULTIPLE_AZ": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [ + { + "Name": "minAvailabilityZones", + "Optional": true, + "Type": "int" + } + ], + "Trigger type": "Configuration changes" + }, "ELB_ACM_CERTIFICATE_REQUIRED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "ELB_CROSS_ZONE_LOAD_BALANCING_ENABLED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "ELB_CUSTOM_SECURITY_POLICY_SSL_CHECK": { - "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Name": "sslProtocolsAndCiphers", @@ -1063,7 +1645,7 @@ "Trigger type": "Configuration changes" }, "ELB_DELETION_PROTECTION_ENABLED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Configuration changes" }, @@ -1079,7 +1661,7 @@ "Trigger type": "Configuration changes" }, "ELB_PREDEFINED_SECURITY_POLICY_SSL_CHECK": { - "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Name": "predefinedPolicyName", @@ -1090,12 +1672,12 @@ "Trigger type": "Configuration changes" }, "ELB_TLS_HTTPS_LISTENERS_ONLY": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "EMR_KERBEROS_ENABLED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "TicketLifetimeInHours", @@ -1126,12 +1708,12 @@ "Trigger type": "Periodic" }, "EMR_MASTER_NO_PUBLIC_IP": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Periodic" }, "ENCRYPTED_VOLUMES": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Name": "kmsId", @@ -1142,7 +1724,7 @@ "Trigger type": "Configuration changes" }, "FMS_SHIELD_RESOURCE_POLICY_CHECK": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), Asia Pacific (Jakarta) Region", "Parameters": [ { "Name": "webACLId", @@ -1178,7 +1760,7 @@ "Trigger type": "Configuration changes" }, "FMS_WEBACL_RESOURCE_POLICY_CHECK": { - "AWS Region": "All supported AWS regions", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta) Region", "Parameters": [ { "Name": "webACLId", @@ -1209,7 +1791,7 @@ "Trigger type": "Configuration changes" }, "FMS_WEBACL_RULEGROUP_ASSOCIATION_CHECK": { - "AWS Region": "All supported AWS regions", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta) Region", "Parameters": [ { "Name": "ruleGroups", @@ -1229,8 +1811,8 @@ ], "Trigger type": "Configuration changes" }, - "FSX_RESOURCES_PROTECTED_BY_BACKUP_PLAN": { - "AWS Region": "All supported AWS regions except China (Beijing), Africa (Cape Town), Asia Pacific (Osaka), Europe (Milan), AWS GovCloud (US-East), AWS GovCloud (US-West), US West (Oregon), and China (Ningxia) Region", + "FSX_LAST_BACKUP_RECOVERY_POINT_CREATED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "resourceTags", @@ -1241,12 +1823,65 @@ "Name": "resourceId", "Optional": true, "Type": "String" + }, + { + "Default": "1", + "Name": "recoveryPointAgeValue", + "Optional": true, + "Type": "int" + }, + { + "Default": "days", + "Name": "recoveryPointAgeUnit", + "Optional": true, + "Type": "String" + } + ], + "Trigger type": "Periodic" + }, + "FSX_RESOURCES_PROTECTED_BY_BACKUP_PLAN": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "resourceTags", + "Optional": true, + "Type": "String" + }, + { + "Name": "resourceId", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossRegionList", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossAccountList", + "Optional": true, + "Type": "String" + }, + { + "Name": "maxRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "minRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "backupVaultLockCheck", + "Optional": true, + "Type": "String" } ], "Trigger type": "Periodic" }, "GUARDDUTY_ENABLED_CENTRALIZED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), Asia Pacific (Osaka), Europe (Milan), Middle East (Bahrain), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Middle East (Bahrain), Africa (Cape Town) Region", "Parameters": [ { "Name": "CentralMonitoringAccount", @@ -1257,7 +1892,7 @@ "Trigger type": "Periodic" }, "GUARDDUTY_NON_ARCHIVED_FINDINGS": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), Asia Pacific (Osaka), Europe (Milan), Middle East (Bahrain), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Middle East (Bahrain), Africa (Cape Town) Region", "Parameters": [ { "Default": "30", @@ -1281,12 +1916,17 @@ "Trigger type": "Periodic" }, "IAM_CUSTOMER_POLICY_BLOCKED_KMS_ACTIONS": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "blockedActionsPatterns", "Optional": false, "Type": "CSV" + }, + { + "Name": "excludePermissionBoundaryPolicy", + "Optional": true, + "Type": "boolean" } ], "Trigger type": "Configuration changes" @@ -1297,7 +1937,7 @@ "Trigger type": "Configuration changes" }, "IAM_INLINE_POLICY_BLOCKED_KMS_ACTIONS": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "blockedActionsPatterns", @@ -1313,7 +1953,7 @@ "Trigger type": "Configuration changes" }, "IAM_NO_INLINE_POLICY_CHECK": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Configuration changes" }, @@ -1383,7 +2023,7 @@ "Trigger type": "Configuration changes" }, "IAM_POLICY_IN_USE": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Name": "policyARN", @@ -1404,8 +2044,14 @@ "Trigger type": "Configuration changes" }, "IAM_POLICY_NO_STATEMENTS_WITH_FULL_ACCESS": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", - "Parameters": [], + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "excludePermissionBoundaryPolicy", + "Optional": true, + "Type": "boolean" + } + ], "Trigger type": "Configuration changes" }, "IAM_ROLE_MANAGED_POLICY_CHECK": { @@ -1420,7 +2066,7 @@ "Trigger type": "Configuration changes" }, "IAM_ROOT_ACCESS_KEY_CHECK": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Periodic" }, @@ -1458,12 +2104,12 @@ "Trigger type": "Periodic" }, "INCOMING_SSH_DISABLED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "INSTANCES_IN_VPC": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Name": "vpcId", @@ -1474,7 +2120,7 @@ "Trigger type": "Configuration changes" }, "INTERNET_GATEWAY_AUTHORIZED_VPC_ONLY": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "AuthorizedVpcIds", @@ -1484,8 +2130,13 @@ ], "Trigger type": "Configuration changes" }, + "KINESIS_STREAM_ENCRYPTED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, "KMS_CMK_NOT_SCHEDULED_FOR_DELETION": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan) Region", "Parameters": [ { "Name": "kmsKeyIds", @@ -1496,7 +2147,7 @@ "Trigger type": "Periodic" }, "LAMBDA_CONCURRENCY_CHECK": { - "AWS Region": "All supported AWS regions except China (Ningxia), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Ningxia), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "ConcurrencyLimitLow", @@ -1512,7 +2163,7 @@ "Trigger type": "Configuration changes" }, "LAMBDA_DLQ_CHECK": { - "AWS Region": "All supported AWS regions except China (Ningxia), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Ningxia), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "dlqArns", @@ -1556,7 +2207,7 @@ "Trigger type": "Configuration changes" }, "LAMBDA_INSIDE_VPC": { - "AWS Region": "All supported AWS regions except China (Ningxia), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Ningxia), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "subnetIds", @@ -1566,6 +2217,17 @@ ], "Trigger type": "Configuration changes" }, + "LAMBDA_VPC_MULTI_AZ_CHECK": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "availabilityZones", + "Optional": true, + "Type": "int" + } + ], + "Trigger type": "Configuration changes" + }, "MFA_ENABLED_FOR_IAM_CONSOLE_ACCESS": { "AWS Region": "All supported AWS regions", "Parameters": [], @@ -1602,8 +2264,50 @@ ], "Trigger type": "Periodic" }, + "NACL_NO_UNRESTRICTED_SSH_RDP": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "NETFW_POLICY_DEFAULT_ACTION_FRAGMENT_PACKETS": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [ + { + "Name": "statelessFragmentDefaultActions", + "Optional": false, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, + "NETFW_POLICY_DEFAULT_ACTION_FULL_PACKETS": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [ + { + "Name": "statelessDefaultActions", + "Optional": false, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, + "NETFW_POLICY_RULE_GROUP_ASSOCIATED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "NETFW_STATELESS_RULE_GROUP_NOT_EMPTY": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "NLB_CROSS_ZONE_LOAD_BALANCING_ENABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, "NO_UNRESTRICTED_ROUTE_TO_IGW": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "routeTableIds", @@ -1613,28 +2317,102 @@ ], "Trigger type": "Configuration changes" }, - "RDS_AUTOMATIC_MINOR_VERSION_UPGRADE_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "OPENSEARCH_ACCESS_CONTROL_ENABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Configuration changes" }, + "OPENSEARCH_AUDIT_LOGGING_ENABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "Parameters": [ + { + "Name": "cloudWatchLogsLogGroupArnList", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, + "OPENSEARCH_DATA_NODE_FAULT_TOLERANCE": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "OPENSEARCH_ENCRYPTED_AT_REST": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "OPENSEARCH_HTTPS_REQUIRED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "Parameters": [ + { + "Name": "tlsPolicies", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, + "OPENSEARCH_IN_VPC_ONLY": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "OPENSEARCH_LOGS_TO_CLOUDWATCH": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "Parameters": [ + { + "Name": "logTypes", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, + "OPENSEARCH_NODE_TO_NODE_ENCRYPTION_CHECK": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "RDS_AUTOMATIC_MINOR_VERSION_UPGRADE_ENABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "RDS_CLUSTER_DEFAULT_ADMIN_CHECK": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Middle East (Bahrain), South America (Sao Paulo) Region", + "Parameters": [ + { + "Name": "validAdminUserNames", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, "RDS_CLUSTER_DELETION_PROTECTION_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), Asia Pacific (Osaka), Middle East (Bahrain), South America (Sao Paulo) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), Asia Pacific (Jakarta), Asia Pacific (Osaka), Middle East (Bahrain), South America (Sao Paulo) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "RDS_CLUSTER_IAM_AUTHENTICATION_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka), Middle East (Bahrain), South America (Sao Paulo) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Middle East (Bahrain), South America (Sao Paulo) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "RDS_CLUSTER_MULTI_AZ_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka), Middle East (Bahrain), South America (Sao Paulo) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Middle East (Bahrain), South America (Sao Paulo) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "RDS_DB_SECURITY_GROUP_NOT_ALLOWED": { + "AWS Region": "Only available in Europe (Ireland), South America (Sao Paulo), US East (N. Virginia), Asia Pacific (Tokyo), US West (Oregon), US West (N. California), Asia Pacific (Singapore), Asia Pacific (Sydney) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "RDS_ENHANCED_MONITORING_ENABLED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "monitoringInterval", @@ -1644,8 +2422,19 @@ ], "Trigger type": "Configuration changes" }, + "RDS_INSTANCE_DEFAULT_ADMIN_CHECK": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West) Region", + "Parameters": [ + { + "Name": "validAdminUserNames", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, "RDS_INSTANCE_DELETION_PROTECTION_ENABLED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "databaseEngines", @@ -1656,7 +2445,7 @@ "Trigger type": "Configuration changes" }, "RDS_INSTANCE_IAM_AUTHENTICATION_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), Asia Pacific (Hong Kong), Asia Pacific (Osaka), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), Asia Pacific (Hong Kong), Asia Pacific (Jakarta), Asia Pacific (Osaka), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Configuration changes" }, @@ -1666,12 +2455,40 @@ "Trigger type": "Configuration changes" }, "RDS_IN_BACKUP_PLAN": { - "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Periodic" }, + "RDS_LAST_BACKUP_RECOVERY_POINT_CREATED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "resourceTags", + "Optional": true, + "Type": "String" + }, + { + "Name": "resourceId", + "Optional": true, + "Type": "String" + }, + { + "Default": "1", + "Name": "recoveryPointAgeValue", + "Optional": true, + "Type": "int" + }, + { + "Default": "days", + "Name": "recoveryPointAgeUnit", + "Optional": true, + "Type": "String" + } + ], + "Trigger type": "Periodic" + }, "RDS_LOGGING_ENABLED": { - "AWS Region": "All supported AWS regions except China (Ningxia), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Ningxia), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Name": "additionalLogs", @@ -1687,7 +2504,7 @@ "Trigger type": "Configuration changes" }, "RDS_RESOURCES_PROTECTED_BY_BACKUP_PLAN": { - "AWS Region": "All supported AWS regions except China (Beijing), Africa (Cape Town), Asia Pacific (Osaka), Europe (Milan), AWS GovCloud (US-East), AWS GovCloud (US-West), US West (Oregon), and China (Ningxia) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "resourceTags", @@ -1698,17 +2515,42 @@ "Name": "resourceId", "Optional": true, "Type": "String" + }, + { + "Name": "crossRegionList", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossAccountList", + "Optional": true, + "Type": "String" + }, + { + "Name": "maxRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "minRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "backupVaultLockCheck", + "Optional": true, + "Type": "String" } ], "Trigger type": "Periodic" }, "RDS_SNAPSHOTS_PUBLIC_PROHIBITED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "RDS_SNAPSHOT_ENCRYPTED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan) Region", "Parameters": [], "Trigger type": "Configuration changes" }, @@ -1723,8 +2565,19 @@ ], "Trigger type": "Configuration changes" }, + "REDSHIFT_AUDIT_LOGGING_ENABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [ + { + "Name": "bucketNames", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, "REDSHIFT_BACKUP_ENABLED": { - "AWS Region": "All supported AWS regions except China (Ningxia), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Ningxia), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Name": "MinRetentionPeriod", @@ -1764,7 +2617,7 @@ "Trigger type": "Configuration changes" }, "REDSHIFT_CLUSTER_KMS_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "kmsKeyArns", @@ -1798,17 +2651,39 @@ "Trigger type": "Configuration changes" }, "REDSHIFT_CLUSTER_PUBLIC_ACCESS_CHECK": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Configuration changes" }, + "REDSHIFT_DEFAULT_ADMIN_CHECK": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West) Region", + "Parameters": [ + { + "Name": "validAdminUserNames", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, + "REDSHIFT_DEFAULT_DB_NAME_CHECK": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [ + { + "Name": "validDatabaseNames", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, "REDSHIFT_ENHANCED_VPC_ROUTING_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "REDSHIFT_REQUIRE_TLS_SSL": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan) Region", "Parameters": [], "Trigger type": "Configuration changes" }, @@ -1880,7 +2755,7 @@ "Trigger type": "Configuration changes" }, "RESTRICTED_INCOMING_TRAFFIC": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Default": "20", @@ -1926,7 +2801,7 @@ "Trigger type": "Periodic" }, "S3_ACCOUNT_LEVEL_PUBLIC_ACCESS_BLOCKS": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka), Europe (Milan), Middle East (Bahrain) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Middle East (Bahrain) Region", "Parameters": [ { "Default": "True", @@ -1953,7 +2828,7 @@ "Type": "String" } ], - "Trigger type": "Configuration changes (current status not checked, only evaluted when changes generate new events)" + "Trigger type": "Configuration changes (current status not checked, only evaluated when changes generate new events)" }, "S3_ACCOUNT_LEVEL_PUBLIC_ACCESS_BLOCKS_PERIODIC": { "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West) Region", @@ -1981,6 +2856,11 @@ ], "Trigger type": "Periodic" }, + "S3_BUCKET_ACL_PROHIBITED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, "S3_BUCKET_BLACKLISTED_ACTIONS_PROHIBITED": { "AWS Region": "All supported AWS regions", "Parameters": [ @@ -1993,7 +2873,7 @@ "Trigger type": "Configuration changes" }, "S3_BUCKET_DEFAULT_LOCK_ENABLED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "mode", @@ -2004,7 +2884,7 @@ "Trigger type": "Configuration changes" }, "S3_BUCKET_LEVEL_PUBLIC_ACCESS_PROHIBITED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "excludedPublicBuckets", @@ -2109,7 +2989,7 @@ "Trigger type": "Configuration changes" }, "S3_DEFAULT_ENCRYPTION_KMS": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "kmsKeyArns", @@ -2119,8 +2999,135 @@ ], "Trigger type": "Configuration changes" }, + "S3_EVENT_NOTIFICATIONS_ENABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [ + { + "Name": "destinationArn", + "Optional": true, + "Type": "String" + }, + { + "Name": "eventTypes", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, + "S3_LAST_BACKUP_RECOVERY_POINT_CREATED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "resourceTags", + "Optional": true, + "Type": "String" + }, + { + "Name": "resourceId", + "Optional": true, + "Type": "String" + }, + { + "Default": "1", + "Name": "recoveryPointAgeValue", + "Optional": true, + "Type": "int" + }, + { + "Default": "days", + "Name": "recoveryPointAgeUnit", + "Optional": true, + "Type": "String" + } + ], + "Trigger type": "Periodic" + }, + "S3_LIFECYCLE_POLICY_CHECK": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [ + { + "Name": "targetTransitionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "targetExpirationDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "targetTransitionStorageClass", + "Optional": true, + "Type": "String" + }, + { + "Name": "targetPrefix", + "Optional": true, + "Type": "String" + }, + { + "Name": "bucketNames", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, + "S3_RESOURCES_PROTECTED_BY_BACKUP_PLAN": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "resourceTags", + "Optional": true, + "Type": "String" + }, + { + "Name": "resourceId", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossRegionList", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossAccountList", + "Optional": true, + "Type": "String" + }, + { + "Name": "maxRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "minRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "backupVaultLockCheck", + "Optional": true, + "Type": "String" + } + ], + "Trigger type": "Periodic" + }, + "S3_VERSION_LIFECYCLE_POLICY_CHECK": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West) Region", + "Parameters": [ + { + "Name": "bucketNames", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, "SAGEMAKER_ENDPOINT_CONFIGURATION_KMS_KEY_CONFIGURED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Name": "kmsKeyArns", @@ -2131,7 +3138,7 @@ "Trigger type": "Periodic" }, "SAGEMAKER_NOTEBOOK_INSTANCE_KMS_KEY_CONFIGURED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Name": "kmsKeyArns", @@ -2142,12 +3149,12 @@ "Trigger type": "Periodic" }, "SAGEMAKER_NOTEBOOK_NO_DIRECT_INTERNET_ACCESS": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Periodic" }, "SECRETSMANAGER_ROTATION_ENABLED_CHECK": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "maximumAllowedRotationFrequency", @@ -2158,7 +3165,7 @@ "Trigger type": "Configuration changes" }, "SECRETSMANAGER_SCHEDULED_ROTATION_SUCCESS_CHECK": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Configuration changes" }, @@ -2174,7 +3181,7 @@ "Trigger type": "Periodic" }, "SECRETSMANAGER_SECRET_UNUSED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "unusedForDays", @@ -2185,7 +3192,7 @@ "Trigger type": "Periodic" }, "SECRETSMANAGER_USING_CMK": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "kmsKeyArns", @@ -2196,12 +3203,12 @@ "Trigger type": "Configuration changes" }, "SECURITYHUB_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [], "Trigger type": "Periodic" }, "SERVICE_VPC_ENDPOINT_ENABLED": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "serviceName", @@ -2222,7 +3229,7 @@ "Trigger type": "Periodic" }, "SNS_ENCRYPTED_KMS": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "kmsKeyIds", @@ -2232,23 +3239,125 @@ ], "Trigger type": "Configuration changes" }, + "SNS_TOPIC_MESSAGE_DELIVERY_NOTIFICATION_ENABLED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, "SSM_DOCUMENT_NOT_PUBLIC": { "AWS Region": "All supported AWS regions", "Parameters": [], "Trigger type": "Periodic" }, + "STORAGEGATEWAY_LAST_BACKUP_RECOVERY_POINT_CREATED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "resourceTags", + "Optional": true, + "Type": "String" + }, + { + "Name": "resourceId", + "Optional": true, + "Type": "String" + }, + { + "Default": "1", + "Name": "recoveryPointAgeValue", + "Optional": true, + "Type": "int" + }, + { + "Default": "days", + "Name": "recoveryPointAgeUnit", + "Optional": true, + "Type": "String" + } + ], + "Trigger type": "Periodic" + }, "SUBNET_AUTO_ASSIGN_PUBLIC_IP_DISABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Configuration changes" }, + "VIRTUALMACHINE_LAST_BACKUP_RECOVERY_POINT_CREATED": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "resourceTags", + "Optional": true, + "Type": "String" + }, + { + "Name": "resourceId", + "Optional": true, + "Type": "String" + }, + { + "Default": "1", + "Name": "recoveryPointAgeValue", + "Optional": true, + "Type": "int" + }, + { + "Default": "days", + "Name": "recoveryPointAgeUnit", + "Optional": true, + "Type": "String" + } + ], + "Trigger type": "Periodic" + }, + "VIRTUALMACHINE_RESOURCES_PROTECTED_BY_BACKUP_PLAN": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [ + { + "Name": "resourceTags", + "Optional": true, + "Type": "String" + }, + { + "Name": "resourceId", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossRegionList", + "Optional": true, + "Type": "String" + }, + { + "Name": "crossAccountList", + "Optional": true, + "Type": "String" + }, + { + "Name": "maxRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "minRetentionDays", + "Optional": true, + "Type": "int" + }, + { + "Name": "backupVaultLockCheck", + "Optional": true, + "Type": "String" + } + ], + "Trigger type": "Periodic" + }, "VPC_DEFAULT_SECURITY_GROUP_CLOSED": { - "AWS Region": "All supported AWS regions", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "VPC_FLOW_LOGS_ENABLED": { - "AWS Region": "All supported AWS regions", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta) Region", "Parameters": [ { "Name": "trafficType", @@ -2259,12 +3368,23 @@ "Trigger type": "Periodic" }, "VPC_NETWORK_ACL_UNUSED_CHECK": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [], "Trigger type": "Configuration changes" }, + "VPC_PEERING_DNS_RESOLUTION_CHECK": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [ + { + "Name": "vpcIds", + "Optional": true, + "Type": "CSV" + } + ], + "Trigger type": "Configuration changes" + }, "VPC_SG_OPEN_ONLY_TO_AUTHORIZED_PORTS": { - "AWS Region": "All supported AWS regions except Asia Pacific (Osaka) Region", + "AWS Region": "All supported AWS regions except Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", "Parameters": [ { "Name": "authorizedTcpPorts", @@ -2280,12 +3400,12 @@ "Trigger type": "Configuration changes" }, "VPC_VPN_2_TUNNELS_UP": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), Asia Pacific (Osaka), Middle East (Bahrain) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), Asia Pacific (Jakarta), Asia Pacific (Osaka), Middle East (Bahrain) Region", "Parameters": [], "Trigger type": "Configuration changes" }, "WAFV2_LOGGING_ENABLED": { - "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka), Europe (Milan), Africa (Cape Town) Region", "Parameters": [ { "Name": "KinesisFirehoseDeliveryStreamArns", @@ -2305,6 +3425,36 @@ } ], "Trigger type": "Periodic" + }, + "WAF_GLOBAL_RULEGROUP_NOT_EMPTY": { + "AWS Region": "Only available in US East (N. Virginia) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "WAF_GLOBAL_RULE_NOT_EMPTY": { + "AWS Region": "Only available in US East (N. Virginia) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "WAF_GLOBAL_WEBACL_NOT_EMPTY": { + "AWS Region": "Only available in US East (N. Virginia) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "WAF_REGIONAL_RULEGROUP_NOT_EMPTY": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta), Asia Pacific (Osaka) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "WAF_REGIONAL_RULE_NOT_EMPTY": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" + }, + "WAF_REGIONAL_WEBACL_NOT_EMPTY": { + "AWS Region": "All supported AWS regions except China (Beijing), China (Ningxia), AWS GovCloud (US-East), AWS GovCloud (US-West), Asia Pacific (Jakarta) Region", + "Parameters": [], + "Trigger type": "Configuration changes" } } } \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json index c93e4b5f3..58c833635 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/af-south-1.json @@ -387,6 +387,78 @@ "InstanceType": "r5d.xlarge", "Location": "afs1-az1" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5dn.large", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5dn.metal", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5n.12xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5n.large", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5n.metal", + "Location": "afs1-az1" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "afs1-az1" + }, { "InstanceType": "t3.2xlarge", "Location": "afs1-az1" @@ -863,6 +935,78 @@ "InstanceType": "r5d.xlarge", "Location": "afs1-az2" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5dn.large", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5dn.metal", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5n.12xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5n.large", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5n.metal", + "Location": "afs1-az2" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "afs1-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "afs1-az2" @@ -1339,6 +1483,78 @@ "InstanceType": "r5d.xlarge", "Location": "afs1-az3" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5dn.large", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5dn.metal", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5n.12xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5n.large", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5n.metal", + "Location": "afs1-az3" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "afs1-az3" + }, { "InstanceType": "t3.2xlarge", "Location": "afs1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-east-1.json index 9cadf69c6..93918971f 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-east-1.json @@ -155,6 +155,78 @@ "InstanceType": "c6g.xlarge", "Location": "ape1-az1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6gn.large", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6i.large", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6i.metal", + "Location": "ape1-az1" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "ape1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "ape1-az1" @@ -259,6 +331,38 @@ "InstanceType": "i3en.xlarge", "Location": "ape1-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "ape1-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "ape1-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ape1-az1" + }, { "InstanceType": "m5.12xlarge", "Location": "ape1-az1" @@ -367,6 +471,46 @@ "InstanceType": "m6g.xlarge", "Location": "ape1-az1" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6i.large", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6i.metal", + "Location": "ape1-az1" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "ape1-az1" + }, { "InstanceType": "r5.12xlarge", "Location": "ape1-az1" @@ -511,6 +655,46 @@ "InstanceType": "r6g.xlarge", "Location": "ape1-az1" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "ape1-az1" + }, + { + "InstanceType": "r6i.large", + "Location": "ape1-az1" + }, + { + "InstanceType": "r6i.metal", + "Location": "ape1-az1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "ape1-az1" + }, { "InstanceType": "t3.2xlarge", "Location": "ape1-az1" @@ -731,6 +915,78 @@ "InstanceType": "c6g.xlarge", "Location": "ape1-az2" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6gn.large", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6i.large", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6i.metal", + "Location": "ape1-az2" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "ape1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "ape1-az2" @@ -835,6 +1091,38 @@ "InstanceType": "i3en.xlarge", "Location": "ape1-az2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "i4i.large", + "Location": "ape1-az2" + }, + { + "InstanceType": "i4i.metal", + "Location": "ape1-az2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ape1-az2" + }, { "InstanceType": "inf1.24xlarge", "Location": "ape1-az2" @@ -959,6 +1247,46 @@ "InstanceType": "m6g.xlarge", "Location": "ape1-az2" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6i.large", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6i.metal", + "Location": "ape1-az2" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "ape1-az2" + }, { "InstanceType": "r5.12xlarge", "Location": "ape1-az2" @@ -1103,6 +1431,46 @@ "InstanceType": "r6g.xlarge", "Location": "ape1-az2" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "ape1-az2" + }, + { + "InstanceType": "r6i.large", + "Location": "ape1-az2" + }, + { + "InstanceType": "r6i.metal", + "Location": "ape1-az2" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "ape1-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "ape1-az2" @@ -1323,6 +1691,78 @@ "InstanceType": "c6g.xlarge", "Location": "ape1-az3" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6gn.large", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6i.large", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6i.metal", + "Location": "ape1-az3" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "ape1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "ape1-az3" @@ -1427,6 +1867,38 @@ "InstanceType": "i3en.xlarge", "Location": "ape1-az3" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "i4i.large", + "Location": "ape1-az3" + }, + { + "InstanceType": "i4i.metal", + "Location": "ape1-az3" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ape1-az3" + }, { "InstanceType": "inf1.24xlarge", "Location": "ape1-az3" @@ -1551,6 +2023,46 @@ "InstanceType": "m6g.xlarge", "Location": "ape1-az3" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6i.large", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6i.metal", + "Location": "ape1-az3" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "ape1-az3" + }, { "InstanceType": "r5.12xlarge", "Location": "ape1-az3" @@ -1695,6 +2207,46 @@ "InstanceType": "r6g.xlarge", "Location": "ape1-az3" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "ape1-az3" + }, + { + "InstanceType": "r6i.large", + "Location": "ape1-az3" + }, + { + "InstanceType": "r6i.metal", + "Location": "ape1-az3" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "ape1-az3" + }, { "InstanceType": "t3.2xlarge", "Location": "ape1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json index 1611da0fb..a1b7ca510 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-1.json @@ -283,6 +283,46 @@ "InstanceType": "c6gn.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "c6i.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6i.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6i.metal", + "Location": "apne1-az1" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "cc2.8xlarge", "Location": "apne1-az1" @@ -391,6 +431,38 @@ "InstanceType": "g4dn.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "g5.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "g5g.16xlarge", "Location": "apne1-az1" @@ -491,6 +563,38 @@ "InstanceType": "i3en.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "apne1-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "inf1.24xlarge", "Location": "apne1-az1" @@ -879,6 +983,46 @@ "InstanceType": "m6gd.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6i.large", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6i.metal", + "Location": "apne1-az1" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "apne1-az1" + }, { "InstanceType": "mac1.metal", "Location": "apne1-az1" @@ -1355,6 +1499,22 @@ "InstanceType": "x1e.xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "apne1-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "apne1-az1" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "apne1-az1" @@ -1379,6 +1539,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "apne1-az1" }, + { + "InstanceType": "x2iedn.metal", + "Location": "apne1-az1" + }, { "InstanceType": "x2iedn.xlarge", "Location": "apne1-az1" @@ -1847,6 +2011,38 @@ "InstanceType": "i3en.xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "apne1-az2" + }, + { + "InstanceType": "i4i.large", + "Location": "apne1-az2" + }, + { + "InstanceType": "i4i.metal", + "Location": "apne1-az2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "apne1-az2" + }, { "InstanceType": "inf1.24xlarge", "Location": "apne1-az2" @@ -2719,6 +2915,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "apne1-az2" }, + { + "InstanceType": "x2idn.metal", + "Location": "apne1-az2" + }, { "InstanceType": "x2iezn.12xlarge", "Location": "apne1-az2" @@ -3047,6 +3247,38 @@ "InstanceType": "c6gd.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6gn.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6gn.medium", + "Location": "apne1-az4" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "c6i.12xlarge", "Location": "apne1-az4" @@ -3195,6 +3427,38 @@ "InstanceType": "g4dn.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "g5.12xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "g5.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "g5g.16xlarge", "Location": "apne1-az4" @@ -3295,6 +3559,38 @@ "InstanceType": "i3en.xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "apne1-az4" + }, + { + "InstanceType": "i4i.large", + "Location": "apne1-az4" + }, + { + "InstanceType": "i4i.metal", + "Location": "apne1-az4" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "apne1-az4" + }, { "InstanceType": "inf1.24xlarge", "Location": "apne1-az4" @@ -4335,6 +4631,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "x2idn.metal", + "Location": "apne1-az4" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "apne1-az4" @@ -4359,6 +4659,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "apne1-az4" }, + { + "InstanceType": "x2iedn.metal", + "Location": "apne1-az4" + }, { "InstanceType": "x2iedn.xlarge", "Location": "apne1-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json index 3d50a02c2..fe132c635 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-2.json @@ -187,6 +187,74 @@ "InstanceType": "c6g.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gd.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gd.medium", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gd.metal", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gn.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "apne2-az1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "c6i.12xlarge", "Location": "apne2-az1" @@ -911,6 +979,42 @@ "InstanceType": "r5d.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "r5dn.large", + "Location": "apne2-az1" + }, + { + "InstanceType": "r5dn.metal", + "Location": "apne2-az1" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "r5n.12xlarge", "Location": "apne2-az1" @@ -1175,6 +1279,54 @@ "InstanceType": "x1e.xlarge", "Location": "apne2-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "apne2-az1" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "apne2-az1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "apne2-az1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "apne2-az1" + }, { "InstanceType": "z1d.12xlarge", "Location": "apne2-az1" @@ -1371,6 +1523,74 @@ "InstanceType": "c6g.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gd.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gd.medium", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gd.metal", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gn.large", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "apne2-az2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "c6i.12xlarge", "Location": "apne2-az2" @@ -1427,6 +1647,34 @@ "InstanceType": "d2.xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "g4dn.12xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "g4dn.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "g4dn.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "g4dn.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "g4dn.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "g4dn.metal", + "Location": "apne2-az2" + }, + { + "InstanceType": "g4dn.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "i3.16xlarge", "Location": "apne2-az2" @@ -1919,6 +2167,54 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "apne2-az2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "apne2-az2" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "apne2-az2" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "apne2-az2" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "apne2-az2" + }, { "InstanceType": "c4.2xlarge", "Location": "apne2-az3" @@ -2107,6 +2403,74 @@ "InstanceType": "c6g.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gd.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gd.medium", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gd.metal", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gn.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "apne2-az3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "c6i.12xlarge", "Location": "apne2-az3" @@ -2827,6 +3191,42 @@ "InstanceType": "r5d.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "r5dn.large", + "Location": "apne2-az3" + }, + { + "InstanceType": "r5dn.metal", + "Location": "apne2-az3" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "r5n.12xlarge", "Location": "apne2-az3" @@ -3091,6 +3491,54 @@ "InstanceType": "x1e.xlarge", "Location": "apne2-az3" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "x2idn.metal", + "Location": "apne2-az3" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "apne2-az3" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "apne2-az3" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "apne2-az3" + }, { "InstanceType": "z1d.12xlarge", "Location": "apne2-az3" @@ -3191,6 +3639,42 @@ "InstanceType": "c5d.xlarge", "Location": "apne2-az4" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "c6g.large", + "Location": "apne2-az4" + }, + { + "InstanceType": "c6g.medium", + "Location": "apne2-az4" + }, + { + "InstanceType": "c6g.metal", + "Location": "apne2-az4" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "apne2-az4" + }, { "InstanceType": "c6i.12xlarge", "Location": "apne2-az4" @@ -3515,6 +3999,78 @@ "InstanceType": "r5d.xlarge", "Location": "apne2-az4" }, + { + "InstanceType": "r5n.12xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "r5n.large", + "Location": "apne2-az4" + }, + { + "InstanceType": "r5n.metal", + "Location": "apne2-az4" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "r6g.12xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "apne2-az4" + }, + { + "InstanceType": "r6g.large", + "Location": "apne2-az4" + }, + { + "InstanceType": "r6g.medium", + "Location": "apne2-az4" + }, + { + "InstanceType": "r6g.metal", + "Location": "apne2-az4" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "apne2-az4" + }, { "InstanceType": "r6i.12xlarge", "Location": "apne2-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json index 72d32ea29..f0925b4f3 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-northeast-3.json @@ -71,6 +71,78 @@ "InstanceType": "c5d.xlarge", "Location": "apne3-az1" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6g.large", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6g.medium", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6g.metal", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6gd.large", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6gd.medium", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6gd.metal", + "Location": "apne3-az1" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "apne3-az1" + }, { "InstanceType": "g4dn.12xlarge", "Location": "apne3-az1" @@ -403,6 +475,78 @@ "InstanceType": "c5d.xlarge", "Location": "apne3-az2" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6g.large", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6g.medium", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6g.metal", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6gd.large", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6gd.medium", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6gd.metal", + "Location": "apne3-az2" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "apne3-az2" + }, { "InstanceType": "g4dn.12xlarge", "Location": "apne3-az2" @@ -743,6 +887,78 @@ "InstanceType": "c5d.xlarge", "Location": "apne3-az3" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6g.large", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6g.medium", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6g.metal", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6gd.large", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6gd.medium", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6gd.metal", + "Location": "apne3-az3" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "apne3-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "apne3-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json index 374274907..f677e3203 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-south-1.json @@ -151,6 +151,50 @@ "InstanceType": "c5n.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6a.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6a.metal", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "c6g.12xlarge", "Location": "aps1-az1" @@ -223,6 +267,30 @@ "InstanceType": "c6gd.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6gn.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "aps1-az1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "c6i.12xlarge", "Location": "aps1-az1" @@ -323,6 +391,38 @@ "InstanceType": "g4dn.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "g5.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "i2.2xlarge", "Location": "aps1-az1" @@ -611,6 +711,10 @@ "InstanceType": "m6a.large", "Location": "aps1-az1" }, + { + "InstanceType": "m6a.metal", + "Location": "aps1-az1" + }, { "InstanceType": "m6a.xlarge", "Location": "aps1-az1" @@ -959,6 +1063,50 @@ "InstanceType": "r5n.xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "r6a.large", + "Location": "aps1-az1" + }, + { + "InstanceType": "r6a.metal", + "Location": "aps1-az1" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "r6g.12xlarge", "Location": "aps1-az1" @@ -1235,6 +1383,42 @@ "InstanceType": "x2idn.32xlarge", "Location": "aps1-az1" }, + { + "InstanceType": "x2idn.metal", + "Location": "aps1-az1" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "aps1-az1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "aps1-az1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "aps1-az1" + }, { "InstanceType": "z1d.12xlarge", "Location": "aps1-az1" @@ -1419,6 +1603,50 @@ "InstanceType": "c5n.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6a.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6a.metal", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "c6g.12xlarge", "Location": "aps1-az2" @@ -1491,6 +1719,38 @@ "InstanceType": "c6gd.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6gn.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "aps1-az2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "c6i.12xlarge", "Location": "aps1-az2" @@ -1839,6 +2099,10 @@ "InstanceType": "m6a.large", "Location": "aps1-az2" }, + { + "InstanceType": "m6a.metal", + "Location": "aps1-az2" + }, { "InstanceType": "m6a.xlarge", "Location": "aps1-az2" @@ -2131,6 +2395,50 @@ "InstanceType": "r5n.xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6a.large", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6a.metal", + "Location": "aps1-az2" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "aps1-az2" + }, { "InstanceType": "r6g.12xlarge", "Location": "aps1-az2" @@ -2343,6 +2651,22 @@ "InstanceType": "x1.32xlarge", "Location": "aps1-az2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "aps1-az2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "aps1-az2" + }, { "InstanceType": "a1.2xlarge", "Location": "aps1-az3" @@ -2519,6 +2843,50 @@ "InstanceType": "c5n.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6a.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6a.metal", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "c6g.12xlarge", "Location": "aps1-az3" @@ -2591,6 +2959,38 @@ "InstanceType": "c6gd.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6gn.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "aps1-az3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "c6i.12xlarge", "Location": "aps1-az3" @@ -2691,6 +3091,38 @@ "InstanceType": "g4dn.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "g5.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "g5.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "i2.2xlarge", "Location": "aps1-az3" @@ -2979,6 +3411,10 @@ "InstanceType": "m6a.large", "Location": "aps1-az3" }, + { + "InstanceType": "m6a.metal", + "Location": "aps1-az3" + }, { "InstanceType": "m6a.xlarge", "Location": "aps1-az3" @@ -3323,6 +3759,50 @@ "InstanceType": "r5n.xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6a.large", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6a.metal", + "Location": "aps1-az3" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "r6g.12xlarge", "Location": "aps1-az3" @@ -3599,6 +4079,42 @@ "InstanceType": "x2idn.32xlarge", "Location": "aps1-az3" }, + { + "InstanceType": "x2idn.metal", + "Location": "aps1-az3" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "aps1-az3" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "aps1-az3" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "aps1-az3" + }, { "InstanceType": "z1d.12xlarge", "Location": "aps1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json index 9db1ee84f..6d64e9dc9 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-1.json @@ -275,6 +275,38 @@ "InstanceType": "c6gd.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6gn.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "apse1-az1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "c6i.12xlarge", "Location": "apse1-az1" @@ -495,6 +527,38 @@ "InstanceType": "i3en.xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "apse1-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "apse1-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "apse1-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "apse1-az1" + }, { "InstanceType": "inf1.24xlarge", "Location": "apse1-az1" @@ -931,6 +995,10 @@ "InstanceType": "mac1.metal", "Location": "apse1-az1" }, + { + "InstanceType": "mac2.metal", + "Location": "apse1-az1" + }, { "InstanceType": "p2.16xlarge", "Location": "apse1-az1" @@ -1531,6 +1599,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "x2idn.metal", + "Location": "apse1-az1" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "apse1-az1" @@ -1555,6 +1627,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "apse1-az1" }, + { + "InstanceType": "x2iedn.metal", + "Location": "apse1-az1" + }, { "InstanceType": "x2iedn.xlarge", "Location": "apse1-az1" @@ -1895,6 +1971,38 @@ "InstanceType": "c6gd.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6gn.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "apse1-az2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "c6i.12xlarge", "Location": "apse1-az2" @@ -2115,6 +2223,38 @@ "InstanceType": "i3en.xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "apse1-az2" + }, + { + "InstanceType": "i4i.large", + "Location": "apse1-az2" + }, + { + "InstanceType": "i4i.metal", + "Location": "apse1-az2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "apse1-az2" + }, { "InstanceType": "inf1.24xlarge", "Location": "apse1-az2" @@ -2551,6 +2691,10 @@ "InstanceType": "mac1.metal", "Location": "apse1-az2" }, + { + "InstanceType": "mac2.metal", + "Location": "apse1-az2" + }, { "InstanceType": "p2.16xlarge", "Location": "apse1-az2" @@ -3135,6 +3279,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "x2idn.metal", + "Location": "apse1-az2" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "apse1-az2" @@ -3159,6 +3307,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "apse1-az2" }, + { + "InstanceType": "x2iedn.metal", + "Location": "apse1-az2" + }, { "InstanceType": "x2iedn.xlarge", "Location": "apse1-az2" @@ -3447,6 +3599,38 @@ "InstanceType": "c6gd.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6gn.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "apse1-az3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "c6i.12xlarge", "Location": "apse1-az3" @@ -3607,6 +3791,38 @@ "InstanceType": "i3en.xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "apse1-az3" + }, + { + "InstanceType": "i4i.large", + "Location": "apse1-az3" + }, + { + "InstanceType": "i4i.metal", + "Location": "apse1-az3" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "apse1-az3" + }, { "InstanceType": "inf1.24xlarge", "Location": "apse1-az3" @@ -4495,6 +4711,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "apse1-az3" }, + { + "InstanceType": "x2idn.metal", + "Location": "apse1-az3" + }, { "InstanceType": "z1d.12xlarge", "Location": "apse1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json index ef92f4817..5ea121742 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ap-southeast-2.json @@ -307,6 +307,38 @@ "InstanceType": "c6gd.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6gn.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "apse2-az1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "c6i.12xlarge", "Location": "apse2-az1" @@ -515,6 +547,62 @@ "InstanceType": "i3en.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "apse2-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "im4gn.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "inf1.24xlarge", "Location": "apse2-az1" @@ -531,6 +619,30 @@ "InstanceType": "inf1.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "is4gen.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "is4gen.medium", + "Location": "apse2-az1" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "m1.large", "Location": "apse2-az1" @@ -1047,6 +1159,42 @@ "InstanceType": "r5ad.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5b.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5b.metal", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "r5d.12xlarge", "Location": "apse2-az1" @@ -1083,6 +1231,42 @@ "InstanceType": "r5d.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5dn.large", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5dn.metal", + "Location": "apse2-az1" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "r5n.12xlarge", "Location": "apse2-az1" @@ -1387,6 +1571,54 @@ "InstanceType": "x1e.xlarge", "Location": "apse2-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "apse2-az1" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "apse2-az1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "apse2-az1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "apse2-az1" + }, { "InstanceType": "z1d.12xlarge", "Location": "apse2-az1" @@ -1715,6 +1947,38 @@ "InstanceType": "c6gd.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6gn.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "apse2-az2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "c6i.12xlarge", "Location": "apse2-az2" @@ -1887,6 +2151,62 @@ "InstanceType": "i3en.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "i4i.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "i4i.metal", + "Location": "apse2-az2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "im4gn.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "inf1.24xlarge", "Location": "apse2-az2" @@ -1903,6 +2223,30 @@ "InstanceType": "inf1.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "is4gen.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "is4gen.medium", + "Location": "apse2-az2" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "m3.2xlarge", "Location": "apse2-az2" @@ -2375,6 +2719,42 @@ "InstanceType": "r5ad.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5b.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5b.metal", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "r5d.12xlarge", "Location": "apse2-az2" @@ -2411,6 +2791,42 @@ "InstanceType": "r5d.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5dn.large", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5dn.metal", + "Location": "apse2-az2" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "r5n.12xlarge", "Location": "apse2-az2" @@ -2711,6 +3127,54 @@ "InstanceType": "x1e.xlarge", "Location": "apse2-az2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "apse2-az2" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "apse2-az2" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "apse2-az2" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "apse2-az2" + }, { "InstanceType": "z1d.12xlarge", "Location": "apse2-az2" @@ -2991,6 +3455,38 @@ "InstanceType": "c6gd.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6gn.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "apse2-az3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "c6i.12xlarge", "Location": "apse2-az3" @@ -3187,6 +3683,62 @@ "InstanceType": "i3en.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "i4i.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "i4i.metal", + "Location": "apse2-az3" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "im4gn.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "inf1.24xlarge", "Location": "apse2-az3" @@ -3203,6 +3755,30 @@ "InstanceType": "inf1.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "is4gen.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "is4gen.medium", + "Location": "apse2-az3" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "m1.large", "Location": "apse2-az3" @@ -3667,6 +4243,42 @@ "InstanceType": "r5ad.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5b.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5b.metal", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "r5d.12xlarge", "Location": "apse2-az3" @@ -3703,6 +4315,42 @@ "InstanceType": "r5d.xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5dn.large", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5dn.metal", + "Location": "apse2-az3" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "r5n.12xlarge", "Location": "apse2-az3" @@ -3975,6 +4623,54 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "apse2-az3" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "x2idn.metal", + "Location": "apse2-az3" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "apse2-az3" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "apse2-az3" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "apse2-az3" + }, { "InstanceType": "z1d.12xlarge", "Location": "apse2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json index 464949d56..deb8cb477 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/ca-central-1.json @@ -279,6 +279,22 @@ "InstanceType": "d2.xlarge", "Location": "cac1-az1" }, + { + "InstanceType": "d3.2xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "d3.4xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "d3.8xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "d3.xlarge", + "Location": "cac1-az1" + }, { "InstanceType": "g3.16xlarge", "Location": "cac1-az1" @@ -339,6 +355,38 @@ "InstanceType": "g4dn.xlarge", "Location": "cac1-az1" }, + { + "InstanceType": "g5.12xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "cac1-az1" + }, { "InstanceType": "i3.16xlarge", "Location": "cac1-az1" @@ -395,6 +443,38 @@ "InstanceType": "i3en.xlarge", "Location": "cac1-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "cac1-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "cac1-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "cac1-az1" + }, { "InstanceType": "inf1.24xlarge", "Location": "cac1-az1" @@ -771,6 +851,42 @@ "InstanceType": "r5ad.xlarge", "Location": "cac1-az1" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "r5b.large", + "Location": "cac1-az1" + }, + { + "InstanceType": "r5b.metal", + "Location": "cac1-az1" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "cac1-az1" + }, { "InstanceType": "r5d.12xlarge", "Location": "cac1-az1" @@ -1099,6 +1215,54 @@ "InstanceType": "x1e.xlarge", "Location": "cac1-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "cac1-az1" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "cac1-az1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "cac1-az1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "cac1-az1" + }, { "InstanceType": "c4.2xlarge", "Location": "cac1-az2" @@ -1323,6 +1487,38 @@ "InstanceType": "c6gd.xlarge", "Location": "cac1-az2" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "c6gn.large", + "Location": "cac1-az2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "cac1-az2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "cac1-az2" + }, { "InstanceType": "c6i.12xlarge", "Location": "cac1-az2" @@ -1379,6 +1575,22 @@ "InstanceType": "d2.xlarge", "Location": "cac1-az2" }, + { + "InstanceType": "d3.2xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "d3.4xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "d3.8xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "d3.xlarge", + "Location": "cac1-az2" + }, { "InstanceType": "g3.16xlarge", "Location": "cac1-az2" @@ -1439,6 +1651,38 @@ "InstanceType": "g4dn.xlarge", "Location": "cac1-az2" }, + { + "InstanceType": "g5.12xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "g5.xlarge", + "Location": "cac1-az2" + }, { "InstanceType": "i3.16xlarge", "Location": "cac1-az2" @@ -1495,6 +1739,62 @@ "InstanceType": "i3en.xlarge", "Location": "cac1-az2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "i4i.large", + "Location": "cac1-az2" + }, + { + "InstanceType": "i4i.metal", + "Location": "cac1-az2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "im4gn.large", + "Location": "cac1-az2" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "cac1-az2" + }, { "InstanceType": "inf1.24xlarge", "Location": "cac1-az2" @@ -1511,6 +1811,30 @@ "InstanceType": "inf1.xlarge", "Location": "cac1-az2" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "is4gen.large", + "Location": "cac1-az2" + }, + { + "InstanceType": "is4gen.medium", + "Location": "cac1-az2" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "cac1-az2" + }, { "InstanceType": "m4.10xlarge", "Location": "cac1-az2" @@ -1883,6 +2207,42 @@ "InstanceType": "r5ad.xlarge", "Location": "cac1-az2" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "r5b.large", + "Location": "cac1-az2" + }, + { + "InstanceType": "r5b.metal", + "Location": "cac1-az2" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "cac1-az2" + }, { "InstanceType": "r5d.12xlarge", "Location": "cac1-az2" @@ -2175,6 +2535,54 @@ "InstanceType": "x1e.xlarge", "Location": "cac1-az2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "cac1-az2" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "cac1-az2" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "cac1-az2" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "cac1-az2" + }, { "InstanceType": "c5.12xlarge", "Location": "cac1-az4" @@ -2343,6 +2751,74 @@ "InstanceType": "c6g.xlarge", "Location": "cac1-az4" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gd.large", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gd.medium", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gd.metal", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gn.large", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gn.medium", + "Location": "cac1-az4" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "cac1-az4" + }, { "InstanceType": "c6i.12xlarge", "Location": "cac1-az4" @@ -2383,6 +2859,22 @@ "InstanceType": "c6i.xlarge", "Location": "cac1-az4" }, + { + "InstanceType": "d3.2xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "d3.4xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "d3.8xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "d3.xlarge", + "Location": "cac1-az4" + }, { "InstanceType": "i3.16xlarge", "Location": "cac1-az4" @@ -2443,6 +2935,86 @@ "InstanceType": "i3en.xlarge", "Location": "cac1-az4" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "i4i.large", + "Location": "cac1-az4" + }, + { + "InstanceType": "i4i.metal", + "Location": "cac1-az4" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "im4gn.large", + "Location": "cac1-az4" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "is4gen.large", + "Location": "cac1-az4" + }, + { + "InstanceType": "is4gen.medium", + "Location": "cac1-az4" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "cac1-az4" + }, { "InstanceType": "m5.12xlarge", "Location": "cac1-az4" @@ -2627,6 +3199,42 @@ "InstanceType": "r5.xlarge", "Location": "cac1-az4" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "r5b.large", + "Location": "cac1-az4" + }, + { + "InstanceType": "r5b.metal", + "Location": "cac1-az4" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "cac1-az4" + }, { "InstanceType": "r5d.12xlarge", "Location": "cac1-az4" @@ -2866,5 +3474,53 @@ { "InstanceType": "t4g.xlarge", "Location": "cac1-az4" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "x2idn.metal", + "Location": "cac1-az4" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "cac1-az4" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "cac1-az4" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "cac1-az4" } ] \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json index 3189dbc93..1624ce17e 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-central-1.json @@ -183,6 +183,50 @@ "InstanceType": "c5n.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6a.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6a.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "c6g.12xlarge", "Location": "euc1-az1" @@ -255,6 +299,78 @@ "InstanceType": "c6gd.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6gn.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6i.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6i.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "euc1-az1" @@ -295,6 +411,66 @@ "InstanceType": "f1.4xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "g4dn.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g4dn.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g4dn.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g4dn.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g4dn.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g4dn.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "g4dn.xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g5.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "i3.16xlarge", "Location": "euc1-az1" @@ -355,6 +531,62 @@ "InstanceType": "i3en.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "im4gn.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "inf1.24xlarge", "Location": "euc1-az1" @@ -371,6 +603,30 @@ "InstanceType": "inf1.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "is4gen.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "is4gen.medium", + "Location": "euc1-az1" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "m4.10xlarge", "Location": "euc1-az1" @@ -567,6 +823,50 @@ "InstanceType": "m5n.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6a.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6a.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "m6g.12xlarge", "Location": "euc1-az1" @@ -951,6 +1251,50 @@ "InstanceType": "r5n.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6a.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6a.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "r6g.12xlarge", "Location": "euc1-az1" @@ -1023,6 +1367,46 @@ "InstanceType": "r6gd.xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6i.large", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6i.metal", + "Location": "euc1-az1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "euc1-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az1" @@ -1195,6 +1579,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "x2idn.metal", + "Location": "euc1-az1" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "euc1-az1" @@ -1219,6 +1607,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "euc1-az1" }, + { + "InstanceType": "x2iedn.metal", + "Location": "euc1-az1" + }, { "InstanceType": "x2iedn.xlarge", "Location": "euc1-az1" @@ -1551,6 +1943,38 @@ "InstanceType": "c6gd.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6gn.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "euc1-az2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "euc1-az2" @@ -1731,6 +2155,62 @@ "InstanceType": "i3en.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "i4i.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "i4i.metal", + "Location": "euc1-az2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "im4gn.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "inf1.24xlarge", "Location": "euc1-az2" @@ -1747,6 +2227,30 @@ "InstanceType": "inf1.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "is4gen.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "is4gen.medium", + "Location": "euc1-az2" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "m3.2xlarge", "Location": "euc1-az2" @@ -2523,6 +3027,46 @@ "InstanceType": "r6gd.xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6i.large", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6i.metal", + "Location": "euc1-az2" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "euc1-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az2" @@ -2691,6 +3235,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "x2idn.metal", + "Location": "euc1-az2" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "euc1-az2" @@ -2715,6 +3263,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "euc1-az2" }, + { + "InstanceType": "x2iedn.metal", + "Location": "euc1-az2" + }, { "InstanceType": "x2iedn.xlarge", "Location": "euc1-az2" @@ -2975,6 +3527,50 @@ "InstanceType": "c5n.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6a.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6a.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "c6g.12xlarge", "Location": "euc1-az3" @@ -3047,6 +3643,78 @@ "InstanceType": "c6gd.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6gn.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6i.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6i.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "euc1-az3" @@ -3159,6 +3827,38 @@ "InstanceType": "g4dn.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "g5.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "g5.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "i2.2xlarge", "Location": "euc1-az3" @@ -3235,6 +3935,62 @@ "InstanceType": "i3en.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "i4i.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "i4i.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "im4gn.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "inf1.24xlarge", "Location": "euc1-az3" @@ -3251,6 +4007,30 @@ "InstanceType": "inf1.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "is4gen.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "is4gen.medium", + "Location": "euc1-az3" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "m3.2xlarge", "Location": "euc1-az3" @@ -3527,6 +4307,50 @@ "InstanceType": "m5zn.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6a.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6a.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "m6g.12xlarge", "Location": "euc1-az3" @@ -3955,6 +4779,50 @@ "InstanceType": "r5n.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6a.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6a.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "r6g.12xlarge", "Location": "euc1-az3" @@ -4027,6 +4895,46 @@ "InstanceType": "r6gd.xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6i.large", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6i.metal", + "Location": "euc1-az3" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "euc1-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "euc1-az3" @@ -4203,6 +5111,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "x2idn.metal", + "Location": "euc1-az3" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "euc1-az3" @@ -4227,6 +5139,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "euc1-az3" }, + { + "InstanceType": "x2iedn.metal", + "Location": "euc1-az3" + }, { "InstanceType": "x2iedn.xlarge", "Location": "euc1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json index 0a05b3218..36c38546b 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-north-1.json @@ -167,6 +167,78 @@ "InstanceType": "c6g.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6gn.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6i.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6i.metal", + "Location": "eun1-az1" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "eun1-az1" @@ -395,6 +467,82 @@ "InstanceType": "m6g.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6gd.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6gd.medium", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6gd.metal", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6i.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6i.metal", + "Location": "eun1-az1" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "mac1.metal", "Location": "eun1-az1" @@ -543,6 +691,46 @@ "InstanceType": "r6g.xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6i.large", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6i.metal", + "Location": "eun1-az1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "t3.2xlarge", "Location": "eun1-az1" @@ -607,6 +795,54 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "eun1-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eun1-az1" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eun1-az1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eun1-az1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eun1-az1" + }, { "InstanceType": "c5.12xlarge", "Location": "eun1-az2" @@ -775,6 +1011,78 @@ "InstanceType": "c6g.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6gn.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6i.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6i.metal", + "Location": "eun1-az2" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "eun1-az2" @@ -819,6 +1127,10 @@ "InstanceType": "g4dn.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "hpc6a.48xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "i3.16xlarge", "Location": "eun1-az2" @@ -987,6 +1299,82 @@ "InstanceType": "m6g.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6gd.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6gd.medium", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6gd.metal", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6i.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6i.metal", + "Location": "eun1-az2" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "mac1.metal", "Location": "eun1-az2" @@ -1063,6 +1451,42 @@ "InstanceType": "r5d.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r5dn.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "r5dn.metal", + "Location": "eun1-az2" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "r5n.12xlarge", "Location": "eun1-az2" @@ -1135,6 +1559,46 @@ "InstanceType": "r6g.xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6i.large", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6i.metal", + "Location": "eun1-az2" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "eun1-az2" @@ -1199,6 +1663,54 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "eun1-az2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eun1-az2" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eun1-az2" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eun1-az2" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eun1-az2" + }, { "InstanceType": "c5.12xlarge", "Location": "eun1-az3" @@ -1367,6 +1879,78 @@ "InstanceType": "c6g.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6gn.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6i.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6i.metal", + "Location": "eun1-az3" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "eun1-az3" @@ -1595,6 +2179,82 @@ "InstanceType": "m6g.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6gd.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6gd.medium", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6gd.metal", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6i.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6i.metal", + "Location": "eun1-az3" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "r5.12xlarge", "Location": "eun1-az3" @@ -1667,6 +2327,42 @@ "InstanceType": "r5d.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r5dn.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "r5dn.metal", + "Location": "eun1-az3" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "r5n.12xlarge", "Location": "eun1-az3" @@ -1739,6 +2435,46 @@ "InstanceType": "r6g.xlarge", "Location": "eun1-az3" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6i.large", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6i.metal", + "Location": "eun1-az3" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eun1-az3" + }, { "InstanceType": "t3.2xlarge", "Location": "eun1-az3" @@ -1794,5 +2530,53 @@ { "InstanceType": "t4g.xlarge", "Location": "eun1-az3" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eun1-az3" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eun1-az3" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eun1-az3" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eun1-az3" } ] \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json index 287552420..8c46cc47d 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-south-1.json @@ -199,6 +199,78 @@ "InstanceType": "c6g.xlarge", "Location": "eus1-az1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6gn.large", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6i.large", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6i.metal", + "Location": "eus1-az1" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eus1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "eus1-az1" @@ -431,6 +503,46 @@ "InstanceType": "m6g.xlarge", "Location": "eus1-az1" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6i.large", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6i.metal", + "Location": "eus1-az1" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eus1-az1" + }, { "InstanceType": "r5.12xlarge", "Location": "eus1-az1" @@ -535,6 +647,78 @@ "InstanceType": "r5d.xlarge", "Location": "eus1-az1" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5dn.large", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5dn.metal", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5n.12xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5n.large", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5n.metal", + "Location": "eus1-az1" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "eus1-az1" + }, { "InstanceType": "r6g.12xlarge", "Location": "eus1-az1" @@ -571,6 +755,46 @@ "InstanceType": "r6g.xlarge", "Location": "eus1-az1" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "r6i.large", + "Location": "eus1-az1" + }, + { + "InstanceType": "r6i.metal", + "Location": "eus1-az1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eus1-az1" + }, { "InstanceType": "t3.2xlarge", "Location": "eus1-az1" @@ -659,6 +883,54 @@ "InstanceType": "u-3tb1.56xlarge", "Location": "eus1-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eus1-az1" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eus1-az1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eus1-az1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eus1-az1" + }, { "InstanceType": "c5.12xlarge", "Location": "eus1-az2" @@ -859,6 +1131,78 @@ "InstanceType": "c6g.xlarge", "Location": "eus1-az2" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6gn.large", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6i.large", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6i.metal", + "Location": "eus1-az2" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eus1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "eus1-az2" @@ -1119,6 +1463,46 @@ "InstanceType": "m6g.xlarge", "Location": "eus1-az2" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6i.large", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6i.metal", + "Location": "eus1-az2" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eus1-az2" + }, { "InstanceType": "r5.12xlarge", "Location": "eus1-az2" @@ -1223,6 +1607,78 @@ "InstanceType": "r5d.xlarge", "Location": "eus1-az2" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5dn.large", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5dn.metal", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5n.12xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5n.large", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5n.metal", + "Location": "eus1-az2" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "eus1-az2" + }, { "InstanceType": "r6g.12xlarge", "Location": "eus1-az2" @@ -1259,6 +1715,46 @@ "InstanceType": "r6g.xlarge", "Location": "eus1-az2" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "r6i.large", + "Location": "eus1-az2" + }, + { + "InstanceType": "r6i.metal", + "Location": "eus1-az2" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eus1-az2" + }, { "InstanceType": "t3.2xlarge", "Location": "eus1-az2" @@ -1347,6 +1843,54 @@ "InstanceType": "u-3tb1.56xlarge", "Location": "eus1-az2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eus1-az2" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eus1-az2" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eus1-az2" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eus1-az2" + }, { "InstanceType": "c5.12xlarge", "Location": "eus1-az3" @@ -1547,6 +2091,78 @@ "InstanceType": "c6g.xlarge", "Location": "eus1-az3" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6gn.large", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6i.large", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6i.metal", + "Location": "eus1-az3" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eus1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "eus1-az3" @@ -1791,6 +2407,46 @@ "InstanceType": "m6g.xlarge", "Location": "eus1-az3" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6i.large", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6i.metal", + "Location": "eus1-az3" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eus1-az3" + }, { "InstanceType": "r5.12xlarge", "Location": "eus1-az3" @@ -1895,6 +2551,78 @@ "InstanceType": "r5d.xlarge", "Location": "eus1-az3" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5dn.large", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5dn.metal", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5n.12xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5n.large", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5n.metal", + "Location": "eus1-az3" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "eus1-az3" + }, { "InstanceType": "r6g.12xlarge", "Location": "eus1-az3" @@ -1931,6 +2659,46 @@ "InstanceType": "r6g.xlarge", "Location": "eus1-az3" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "r6i.large", + "Location": "eus1-az3" + }, + { + "InstanceType": "r6i.metal", + "Location": "eus1-az3" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eus1-az3" + }, { "InstanceType": "t3.2xlarge", "Location": "eus1-az3" @@ -2014,5 +2782,53 @@ { "InstanceType": "t4g.xlarge", "Location": "eus1-az3" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eus1-az3" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eus1-az3" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eus1-az3" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eus1-az3" } ] \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json index 1e271970f..73a8dff34 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-1.json @@ -271,6 +271,10 @@ "InstanceType": "c6a.large", "Location": "euw1-az1" }, + { + "InstanceType": "c6a.metal", + "Location": "euw1-az1" + }, { "InstanceType": "c6a.xlarge", "Location": "euw1-az1" @@ -419,6 +423,78 @@ "InstanceType": "c6i.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c6id.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "c6id.metal", + "Location": "euw1-az1" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7g.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7g.medium", + "Location": "euw1-az1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "cc2.8xlarge", "Location": "euw1-az1" @@ -671,6 +747,38 @@ "InstanceType": "i3en.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "euw1-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "im4gn.16xlarge", "Location": "euw1-az1" @@ -1071,6 +1179,10 @@ "InstanceType": "m6a.large", "Location": "euw1-az1" }, + { + "InstanceType": "m6a.metal", + "Location": "euw1-az1" + }, { "InstanceType": "m6a.xlarge", "Location": "euw1-az1" @@ -1187,10 +1299,54 @@ "InstanceType": "m6i.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6id.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6id.metal", + "Location": "euw1-az1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "mac1.metal", "Location": "euw1-az1" }, + { + "InstanceType": "mac2.metal", + "Location": "euw1-az1" + }, { "InstanceType": "p2.16xlarge", "Location": "euw1-az1" @@ -1495,6 +1651,50 @@ "InstanceType": "r5n.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6a.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6a.metal", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "r6g.12xlarge", "Location": "euw1-az1" @@ -1607,6 +1807,46 @@ "InstanceType": "r6i.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6id.large", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6id.metal", + "Location": "euw1-az1" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "euw1-az1" + }, { "InstanceType": "t1.micro", "Location": "euw1-az1" @@ -1823,6 +2063,22 @@ "InstanceType": "x2gd.xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "euw1-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "euw1-az1" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "euw1-az1" @@ -1847,6 +2103,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "euw1-az1" }, + { + "InstanceType": "x2iedn.metal", + "Location": "euw1-az1" + }, { "InstanceType": "x2iedn.xlarge", "Location": "euw1-az1" @@ -2175,6 +2435,10 @@ "InstanceType": "c6a.large", "Location": "euw1-az2" }, + { + "InstanceType": "c6a.metal", + "Location": "euw1-az2" + }, { "InstanceType": "c6a.xlarge", "Location": "euw1-az2" @@ -2323,6 +2587,78 @@ "InstanceType": "c6i.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c6id.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "c6id.metal", + "Location": "euw1-az2" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7g.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7g.medium", + "Location": "euw1-az2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "cc2.8xlarge", "Location": "euw1-az2" @@ -2591,6 +2927,38 @@ "InstanceType": "i3en.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "i4i.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "i4i.metal", + "Location": "euw1-az2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "im4gn.16xlarge", "Location": "euw1-az2" @@ -2991,6 +3359,10 @@ "InstanceType": "m6a.large", "Location": "euw1-az2" }, + { + "InstanceType": "m6a.metal", + "Location": "euw1-az2" + }, { "InstanceType": "m6a.xlarge", "Location": "euw1-az2" @@ -3107,10 +3479,54 @@ "InstanceType": "m6i.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "m6id.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "m6id.metal", + "Location": "euw1-az2" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "mac1.metal", "Location": "euw1-az2" }, + { + "InstanceType": "mac2.metal", + "Location": "euw1-az2" + }, { "InstanceType": "p2.16xlarge", "Location": "euw1-az2" @@ -3431,6 +3847,50 @@ "InstanceType": "r5n.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6a.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6a.metal", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "r6g.12xlarge", "Location": "euw1-az2" @@ -3543,6 +4003,46 @@ "InstanceType": "r6i.xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6id.large", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6id.metal", + "Location": "euw1-az2" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "euw1-az2" + }, { "InstanceType": "t1.micro", "Location": "euw1-az2" @@ -3759,6 +4259,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "x2idn.metal", + "Location": "euw1-az2" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "euw1-az2" @@ -3783,6 +4287,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "euw1-az2" }, + { + "InstanceType": "x2iedn.metal", + "Location": "euw1-az2" + }, { "InstanceType": "x2iedn.xlarge", "Location": "euw1-az2" @@ -4055,6 +4563,10 @@ "InstanceType": "c6a.large", "Location": "euw1-az3" }, + { + "InstanceType": "c6a.metal", + "Location": "euw1-az3" + }, { "InstanceType": "c6a.xlarge", "Location": "euw1-az3" @@ -4203,6 +4715,78 @@ "InstanceType": "c6i.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c6id.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "c6id.metal", + "Location": "euw1-az3" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7g.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7g.medium", + "Location": "euw1-az3" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "cc2.8xlarge", "Location": "euw1-az3" @@ -4471,6 +5055,38 @@ "InstanceType": "i3en.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "i4i.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "i4i.metal", + "Location": "euw1-az3" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "im4gn.16xlarge", "Location": "euw1-az3" @@ -4871,6 +5487,10 @@ "InstanceType": "m6a.large", "Location": "euw1-az3" }, + { + "InstanceType": "m6a.metal", + "Location": "euw1-az3" + }, { "InstanceType": "m6a.xlarge", "Location": "euw1-az3" @@ -4987,6 +5607,46 @@ "InstanceType": "m6i.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "m6id.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "m6id.metal", + "Location": "euw1-az3" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "p2.16xlarge", "Location": "euw1-az3" @@ -5299,6 +5959,50 @@ "InstanceType": "r5n.xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6a.large", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6a.metal", + "Location": "euw1-az3" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "euw1-az3" + }, { "InstanceType": "r6g.12xlarge", "Location": "euw1-az3" @@ -5611,6 +6315,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "x2idn.metal", + "Location": "euw1-az3" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "euw1-az3" @@ -5635,6 +6343,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "euw1-az3" }, + { + "InstanceType": "x2iedn.metal", + "Location": "euw1-az3" + }, { "InstanceType": "x2iedn.xlarge", "Location": "euw1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json index 72bf270a1..646752a03 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-2.json @@ -223,6 +223,38 @@ "InstanceType": "c6gd.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6gn.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "euw2-az1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "c6i.12xlarge", "Location": "euw2-az1" @@ -411,6 +443,102 @@ "InstanceType": "i3en.xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "euw2-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "im4gn.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "inf1.24xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "inf1.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "inf1.6xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "inf1.xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "is4gen.large", + "Location": "euw2-az1" + }, + { + "InstanceType": "is4gen.medium", + "Location": "euw2-az1" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "m4.10xlarge", "Location": "euw2-az1" @@ -1115,6 +1243,54 @@ "InstanceType": "x1.32xlarge", "Location": "euw2-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "euw2-az1" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "euw2-az1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "euw2-az1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "euw2-az1" + }, { "InstanceType": "z1d.12xlarge", "Location": "euw2-az1" @@ -1331,6 +1507,74 @@ "InstanceType": "c6g.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gd.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gd.medium", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gd.metal", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gn.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "euw2-az2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "c6i.12xlarge", "Location": "euw2-az2" @@ -1475,6 +1719,38 @@ "InstanceType": "g4dn.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "g5.12xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "g5.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "i3.16xlarge", "Location": "euw2-az2" @@ -1535,6 +1811,62 @@ "InstanceType": "i3en.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "i4i.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "i4i.metal", + "Location": "euw2-az2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "im4gn.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "inf1.24xlarge", "Location": "euw2-az2" @@ -1551,6 +1883,30 @@ "InstanceType": "inf1.xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "is4gen.large", + "Location": "euw2-az2" + }, + { + "InstanceType": "is4gen.medium", + "Location": "euw2-az2" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "m4.10xlarge", "Location": "euw2-az2" @@ -2267,6 +2623,54 @@ "InstanceType": "x1.32xlarge", "Location": "euw2-az2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "euw2-az2" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "euw2-az2" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "euw2-az2" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "euw2-az2" + }, { "InstanceType": "z1d.12xlarge", "Location": "euw2-az2" @@ -2519,6 +2923,38 @@ "InstanceType": "c6gd.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6gn.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "euw2-az3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "c6i.12xlarge", "Location": "euw2-az3" @@ -2619,6 +3055,38 @@ "InstanceType": "g4dn.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "g5.12xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "g5.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "i3.16xlarge", "Location": "euw2-az3" @@ -2679,6 +3147,62 @@ "InstanceType": "i3en.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "i4i.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "i4i.metal", + "Location": "euw2-az3" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "im4gn.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "inf1.24xlarge", "Location": "euw2-az3" @@ -2695,6 +3219,30 @@ "InstanceType": "inf1.xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "is4gen.large", + "Location": "euw2-az3" + }, + { + "InstanceType": "is4gen.medium", + "Location": "euw2-az3" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "m4.10xlarge", "Location": "euw2-az3" @@ -3407,6 +3955,54 @@ "InstanceType": "x1.32xlarge", "Location": "euw2-az3" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "x2idn.metal", + "Location": "euw2-az3" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "euw2-az3" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "euw2-az3" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "euw2-az3" + }, { "InstanceType": "z1d.12xlarge", "Location": "euw2-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json index 734bbee84..2d2630d33 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/eu-west-3.json @@ -299,6 +299,38 @@ "InstanceType": "i3en.xlarge", "Location": "euw3-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "euw3-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "euw3-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "euw3-az1" + }, { "InstanceType": "inf1.24xlarge", "Location": "euw3-az1" @@ -687,6 +719,42 @@ "InstanceType": "r5d.xlarge", "Location": "euw3-az1" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "euw3-az1" + }, + { + "InstanceType": "r5dn.large", + "Location": "euw3-az1" + }, + { + "InstanceType": "r5dn.metal", + "Location": "euw3-az1" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "euw3-az1" + }, { "InstanceType": "r5n.12xlarge", "Location": "euw3-az1" @@ -1087,6 +1155,38 @@ "InstanceType": "c6g.xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6gn.large", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "euw3-az2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "euw3-az2" + }, { "InstanceType": "c6i.12xlarge", "Location": "euw3-az2" @@ -1231,6 +1331,38 @@ "InstanceType": "i3en.xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "i4i.large", + "Location": "euw3-az2" + }, + { + "InstanceType": "i4i.metal", + "Location": "euw3-az2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "euw3-az2" + }, { "InstanceType": "m5.12xlarge", "Location": "euw3-az2" @@ -1603,6 +1735,42 @@ "InstanceType": "r5d.xlarge", "Location": "euw3-az2" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "euw3-az2" + }, + { + "InstanceType": "r5dn.large", + "Location": "euw3-az2" + }, + { + "InstanceType": "r5dn.metal", + "Location": "euw3-az2" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "euw3-az2" + }, { "InstanceType": "r5n.12xlarge", "Location": "euw3-az2" @@ -2035,6 +2203,38 @@ "InstanceType": "c6g.xlarge", "Location": "euw3-az3" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6gn.large", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "euw3-az3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "euw3-az3" + }, { "InstanceType": "c6i.12xlarge", "Location": "euw3-az3" @@ -2179,6 +2379,38 @@ "InstanceType": "i3en.xlarge", "Location": "euw3-az3" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "euw3-az3" + }, + { + "InstanceType": "i4i.large", + "Location": "euw3-az3" + }, + { + "InstanceType": "i4i.metal", + "Location": "euw3-az3" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "euw3-az3" + }, { "InstanceType": "inf1.24xlarge", "Location": "euw3-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json index 05fbb047f..fbb234b0c 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/me-south-1.json @@ -187,6 +187,78 @@ "InstanceType": "c6g.xlarge", "Location": "mes1-az1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6gn.large", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6i.large", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6i.metal", + "Location": "mes1-az1" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "mes1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "mes1-az1" @@ -223,10 +295,6 @@ "InstanceType": "i3.large", "Location": "mes1-az1" }, - { - "InstanceType": "i3.metal", - "Location": "mes1-az1" - }, { "InstanceType": "i3.xlarge", "Location": "mes1-az1" @@ -371,6 +439,46 @@ "InstanceType": "m6g.xlarge", "Location": "mes1-az1" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6i.large", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6i.metal", + "Location": "mes1-az1" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "mes1-az1" + }, { "InstanceType": "r5.12xlarge", "Location": "mes1-az1" @@ -659,6 +767,78 @@ "InstanceType": "c6g.xlarge", "Location": "mes1-az2" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6gn.large", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6i.large", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6i.metal", + "Location": "mes1-az2" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "mes1-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "mes1-az2" @@ -723,10 +903,6 @@ "InstanceType": "i3.large", "Location": "mes1-az2" }, - { - "InstanceType": "i3.metal", - "Location": "mes1-az2" - }, { "InstanceType": "i3.xlarge", "Location": "mes1-az2" @@ -887,6 +1063,46 @@ "InstanceType": "m6g.xlarge", "Location": "mes1-az2" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6i.large", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6i.metal", + "Location": "mes1-az2" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "mes1-az2" + }, { "InstanceType": "r5.12xlarge", "Location": "mes1-az2" @@ -1175,6 +1391,78 @@ "InstanceType": "c6g.xlarge", "Location": "mes1-az3" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6gn.large", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6i.large", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6i.metal", + "Location": "mes1-az3" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "mes1-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "mes1-az3" @@ -1239,10 +1527,6 @@ "InstanceType": "i3.large", "Location": "mes1-az3" }, - { - "InstanceType": "i3.metal", - "Location": "mes1-az3" - }, { "InstanceType": "i3.xlarge", "Location": "mes1-az3" @@ -1403,6 +1687,46 @@ "InstanceType": "m6g.xlarge", "Location": "mes1-az3" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6i.large", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6i.metal", + "Location": "mes1-az3" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "mes1-az3" + }, { "InstanceType": "r5.12xlarge", "Location": "mes1-az3" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json index 0825a19ba..ad40637cf 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/sa-east-1.json @@ -247,6 +247,38 @@ "InstanceType": "c6g.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "c6gn.large", + "Location": "sae1-az1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "sae1-az1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "c6i.12xlarge", "Location": "sae1-az1" @@ -843,6 +875,42 @@ "InstanceType": "r5ad.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r5b.large", + "Location": "sae1-az1" + }, + { + "InstanceType": "r5b.metal", + "Location": "sae1-az1" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "r5d.12xlarge", "Location": "sae1-az1" @@ -951,6 +1019,42 @@ "InstanceType": "r6g.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "r6gd.large", + "Location": "sae1-az1" + }, + { + "InstanceType": "r6gd.medium", + "Location": "sae1-az1" + }, + { + "InstanceType": "r6gd.metal", + "Location": "sae1-az1" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "r6i.12xlarge", "Location": "sae1-az1" @@ -1139,6 +1243,54 @@ "InstanceType": "x1e.xlarge", "Location": "sae1-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "sae1-az1" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "sae1-az1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "sae1-az1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "sae1-az1" + }, { "InstanceType": "c1.medium", "Location": "sae1-az2" @@ -1347,6 +1499,38 @@ "InstanceType": "c6g.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "c6gn.large", + "Location": "sae1-az2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "sae1-az2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "c6i.12xlarge", "Location": "sae1-az2" @@ -1731,6 +1915,42 @@ "InstanceType": "r5.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r5b.large", + "Location": "sae1-az2" + }, + { + "InstanceType": "r5b.metal", + "Location": "sae1-az2" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "r5d.12xlarge", "Location": "sae1-az2" @@ -1839,6 +2059,42 @@ "InstanceType": "r6g.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "r6gd.large", + "Location": "sae1-az2" + }, + { + "InstanceType": "r6gd.medium", + "Location": "sae1-az2" + }, + { + "InstanceType": "r6gd.metal", + "Location": "sae1-az2" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "r6i.12xlarge", "Location": "sae1-az2" @@ -1963,6 +2219,54 @@ "InstanceType": "t4g.xlarge", "Location": "sae1-az2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "sae1-az2" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "sae1-az2" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "sae1-az2" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "sae1-az2" + }, { "InstanceType": "c3.2xlarge", "Location": "sae1-az3" @@ -2171,6 +2475,38 @@ "InstanceType": "c6g.xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "c6gn.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "sae1-az3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "c6i.12xlarge", "Location": "sae1-az3" @@ -2711,6 +3047,42 @@ "InstanceType": "r5ad.xlarge", "Location": "sae1-az3" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "r5b.large", + "Location": "sae1-az3" + }, + { + "InstanceType": "r5b.metal", + "Location": "sae1-az3" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "sae1-az3" + }, { "InstanceType": "r5d.12xlarge", "Location": "sae1-az3" @@ -3002,5 +3374,53 @@ { "InstanceType": "x1e.xlarge", "Location": "sae1-az3" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "x2idn.metal", + "Location": "sae1-az3" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "sae1-az3" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "sae1-az3" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "sae1-az3" } ] \ No newline at end of file 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 6b7337b9d..c2757a9cc 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 @@ -219,6 +219,10 @@ "InstanceType": "c6a.large", "Location": "use1-az1" }, + { + "InstanceType": "c6a.metal", + "Location": "use1-az1" + }, { "InstanceType": "c6a.xlarge", "Location": "use1-az1" @@ -367,6 +371,78 @@ "InstanceType": "c6i.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c6id.large", + "Location": "use1-az1" + }, + { + "InstanceType": "c6id.metal", + "Location": "use1-az1" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "c7g.large", + "Location": "use1-az1" + }, + { + "InstanceType": "c7g.medium", + "Location": "use1-az1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "use1-az1" @@ -615,6 +691,38 @@ "InstanceType": "i3en.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "use1-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "use1-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "inf1.24xlarge", "Location": "use1-az1" @@ -631,6 +739,30 @@ "InstanceType": "inf1.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "is4gen.large", + "Location": "use1-az1" + }, + { + "InstanceType": "is4gen.medium", + "Location": "use1-az1" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "m1.large", "Location": "use1-az1" @@ -951,6 +1083,10 @@ "InstanceType": "m6a.large", "Location": "use1-az1" }, + { + "InstanceType": "m6a.metal", + "Location": "use1-az1" + }, { "InstanceType": "m6a.xlarge", "Location": "use1-az1" @@ -1067,6 +1203,50 @@ "InstanceType": "m6i.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "m6id.large", + "Location": "use1-az1" + }, + { + "InstanceType": "m6id.metal", + "Location": "use1-az1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "mac2.metal", + "Location": "use1-az1" + }, { "InstanceType": "p2.16xlarge", "Location": "use1-az1" @@ -1367,6 +1547,50 @@ "InstanceType": "r5n.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6a.large", + "Location": "use1-az1" + }, + { + "InstanceType": "r6a.metal", + "Location": "use1-az1" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "r6g.12xlarge", "Location": "use1-az1" @@ -1479,6 +1703,46 @@ "InstanceType": "r6i.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "r6id.large", + "Location": "use1-az1" + }, + { + "InstanceType": "r6id.metal", + "Location": "use1-az1" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "use1-az1" + }, { "InstanceType": "t1.micro", "Location": "use1-az1" @@ -1603,6 +1867,18 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "use1-az1" }, + { + "InstanceType": "vt1.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "vt1.3xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "vt1.6xlarge", + "Location": "use1-az1" + }, { "InstanceType": "x1.16xlarge", "Location": "use1-az1" @@ -1671,6 +1947,22 @@ "InstanceType": "x2gd.xlarge", "Location": "use1-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "use1-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "use1-az1" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "use1-az1" @@ -1695,6 +1987,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "use1-az1" }, + { + "InstanceType": "x2iedn.metal", + "Location": "use1-az1" + }, { "InstanceType": "x2iedn.xlarge", "Location": "use1-az1" @@ -1999,6 +2295,10 @@ "InstanceType": "c6a.large", "Location": "use1-az2" }, + { + "InstanceType": "c6a.metal", + "Location": "use1-az2" + }, { "InstanceType": "c6a.xlarge", "Location": "use1-az2" @@ -2147,6 +2447,78 @@ "InstanceType": "c6i.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c6id.large", + "Location": "use1-az2" + }, + { + "InstanceType": "c6id.metal", + "Location": "use1-az2" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "c7g.large", + "Location": "use1-az2" + }, + { + "InstanceType": "c7g.medium", + "Location": "use1-az2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "cc2.8xlarge", "Location": "use1-az2" @@ -2443,6 +2815,38 @@ "InstanceType": "i3en.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "i4i.large", + "Location": "use1-az2" + }, + { + "InstanceType": "i4i.metal", + "Location": "use1-az2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "im4gn.16xlarge", "Location": "use1-az2" @@ -2847,6 +3251,10 @@ "InstanceType": "m6a.large", "Location": "use1-az2" }, + { + "InstanceType": "m6a.metal", + "Location": "use1-az2" + }, { "InstanceType": "m6a.xlarge", "Location": "use1-az2" @@ -2963,6 +3371,46 @@ "InstanceType": "m6i.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "m6id.large", + "Location": "use1-az2" + }, + { + "InstanceType": "m6id.metal", + "Location": "use1-az2" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "p2.16xlarge", "Location": "use1-az2" @@ -3279,6 +3727,50 @@ "InstanceType": "r5n.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6a.large", + "Location": "use1-az2" + }, + { + "InstanceType": "r6a.metal", + "Location": "use1-az2" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "r6g.12xlarge", "Location": "use1-az2" @@ -3391,6 +3883,46 @@ "InstanceType": "r6i.xlarge", "Location": "use1-az2" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "use1-az2" + }, + { + "InstanceType": "r6id.large", + "Location": "use1-az2" + }, + { + "InstanceType": "r6id.metal", + "Location": "use1-az2" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "use1-az2" + }, { "InstanceType": "t1.micro", "Location": "use1-az2" @@ -3619,6 +4151,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "use1-az2" }, + { + "InstanceType": "x2idn.metal", + "Location": "use1-az2" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "use1-az2" @@ -3643,6 +4179,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "use1-az2" }, + { + "InstanceType": "x2iedn.metal", + "Location": "use1-az2" + }, { "InstanceType": "x2iedn.xlarge", "Location": "use1-az2" @@ -4235,6 +4775,10 @@ "InstanceType": "c6a.large", "Location": "use1-az4" }, + { + "InstanceType": "c6a.metal", + "Location": "use1-az4" + }, { "InstanceType": "c6a.xlarge", "Location": "use1-az4" @@ -4383,6 +4927,78 @@ "InstanceType": "c6i.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c6id.large", + "Location": "use1-az4" + }, + { + "InstanceType": "c6id.metal", + "Location": "use1-az4" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "c7g.large", + "Location": "use1-az4" + }, + { + "InstanceType": "c7g.medium", + "Location": "use1-az4" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "cc2.8xlarge", "Location": "use1-az4" @@ -4675,6 +5291,38 @@ "InstanceType": "i3en.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "i4i.large", + "Location": "use1-az4" + }, + { + "InstanceType": "i4i.metal", + "Location": "use1-az4" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "im4gn.16xlarge", "Location": "use1-az4" @@ -5079,6 +5727,10 @@ "InstanceType": "m6a.large", "Location": "use1-az4" }, + { + "InstanceType": "m6a.metal", + "Location": "use1-az4" + }, { "InstanceType": "m6a.xlarge", "Location": "use1-az4" @@ -5195,10 +5847,54 @@ "InstanceType": "m6i.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "m6id.large", + "Location": "use1-az4" + }, + { + "InstanceType": "m6id.metal", + "Location": "use1-az4" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "mac1.metal", "Location": "use1-az4" }, + { + "InstanceType": "mac2.metal", + "Location": "use1-az4" + }, { "InstanceType": "p2.16xlarge", "Location": "use1-az4" @@ -5499,6 +6195,50 @@ "InstanceType": "r5n.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r6a.large", + "Location": "use1-az4" + }, + { + "InstanceType": "r6a.metal", + "Location": "use1-az4" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "r6g.12xlarge", "Location": "use1-az4" @@ -5611,6 +6351,46 @@ "InstanceType": "r6i.xlarge", "Location": "use1-az4" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "use1-az4" + }, + { + "InstanceType": "r6id.large", + "Location": "use1-az4" + }, + { + "InstanceType": "r6id.metal", + "Location": "use1-az4" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "use1-az4" + }, { "InstanceType": "t1.micro", "Location": "use1-az4" @@ -5827,6 +6607,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "use1-az4" }, + { + "InstanceType": "x2idn.metal", + "Location": "use1-az4" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "use1-az4" @@ -5851,6 +6635,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "use1-az4" }, + { + "InstanceType": "x2iedn.metal", + "Location": "use1-az4" + }, { "InstanceType": "x2iedn.xlarge", "Location": "use1-az4" @@ -6115,6 +6903,10 @@ "InstanceType": "c6a.large", "Location": "use1-az5" }, + { + "InstanceType": "c6a.metal", + "Location": "use1-az5" + }, { "InstanceType": "c6a.xlarge", "Location": "use1-az5" @@ -6231,6 +7023,78 @@ "InstanceType": "c6i.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c6id.large", + "Location": "use1-az5" + }, + { + "InstanceType": "c6id.metal", + "Location": "use1-az5" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "c7g.large", + "Location": "use1-az5" + }, + { + "InstanceType": "c7g.medium", + "Location": "use1-az5" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "d2.2xlarge", "Location": "use1-az5" @@ -6383,6 +7247,38 @@ "InstanceType": "i3en.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "i4i.large", + "Location": "use1-az5" + }, + { + "InstanceType": "i4i.metal", + "Location": "use1-az5" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "inf1.24xlarge", "Location": "use1-az5" @@ -6695,6 +7591,10 @@ "InstanceType": "m6a.large", "Location": "use1-az5" }, + { + "InstanceType": "m6a.metal", + "Location": "use1-az5" + }, { "InstanceType": "m6a.xlarge", "Location": "use1-az5" @@ -6811,6 +7711,46 @@ "InstanceType": "m6i.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "m6id.large", + "Location": "use1-az5" + }, + { + "InstanceType": "m6id.metal", + "Location": "use1-az5" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "p3.16xlarge", "Location": "use1-az5" @@ -7055,6 +7995,50 @@ "InstanceType": "r5n.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r6a.large", + "Location": "use1-az5" + }, + { + "InstanceType": "r6a.metal", + "Location": "use1-az5" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "r6g.12xlarge", "Location": "use1-az5" @@ -7167,6 +8151,46 @@ "InstanceType": "r6i.xlarge", "Location": "use1-az5" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "use1-az5" + }, + { + "InstanceType": "r6id.large", + "Location": "use1-az5" + }, + { + "InstanceType": "r6id.metal", + "Location": "use1-az5" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "use1-az5" + }, { "InstanceType": "t1.micro", "Location": "use1-az5" @@ -7339,6 +8363,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "use1-az5" }, + { + "InstanceType": "x2idn.metal", + "Location": "use1-az5" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "use1-az5" @@ -7363,6 +8391,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "use1-az5" }, + { + "InstanceType": "x2iedn.metal", + "Location": "use1-az5" + }, { "InstanceType": "x2iedn.xlarge", "Location": "use1-az5" @@ -7667,6 +8699,10 @@ "InstanceType": "c6a.large", "Location": "use1-az6" }, + { + "InstanceType": "c6a.metal", + "Location": "use1-az6" + }, { "InstanceType": "c6a.xlarge", "Location": "use1-az6" @@ -7815,6 +8851,78 @@ "InstanceType": "c6i.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c6id.large", + "Location": "use1-az6" + }, + { + "InstanceType": "c6id.metal", + "Location": "use1-az6" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "c7g.large", + "Location": "use1-az6" + }, + { + "InstanceType": "c7g.medium", + "Location": "use1-az6" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "cc2.8xlarge", "Location": "use1-az6" @@ -8107,6 +9215,38 @@ "InstanceType": "i3en.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "i4i.large", + "Location": "use1-az6" + }, + { + "InstanceType": "i4i.metal", + "Location": "use1-az6" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "im4gn.16xlarge", "Location": "use1-az6" @@ -8511,6 +9651,10 @@ "InstanceType": "m6a.large", "Location": "use1-az6" }, + { + "InstanceType": "m6a.metal", + "Location": "use1-az6" + }, { "InstanceType": "m6a.xlarge", "Location": "use1-az6" @@ -8627,10 +9771,54 @@ "InstanceType": "m6i.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "m6id.large", + "Location": "use1-az6" + }, + { + "InstanceType": "m6id.metal", + "Location": "use1-az6" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "mac1.metal", "Location": "use1-az6" }, + { + "InstanceType": "mac2.metal", + "Location": "use1-az6" + }, { "InstanceType": "p2.16xlarge", "Location": "use1-az6" @@ -8951,6 +10139,50 @@ "InstanceType": "r5n.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r6a.large", + "Location": "use1-az6" + }, + { + "InstanceType": "r6a.metal", + "Location": "use1-az6" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "r6g.12xlarge", "Location": "use1-az6" @@ -9063,6 +10295,46 @@ "InstanceType": "r6i.xlarge", "Location": "use1-az6" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "use1-az6" + }, + { + "InstanceType": "r6id.large", + "Location": "use1-az6" + }, + { + "InstanceType": "r6id.metal", + "Location": "use1-az6" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "use1-az6" + }, { "InstanceType": "t1.micro", "Location": "use1-az6" @@ -9279,6 +10551,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "use1-az6" }, + { + "InstanceType": "x2idn.metal", + "Location": "use1-az6" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "use1-az6" @@ -9303,6 +10579,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "use1-az6" }, + { + "InstanceType": "x2iedn.metal", + "Location": "use1-az6" + }, { "InstanceType": "x2iedn.xlarge", "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 ce877e8ed..d98abd332 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 @@ -207,6 +207,50 @@ "InstanceType": "c5n.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c6a.large", + "Location": "use2-az1" + }, + { + "InstanceType": "c6a.metal", + "Location": "use2-az1" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "c6g.12xlarge", "Location": "use2-az1" @@ -351,6 +395,78 @@ "InstanceType": "c6i.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c6id.large", + "Location": "use2-az1" + }, + { + "InstanceType": "c6id.metal", + "Location": "use2-az1" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "c7g.large", + "Location": "use2-az1" + }, + { + "InstanceType": "c7g.medium", + "Location": "use2-az1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "d2.2xlarge", "Location": "use2-az1" @@ -539,6 +655,38 @@ "InstanceType": "i3en.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "use2-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "use2-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "im4gn.16xlarge", "Location": "use2-az1" @@ -863,6 +1011,50 @@ "InstanceType": "m5zn.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m6a.large", + "Location": "use2-az1" + }, + { + "InstanceType": "m6a.metal", + "Location": "use2-az1" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "m6g.12xlarge", "Location": "use2-az1" @@ -975,6 +1167,46 @@ "InstanceType": "m6i.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "m6id.large", + "Location": "use2-az1" + }, + { + "InstanceType": "m6id.metal", + "Location": "use2-az1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "p2.16xlarge", "Location": "use2-az1" @@ -1287,6 +1519,50 @@ "InstanceType": "r5n.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r6a.large", + "Location": "use2-az1" + }, + { + "InstanceType": "r6a.metal", + "Location": "use2-az1" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "r6g.12xlarge", "Location": "use2-az1" @@ -1399,6 +1675,46 @@ "InstanceType": "r6i.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "r6id.large", + "Location": "use2-az1" + }, + { + "InstanceType": "r6id.metal", + "Location": "use2-az1" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "use2-az1" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az1" @@ -1587,6 +1903,22 @@ "InstanceType": "x2gd.xlarge", "Location": "use2-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "use2-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "use2-az1" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "use2-az1" @@ -1611,6 +1943,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "use2-az1" }, + { + "InstanceType": "x2iedn.metal", + "Location": "use2-az1" + }, { "InstanceType": "x2iedn.xlarge", "Location": "use2-az1" @@ -1851,6 +2187,50 @@ "InstanceType": "c5n.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c6a.large", + "Location": "use2-az2" + }, + { + "InstanceType": "c6a.metal", + "Location": "use2-az2" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "c6g.12xlarge", "Location": "use2-az2" @@ -1995,6 +2375,78 @@ "InstanceType": "c6i.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c6id.large", + "Location": "use2-az2" + }, + { + "InstanceType": "c6id.metal", + "Location": "use2-az2" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "c7g.large", + "Location": "use2-az2" + }, + { + "InstanceType": "c7g.medium", + "Location": "use2-az2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "d2.2xlarge", "Location": "use2-az2" @@ -2187,6 +2639,38 @@ "InstanceType": "i3en.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "i4i.large", + "Location": "use2-az2" + }, + { + "InstanceType": "i4i.metal", + "Location": "use2-az2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "im4gn.16xlarge", "Location": "use2-az2" @@ -2511,6 +2995,50 @@ "InstanceType": "m5zn.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m6a.large", + "Location": "use2-az2" + }, + { + "InstanceType": "m6a.metal", + "Location": "use2-az2" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "m6g.12xlarge", "Location": "use2-az2" @@ -2623,6 +3151,46 @@ "InstanceType": "m6i.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "m6id.large", + "Location": "use2-az2" + }, + { + "InstanceType": "m6id.metal", + "Location": "use2-az2" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "mac1.metal", "Location": "use2-az2" @@ -2943,6 +3511,50 @@ "InstanceType": "r5n.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r6a.large", + "Location": "use2-az2" + }, + { + "InstanceType": "r6a.metal", + "Location": "use2-az2" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "r6g.12xlarge", "Location": "use2-az2" @@ -3055,6 +3667,46 @@ "InstanceType": "r6i.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "r6id.large", + "Location": "use2-az2" + }, + { + "InstanceType": "r6id.metal", + "Location": "use2-az2" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "use2-az2" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az2" @@ -3243,6 +3895,22 @@ "InstanceType": "x2gd.xlarge", "Location": "use2-az2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "use2-az2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "use2-az2" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "use2-az2" @@ -3267,6 +3935,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "use2-az2" }, + { + "InstanceType": "x2iedn.metal", + "Location": "use2-az2" + }, { "InstanceType": "x2iedn.xlarge", "Location": "use2-az2" @@ -3451,6 +4123,50 @@ "InstanceType": "c5n.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c6a.large", + "Location": "use2-az3" + }, + { + "InstanceType": "c6a.metal", + "Location": "use2-az3" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "c6g.12xlarge", "Location": "use2-az3" @@ -3595,6 +4311,78 @@ "InstanceType": "c6i.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c6id.large", + "Location": "use2-az3" + }, + { + "InstanceType": "c6id.metal", + "Location": "use2-az3" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "c7g.large", + "Location": "use2-az3" + }, + { + "InstanceType": "c7g.medium", + "Location": "use2-az3" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "d2.2xlarge", "Location": "use2-az3" @@ -3783,6 +4571,38 @@ "InstanceType": "i3en.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "i4i.large", + "Location": "use2-az3" + }, + { + "InstanceType": "i4i.metal", + "Location": "use2-az3" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "im4gn.16xlarge", "Location": "use2-az3" @@ -4107,6 +4927,50 @@ "InstanceType": "m5zn.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6a.large", + "Location": "use2-az3" + }, + { + "InstanceType": "m6a.metal", + "Location": "use2-az3" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "m6g.12xlarge", "Location": "use2-az3" @@ -4219,6 +5083,46 @@ "InstanceType": "m6i.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "m6id.large", + "Location": "use2-az3" + }, + { + "InstanceType": "m6id.metal", + "Location": "use2-az3" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "mac1.metal", "Location": "use2-az3" @@ -4523,6 +5427,50 @@ "InstanceType": "r5n.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r6a.large", + "Location": "use2-az3" + }, + { + "InstanceType": "r6a.metal", + "Location": "use2-az3" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "r6g.12xlarge", "Location": "use2-az3" @@ -4635,6 +5583,46 @@ "InstanceType": "r6i.xlarge", "Location": "use2-az3" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "r6id.large", + "Location": "use2-az3" + }, + { + "InstanceType": "r6id.metal", + "Location": "use2-az3" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "use2-az3" + }, { "InstanceType": "t2.2xlarge", "Location": "use2-az3" @@ -4798,5 +5786,21 @@ { "InstanceType": "x2gd.xlarge", "Location": "use2-az3" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "use2-az3" + }, + { + "InstanceType": "x2idn.metal", + "Location": "use2-az3" } ] \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json index 9005d4ff5..0bd3288c2 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone-id/us-west-1.json @@ -251,6 +251,38 @@ "InstanceType": "c6gd.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6gn.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "usw1-az1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "c6i.12xlarge", "Location": "usw1-az1" @@ -431,6 +463,38 @@ "InstanceType": "i3en.xlarge", "Location": "usw1-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "usw1-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "usw1-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "usw1-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "usw1-az1" + }, { "InstanceType": "inf1.24xlarge", "Location": "usw1-az1" @@ -1515,6 +1579,38 @@ "InstanceType": "c6gd.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6gn.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "usw1-az3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "c6i.12xlarge", "Location": "usw1-az3" @@ -1695,6 +1791,38 @@ "InstanceType": "i3en.xlarge", "Location": "usw1-az3" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "usw1-az3" + }, + { + "InstanceType": "i4i.large", + "Location": "usw1-az3" + }, + { + "InstanceType": "i4i.metal", + "Location": "usw1-az3" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "usw1-az3" + }, { "InstanceType": "inf1.24xlarge", "Location": "usw1-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 897fee408..b5d251f02 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 @@ -247,6 +247,10 @@ "InstanceType": "c6a.large", "Location": "usw2-az1" }, + { + "InstanceType": "c6a.metal", + "Location": "usw2-az1" + }, { "InstanceType": "c6a.xlarge", "Location": "usw2-az1" @@ -395,6 +399,78 @@ "InstanceType": "c6i.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6id.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6id.metal", + "Location": "usw2-az1" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7g.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7g.medium", + "Location": "usw2-az1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "cc2.8xlarge", "Location": "usw2-az1" @@ -691,6 +767,38 @@ "InstanceType": "i3en.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "i4i.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "i4i.metal", + "Location": "usw2-az1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "im4gn.16xlarge", "Location": "usw2-az1" @@ -1095,6 +1203,10 @@ "InstanceType": "m6a.large", "Location": "usw2-az1" }, + { + "InstanceType": "m6a.metal", + "Location": "usw2-az1" + }, { "InstanceType": "m6a.xlarge", "Location": "usw2-az1" @@ -1211,10 +1323,54 @@ "InstanceType": "m6i.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6id.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6id.metal", + "Location": "usw2-az1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "mac1.metal", "Location": "usw2-az1" }, + { + "InstanceType": "mac2.metal", + "Location": "usw2-az1" + }, { "InstanceType": "p2.16xlarge", "Location": "usw2-az1" @@ -1535,6 +1691,50 @@ "InstanceType": "r5n.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6a.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6a.metal", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "r6g.12xlarge", "Location": "usw2-az1" @@ -1647,6 +1847,46 @@ "InstanceType": "r6i.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6id.large", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6id.metal", + "Location": "usw2-az1" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "usw2-az1" + }, { "InstanceType": "t1.micro", "Location": "usw2-az1" @@ -1863,6 +2103,22 @@ "InstanceType": "x2gd.xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "usw2-az1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "usw2-az1" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "usw2-az1" @@ -1887,6 +2143,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "usw2-az1" }, + { + "InstanceType": "x2iedn.metal", + "Location": "usw2-az1" + }, { "InstanceType": "x2iedn.xlarge", "Location": "usw2-az1" @@ -2215,6 +2475,10 @@ "InstanceType": "c6a.large", "Location": "usw2-az2" }, + { + "InstanceType": "c6a.metal", + "Location": "usw2-az2" + }, { "InstanceType": "c6a.xlarge", "Location": "usw2-az2" @@ -2363,6 +2627,78 @@ "InstanceType": "c6i.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c6id.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "c6id.metal", + "Location": "usw2-az2" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7g.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7g.medium", + "Location": "usw2-az2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "cc2.8xlarge", "Location": "usw2-az2" @@ -2639,6 +2975,38 @@ "InstanceType": "i3en.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "i4i.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "i4i.metal", + "Location": "usw2-az2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "im4gn.16xlarge", "Location": "usw2-az2" @@ -3043,6 +3411,10 @@ "InstanceType": "m6a.large", "Location": "usw2-az2" }, + { + "InstanceType": "m6a.metal", + "Location": "usw2-az2" + }, { "InstanceType": "m6a.xlarge", "Location": "usw2-az2" @@ -3159,10 +3531,54 @@ "InstanceType": "m6i.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6id.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6id.metal", + "Location": "usw2-az2" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "mac1.metal", "Location": "usw2-az2" }, + { + "InstanceType": "mac2.metal", + "Location": "usw2-az2" + }, { "InstanceType": "p2.16xlarge", "Location": "usw2-az2" @@ -3479,6 +3895,50 @@ "InstanceType": "r5n.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6a.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6a.metal", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "r6g.12xlarge", "Location": "usw2-az2" @@ -3591,6 +4051,46 @@ "InstanceType": "r6i.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6id.large", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6id.metal", + "Location": "usw2-az2" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "usw2-az2" + }, { "InstanceType": "t1.micro", "Location": "usw2-az2" @@ -3795,6 +4295,22 @@ "InstanceType": "x2gd.xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "usw2-az2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "usw2-az2" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "usw2-az2" @@ -3819,6 +4335,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "usw2-az2" }, + { + "InstanceType": "x2iedn.metal", + "Location": "usw2-az2" + }, { "InstanceType": "x2iedn.xlarge", "Location": "usw2-az2" @@ -4115,6 +4635,10 @@ "InstanceType": "c6a.large", "Location": "usw2-az3" }, + { + "InstanceType": "c6a.metal", + "Location": "usw2-az3" + }, { "InstanceType": "c6a.xlarge", "Location": "usw2-az3" @@ -4263,6 +4787,78 @@ "InstanceType": "c6i.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c6id.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "c6id.metal", + "Location": "usw2-az3" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7g.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7g.medium", + "Location": "usw2-az3" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "cc2.8xlarge", "Location": "usw2-az3" @@ -4555,6 +5151,38 @@ "InstanceType": "i3en.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "i4i.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "i4i.metal", + "Location": "usw2-az3" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "im4gn.16xlarge", "Location": "usw2-az3" @@ -4959,6 +5587,10 @@ "InstanceType": "m6a.large", "Location": "usw2-az3" }, + { + "InstanceType": "m6a.metal", + "Location": "usw2-az3" + }, { "InstanceType": "m6a.xlarge", "Location": "usw2-az3" @@ -5075,10 +5707,54 @@ "InstanceType": "m6i.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6id.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6id.metal", + "Location": "usw2-az3" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "mac1.metal", "Location": "usw2-az3" }, + { + "InstanceType": "mac2.metal", + "Location": "usw2-az3" + }, { "InstanceType": "p2.16xlarge", "Location": "usw2-az3" @@ -5511,6 +6187,46 @@ "InstanceType": "r6i.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "r6id.large", + "Location": "usw2-az3" + }, + { + "InstanceType": "r6id.metal", + "Location": "usw2-az3" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "usw2-az3" + }, { "InstanceType": "t1.micro", "Location": "usw2-az3" @@ -5715,6 +6431,22 @@ "InstanceType": "x2gd.xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "usw2-az3" + }, + { + "InstanceType": "x2idn.metal", + "Location": "usw2-az3" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "usw2-az3" @@ -5739,6 +6471,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "usw2-az3" }, + { + "InstanceType": "x2iedn.metal", + "Location": "usw2-az3" + }, { "InstanceType": "x2iedn.xlarge", "Location": "usw2-az3" @@ -5995,6 +6731,10 @@ "InstanceType": "c6a.large", "Location": "usw2-az4" }, + { + "InstanceType": "c6a.metal", + "Location": "usw2-az4" + }, { "InstanceType": "c6a.xlarge", "Location": "usw2-az4" @@ -6071,6 +6811,38 @@ "InstanceType": "c6gd.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6gn.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6gn.medium", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "c6i.12xlarge", "Location": "usw2-az4" @@ -6111,6 +6883,78 @@ "InstanceType": "c6i.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6id.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6id.metal", + "Location": "usw2-az4" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7g.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7g.medium", + "Location": "usw2-az4" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "d2.2xlarge", "Location": "usw2-az4" @@ -6223,6 +7067,38 @@ "InstanceType": "i3en.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "i4i.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "i4i.metal", + "Location": "usw2-az4" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "inf1.24xlarge", "Location": "usw2-az4" @@ -6375,6 +7251,10 @@ "InstanceType": "m5d.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "m6a.metal", + "Location": "usw2-az4" + }, { "InstanceType": "m6g.12xlarge", "Location": "usw2-az4" @@ -6487,10 +7367,54 @@ "InstanceType": "m6i.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6id.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6id.metal", + "Location": "usw2-az4" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "mac1.metal", "Location": "usw2-az4" }, + { + "InstanceType": "mac2.metal", + "Location": "usw2-az4" + }, { "InstanceType": "r5.12xlarge", "Location": "usw2-az4" @@ -6659,6 +7583,50 @@ "InstanceType": "r5dn.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6a.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6a.metal", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "r6g.12xlarge", "Location": "usw2-az4" @@ -6771,6 +7739,46 @@ "InstanceType": "r6i.xlarge", "Location": "usw2-az4" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6id.large", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6id.metal", + "Location": "usw2-az4" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "usw2-az4" + }, { "InstanceType": "t3.2xlarge", "Location": "usw2-az4" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json index 6b83e453b..9606cfd30 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/af-south-1.json @@ -387,6 +387,78 @@ "InstanceType": "r5d.xlarge", "Location": "af-south-1a" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5dn.large", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5dn.metal", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5n.12xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5n.large", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5n.metal", + "Location": "af-south-1a" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "af-south-1a" + }, { "InstanceType": "t3.2xlarge", "Location": "af-south-1a" @@ -863,6 +935,78 @@ "InstanceType": "r5d.xlarge", "Location": "af-south-1b" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5dn.large", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5dn.metal", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5n.12xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5n.large", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5n.metal", + "Location": "af-south-1b" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "af-south-1b" + }, { "InstanceType": "t3.2xlarge", "Location": "af-south-1b" @@ -1339,6 +1483,78 @@ "InstanceType": "r5d.xlarge", "Location": "af-south-1c" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5dn.large", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5dn.metal", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5n.12xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5n.large", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5n.metal", + "Location": "af-south-1c" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "af-south-1c" + }, { "InstanceType": "t3.2xlarge", "Location": "af-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-east-1.json index a4465d6a0..9b8bbaf45 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-east-1.json @@ -155,6 +155,78 @@ "InstanceType": "c6g.xlarge", "Location": "ap-east-1a" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6i.large", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6i.metal", + "Location": "ap-east-1a" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "ap-east-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-east-1a" @@ -259,6 +331,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-east-1a" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-east-1a" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-east-1a" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-east-1a" + }, { "InstanceType": "m5.12xlarge", "Location": "ap-east-1a" @@ -367,6 +471,46 @@ "InstanceType": "m6g.xlarge", "Location": "ap-east-1a" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6i.large", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6i.metal", + "Location": "ap-east-1a" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "ap-east-1a" + }, { "InstanceType": "r5.12xlarge", "Location": "ap-east-1a" @@ -511,6 +655,46 @@ "InstanceType": "r6g.xlarge", "Location": "ap-east-1a" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "ap-east-1a" + }, + { + "InstanceType": "r6i.large", + "Location": "ap-east-1a" + }, + { + "InstanceType": "r6i.metal", + "Location": "ap-east-1a" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "ap-east-1a" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-east-1a" @@ -731,6 +915,78 @@ "InstanceType": "c6g.xlarge", "Location": "ap-east-1b" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6i.large", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6i.metal", + "Location": "ap-east-1b" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "ap-east-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-east-1b" @@ -835,6 +1091,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-east-1b" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-east-1b" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-east-1b" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-east-1b" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-east-1b" @@ -959,6 +1247,46 @@ "InstanceType": "m6g.xlarge", "Location": "ap-east-1b" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6i.large", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6i.metal", + "Location": "ap-east-1b" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "ap-east-1b" + }, { "InstanceType": "r5.12xlarge", "Location": "ap-east-1b" @@ -1103,6 +1431,46 @@ "InstanceType": "r6g.xlarge", "Location": "ap-east-1b" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "ap-east-1b" + }, + { + "InstanceType": "r6i.large", + "Location": "ap-east-1b" + }, + { + "InstanceType": "r6i.metal", + "Location": "ap-east-1b" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "ap-east-1b" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-east-1b" @@ -1323,6 +1691,78 @@ "InstanceType": "c6g.xlarge", "Location": "ap-east-1c" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6i.large", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6i.metal", + "Location": "ap-east-1c" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "ap-east-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-east-1c" @@ -1427,6 +1867,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-east-1c" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-east-1c" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-east-1c" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-east-1c" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-east-1c" @@ -1551,6 +2023,46 @@ "InstanceType": "m6g.xlarge", "Location": "ap-east-1c" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6i.large", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6i.metal", + "Location": "ap-east-1c" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "ap-east-1c" + }, { "InstanceType": "r5.12xlarge", "Location": "ap-east-1c" @@ -1695,6 +2207,46 @@ "InstanceType": "r6g.xlarge", "Location": "ap-east-1c" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "ap-east-1c" + }, + { + "InstanceType": "r6i.large", + "Location": "ap-east-1c" + }, + { + "InstanceType": "r6i.metal", + "Location": "ap-east-1c" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "ap-east-1c" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-east-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json index 2b4ef7d01..45507dff3 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-1.json @@ -275,6 +275,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-northeast-1a" @@ -423,6 +455,38 @@ "InstanceType": "g4dn.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "g5g.16xlarge", "Location": "ap-northeast-1a" @@ -523,6 +587,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-northeast-1a" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-northeast-1a" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-northeast-1a" @@ -1563,6 +1659,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-northeast-1a" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "ap-northeast-1a" @@ -1587,6 +1687,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "ap-northeast-1a" }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-northeast-1a" + }, { "InstanceType": "x2iedn.xlarge", "Location": "ap-northeast-1a" @@ -1927,6 +2031,46 @@ "InstanceType": "c6gn.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "c6i.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6i.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6i.metal", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "cc2.8xlarge", "Location": "ap-northeast-1c" @@ -2035,6 +2179,38 @@ "InstanceType": "g4dn.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "g5g.16xlarge", "Location": "ap-northeast-1c" @@ -2135,6 +2311,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-northeast-1c" @@ -2523,6 +2731,46 @@ "InstanceType": "m6gd.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6i.large", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6i.metal", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "ap-northeast-1c" + }, { "InstanceType": "mac1.metal", "Location": "ap-northeast-1c" @@ -2999,6 +3247,22 @@ "InstanceType": "x1e.xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "ap-northeast-1c" + }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-northeast-1c" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "ap-northeast-1c" @@ -3023,6 +3287,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "ap-northeast-1c" }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-northeast-1c" + }, { "InstanceType": "x2iedn.xlarge", "Location": "ap-northeast-1c" @@ -3491,6 +3759,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-northeast-1d" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-northeast-1d" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-northeast-1d" @@ -4363,6 +4663,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "ap-northeast-1d" }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-northeast-1d" + }, { "InstanceType": "x2iezn.12xlarge", "Location": "ap-northeast-1d" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json index 7bf58384a..bd82106fd 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-2.json @@ -187,6 +187,74 @@ "InstanceType": "c6g.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gd.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gd.medium", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gd.metal", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-northeast-2a" @@ -911,6 +979,42 @@ "InstanceType": "r5d.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r5dn.large", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r5dn.metal", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "r5n.12xlarge", "Location": "ap-northeast-2a" @@ -1175,6 +1279,54 @@ "InstanceType": "x1e.xlarge", "Location": "ap-northeast-2a" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-northeast-2a" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ap-northeast-2a" + }, { "InstanceType": "z1d.12xlarge", "Location": "ap-northeast-2a" @@ -1371,6 +1523,74 @@ "InstanceType": "c6g.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gd.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gd.medium", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gd.metal", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-northeast-2b" @@ -1427,6 +1647,34 @@ "InstanceType": "d2.xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "g4dn.12xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "g4dn.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "g4dn.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "g4dn.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "g4dn.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "g4dn.metal", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "g4dn.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "i3.16xlarge", "Location": "ap-northeast-2b" @@ -1919,6 +2167,54 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "ap-northeast-2b" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-northeast-2b" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ap-northeast-2b" + }, { "InstanceType": "c4.2xlarge", "Location": "ap-northeast-2c" @@ -2107,6 +2403,74 @@ "InstanceType": "c6g.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gd.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gd.medium", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gd.metal", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-northeast-2c" @@ -2827,6 +3191,42 @@ "InstanceType": "r5d.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r5dn.large", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r5dn.metal", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "r5n.12xlarge", "Location": "ap-northeast-2c" @@ -3091,6 +3491,54 @@ "InstanceType": "x1e.xlarge", "Location": "ap-northeast-2c" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-northeast-2c" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ap-northeast-2c" + }, { "InstanceType": "z1d.12xlarge", "Location": "ap-northeast-2c" @@ -3191,6 +3639,42 @@ "InstanceType": "c5d.xlarge", "Location": "ap-northeast-2d" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c6g.large", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c6g.medium", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c6g.metal", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "ap-northeast-2d" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-northeast-2d" @@ -3515,6 +3999,78 @@ "InstanceType": "r5d.xlarge", "Location": "ap-northeast-2d" }, + { + "InstanceType": "r5n.12xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r5n.large", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r5n.metal", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r6g.12xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r6g.16xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r6g.2xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r6g.4xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r6g.8xlarge", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r6g.large", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r6g.medium", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r6g.metal", + "Location": "ap-northeast-2d" + }, + { + "InstanceType": "r6g.xlarge", + "Location": "ap-northeast-2d" + }, { "InstanceType": "r6i.12xlarge", "Location": "ap-northeast-2d" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json index d917239f6..5b100bca4 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-northeast-3.json @@ -79,6 +79,78 @@ "InstanceType": "c5d.xlarge", "Location": "ap-northeast-3a" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6g.large", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6g.medium", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6g.metal", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6gd.large", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6gd.medium", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6gd.metal", + "Location": "ap-northeast-3a" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "ap-northeast-3a" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-3a" @@ -471,6 +543,78 @@ "InstanceType": "c5d.xlarge", "Location": "ap-northeast-3b" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6g.large", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6g.medium", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6g.metal", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6gd.large", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6gd.medium", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6gd.metal", + "Location": "ap-northeast-3b" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "ap-northeast-3b" + }, { "InstanceType": "g4dn.12xlarge", "Location": "ap-northeast-3b" @@ -803,6 +947,78 @@ "InstanceType": "c5d.xlarge", "Location": "ap-northeast-3c" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6g.large", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6g.medium", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6g.metal", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6gd.large", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6gd.medium", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6gd.metal", + "Location": "ap-northeast-3c" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "ap-northeast-3c" + }, { "InstanceType": "g4dn.12xlarge", "Location": "ap-northeast-3c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json index d89c1a25a..b70e7ebc4 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-south-1.json @@ -151,6 +151,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-south-1a" @@ -223,6 +267,30 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-south-1a" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-south-1a" @@ -323,6 +391,38 @@ "InstanceType": "g4dn.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "i2.2xlarge", "Location": "ap-south-1a" @@ -611,6 +711,10 @@ "InstanceType": "m6a.large", "Location": "ap-south-1a" }, + { + "InstanceType": "m6a.metal", + "Location": "ap-south-1a" + }, { "InstanceType": "m6a.xlarge", "Location": "ap-south-1a" @@ -959,6 +1063,50 @@ "InstanceType": "r5n.xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r6a.large", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r6a.metal", + "Location": "ap-south-1a" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "r6g.12xlarge", "Location": "ap-south-1a" @@ -1235,6 +1383,42 @@ "InstanceType": "x2idn.32xlarge", "Location": "ap-south-1a" }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-south-1a" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ap-south-1a" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-south-1a" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ap-south-1a" + }, { "InstanceType": "z1d.12xlarge", "Location": "ap-south-1a" @@ -1439,6 +1623,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-south-1b" @@ -1511,6 +1739,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-south-1b" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-south-1b" @@ -1611,6 +1871,38 @@ "InstanceType": "g4dn.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "i2.2xlarge", "Location": "ap-south-1b" @@ -1899,6 +2191,10 @@ "InstanceType": "m6a.large", "Location": "ap-south-1b" }, + { + "InstanceType": "m6a.metal", + "Location": "ap-south-1b" + }, { "InstanceType": "m6a.xlarge", "Location": "ap-south-1b" @@ -2243,6 +2539,50 @@ "InstanceType": "r5n.xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6a.large", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6a.metal", + "Location": "ap-south-1b" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "r6g.12xlarge", "Location": "ap-south-1b" @@ -2519,6 +2859,42 @@ "InstanceType": "x2idn.32xlarge", "Location": "ap-south-1b" }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-south-1b" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ap-south-1b" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-south-1b" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ap-south-1b" + }, { "InstanceType": "z1d.12xlarge", "Location": "ap-south-1b" @@ -2703,6 +3079,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-south-1c" @@ -2775,6 +3195,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-south-1c" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-south-1c" @@ -3123,6 +3575,10 @@ "InstanceType": "m6a.large", "Location": "ap-south-1c" }, + { + "InstanceType": "m6a.metal", + "Location": "ap-south-1c" + }, { "InstanceType": "m6a.xlarge", "Location": "ap-south-1c" @@ -3415,6 +3871,50 @@ "InstanceType": "r5n.xlarge", "Location": "ap-south-1c" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6a.large", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6a.metal", + "Location": "ap-south-1c" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "ap-south-1c" + }, { "InstanceType": "r6g.12xlarge", "Location": "ap-south-1c" @@ -3626,5 +4126,21 @@ { "InstanceType": "x1.32xlarge", "Location": "ap-south-1c" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "ap-south-1c" + }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-south-1c" } ] \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json index a4503bed0..469f550bf 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-1.json @@ -307,6 +307,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-southeast-1a" @@ -527,6 +559,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-southeast-1a" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-southeast-1a" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-southeast-1a" @@ -963,6 +1027,10 @@ "InstanceType": "mac1.metal", "Location": "ap-southeast-1a" }, + { + "InstanceType": "mac2.metal", + "Location": "ap-southeast-1a" + }, { "InstanceType": "p2.16xlarge", "Location": "ap-southeast-1a" @@ -1547,6 +1615,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-southeast-1a" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "ap-southeast-1a" @@ -1571,6 +1643,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "ap-southeast-1a" }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-southeast-1a" + }, { "InstanceType": "x2iedn.xlarge", "Location": "ap-southeast-1a" @@ -1879,6 +1955,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-southeast-1b" @@ -2099,6 +2207,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-southeast-1b" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-southeast-1b" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-southeast-1b" @@ -2535,6 +2675,10 @@ "InstanceType": "mac1.metal", "Location": "ap-southeast-1b" }, + { + "InstanceType": "mac2.metal", + "Location": "ap-southeast-1b" + }, { "InstanceType": "p2.16xlarge", "Location": "ap-southeast-1b" @@ -3135,6 +3279,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-southeast-1b" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "ap-southeast-1b" @@ -3159,6 +3307,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "ap-southeast-1b" }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-southeast-1b" + }, { "InstanceType": "x2iedn.xlarge", "Location": "ap-southeast-1b" @@ -3447,6 +3599,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-southeast-1c" @@ -3607,6 +3791,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-southeast-1c" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-southeast-1c" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-southeast-1c" @@ -4495,6 +4711,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "ap-southeast-1c" }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-southeast-1c" + }, { "InstanceType": "z1d.12xlarge", "Location": "ap-southeast-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json index 9a90e144e..9ba9637e8 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ap-southeast-2.json @@ -251,6 +251,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-southeast-2a" @@ -447,6 +479,62 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "im4gn.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-southeast-2a" @@ -463,6 +551,30 @@ "InstanceType": "inf1.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "is4gen.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "is4gen.medium", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "m1.large", "Location": "ap-southeast-2a" @@ -927,6 +1039,42 @@ "InstanceType": "r5ad.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5b.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5b.metal", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "r5d.12xlarge", "Location": "ap-southeast-2a" @@ -963,6 +1111,42 @@ "InstanceType": "r5d.xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5dn.large", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5dn.metal", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "r5n.12xlarge", "Location": "ap-southeast-2a" @@ -1235,6 +1419,54 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "ap-southeast-2a" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-southeast-2a" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ap-southeast-2a" + }, { "InstanceType": "z1d.12xlarge", "Location": "ap-southeast-2a" @@ -1571,6 +1803,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-southeast-2b" @@ -1779,6 +2043,62 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "im4gn.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-southeast-2b" @@ -1795,6 +2115,30 @@ "InstanceType": "inf1.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "is4gen.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "is4gen.medium", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "m1.large", "Location": "ap-southeast-2b" @@ -2311,6 +2655,42 @@ "InstanceType": "r5ad.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5b.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5b.metal", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "r5d.12xlarge", "Location": "ap-southeast-2b" @@ -2347,6 +2727,42 @@ "InstanceType": "r5d.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5dn.large", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5dn.metal", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "r5n.12xlarge", "Location": "ap-southeast-2b" @@ -2651,6 +3067,54 @@ "InstanceType": "x1e.xlarge", "Location": "ap-southeast-2b" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-southeast-2b" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ap-southeast-2b" + }, { "InstanceType": "z1d.12xlarge", "Location": "ap-southeast-2b" @@ -2979,6 +3443,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-southeast-2c" @@ -3151,6 +3647,62 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "im4gn.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-southeast-2c" @@ -3167,6 +3719,30 @@ "InstanceType": "inf1.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "is4gen.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "is4gen.medium", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "m3.2xlarge", "Location": "ap-southeast-2c" @@ -3639,6 +4215,42 @@ "InstanceType": "r5ad.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5b.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5b.metal", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "r5d.12xlarge", "Location": "ap-southeast-2c" @@ -3675,6 +4287,42 @@ "InstanceType": "r5d.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5dn.large", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5dn.metal", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "r5n.12xlarge", "Location": "ap-southeast-2c" @@ -3975,6 +4623,54 @@ "InstanceType": "x1e.xlarge", "Location": "ap-southeast-2c" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-southeast-2c" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ap-southeast-2c" + }, { "InstanceType": "z1d.12xlarge", "Location": "ap-southeast-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json index 357290cf2..88259a650 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/ca-central-1.json @@ -279,6 +279,22 @@ "InstanceType": "d2.xlarge", "Location": "ca-central-1a" }, + { + "InstanceType": "d3.2xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "d3.4xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "d3.8xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "d3.xlarge", + "Location": "ca-central-1a" + }, { "InstanceType": "g3.16xlarge", "Location": "ca-central-1a" @@ -339,6 +355,38 @@ "InstanceType": "g4dn.xlarge", "Location": "ca-central-1a" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ca-central-1a" + }, { "InstanceType": "i3.16xlarge", "Location": "ca-central-1a" @@ -395,6 +443,38 @@ "InstanceType": "i3en.xlarge", "Location": "ca-central-1a" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "i4i.large", + "Location": "ca-central-1a" + }, + { + "InstanceType": "i4i.metal", + "Location": "ca-central-1a" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ca-central-1a" + }, { "InstanceType": "inf1.24xlarge", "Location": "ca-central-1a" @@ -771,6 +851,42 @@ "InstanceType": "r5ad.xlarge", "Location": "ca-central-1a" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r5b.large", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r5b.metal", + "Location": "ca-central-1a" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "ca-central-1a" + }, { "InstanceType": "r5d.12xlarge", "Location": "ca-central-1a" @@ -1099,6 +1215,54 @@ "InstanceType": "x1e.xlarge", "Location": "ca-central-1a" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "x2idn.metal", + "Location": "ca-central-1a" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ca-central-1a" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ca-central-1a" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ca-central-1a" + }, { "InstanceType": "c4.2xlarge", "Location": "ca-central-1b" @@ -1323,6 +1487,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ca-central-1b" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c6gn.large", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ca-central-1b" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ca-central-1b" + }, { "InstanceType": "c6i.12xlarge", "Location": "ca-central-1b" @@ -1379,6 +1575,22 @@ "InstanceType": "d2.xlarge", "Location": "ca-central-1b" }, + { + "InstanceType": "d3.2xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "d3.4xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "d3.8xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "d3.xlarge", + "Location": "ca-central-1b" + }, { "InstanceType": "g3.16xlarge", "Location": "ca-central-1b" @@ -1439,6 +1651,38 @@ "InstanceType": "g4dn.xlarge", "Location": "ca-central-1b" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ca-central-1b" + }, { "InstanceType": "i3.16xlarge", "Location": "ca-central-1b" @@ -1495,6 +1739,62 @@ "InstanceType": "i3en.xlarge", "Location": "ca-central-1b" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "i4i.large", + "Location": "ca-central-1b" + }, + { + "InstanceType": "i4i.metal", + "Location": "ca-central-1b" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "im4gn.large", + "Location": "ca-central-1b" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "ca-central-1b" + }, { "InstanceType": "inf1.24xlarge", "Location": "ca-central-1b" @@ -1511,6 +1811,30 @@ "InstanceType": "inf1.xlarge", "Location": "ca-central-1b" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "is4gen.large", + "Location": "ca-central-1b" + }, + { + "InstanceType": "is4gen.medium", + "Location": "ca-central-1b" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "ca-central-1b" + }, { "InstanceType": "m4.10xlarge", "Location": "ca-central-1b" @@ -1883,6 +2207,42 @@ "InstanceType": "r5ad.xlarge", "Location": "ca-central-1b" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r5b.large", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r5b.metal", + "Location": "ca-central-1b" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "ca-central-1b" + }, { "InstanceType": "r5d.12xlarge", "Location": "ca-central-1b" @@ -2175,6 +2535,54 @@ "InstanceType": "x1e.xlarge", "Location": "ca-central-1b" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "x2idn.metal", + "Location": "ca-central-1b" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ca-central-1b" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ca-central-1b" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ca-central-1b" + }, { "InstanceType": "c5.12xlarge", "Location": "ca-central-1d" @@ -2343,6 +2751,74 @@ "InstanceType": "c6g.xlarge", "Location": "ca-central-1d" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gd.large", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gd.medium", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gd.metal", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gn.large", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ca-central-1d" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ca-central-1d" + }, { "InstanceType": "c6i.12xlarge", "Location": "ca-central-1d" @@ -2383,6 +2859,22 @@ "InstanceType": "c6i.xlarge", "Location": "ca-central-1d" }, + { + "InstanceType": "d3.2xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "d3.4xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "d3.8xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "d3.xlarge", + "Location": "ca-central-1d" + }, { "InstanceType": "i3.16xlarge", "Location": "ca-central-1d" @@ -2443,6 +2935,86 @@ "InstanceType": "i3en.xlarge", "Location": "ca-central-1d" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "i4i.large", + "Location": "ca-central-1d" + }, + { + "InstanceType": "i4i.metal", + "Location": "ca-central-1d" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "im4gn.large", + "Location": "ca-central-1d" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "is4gen.large", + "Location": "ca-central-1d" + }, + { + "InstanceType": "is4gen.medium", + "Location": "ca-central-1d" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "ca-central-1d" + }, { "InstanceType": "m5.12xlarge", "Location": "ca-central-1d" @@ -2627,6 +3199,42 @@ "InstanceType": "r5.xlarge", "Location": "ca-central-1d" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r5b.large", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r5b.metal", + "Location": "ca-central-1d" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "ca-central-1d" + }, { "InstanceType": "r5d.12xlarge", "Location": "ca-central-1d" @@ -2866,5 +3474,53 @@ { "InstanceType": "t4g.xlarge", "Location": "ca-central-1d" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "x2idn.metal", + "Location": "ca-central-1d" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ca-central-1d" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ca-central-1d" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ca-central-1d" } ] \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json index 0f017ecba..dedafcceb 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-central-1.json @@ -299,6 +299,38 @@ "InstanceType": "c6gd.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-central-1a" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1a" @@ -479,6 +511,62 @@ "InstanceType": "i3en.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-central-1a" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "im4gn.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "inf1.24xlarge", "Location": "eu-central-1a" @@ -495,6 +583,30 @@ "InstanceType": "inf1.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "is4gen.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "is4gen.medium", + "Location": "eu-central-1a" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "m3.2xlarge", "Location": "eu-central-1a" @@ -1271,6 +1383,46 @@ "InstanceType": "r6gd.xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-central-1a" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eu-central-1a" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1a" @@ -1439,6 +1591,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-central-1a" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "eu-central-1a" @@ -1463,6 +1619,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "eu-central-1a" }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-central-1a" + }, { "InstanceType": "x2iedn.xlarge", "Location": "eu-central-1a" @@ -1723,6 +1883,50 @@ "InstanceType": "c5n.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6a.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6a.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "c6g.12xlarge", "Location": "eu-central-1b" @@ -1795,6 +1999,78 @@ "InstanceType": "c6gd.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6i.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6i.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1b" @@ -1907,6 +2183,38 @@ "InstanceType": "g4dn.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "g5.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "g5.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "i2.2xlarge", "Location": "eu-central-1b" @@ -1983,6 +2291,62 @@ "InstanceType": "i3en.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "im4gn.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "inf1.24xlarge", "Location": "eu-central-1b" @@ -1999,6 +2363,30 @@ "InstanceType": "inf1.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "is4gen.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "is4gen.medium", + "Location": "eu-central-1b" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "m3.2xlarge", "Location": "eu-central-1b" @@ -2275,6 +2663,50 @@ "InstanceType": "m5zn.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6a.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6a.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "m6g.12xlarge", "Location": "eu-central-1b" @@ -2703,6 +3135,50 @@ "InstanceType": "r5n.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6a.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6a.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "r6g.12xlarge", "Location": "eu-central-1b" @@ -2775,6 +3251,46 @@ "InstanceType": "r6gd.xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-central-1b" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eu-central-1b" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1b" @@ -2951,6 +3467,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-central-1b" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "eu-central-1b" @@ -2975,6 +3495,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "eu-central-1b" }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-central-1b" + }, { "InstanceType": "x2iedn.xlarge", "Location": "eu-central-1b" @@ -3191,6 +3715,50 @@ "InstanceType": "c5n.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6a.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6a.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "c6g.12xlarge", "Location": "eu-central-1c" @@ -3263,6 +3831,78 @@ "InstanceType": "c6gd.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6i.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6i.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1c" @@ -3303,6 +3943,66 @@ "InstanceType": "f1.4xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "g4dn.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g4dn.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g4dn.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g4dn.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g4dn.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g4dn.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g4dn.xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g5.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "g5.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-central-1c" @@ -3363,6 +4063,62 @@ "InstanceType": "i3en.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "im4gn.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "inf1.24xlarge", "Location": "eu-central-1c" @@ -3379,6 +4135,30 @@ "InstanceType": "inf1.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "is4gen.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "is4gen.medium", + "Location": "eu-central-1c" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "m4.10xlarge", "Location": "eu-central-1c" @@ -3575,6 +4355,50 @@ "InstanceType": "m5n.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6a.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6a.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "m6g.12xlarge", "Location": "eu-central-1c" @@ -3959,6 +4783,50 @@ "InstanceType": "r5n.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6a.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6a.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "r6g.12xlarge", "Location": "eu-central-1c" @@ -4031,6 +4899,46 @@ "InstanceType": "r6gd.xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-central-1c" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eu-central-1c" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1c" @@ -4203,6 +5111,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-central-1c" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "eu-central-1c" @@ -4227,6 +5139,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "eu-central-1c" }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-central-1c" + }, { "InstanceType": "x2iedn.xlarge", "Location": "eu-central-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json index d59fc16c3..9ca612b13 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-north-1.json @@ -167,6 +167,78 @@ "InstanceType": "c6g.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6i.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6i.metal", + "Location": "eu-north-1a" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-north-1a" @@ -395,6 +467,82 @@ "InstanceType": "m6g.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6gd.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6gd.medium", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6gd.metal", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6i.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6i.metal", + "Location": "eu-north-1a" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "mac1.metal", "Location": "eu-north-1a" @@ -543,6 +691,46 @@ "InstanceType": "r6g.xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-north-1a" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-north-1a" @@ -607,6 +795,54 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "eu-north-1a" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-north-1a" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-north-1a" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-north-1a" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-north-1a" + }, { "InstanceType": "c5.12xlarge", "Location": "eu-north-1b" @@ -775,6 +1011,78 @@ "InstanceType": "c6g.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6i.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6i.metal", + "Location": "eu-north-1b" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-north-1b" @@ -819,6 +1127,10 @@ "InstanceType": "g4dn.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "hpc6a.48xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-north-1b" @@ -987,6 +1299,82 @@ "InstanceType": "m6g.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6gd.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6gd.medium", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6gd.metal", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6i.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6i.metal", + "Location": "eu-north-1b" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "mac1.metal", "Location": "eu-north-1b" @@ -1063,6 +1451,42 @@ "InstanceType": "r5d.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r5dn.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r5dn.metal", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "r5n.12xlarge", "Location": "eu-north-1b" @@ -1135,6 +1559,46 @@ "InstanceType": "r6g.xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-north-1b" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-north-1b" @@ -1199,6 +1663,54 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "eu-north-1b" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-north-1b" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-north-1b" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-north-1b" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-north-1b" + }, { "InstanceType": "c5.12xlarge", "Location": "eu-north-1c" @@ -1367,6 +1879,78 @@ "InstanceType": "c6g.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6i.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6i.metal", + "Location": "eu-north-1c" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-north-1c" @@ -1595,6 +2179,82 @@ "InstanceType": "m6g.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6gd.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6gd.medium", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6gd.metal", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6i.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6i.metal", + "Location": "eu-north-1c" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-north-1c" @@ -1667,6 +2327,42 @@ "InstanceType": "r5d.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r5dn.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r5dn.metal", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "r5n.12xlarge", "Location": "eu-north-1c" @@ -1739,6 +2435,46 @@ "InstanceType": "r6g.xlarge", "Location": "eu-north-1c" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-north-1c" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eu-north-1c" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-north-1c" @@ -1794,5 +2530,53 @@ { "InstanceType": "t4g.xlarge", "Location": "eu-north-1c" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-north-1c" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-north-1c" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-north-1c" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-north-1c" } ] \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json index 20db95abf..eb91b2498 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-south-1.json @@ -199,6 +199,78 @@ "InstanceType": "c6g.xlarge", "Location": "eu-south-1a" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6i.large", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6i.metal", + "Location": "eu-south-1a" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eu-south-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-south-1a" @@ -431,6 +503,46 @@ "InstanceType": "m6g.xlarge", "Location": "eu-south-1a" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6i.large", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6i.metal", + "Location": "eu-south-1a" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eu-south-1a" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-south-1a" @@ -535,6 +647,78 @@ "InstanceType": "r5d.xlarge", "Location": "eu-south-1a" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5dn.large", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5dn.metal", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5n.12xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5n.large", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5n.metal", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "eu-south-1a" + }, { "InstanceType": "r6g.12xlarge", "Location": "eu-south-1a" @@ -571,6 +755,46 @@ "InstanceType": "r6g.xlarge", "Location": "eu-south-1a" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-south-1a" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eu-south-1a" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-south-1a" @@ -659,6 +883,54 @@ "InstanceType": "u-3tb1.56xlarge", "Location": "eu-south-1a" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-south-1a" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-south-1a" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-south-1a" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-south-1a" + }, { "InstanceType": "c5.12xlarge", "Location": "eu-south-1b" @@ -859,6 +1131,78 @@ "InstanceType": "c6g.xlarge", "Location": "eu-south-1b" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6i.large", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6i.metal", + "Location": "eu-south-1b" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eu-south-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-south-1b" @@ -1119,6 +1463,46 @@ "InstanceType": "m6g.xlarge", "Location": "eu-south-1b" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6i.large", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6i.metal", + "Location": "eu-south-1b" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eu-south-1b" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-south-1b" @@ -1223,6 +1607,78 @@ "InstanceType": "r5d.xlarge", "Location": "eu-south-1b" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5dn.large", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5dn.metal", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5n.12xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5n.large", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5n.metal", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "eu-south-1b" + }, { "InstanceType": "r6g.12xlarge", "Location": "eu-south-1b" @@ -1259,6 +1715,46 @@ "InstanceType": "r6g.xlarge", "Location": "eu-south-1b" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-south-1b" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eu-south-1b" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-south-1b" @@ -1347,6 +1843,54 @@ "InstanceType": "u-3tb1.56xlarge", "Location": "eu-south-1b" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-south-1b" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-south-1b" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-south-1b" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-south-1b" + }, { "InstanceType": "c5.12xlarge", "Location": "eu-south-1c" @@ -1547,6 +2091,78 @@ "InstanceType": "c6g.xlarge", "Location": "eu-south-1c" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6i.large", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6i.metal", + "Location": "eu-south-1c" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eu-south-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-south-1c" @@ -1791,6 +2407,46 @@ "InstanceType": "m6g.xlarge", "Location": "eu-south-1c" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6i.large", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6i.metal", + "Location": "eu-south-1c" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eu-south-1c" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-south-1c" @@ -1895,6 +2551,78 @@ "InstanceType": "r5d.xlarge", "Location": "eu-south-1c" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5dn.large", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5dn.metal", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5n.12xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5n.large", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5n.metal", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "eu-south-1c" + }, { "InstanceType": "r6g.12xlarge", "Location": "eu-south-1c" @@ -1931,6 +2659,46 @@ "InstanceType": "r6g.xlarge", "Location": "eu-south-1c" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-south-1c" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eu-south-1c" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-south-1c" @@ -2014,5 +2782,53 @@ { "InstanceType": "t4g.xlarge", "Location": "eu-south-1c" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-south-1c" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-south-1c" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-south-1c" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-south-1c" } ] \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json index 25e426a1d..843965cae 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-1.json @@ -271,6 +271,10 @@ "InstanceType": "c6a.large", "Location": "eu-west-1a" }, + { + "InstanceType": "c6a.metal", + "Location": "eu-west-1a" + }, { "InstanceType": "c6a.xlarge", "Location": "eu-west-1a" @@ -419,6 +423,78 @@ "InstanceType": "c6i.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c6id.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c6id.metal", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-west-1a" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "cc2.8xlarge", "Location": "eu-west-1a" @@ -671,6 +747,38 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-west-1a" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "im4gn.16xlarge", "Location": "eu-west-1a" @@ -1071,6 +1179,10 @@ "InstanceType": "m6a.large", "Location": "eu-west-1a" }, + { + "InstanceType": "m6a.metal", + "Location": "eu-west-1a" + }, { "InstanceType": "m6a.xlarge", "Location": "eu-west-1a" @@ -1187,10 +1299,54 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6id.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6id.metal", + "Location": "eu-west-1a" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-1a" }, + { + "InstanceType": "mac2.metal", + "Location": "eu-west-1a" + }, { "InstanceType": "p2.16xlarge", "Location": "eu-west-1a" @@ -1495,6 +1651,50 @@ "InstanceType": "r5n.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6a.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6a.metal", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "r6g.12xlarge", "Location": "eu-west-1a" @@ -1607,6 +1807,46 @@ "InstanceType": "r6i.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6id.large", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6id.metal", + "Location": "eu-west-1a" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "eu-west-1a" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1a" @@ -1823,6 +2063,22 @@ "InstanceType": "x2gd.xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-west-1a" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-west-1a" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "eu-west-1a" @@ -1847,6 +2103,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "eu-west-1a" }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-west-1a" + }, { "InstanceType": "x2iedn.xlarge", "Location": "eu-west-1a" @@ -2175,6 +2435,10 @@ "InstanceType": "c6a.large", "Location": "eu-west-1b" }, + { + "InstanceType": "c6a.metal", + "Location": "eu-west-1b" + }, { "InstanceType": "c6a.xlarge", "Location": "eu-west-1b" @@ -2323,6 +2587,78 @@ "InstanceType": "c6i.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c6id.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c6id.metal", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-west-1b" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "cc2.8xlarge", "Location": "eu-west-1b" @@ -2591,6 +2927,38 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-west-1b" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "im4gn.16xlarge", "Location": "eu-west-1b" @@ -2991,6 +3359,10 @@ "InstanceType": "m6a.large", "Location": "eu-west-1b" }, + { + "InstanceType": "m6a.metal", + "Location": "eu-west-1b" + }, { "InstanceType": "m6a.xlarge", "Location": "eu-west-1b" @@ -3107,10 +3479,54 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m6id.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m6id.metal", + "Location": "eu-west-1b" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-1b" }, + { + "InstanceType": "mac2.metal", + "Location": "eu-west-1b" + }, { "InstanceType": "p2.16xlarge", "Location": "eu-west-1b" @@ -3431,6 +3847,50 @@ "InstanceType": "r5n.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6a.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6a.metal", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "r6g.12xlarge", "Location": "eu-west-1b" @@ -3543,6 +4003,46 @@ "InstanceType": "r6i.xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6id.large", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6id.metal", + "Location": "eu-west-1b" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "eu-west-1b" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1b" @@ -3759,6 +4259,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-west-1b" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "eu-west-1b" @@ -3783,6 +4287,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "eu-west-1b" }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-west-1b" + }, { "InstanceType": "x2iedn.xlarge", "Location": "eu-west-1b" @@ -4055,6 +4563,10 @@ "InstanceType": "c6a.large", "Location": "eu-west-1c" }, + { + "InstanceType": "c6a.metal", + "Location": "eu-west-1c" + }, { "InstanceType": "c6a.xlarge", "Location": "eu-west-1c" @@ -4203,6 +4715,78 @@ "InstanceType": "c6i.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c6id.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c6id.metal", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-west-1c" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "cc2.8xlarge", "Location": "eu-west-1c" @@ -4471,6 +5055,38 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-west-1c" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "im4gn.16xlarge", "Location": "eu-west-1c" @@ -4871,6 +5487,10 @@ "InstanceType": "m6a.large", "Location": "eu-west-1c" }, + { + "InstanceType": "m6a.metal", + "Location": "eu-west-1c" + }, { "InstanceType": "m6a.xlarge", "Location": "eu-west-1c" @@ -4987,6 +5607,46 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m6id.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m6id.metal", + "Location": "eu-west-1c" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "p2.16xlarge", "Location": "eu-west-1c" @@ -5299,6 +5959,50 @@ "InstanceType": "r5n.xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6a.large", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6a.metal", + "Location": "eu-west-1c" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "eu-west-1c" + }, { "InstanceType": "r6g.12xlarge", "Location": "eu-west-1c" @@ -5611,6 +6315,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-west-1c" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "eu-west-1c" @@ -5635,6 +6343,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "eu-west-1c" }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-west-1c" + }, { "InstanceType": "x2iedn.xlarge", "Location": "eu-west-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json index bc44aa5b8..d791ee957 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-2.json @@ -187,6 +187,74 @@ "InstanceType": "c6g.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gd.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gd.medium", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gd.metal", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-west-2a" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "c6i.12xlarge", "Location": "eu-west-2a" @@ -331,6 +399,38 @@ "InstanceType": "g4dn.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "g5.12xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "g5.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-west-2a" @@ -391,6 +491,62 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-west-2a" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "im4gn.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "inf1.24xlarge", "Location": "eu-west-2a" @@ -407,6 +563,30 @@ "InstanceType": "inf1.xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "is4gen.large", + "Location": "eu-west-2a" + }, + { + "InstanceType": "is4gen.medium", + "Location": "eu-west-2a" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "m4.10xlarge", "Location": "eu-west-2a" @@ -1123,6 +1303,54 @@ "InstanceType": "x1.32xlarge", "Location": "eu-west-2a" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-west-2a" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-west-2a" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-west-2a" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-west-2a" + }, { "InstanceType": "z1d.12xlarge", "Location": "eu-west-2a" @@ -1375,6 +1603,38 @@ "InstanceType": "c6gd.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-west-2b" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "c6i.12xlarge", "Location": "eu-west-2b" @@ -1475,6 +1735,38 @@ "InstanceType": "g4dn.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "g5.12xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "g5.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-west-2b" @@ -1535,6 +1827,62 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-west-2b" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "im4gn.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "inf1.24xlarge", "Location": "eu-west-2b" @@ -1551,6 +1899,30 @@ "InstanceType": "inf1.xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "is4gen.large", + "Location": "eu-west-2b" + }, + { + "InstanceType": "is4gen.medium", + "Location": "eu-west-2b" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "m4.10xlarge", "Location": "eu-west-2b" @@ -2263,6 +2635,54 @@ "InstanceType": "x1.32xlarge", "Location": "eu-west-2b" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-west-2b" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-west-2b" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-west-2b" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-west-2b" + }, { "InstanceType": "z1d.12xlarge", "Location": "eu-west-2b" @@ -2515,6 +2935,38 @@ "InstanceType": "c6gd.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-west-2c" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "c6i.12xlarge", "Location": "eu-west-2c" @@ -2703,6 +3155,102 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-west-2c" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "im4gn.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "inf1.24xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "inf1.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "inf1.6xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "inf1.xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "is4gen.large", + "Location": "eu-west-2c" + }, + { + "InstanceType": "is4gen.medium", + "Location": "eu-west-2c" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "m4.10xlarge", "Location": "eu-west-2c" @@ -3407,6 +3955,54 @@ "InstanceType": "x1.32xlarge", "Location": "eu-west-2c" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-west-2c" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-west-2c" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-west-2c" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-west-2c" + }, { "InstanceType": "z1d.12xlarge", "Location": "eu-west-2c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json index 0ba671366..e01e8cb76 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/eu-west-3.json @@ -299,6 +299,38 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-3a" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-west-3a" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-west-3a" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-west-3a" + }, { "InstanceType": "inf1.24xlarge", "Location": "eu-west-3a" @@ -687,6 +719,42 @@ "InstanceType": "r5d.xlarge", "Location": "eu-west-3a" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r5dn.large", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r5dn.metal", + "Location": "eu-west-3a" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "eu-west-3a" + }, { "InstanceType": "r5n.12xlarge", "Location": "eu-west-3a" @@ -1087,6 +1155,38 @@ "InstanceType": "c6g.xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-west-3b" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-west-3b" + }, { "InstanceType": "c6i.12xlarge", "Location": "eu-west-3b" @@ -1231,6 +1331,38 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-west-3b" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-west-3b" + }, { "InstanceType": "m5.12xlarge", "Location": "eu-west-3b" @@ -1603,6 +1735,42 @@ "InstanceType": "r5d.xlarge", "Location": "eu-west-3b" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r5dn.large", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r5dn.metal", + "Location": "eu-west-3b" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "eu-west-3b" + }, { "InstanceType": "r5n.12xlarge", "Location": "eu-west-3b" @@ -2035,6 +2203,38 @@ "InstanceType": "c6g.xlarge", "Location": "eu-west-3c" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-west-3c" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-west-3c" + }, { "InstanceType": "c6i.12xlarge", "Location": "eu-west-3c" @@ -2179,6 +2379,38 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-3c" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-west-3c" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-west-3c" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-west-3c" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-west-3c" + }, { "InstanceType": "inf1.24xlarge", "Location": "eu-west-3c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json index a8dc93e1b..0b25654b7 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/me-south-1.json @@ -187,6 +187,78 @@ "InstanceType": "c6g.xlarge", "Location": "me-south-1a" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6gn.large", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6gn.medium", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6i.large", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6i.metal", + "Location": "me-south-1a" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "me-south-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "me-south-1a" @@ -223,10 +295,6 @@ "InstanceType": "i3.large", "Location": "me-south-1a" }, - { - "InstanceType": "i3.metal", - "Location": "me-south-1a" - }, { "InstanceType": "i3.xlarge", "Location": "me-south-1a" @@ -371,6 +439,46 @@ "InstanceType": "m6g.xlarge", "Location": "me-south-1a" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6i.large", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6i.metal", + "Location": "me-south-1a" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "me-south-1a" + }, { "InstanceType": "r5.12xlarge", "Location": "me-south-1a" @@ -659,6 +767,78 @@ "InstanceType": "c6g.xlarge", "Location": "me-south-1b" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6gn.large", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6gn.medium", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6i.large", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6i.metal", + "Location": "me-south-1b" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "me-south-1b" + }, { "InstanceType": "d2.2xlarge", "Location": "me-south-1b" @@ -723,10 +903,6 @@ "InstanceType": "i3.large", "Location": "me-south-1b" }, - { - "InstanceType": "i3.metal", - "Location": "me-south-1b" - }, { "InstanceType": "i3.xlarge", "Location": "me-south-1b" @@ -887,6 +1063,46 @@ "InstanceType": "m6g.xlarge", "Location": "me-south-1b" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6i.large", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6i.metal", + "Location": "me-south-1b" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "me-south-1b" + }, { "InstanceType": "r5.12xlarge", "Location": "me-south-1b" @@ -1175,6 +1391,78 @@ "InstanceType": "c6g.xlarge", "Location": "me-south-1c" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6gn.large", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6gn.medium", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6i.large", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6i.metal", + "Location": "me-south-1c" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "me-south-1c" + }, { "InstanceType": "d2.2xlarge", "Location": "me-south-1c" @@ -1239,10 +1527,6 @@ "InstanceType": "i3.large", "Location": "me-south-1c" }, - { - "InstanceType": "i3.metal", - "Location": "me-south-1c" - }, { "InstanceType": "i3.xlarge", "Location": "me-south-1c" @@ -1403,6 +1687,46 @@ "InstanceType": "m6g.xlarge", "Location": "me-south-1c" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6i.large", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6i.metal", + "Location": "me-south-1c" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "me-south-1c" + }, { "InstanceType": "r5.12xlarge", "Location": "me-south-1c" diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json index 482624522..789a0bb63 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/sa-east-1.json @@ -247,6 +247,38 @@ "InstanceType": "c6g.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c6gn.large", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c6gn.medium", + "Location": "sa-east-1a" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "c6i.12xlarge", "Location": "sa-east-1a" @@ -843,6 +875,42 @@ "InstanceType": "r5ad.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r5b.large", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r5b.metal", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "r5d.12xlarge", "Location": "sa-east-1a" @@ -951,6 +1019,42 @@ "InstanceType": "r6g.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r6gd.large", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r6gd.medium", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r6gd.metal", + "Location": "sa-east-1a" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "r6i.12xlarge", "Location": "sa-east-1a" @@ -1139,6 +1243,54 @@ "InstanceType": "x1e.xlarge", "Location": "sa-east-1a" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "x2idn.metal", + "Location": "sa-east-1a" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "sa-east-1a" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "sa-east-1a" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "sa-east-1a" + }, { "InstanceType": "c1.medium", "Location": "sa-east-1b" @@ -1347,6 +1499,38 @@ "InstanceType": "c6g.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c6gn.large", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c6gn.medium", + "Location": "sa-east-1b" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "c6i.12xlarge", "Location": "sa-east-1b" @@ -1731,6 +1915,42 @@ "InstanceType": "r5.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r5b.large", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r5b.metal", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "r5d.12xlarge", "Location": "sa-east-1b" @@ -1839,6 +2059,42 @@ "InstanceType": "r6g.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r6gd.large", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r6gd.medium", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r6gd.metal", + "Location": "sa-east-1b" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "r6i.12xlarge", "Location": "sa-east-1b" @@ -1963,6 +2219,54 @@ "InstanceType": "t4g.xlarge", "Location": "sa-east-1b" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "x2idn.metal", + "Location": "sa-east-1b" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "sa-east-1b" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "sa-east-1b" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "sa-east-1b" + }, { "InstanceType": "c3.2xlarge", "Location": "sa-east-1c" @@ -2171,6 +2475,38 @@ "InstanceType": "c6g.xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c6gn.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c6gn.medium", + "Location": "sa-east-1c" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "c6i.12xlarge", "Location": "sa-east-1c" @@ -2711,6 +3047,42 @@ "InstanceType": "r5ad.xlarge", "Location": "sa-east-1c" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r5b.large", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r5b.metal", + "Location": "sa-east-1c" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "sa-east-1c" + }, { "InstanceType": "r5d.12xlarge", "Location": "sa-east-1c" @@ -3002,5 +3374,53 @@ { "InstanceType": "x1e.xlarge", "Location": "sa-east-1c" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "x2idn.metal", + "Location": "sa-east-1c" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "sa-east-1c" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "sa-east-1c" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "sa-east-1c" } ] \ No newline at end of file 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 df94c204f..e58b7ef93 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 @@ -219,6 +219,10 @@ "InstanceType": "c6a.large", "Location": "us-east-1a" }, + { + "InstanceType": "c6a.metal", + "Location": "us-east-1a" + }, { "InstanceType": "c6a.xlarge", "Location": "us-east-1a" @@ -367,6 +371,78 @@ "InstanceType": "c6i.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6id.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6id.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7g.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-east-1a" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "d2.2xlarge", "Location": "us-east-1a" @@ -615,6 +691,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "i4i.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "inf1.24xlarge", "Location": "us-east-1a" @@ -631,6 +739,30 @@ "InstanceType": "inf1.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "is4gen.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "is4gen.medium", + "Location": "us-east-1a" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "m1.large", "Location": "us-east-1a" @@ -951,6 +1083,10 @@ "InstanceType": "m6a.large", "Location": "us-east-1a" }, + { + "InstanceType": "m6a.metal", + "Location": "us-east-1a" + }, { "InstanceType": "m6a.xlarge", "Location": "us-east-1a" @@ -1067,6 +1203,50 @@ "InstanceType": "m6i.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6id.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6id.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "mac2.metal", + "Location": "us-east-1a" + }, { "InstanceType": "p2.16xlarge", "Location": "us-east-1a" @@ -1367,6 +1547,50 @@ "InstanceType": "r5n.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6a.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6a.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "r6g.12xlarge", "Location": "us-east-1a" @@ -1479,6 +1703,46 @@ "InstanceType": "r6i.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6id.large", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6id.metal", + "Location": "us-east-1a" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "t1.micro", "Location": "us-east-1a" @@ -1603,6 +1867,18 @@ "InstanceType": "u-6tb1.56xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "vt1.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "vt1.3xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "vt1.6xlarge", + "Location": "us-east-1a" + }, { "InstanceType": "x1.16xlarge", "Location": "us-east-1a" @@ -1671,6 +1947,22 @@ "InstanceType": "x2gd.xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "us-east-1a" + }, + { + "InstanceType": "x2idn.metal", + "Location": "us-east-1a" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "us-east-1a" @@ -1695,6 +1987,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "us-east-1a" }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-east-1a" + }, { "InstanceType": "x2iedn.xlarge", "Location": "us-east-1a" @@ -1999,6 +2295,10 @@ "InstanceType": "c6a.large", "Location": "us-east-1b" }, + { + "InstanceType": "c6a.metal", + "Location": "us-east-1b" + }, { "InstanceType": "c6a.xlarge", "Location": "us-east-1b" @@ -2147,6 +2447,78 @@ "InstanceType": "c6i.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6id.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6id.metal", + "Location": "us-east-1b" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7g.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-east-1b" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "cc2.8xlarge", "Location": "us-east-1b" @@ -2443,6 +2815,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "i4i.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-east-1b" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "im4gn.16xlarge", "Location": "us-east-1b" @@ -2847,6 +3251,10 @@ "InstanceType": "m6a.large", "Location": "us-east-1b" }, + { + "InstanceType": "m6a.metal", + "Location": "us-east-1b" + }, { "InstanceType": "m6a.xlarge", "Location": "us-east-1b" @@ -2963,6 +3371,46 @@ "InstanceType": "m6i.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6id.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6id.metal", + "Location": "us-east-1b" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "p2.16xlarge", "Location": "us-east-1b" @@ -3279,6 +3727,50 @@ "InstanceType": "r5n.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6a.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6a.metal", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "r6g.12xlarge", "Location": "us-east-1b" @@ -3391,6 +3883,46 @@ "InstanceType": "r6i.xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6id.large", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6id.metal", + "Location": "us-east-1b" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "us-east-1b" + }, { "InstanceType": "t1.micro", "Location": "us-east-1b" @@ -3619,6 +4151,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "x2idn.metal", + "Location": "us-east-1b" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "us-east-1b" @@ -3643,6 +4179,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "us-east-1b" }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-east-1b" + }, { "InstanceType": "x2iedn.xlarge", "Location": "us-east-1b" @@ -3971,6 +4511,10 @@ "InstanceType": "c6a.large", "Location": "us-east-1c" }, + { + "InstanceType": "c6a.metal", + "Location": "us-east-1c" + }, { "InstanceType": "c6a.xlarge", "Location": "us-east-1c" @@ -4119,6 +4663,78 @@ "InstanceType": "c6i.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c6id.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "c6id.metal", + "Location": "us-east-1c" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7g.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-east-1c" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "cc2.8xlarge", "Location": "us-east-1c" @@ -4411,6 +5027,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "i4i.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-east-1c" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "im4gn.16xlarge", "Location": "us-east-1c" @@ -4815,6 +5463,10 @@ "InstanceType": "m6a.large", "Location": "us-east-1c" }, + { + "InstanceType": "m6a.metal", + "Location": "us-east-1c" + }, { "InstanceType": "m6a.xlarge", "Location": "us-east-1c" @@ -4931,10 +5583,54 @@ "InstanceType": "m6i.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "m6id.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "m6id.metal", + "Location": "us-east-1c" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "mac1.metal", "Location": "us-east-1c" }, + { + "InstanceType": "mac2.metal", + "Location": "us-east-1c" + }, { "InstanceType": "p2.16xlarge", "Location": "us-east-1c" @@ -5235,6 +5931,50 @@ "InstanceType": "r5n.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6a.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6a.metal", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "r6g.12xlarge", "Location": "us-east-1c" @@ -5347,6 +6087,46 @@ "InstanceType": "r6i.xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6id.large", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6id.metal", + "Location": "us-east-1c" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "us-east-1c" + }, { "InstanceType": "t1.micro", "Location": "us-east-1c" @@ -5563,6 +6343,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "x2idn.metal", + "Location": "us-east-1c" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "us-east-1c" @@ -5587,6 +6371,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "us-east-1c" }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-east-1c" + }, { "InstanceType": "x2iedn.xlarge", "Location": "us-east-1c" @@ -5915,6 +6703,10 @@ "InstanceType": "c6a.large", "Location": "us-east-1d" }, + { + "InstanceType": "c6a.metal", + "Location": "us-east-1d" + }, { "InstanceType": "c6a.xlarge", "Location": "us-east-1d" @@ -6063,6 +6855,78 @@ "InstanceType": "c6i.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c6id.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "c6id.metal", + "Location": "us-east-1d" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7g.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-east-1d" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "cc2.8xlarge", "Location": "us-east-1d" @@ -6355,6 +7219,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "i4i.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-east-1d" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "im4gn.16xlarge", "Location": "us-east-1d" @@ -6759,6 +7655,10 @@ "InstanceType": "m6a.large", "Location": "us-east-1d" }, + { + "InstanceType": "m6a.metal", + "Location": "us-east-1d" + }, { "InstanceType": "m6a.xlarge", "Location": "us-east-1d" @@ -6875,10 +7775,54 @@ "InstanceType": "m6i.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "m6id.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "m6id.metal", + "Location": "us-east-1d" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "mac1.metal", "Location": "us-east-1d" }, + { + "InstanceType": "mac2.metal", + "Location": "us-east-1d" + }, { "InstanceType": "p2.16xlarge", "Location": "us-east-1d" @@ -7199,6 +8143,50 @@ "InstanceType": "r5n.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6a.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6a.metal", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "r6g.12xlarge", "Location": "us-east-1d" @@ -7311,6 +8299,46 @@ "InstanceType": "r6i.xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6id.large", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6id.metal", + "Location": "us-east-1d" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "us-east-1d" + }, { "InstanceType": "t1.micro", "Location": "us-east-1d" @@ -7527,6 +8555,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "x2idn.metal", + "Location": "us-east-1d" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "us-east-1d" @@ -7551,6 +8583,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "us-east-1d" }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-east-1d" + }, { "InstanceType": "x2iedn.xlarge", "Location": "us-east-1d" @@ -8079,6 +9115,10 @@ "InstanceType": "c6a.large", "Location": "us-east-1f" }, + { + "InstanceType": "c6a.metal", + "Location": "us-east-1f" + }, { "InstanceType": "c6a.xlarge", "Location": "us-east-1f" @@ -8195,6 +9235,78 @@ "InstanceType": "c6i.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6id.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6id.metal", + "Location": "us-east-1f" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7g.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-east-1f" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "d2.2xlarge", "Location": "us-east-1f" @@ -8347,6 +9459,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "i4i.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-east-1f" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "inf1.24xlarge", "Location": "us-east-1f" @@ -8659,6 +9803,10 @@ "InstanceType": "m6a.large", "Location": "us-east-1f" }, + { + "InstanceType": "m6a.metal", + "Location": "us-east-1f" + }, { "InstanceType": "m6a.xlarge", "Location": "us-east-1f" @@ -8775,6 +9923,46 @@ "InstanceType": "m6i.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "m6id.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "m6id.metal", + "Location": "us-east-1f" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "p3.16xlarge", "Location": "us-east-1f" @@ -9019,6 +10207,50 @@ "InstanceType": "r5n.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6a.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6a.metal", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "r6g.12xlarge", "Location": "us-east-1f" @@ -9131,6 +10363,46 @@ "InstanceType": "r6i.xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6id.large", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6id.metal", + "Location": "us-east-1f" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "us-east-1f" + }, { "InstanceType": "t1.micro", "Location": "us-east-1f" @@ -9303,6 +10575,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "x2idn.metal", + "Location": "us-east-1f" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "us-east-1f" @@ -9327,6 +10603,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "us-east-1f" }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-east-1f" + }, { "InstanceType": "x2iedn.xlarge", "Location": "us-east-1f" 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 93fdb09b9..0106e5761 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 @@ -207,6 +207,50 @@ "InstanceType": "c5n.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6a.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6a.metal", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "c6g.12xlarge", "Location": "us-east-2a" @@ -351,6 +395,78 @@ "InstanceType": "c6i.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6id.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6id.metal", + "Location": "us-east-2a" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7g.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-east-2a" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "d2.2xlarge", "Location": "us-east-2a" @@ -539,6 +655,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "i4i.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-east-2a" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "im4gn.16xlarge", "Location": "us-east-2a" @@ -863,6 +1011,50 @@ "InstanceType": "m5zn.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6a.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6a.metal", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "m6g.12xlarge", "Location": "us-east-2a" @@ -975,6 +1167,46 @@ "InstanceType": "m6i.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6id.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6id.metal", + "Location": "us-east-2a" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "p2.16xlarge", "Location": "us-east-2a" @@ -1287,6 +1519,50 @@ "InstanceType": "r5n.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6a.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6a.metal", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "r6g.12xlarge", "Location": "us-east-2a" @@ -1399,6 +1675,46 @@ "InstanceType": "r6i.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6id.large", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6id.metal", + "Location": "us-east-2a" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "us-east-2a" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2a" @@ -1587,6 +1903,22 @@ "InstanceType": "x2gd.xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "us-east-2a" + }, + { + "InstanceType": "x2idn.metal", + "Location": "us-east-2a" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "us-east-2a" @@ -1611,6 +1943,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "us-east-2a" }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-east-2a" + }, { "InstanceType": "x2iedn.xlarge", "Location": "us-east-2a" @@ -1851,6 +2187,50 @@ "InstanceType": "c5n.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6a.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6a.metal", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "c6g.12xlarge", "Location": "us-east-2b" @@ -1995,6 +2375,78 @@ "InstanceType": "c6i.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6id.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6id.metal", + "Location": "us-east-2b" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7g.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-east-2b" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "d2.2xlarge", "Location": "us-east-2b" @@ -2187,6 +2639,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "i4i.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-east-2b" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "im4gn.16xlarge", "Location": "us-east-2b" @@ -2511,6 +2995,50 @@ "InstanceType": "m5zn.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6a.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6a.metal", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "m6g.12xlarge", "Location": "us-east-2b" @@ -2623,6 +3151,46 @@ "InstanceType": "m6i.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6id.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6id.metal", + "Location": "us-east-2b" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "mac1.metal", "Location": "us-east-2b" @@ -2943,6 +3511,50 @@ "InstanceType": "r5n.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6a.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6a.metal", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "r6g.12xlarge", "Location": "us-east-2b" @@ -3055,6 +3667,46 @@ "InstanceType": "r6i.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6id.large", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6id.metal", + "Location": "us-east-2b" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "us-east-2b" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2b" @@ -3243,6 +3895,22 @@ "InstanceType": "x2gd.xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "us-east-2b" + }, + { + "InstanceType": "x2idn.metal", + "Location": "us-east-2b" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "us-east-2b" @@ -3267,6 +3935,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "us-east-2b" }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-east-2b" + }, { "InstanceType": "x2iedn.xlarge", "Location": "us-east-2b" @@ -3451,6 +4123,50 @@ "InstanceType": "c5n.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6a.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6a.metal", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "c6g.12xlarge", "Location": "us-east-2c" @@ -3595,6 +4311,78 @@ "InstanceType": "c6i.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6id.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6id.metal", + "Location": "us-east-2c" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7g.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-east-2c" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "d2.2xlarge", "Location": "us-east-2c" @@ -3783,6 +4571,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "i4i.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-east-2c" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "im4gn.16xlarge", "Location": "us-east-2c" @@ -4107,6 +4927,50 @@ "InstanceType": "m5zn.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6a.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6a.metal", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "m6g.12xlarge", "Location": "us-east-2c" @@ -4219,6 +5083,46 @@ "InstanceType": "m6i.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6id.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6id.metal", + "Location": "us-east-2c" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "mac1.metal", "Location": "us-east-2c" @@ -4523,6 +5427,50 @@ "InstanceType": "r5n.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6a.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6a.metal", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "r6g.12xlarge", "Location": "us-east-2c" @@ -4635,6 +5583,46 @@ "InstanceType": "r6i.xlarge", "Location": "us-east-2c" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6id.large", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6id.metal", + "Location": "us-east-2c" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "us-east-2c" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2c" @@ -4798,5 +5786,21 @@ { "InstanceType": "x2gd.xlarge", "Location": "us-east-2c" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "us-east-2c" + }, + { + "InstanceType": "x2idn.metal", + "Location": "us-east-2c" } ] \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json index cc7faa7fd..5d2337fbc 100644 --- a/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/availability-zone/us-west-1.json @@ -251,6 +251,38 @@ "InstanceType": "c6gd.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6gn.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6gn.medium", + "Location": "us-west-1b" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "c6i.12xlarge", "Location": "us-west-1b" @@ -431,6 +463,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-west-1b" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-west-1b" + }, + { + "InstanceType": "i4i.large", + "Location": "us-west-1b" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-west-1b" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-west-1b" + }, { "InstanceType": "inf1.24xlarge", "Location": "us-west-1b" @@ -1515,6 +1579,38 @@ "InstanceType": "c6gd.xlarge", "Location": "us-west-1c" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "us-west-1c" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "us-west-1c" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "us-west-1c" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "us-west-1c" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "us-west-1c" + }, + { + "InstanceType": "c6gn.large", + "Location": "us-west-1c" + }, + { + "InstanceType": "c6gn.medium", + "Location": "us-west-1c" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "us-west-1c" + }, { "InstanceType": "c6i.12xlarge", "Location": "us-west-1c" @@ -1695,6 +1791,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-west-1c" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-west-1c" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-west-1c" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-west-1c" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-west-1c" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-west-1c" + }, + { + "InstanceType": "i4i.large", + "Location": "us-west-1c" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-west-1c" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-west-1c" + }, { "InstanceType": "inf1.24xlarge", "Location": "us-west-1c" 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 1767de49a..b3c1456c1 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 @@ -247,6 +247,10 @@ "InstanceType": "c6a.large", "Location": "us-west-2a" }, + { + "InstanceType": "c6a.metal", + "Location": "us-west-2a" + }, { "InstanceType": "c6a.xlarge", "Location": "us-west-2a" @@ -395,6 +399,78 @@ "InstanceType": "c6i.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6id.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6id.metal", + "Location": "us-west-2a" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7g.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-west-2a" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "cc2.8xlarge", "Location": "us-west-2a" @@ -691,6 +767,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "i4i.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-west-2a" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "im4gn.16xlarge", "Location": "us-west-2a" @@ -1095,6 +1203,10 @@ "InstanceType": "m6a.large", "Location": "us-west-2a" }, + { + "InstanceType": "m6a.metal", + "Location": "us-west-2a" + }, { "InstanceType": "m6a.xlarge", "Location": "us-west-2a" @@ -1211,10 +1323,54 @@ "InstanceType": "m6i.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6id.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6id.metal", + "Location": "us-west-2a" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2a" }, + { + "InstanceType": "mac2.metal", + "Location": "us-west-2a" + }, { "InstanceType": "p2.16xlarge", "Location": "us-west-2a" @@ -1535,6 +1691,50 @@ "InstanceType": "r5n.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6a.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6a.metal", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "r6g.12xlarge", "Location": "us-west-2a" @@ -1647,6 +1847,46 @@ "InstanceType": "r6i.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6id.large", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6id.metal", + "Location": "us-west-2a" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "us-west-2a" + }, { "InstanceType": "t1.micro", "Location": "us-west-2a" @@ -1863,6 +2103,22 @@ "InstanceType": "x2gd.xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "us-west-2a" + }, + { + "InstanceType": "x2idn.metal", + "Location": "us-west-2a" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "us-west-2a" @@ -1887,6 +2143,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "us-west-2a" }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-west-2a" + }, { "InstanceType": "x2iedn.xlarge", "Location": "us-west-2a" @@ -2215,6 +2475,10 @@ "InstanceType": "c6a.large", "Location": "us-west-2b" }, + { + "InstanceType": "c6a.metal", + "Location": "us-west-2b" + }, { "InstanceType": "c6a.xlarge", "Location": "us-west-2b" @@ -2363,6 +2627,78 @@ "InstanceType": "c6i.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c6id.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "c6id.metal", + "Location": "us-west-2b" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7g.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-west-2b" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "cc2.8xlarge", "Location": "us-west-2b" @@ -2639,6 +2975,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "i4i.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-west-2b" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "im4gn.16xlarge", "Location": "us-west-2b" @@ -3043,6 +3411,10 @@ "InstanceType": "m6a.large", "Location": "us-west-2b" }, + { + "InstanceType": "m6a.metal", + "Location": "us-west-2b" + }, { "InstanceType": "m6a.xlarge", "Location": "us-west-2b" @@ -3159,10 +3531,54 @@ "InstanceType": "m6i.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6id.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6id.metal", + "Location": "us-west-2b" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2b" }, + { + "InstanceType": "mac2.metal", + "Location": "us-west-2b" + }, { "InstanceType": "p2.16xlarge", "Location": "us-west-2b" @@ -3479,6 +3895,50 @@ "InstanceType": "r5n.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6a.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6a.metal", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "r6g.12xlarge", "Location": "us-west-2b" @@ -3591,6 +4051,46 @@ "InstanceType": "r6i.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6id.large", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6id.metal", + "Location": "us-west-2b" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "us-west-2b" + }, { "InstanceType": "t1.micro", "Location": "us-west-2b" @@ -3795,6 +4295,22 @@ "InstanceType": "x2gd.xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "us-west-2b" + }, + { + "InstanceType": "x2idn.metal", + "Location": "us-west-2b" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "us-west-2b" @@ -3819,6 +4335,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "us-west-2b" }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-west-2b" + }, { "InstanceType": "x2iedn.xlarge", "Location": "us-west-2b" @@ -4115,6 +4635,10 @@ "InstanceType": "c6a.large", "Location": "us-west-2c" }, + { + "InstanceType": "c6a.metal", + "Location": "us-west-2c" + }, { "InstanceType": "c6a.xlarge", "Location": "us-west-2c" @@ -4263,6 +4787,78 @@ "InstanceType": "c6i.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c6id.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "c6id.metal", + "Location": "us-west-2c" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7g.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-west-2c" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "cc2.8xlarge", "Location": "us-west-2c" @@ -4555,6 +5151,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "i4i.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-west-2c" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "im4gn.16xlarge", "Location": "us-west-2c" @@ -4959,6 +5587,10 @@ "InstanceType": "m6a.large", "Location": "us-west-2c" }, + { + "InstanceType": "m6a.metal", + "Location": "us-west-2c" + }, { "InstanceType": "m6a.xlarge", "Location": "us-west-2c" @@ -5075,10 +5707,54 @@ "InstanceType": "m6i.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6id.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6id.metal", + "Location": "us-west-2c" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2c" }, + { + "InstanceType": "mac2.metal", + "Location": "us-west-2c" + }, { "InstanceType": "p2.16xlarge", "Location": "us-west-2c" @@ -5511,6 +6187,46 @@ "InstanceType": "r6i.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "r6id.large", + "Location": "us-west-2c" + }, + { + "InstanceType": "r6id.metal", + "Location": "us-west-2c" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "us-west-2c" + }, { "InstanceType": "t1.micro", "Location": "us-west-2c" @@ -5715,6 +6431,22 @@ "InstanceType": "x2gd.xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "us-west-2c" + }, + { + "InstanceType": "x2idn.metal", + "Location": "us-west-2c" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "us-west-2c" @@ -5739,6 +6471,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "us-west-2c" }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-west-2c" + }, { "InstanceType": "x2iedn.xlarge", "Location": "us-west-2c" @@ -5995,6 +6731,10 @@ "InstanceType": "c6a.large", "Location": "us-west-2d" }, + { + "InstanceType": "c6a.metal", + "Location": "us-west-2d" + }, { "InstanceType": "c6a.xlarge", "Location": "us-west-2d" @@ -6071,6 +6811,38 @@ "InstanceType": "c6gd.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6gn.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6gn.medium", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "c6i.12xlarge", "Location": "us-west-2d" @@ -6111,6 +6883,78 @@ "InstanceType": "c6i.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6id.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6id.metal", + "Location": "us-west-2d" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7g.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-west-2d" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "d2.2xlarge", "Location": "us-west-2d" @@ -6223,6 +7067,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "i4i.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-west-2d" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "inf1.24xlarge", "Location": "us-west-2d" @@ -6375,6 +7251,10 @@ "InstanceType": "m5d.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "m6a.metal", + "Location": "us-west-2d" + }, { "InstanceType": "m6g.12xlarge", "Location": "us-west-2d" @@ -6487,10 +7367,54 @@ "InstanceType": "m6i.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6id.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6id.metal", + "Location": "us-west-2d" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2d" }, + { + "InstanceType": "mac2.metal", + "Location": "us-west-2d" + }, { "InstanceType": "r5.12xlarge", "Location": "us-west-2d" @@ -6659,6 +7583,50 @@ "InstanceType": "r5dn.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6a.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6a.metal", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "r6g.12xlarge", "Location": "us-west-2d" @@ -6771,6 +7739,46 @@ "InstanceType": "r6i.xlarge", "Location": "us-west-2d" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6id.large", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6id.metal", + "Location": "us-west-2d" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "us-west-2d" + }, { "InstanceType": "t3.2xlarge", "Location": "us-west-2d" diff --git a/moto/ec2/resources/instance_type_offerings/region/af-south-1.json b/moto/ec2/resources/instance_type_offerings/region/af-south-1.json index d3c816545..8b03e5b13 100644 --- a/moto/ec2/resources/instance_type_offerings/region/af-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/af-south-1.json @@ -415,6 +415,78 @@ "InstanceType": "r5d.xlarge", "Location": "af-south-1" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r5dn.large", + "Location": "af-south-1" + }, + { + "InstanceType": "r5dn.metal", + "Location": "af-south-1" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r5n.12xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "af-south-1" + }, + { + "InstanceType": "r5n.large", + "Location": "af-south-1" + }, + { + "InstanceType": "r5n.metal", + "Location": "af-south-1" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "af-south-1" + }, { "InstanceType": "t3.2xlarge", "Location": "af-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-east-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-east-1.json index 9d2c276ed..63a8e1024 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-east-1.json @@ -155,6 +155,78 @@ "InstanceType": "c6g.xlarge", "Location": "ap-east-1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6i.large", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6i.metal", + "Location": "ap-east-1" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "ap-east-1" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-east-1" @@ -259,6 +331,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-east-1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-east-1" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-east-1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-east-1" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-east-1" @@ -383,6 +487,46 @@ "InstanceType": "m6g.xlarge", "Location": "ap-east-1" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6i.large", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6i.metal", + "Location": "ap-east-1" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "ap-east-1" + }, { "InstanceType": "r5.12xlarge", "Location": "ap-east-1" @@ -527,6 +671,46 @@ "InstanceType": "r6g.xlarge", "Location": "ap-east-1" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "ap-east-1" + }, + { + "InstanceType": "r6i.large", + "Location": "ap-east-1" + }, + { + "InstanceType": "r6i.metal", + "Location": "ap-east-1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "ap-east-1" + }, { "InstanceType": "t3.2xlarge", "Location": "ap-east-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json index 601983b90..c8d32ce47 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-1.json @@ -455,6 +455,38 @@ "InstanceType": "g4dn.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "g5g.16xlarge", "Location": "ap-northeast-1" @@ -555,6 +587,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-northeast-1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-northeast-1" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-northeast-1" @@ -1595,6 +1659,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-northeast-1" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "ap-northeast-1" @@ -1619,6 +1687,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "ap-northeast-1" }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-northeast-1" + }, { "InstanceType": "x2iedn.xlarge", "Location": "ap-northeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json index 92e6d8cc0..3cb0ac35c 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-2.json @@ -187,6 +187,74 @@ "InstanceType": "c6g.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gd.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gd.medium", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gd.metal", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-northeast-2" @@ -915,6 +983,42 @@ "InstanceType": "r5d.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r5dn.large", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r5dn.metal", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "r5n.12xlarge", "Location": "ap-northeast-2" @@ -1179,6 +1283,54 @@ "InstanceType": "x1e.xlarge", "Location": "ap-northeast-2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-northeast-2" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ap-northeast-2" + }, { "InstanceType": "z1d.12xlarge", "Location": "ap-northeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json index 1bc3a8476..ff6bd3c51 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-northeast-3.json @@ -91,6 +91,78 @@ "InstanceType": "c5d.xlarge", "Location": "ap-northeast-3" }, + { + "InstanceType": "c6g.12xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6g.16xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6g.2xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6g.4xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6g.8xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6g.large", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6g.medium", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6g.metal", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6g.xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6gd.12xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6gd.16xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6gd.2xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6gd.4xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6gd.8xlarge", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6gd.large", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6gd.medium", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6gd.metal", + "Location": "ap-northeast-3" + }, + { + "InstanceType": "c6gd.xlarge", + "Location": "ap-northeast-3" + }, { "InstanceType": "d2.2xlarge", "Location": "ap-northeast-3" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json index 5cb66bb58..cc54c6280 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-south-1.json @@ -175,6 +175,50 @@ "InstanceType": "c5n.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6a.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6a.metal", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "c6g.12xlarge", "Location": "ap-south-1" @@ -247,6 +291,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-south-1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-south-1" @@ -347,6 +423,38 @@ "InstanceType": "g4dn.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "i2.2xlarge", "Location": "ap-south-1" @@ -635,6 +743,10 @@ "InstanceType": "m6a.large", "Location": "ap-south-1" }, + { + "InstanceType": "m6a.metal", + "Location": "ap-south-1" + }, { "InstanceType": "m6a.xlarge", "Location": "ap-south-1" @@ -983,6 +1095,50 @@ "InstanceType": "r5n.xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6a.large", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6a.metal", + "Location": "ap-south-1" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "r6g.12xlarge", "Location": "ap-south-1" @@ -1259,6 +1415,42 @@ "InstanceType": "x2idn.32xlarge", "Location": "ap-south-1" }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-south-1" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ap-south-1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-south-1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ap-south-1" + }, { "InstanceType": "z1d.12xlarge", "Location": "ap-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json index 7764dd50f..8829cb386 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-1.json @@ -307,6 +307,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-southeast-1" @@ -527,6 +559,38 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-southeast-1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-southeast-1" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-southeast-1" @@ -963,6 +1027,10 @@ "InstanceType": "mac1.metal", "Location": "ap-southeast-1" }, + { + "InstanceType": "mac2.metal", + "Location": "ap-southeast-1" + }, { "InstanceType": "p2.16xlarge", "Location": "ap-southeast-1" @@ -1563,6 +1631,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-southeast-1" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "ap-southeast-1" @@ -1587,6 +1659,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "ap-southeast-1" }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-southeast-1" + }, { "InstanceType": "x2iedn.xlarge", "Location": "ap-southeast-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json index 2d30d6073..1d535ffaa 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/ap-southeast-2.json @@ -307,6 +307,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6gn.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "c6i.12xlarge", "Location": "ap-southeast-2" @@ -515,6 +547,62 @@ "InstanceType": "i3en.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "i4i.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "i4i.metal", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "im4gn.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "inf1.24xlarge", "Location": "ap-southeast-2" @@ -531,6 +619,30 @@ "InstanceType": "inf1.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "is4gen.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "is4gen.medium", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "m1.large", "Location": "ap-southeast-2" @@ -1047,6 +1159,42 @@ "InstanceType": "r5ad.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5b.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5b.metal", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "r5d.12xlarge", "Location": "ap-southeast-2" @@ -1083,6 +1231,42 @@ "InstanceType": "r5d.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5dn.large", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5dn.metal", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "r5n.12xlarge", "Location": "ap-southeast-2" @@ -1387,6 +1571,54 @@ "InstanceType": "x1e.xlarge", "Location": "ap-southeast-2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ap-southeast-2" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ap-southeast-2" + }, { "InstanceType": "z1d.12xlarge", "Location": "ap-southeast-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json b/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json index 5e562618b..128aa5107 100644 --- a/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/ca-central-1.json @@ -223,6 +223,38 @@ "InstanceType": "c6gd.xlarge", "Location": "ca-central-1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "c6gn.large", + "Location": "ca-central-1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "ca-central-1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "ca-central-1" + }, { "InstanceType": "c6i.12xlarge", "Location": "ca-central-1" @@ -279,6 +311,22 @@ "InstanceType": "d2.xlarge", "Location": "ca-central-1" }, + { + "InstanceType": "d3.2xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "d3.4xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "d3.8xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "d3.xlarge", + "Location": "ca-central-1" + }, { "InstanceType": "g3.16xlarge", "Location": "ca-central-1" @@ -339,6 +387,38 @@ "InstanceType": "g4dn.xlarge", "Location": "ca-central-1" }, + { + "InstanceType": "g5.12xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "ca-central-1" + }, { "InstanceType": "i3.16xlarge", "Location": "ca-central-1" @@ -399,6 +479,62 @@ "InstanceType": "i3en.xlarge", "Location": "ca-central-1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "i4i.large", + "Location": "ca-central-1" + }, + { + "InstanceType": "i4i.metal", + "Location": "ca-central-1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "im4gn.large", + "Location": "ca-central-1" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "ca-central-1" + }, { "InstanceType": "inf1.24xlarge", "Location": "ca-central-1" @@ -415,6 +551,30 @@ "InstanceType": "inf1.xlarge", "Location": "ca-central-1" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "is4gen.large", + "Location": "ca-central-1" + }, + { + "InstanceType": "is4gen.medium", + "Location": "ca-central-1" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "ca-central-1" + }, { "InstanceType": "m4.10xlarge", "Location": "ca-central-1" @@ -787,6 +947,42 @@ "InstanceType": "r5ad.xlarge", "Location": "ca-central-1" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "r5b.large", + "Location": "ca-central-1" + }, + { + "InstanceType": "r5b.metal", + "Location": "ca-central-1" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "ca-central-1" + }, { "InstanceType": "r5d.12xlarge", "Location": "ca-central-1" @@ -1114,5 +1310,53 @@ { "InstanceType": "x1e.xlarge", "Location": "ca-central-1" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "ca-central-1" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "ca-central-1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "ca-central-1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "ca-central-1" } ] \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json index 4487a5235..f160d5b71 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-central-1.json @@ -227,6 +227,50 @@ "InstanceType": "c5n.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6a.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6a.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "c6g.12xlarge", "Location": "eu-central-1" @@ -299,6 +343,78 @@ "InstanceType": "c6gd.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6i.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6i.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-central-1" @@ -411,6 +527,38 @@ "InstanceType": "g4dn.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "g5.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "g5.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "i2.2xlarge", "Location": "eu-central-1" @@ -487,6 +635,62 @@ "InstanceType": "i3en.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "im4gn.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "inf1.24xlarge", "Location": "eu-central-1" @@ -503,6 +707,30 @@ "InstanceType": "inf1.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "is4gen.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "is4gen.medium", + "Location": "eu-central-1" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "m3.2xlarge", "Location": "eu-central-1" @@ -779,6 +1007,50 @@ "InstanceType": "m5zn.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6a.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6a.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "m6g.12xlarge", "Location": "eu-central-1" @@ -1211,6 +1483,50 @@ "InstanceType": "r5n.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6a.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6a.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "r6g.12xlarge", "Location": "eu-central-1" @@ -1283,6 +1599,46 @@ "InstanceType": "r6gd.xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-central-1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eu-central-1" + }, { "InstanceType": "t2.2xlarge", "Location": "eu-central-1" @@ -1459,6 +1815,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-central-1" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "eu-central-1" @@ -1483,6 +1843,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "eu-central-1" }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-central-1" + }, { "InstanceType": "x2iedn.xlarge", "Location": "eu-central-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json index 10af0c8af..63cc2ee7f 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-north-1.json @@ -167,6 +167,78 @@ "InstanceType": "c6g.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6i.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6i.metal", + "Location": "eu-north-1" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-north-1" @@ -211,6 +283,10 @@ "InstanceType": "g4dn.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "hpc6a.48xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-north-1" @@ -395,6 +471,82 @@ "InstanceType": "m6g.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "m6gd.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6gd.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6gd.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6gd.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6gd.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6gd.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6gd.medium", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6gd.metal", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6gd.xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6i.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6i.metal", + "Location": "eu-north-1" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "mac1.metal", "Location": "eu-north-1" @@ -471,6 +623,42 @@ "InstanceType": "r5d.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r5dn.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "r5dn.metal", + "Location": "eu-north-1" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "r5n.12xlarge", "Location": "eu-north-1" @@ -543,6 +731,46 @@ "InstanceType": "r6g.xlarge", "Location": "eu-north-1" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-north-1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eu-north-1" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-north-1" @@ -606,5 +834,53 @@ { "InstanceType": "u-6tb1.56xlarge", "Location": "eu-north-1" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-north-1" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-north-1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-north-1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-north-1" } ] \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-south-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-south-1.json index a718de1f9..5cbfea52a 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-south-1.json @@ -199,6 +199,78 @@ "InstanceType": "c6g.xlarge", "Location": "eu-south-1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6i.large", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6i.metal", + "Location": "eu-south-1" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "eu-south-1" + }, { "InstanceType": "d2.2xlarge", "Location": "eu-south-1" @@ -459,6 +531,46 @@ "InstanceType": "m6g.xlarge", "Location": "eu-south-1" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6i.large", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6i.metal", + "Location": "eu-south-1" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "eu-south-1" + }, { "InstanceType": "r5.12xlarge", "Location": "eu-south-1" @@ -563,6 +675,78 @@ "InstanceType": "r5d.xlarge", "Location": "eu-south-1" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5dn.large", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5dn.metal", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5n.12xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5n.16xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5n.24xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5n.2xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5n.4xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5n.8xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5n.large", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5n.metal", + "Location": "eu-south-1" + }, + { + "InstanceType": "r5n.xlarge", + "Location": "eu-south-1" + }, { "InstanceType": "r6g.12xlarge", "Location": "eu-south-1" @@ -599,6 +783,46 @@ "InstanceType": "r6g.xlarge", "Location": "eu-south-1" }, + { + "InstanceType": "r6i.12xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r6i.16xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r6i.24xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r6i.2xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r6i.32xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r6i.4xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r6i.8xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "r6i.large", + "Location": "eu-south-1" + }, + { + "InstanceType": "r6i.metal", + "Location": "eu-south-1" + }, + { + "InstanceType": "r6i.xlarge", + "Location": "eu-south-1" + }, { "InstanceType": "t3.2xlarge", "Location": "eu-south-1" @@ -686,5 +910,53 @@ { "InstanceType": "u-3tb1.56xlarge", "Location": "eu-south-1" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-south-1" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-south-1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-south-1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-south-1" } ] \ No newline at end of file diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json index ddd86bf5b..f733b470c 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-1.json @@ -271,6 +271,10 @@ "InstanceType": "c6a.large", "Location": "eu-west-1" }, + { + "InstanceType": "c6a.metal", + "Location": "eu-west-1" + }, { "InstanceType": "c6a.xlarge", "Location": "eu-west-1" @@ -419,6 +423,78 @@ "InstanceType": "c6i.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c6id.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "c6id.metal", + "Location": "eu-west-1" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7g.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7g.medium", + "Location": "eu-west-1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "cc2.8xlarge", "Location": "eu-west-1" @@ -687,6 +763,38 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-west-1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "im4gn.16xlarge", "Location": "eu-west-1" @@ -1087,6 +1195,10 @@ "InstanceType": "m6a.large", "Location": "eu-west-1" }, + { + "InstanceType": "m6a.metal", + "Location": "eu-west-1" + }, { "InstanceType": "m6a.xlarge", "Location": "eu-west-1" @@ -1203,10 +1315,54 @@ "InstanceType": "m6i.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "m6id.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "m6id.metal", + "Location": "eu-west-1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "mac1.metal", "Location": "eu-west-1" }, + { + "InstanceType": "mac2.metal", + "Location": "eu-west-1" + }, { "InstanceType": "p2.16xlarge", "Location": "eu-west-1" @@ -1527,6 +1683,50 @@ "InstanceType": "r5n.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6a.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6a.metal", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "r6g.12xlarge", "Location": "eu-west-1" @@ -1639,6 +1839,46 @@ "InstanceType": "r6i.xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6id.large", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6id.metal", + "Location": "eu-west-1" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "eu-west-1" + }, { "InstanceType": "t1.micro", "Location": "eu-west-1" @@ -1867,6 +2107,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-west-1" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "eu-west-1" @@ -1891,6 +2135,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "eu-west-1" }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-west-1" + }, { "InstanceType": "x2iedn.xlarge", "Location": "eu-west-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json index af0d1d4ef..0e1b24461 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-2.json @@ -223,6 +223,38 @@ "InstanceType": "c6gd.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-west-2" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "c6i.12xlarge", "Location": "eu-west-2" @@ -367,6 +399,38 @@ "InstanceType": "g4dn.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "g5.12xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "g5.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "g5.24xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "g5.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "g5.48xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "g5.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "g5.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "g5.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "i3.16xlarge", "Location": "eu-west-2" @@ -427,6 +491,62 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-west-2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "im4gn.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "im4gn.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "im4gn.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "im4gn.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "im4gn.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "im4gn.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "inf1.24xlarge", "Location": "eu-west-2" @@ -443,6 +563,30 @@ "InstanceType": "inf1.xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "is4gen.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "is4gen.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "is4gen.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "is4gen.large", + "Location": "eu-west-2" + }, + { + "InstanceType": "is4gen.medium", + "Location": "eu-west-2" + }, + { + "InstanceType": "is4gen.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "m4.10xlarge", "Location": "eu-west-2" @@ -1159,6 +1303,54 @@ "InstanceType": "x1.32xlarge", "Location": "eu-west-2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "eu-west-2" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "eu-west-2" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "eu-west-2" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "eu-west-2" + }, { "InstanceType": "z1d.12xlarge", "Location": "eu-west-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json b/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json index ac2b35281..337c22b48 100644 --- a/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json +++ b/moto/ec2/resources/instance_type_offerings/region/eu-west-3.json @@ -155,6 +155,38 @@ "InstanceType": "c6g.xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6gn.large", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6gn.medium", + "Location": "eu-west-3" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "c6i.12xlarge", "Location": "eu-west-3" @@ -299,6 +331,38 @@ "InstanceType": "i3en.xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "i4i.large", + "Location": "eu-west-3" + }, + { + "InstanceType": "i4i.metal", + "Location": "eu-west-3" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "inf1.24xlarge", "Location": "eu-west-3" @@ -687,6 +751,42 @@ "InstanceType": "r5d.xlarge", "Location": "eu-west-3" }, + { + "InstanceType": "r5dn.12xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r5dn.16xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r5dn.24xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r5dn.2xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r5dn.4xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r5dn.8xlarge", + "Location": "eu-west-3" + }, + { + "InstanceType": "r5dn.large", + "Location": "eu-west-3" + }, + { + "InstanceType": "r5dn.metal", + "Location": "eu-west-3" + }, + { + "InstanceType": "r5dn.xlarge", + "Location": "eu-west-3" + }, { "InstanceType": "r5n.12xlarge", "Location": "eu-west-3" diff --git a/moto/ec2/resources/instance_type_offerings/region/me-south-1.json b/moto/ec2/resources/instance_type_offerings/region/me-south-1.json index 843e3ad3c..9f88eb718 100644 --- a/moto/ec2/resources/instance_type_offerings/region/me-south-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/me-south-1.json @@ -187,6 +187,78 @@ "InstanceType": "c6g.xlarge", "Location": "me-south-1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "c6gn.large", + "Location": "me-south-1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "me-south-1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "c6i.12xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "c6i.16xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "c6i.24xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "c6i.2xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "c6i.32xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "c6i.4xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "c6i.8xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "c6i.large", + "Location": "me-south-1" + }, + { + "InstanceType": "c6i.metal", + "Location": "me-south-1" + }, + { + "InstanceType": "c6i.xlarge", + "Location": "me-south-1" + }, { "InstanceType": "d2.2xlarge", "Location": "me-south-1" @@ -251,10 +323,6 @@ "InstanceType": "i3.large", "Location": "me-south-1" }, - { - "InstanceType": "i3.metal", - "Location": "me-south-1" - }, { "InstanceType": "i3.xlarge", "Location": "me-south-1" @@ -415,6 +483,46 @@ "InstanceType": "m6g.xlarge", "Location": "me-south-1" }, + { + "InstanceType": "m6i.12xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m6i.16xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m6i.24xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m6i.2xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m6i.32xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m6i.4xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m6i.8xlarge", + "Location": "me-south-1" + }, + { + "InstanceType": "m6i.large", + "Location": "me-south-1" + }, + { + "InstanceType": "m6i.metal", + "Location": "me-south-1" + }, + { + "InstanceType": "m6i.xlarge", + "Location": "me-south-1" + }, { "InstanceType": "r5.12xlarge", "Location": "me-south-1" diff --git a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json index 2ff21bae9..2b4af1744 100644 --- a/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/sa-east-1.json @@ -247,6 +247,38 @@ "InstanceType": "c6g.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "c6gn.large", + "Location": "sa-east-1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "sa-east-1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "c6i.12xlarge", "Location": "sa-east-1" @@ -843,6 +875,42 @@ "InstanceType": "r5ad.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "r5b.12xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r5b.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r5b.24xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r5b.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r5b.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r5b.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r5b.large", + "Location": "sa-east-1" + }, + { + "InstanceType": "r5b.metal", + "Location": "sa-east-1" + }, + { + "InstanceType": "r5b.xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "r5d.12xlarge", "Location": "sa-east-1" @@ -951,6 +1019,42 @@ "InstanceType": "r6g.xlarge", "Location": "sa-east-1" }, + { + "InstanceType": "r6gd.12xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r6gd.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r6gd.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r6gd.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r6gd.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "r6gd.large", + "Location": "sa-east-1" + }, + { + "InstanceType": "r6gd.medium", + "Location": "sa-east-1" + }, + { + "InstanceType": "r6gd.metal", + "Location": "sa-east-1" + }, + { + "InstanceType": "r6gd.xlarge", + "Location": "sa-east-1" + }, { "InstanceType": "r6i.12xlarge", "Location": "sa-east-1" @@ -1138,5 +1242,53 @@ { "InstanceType": "x1e.xlarge", "Location": "sa-east-1" + }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "x2idn.metal", + "Location": "sa-east-1" + }, + { + "InstanceType": "x2iedn.16xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "x2iedn.24xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "x2iedn.2xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "x2iedn.32xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "x2iedn.4xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "x2iedn.8xlarge", + "Location": "sa-east-1" + }, + { + "InstanceType": "x2iedn.metal", + "Location": "sa-east-1" + }, + { + "InstanceType": "x2iedn.xlarge", + "Location": "sa-east-1" } ] \ No newline at end of file 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 4e5de569e..82ff4d5f2 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 @@ -271,6 +271,10 @@ "InstanceType": "c6a.large", "Location": "us-east-1" }, + { + "InstanceType": "c6a.metal", + "Location": "us-east-1" + }, { "InstanceType": "c6a.xlarge", "Location": "us-east-1" @@ -419,6 +423,78 @@ "InstanceType": "c6i.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c6id.large", + "Location": "us-east-1" + }, + { + "InstanceType": "c6id.metal", + "Location": "us-east-1" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "c7g.large", + "Location": "us-east-1" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-east-1" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "cc2.8xlarge", "Location": "us-east-1" @@ -715,6 +791,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "i4i.large", + "Location": "us-east-1" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-east-1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "im4gn.16xlarge", "Location": "us-east-1" @@ -1119,6 +1227,10 @@ "InstanceType": "m6a.large", "Location": "us-east-1" }, + { + "InstanceType": "m6a.metal", + "Location": "us-east-1" + }, { "InstanceType": "m6a.xlarge", "Location": "us-east-1" @@ -1235,10 +1347,54 @@ "InstanceType": "m6i.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "m6id.large", + "Location": "us-east-1" + }, + { + "InstanceType": "m6id.metal", + "Location": "us-east-1" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "mac1.metal", "Location": "us-east-1" }, + { + "InstanceType": "mac2.metal", + "Location": "us-east-1" + }, { "InstanceType": "p2.16xlarge", "Location": "us-east-1" @@ -1559,6 +1715,50 @@ "InstanceType": "r5n.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r6a.large", + "Location": "us-east-1" + }, + { + "InstanceType": "r6a.metal", + "Location": "us-east-1" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "r6g.12xlarge", "Location": "us-east-1" @@ -1671,6 +1871,46 @@ "InstanceType": "r6i.xlarge", "Location": "us-east-1" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "us-east-1" + }, + { + "InstanceType": "r6id.large", + "Location": "us-east-1" + }, + { + "InstanceType": "r6id.metal", + "Location": "us-east-1" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "us-east-1" + }, { "InstanceType": "t1.micro", "Location": "us-east-1" @@ -1899,6 +2139,10 @@ "InstanceType": "x2idn.32xlarge", "Location": "us-east-1" }, + { + "InstanceType": "x2idn.metal", + "Location": "us-east-1" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "us-east-1" @@ -1923,6 +2167,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "us-east-1" }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-east-1" + }, { "InstanceType": "x2iedn.xlarge", "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 b2502b00c..39859fb71 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 @@ -207,6 +207,50 @@ "InstanceType": "c5n.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "c6a.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c6a.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c6a.24xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c6a.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c6a.32xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c6a.48xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c6a.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c6a.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c6a.large", + "Location": "us-east-2" + }, + { + "InstanceType": "c6a.metal", + "Location": "us-east-2" + }, + { + "InstanceType": "c6a.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "c6g.12xlarge", "Location": "us-east-2" @@ -351,6 +395,78 @@ "InstanceType": "c6i.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c6id.large", + "Location": "us-east-2" + }, + { + "InstanceType": "c6id.metal", + "Location": "us-east-2" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "c7g.large", + "Location": "us-east-2" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-east-2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "d2.2xlarge", "Location": "us-east-2" @@ -543,6 +659,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "i4i.large", + "Location": "us-east-2" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-east-2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "im4gn.16xlarge", "Location": "us-east-2" @@ -867,6 +1015,50 @@ "InstanceType": "m5zn.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "m6a.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m6a.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m6a.24xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m6a.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m6a.32xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m6a.48xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m6a.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m6a.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m6a.large", + "Location": "us-east-2" + }, + { + "InstanceType": "m6a.metal", + "Location": "us-east-2" + }, + { + "InstanceType": "m6a.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "m6g.12xlarge", "Location": "us-east-2" @@ -979,6 +1171,46 @@ "InstanceType": "m6i.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "m6id.large", + "Location": "us-east-2" + }, + { + "InstanceType": "m6id.metal", + "Location": "us-east-2" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "mac1.metal", "Location": "us-east-2" @@ -1299,6 +1531,50 @@ "InstanceType": "r5n.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r6a.large", + "Location": "us-east-2" + }, + { + "InstanceType": "r6a.metal", + "Location": "us-east-2" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "r6g.12xlarge", "Location": "us-east-2" @@ -1411,6 +1687,46 @@ "InstanceType": "r6i.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "r6id.large", + "Location": "us-east-2" + }, + { + "InstanceType": "r6id.metal", + "Location": "us-east-2" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "us-east-2" + }, { "InstanceType": "t2.2xlarge", "Location": "us-east-2" @@ -1599,6 +1915,22 @@ "InstanceType": "x2gd.xlarge", "Location": "us-east-2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "us-east-2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "us-east-2" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "us-east-2" @@ -1623,6 +1955,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "us-east-2" }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-east-2" + }, { "InstanceType": "x2iedn.xlarge", "Location": "us-east-2" diff --git a/moto/ec2/resources/instance_type_offerings/region/us-west-1.json b/moto/ec2/resources/instance_type_offerings/region/us-west-1.json index fa3438d68..13b9b5638 100644 --- a/moto/ec2/resources/instance_type_offerings/region/us-west-1.json +++ b/moto/ec2/resources/instance_type_offerings/region/us-west-1.json @@ -251,6 +251,38 @@ "InstanceType": "c6gd.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "c6gn.12xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6gn.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6gn.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6gn.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6gn.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "c6gn.large", + "Location": "us-west-1" + }, + { + "InstanceType": "c6gn.medium", + "Location": "us-west-1" + }, + { + "InstanceType": "c6gn.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "c6i.12xlarge", "Location": "us-west-1" @@ -431,6 +463,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-west-1" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-west-1" + }, + { + "InstanceType": "i4i.large", + "Location": "us-west-1" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-west-1" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-west-1" + }, { "InstanceType": "inf1.24xlarge", "Location": "us-west-1" 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 61bd5a6a9..f9ab6db7b 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 @@ -271,6 +271,10 @@ "InstanceType": "c6a.large", "Location": "us-west-2" }, + { + "InstanceType": "c6a.metal", + "Location": "us-west-2" + }, { "InstanceType": "c6a.xlarge", "Location": "us-west-2" @@ -419,6 +423,78 @@ "InstanceType": "c6i.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "c6id.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c6id.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c6id.24xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c6id.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c6id.32xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c6id.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c6id.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c6id.large", + "Location": "us-west-2" + }, + { + "InstanceType": "c6id.metal", + "Location": "us-west-2" + }, + { + "InstanceType": "c6id.xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7g.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7g.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7g.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7g.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7g.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "c7g.large", + "Location": "us-west-2" + }, + { + "InstanceType": "c7g.medium", + "Location": "us-west-2" + }, + { + "InstanceType": "c7g.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "cc2.8xlarge", "Location": "us-west-2" @@ -715,6 +791,38 @@ "InstanceType": "i3en.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "i4i.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "i4i.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "i4i.32xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "i4i.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "i4i.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "i4i.large", + "Location": "us-west-2" + }, + { + "InstanceType": "i4i.metal", + "Location": "us-west-2" + }, + { + "InstanceType": "i4i.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "im4gn.16xlarge", "Location": "us-west-2" @@ -1119,6 +1227,10 @@ "InstanceType": "m6a.large", "Location": "us-west-2" }, + { + "InstanceType": "m6a.metal", + "Location": "us-west-2" + }, { "InstanceType": "m6a.xlarge", "Location": "us-west-2" @@ -1235,10 +1347,54 @@ "InstanceType": "m6i.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "m6id.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6id.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6id.24xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6id.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6id.32xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6id.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6id.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "m6id.large", + "Location": "us-west-2" + }, + { + "InstanceType": "m6id.metal", + "Location": "us-west-2" + }, + { + "InstanceType": "m6id.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "mac1.metal", "Location": "us-west-2" }, + { + "InstanceType": "mac2.metal", + "Location": "us-west-2" + }, { "InstanceType": "p2.16xlarge", "Location": "us-west-2" @@ -1559,6 +1715,50 @@ "InstanceType": "r5n.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "r6a.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r6a.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r6a.24xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r6a.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r6a.32xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r6a.48xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r6a.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r6a.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r6a.large", + "Location": "us-west-2" + }, + { + "InstanceType": "r6a.metal", + "Location": "us-west-2" + }, + { + "InstanceType": "r6a.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "r6g.12xlarge", "Location": "us-west-2" @@ -1671,6 +1871,46 @@ "InstanceType": "r6i.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "r6id.12xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r6id.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r6id.24xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r6id.2xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r6id.32xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r6id.4xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r6id.8xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "r6id.large", + "Location": "us-west-2" + }, + { + "InstanceType": "r6id.metal", + "Location": "us-west-2" + }, + { + "InstanceType": "r6id.xlarge", + "Location": "us-west-2" + }, { "InstanceType": "t1.micro", "Location": "us-west-2" @@ -1887,6 +2127,22 @@ "InstanceType": "x2gd.xlarge", "Location": "us-west-2" }, + { + "InstanceType": "x2idn.16xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "x2idn.24xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "x2idn.32xlarge", + "Location": "us-west-2" + }, + { + "InstanceType": "x2idn.metal", + "Location": "us-west-2" + }, { "InstanceType": "x2iedn.16xlarge", "Location": "us-west-2" @@ -1911,6 +2167,10 @@ "InstanceType": "x2iedn.8xlarge", "Location": "us-west-2" }, + { + "InstanceType": "x2iedn.metal", + "Location": "us-west-2" + }, { "InstanceType": "x2iedn.xlarge", "Location": "us-west-2" diff --git a/moto/iam/aws_managed_policies.py b/moto/iam/aws_managed_policies.py index 66349b0f7..bb7019b25 100644 --- a/moto/iam/aws_managed_policies.py +++ b/moto/iam/aws_managed_policies.py @@ -1628,7 +1628,7 @@ aws_managed_policies_data = """ }, "AWSApplicationMigrationFullAccess":{ "CreateDate":"2021-04-07T06:56:05+00:00", - "DefaultVersionId":"v4", + "DefaultVersionId":"v5", "Document":{ "Statement":[ { @@ -1779,6 +1779,21 @@ aws_managed_policies_data = """ "arn:aws:ssm:*:*:document/AWSMigration-ReplaceSuseSubscriptionWithAwsSubscription" ] }, + { + "Action":[ + "drs:DisconnectSourceServer" + ], + "Condition":{ + "Bool":{ + "aws:ViaAWSService":"true" + }, + "Null":{ + "aws:ResourceTag/AWSApplicationMigrationServiceConfiguredDR":"false" + } + }, + "Effect":"Allow", + "Resource":"arn:aws:drs:*:*:source-server/*" + }, { "Action":[ "ssm:GetParameter", @@ -1799,7 +1814,7 @@ aws_managed_policies_data = """ }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-05-31T21:14:49+00:00" + "UpdateDate":"2022-08-11T16:08:08+00:00" }, "AWSApplicationMigrationMGHAccess":{ "CreateDate":"2021-04-07T07:10:01+00:00", @@ -2455,7 +2470,7 @@ aws_managed_policies_data = """ }, "AWSAuditManagerServiceRolePolicy":{ "CreateDate":"2020-12-08T15:12:12+00:00", - "DefaultVersionId":"v3", + "DefaultVersionId":"v4", "Document":{ "Statement":[ { @@ -2495,7 +2510,8 @@ aws_managed_policies_data = """ "ec2:DescribeNetworkAcls", "ec2:DescribeRouteTables", "ec2:DescribeSnapshots", - "ec2:DescribeVpcEndpoints" + "ec2:DescribeVpcEndpoints", + "ec2:DescribeVolumes" ], "Effect":"Allow", "Resource":"*", @@ -2531,7 +2547,10 @@ aws_managed_policies_data = """ "Action":[ "kms:ListKeys", "kms:DescribeKey", - "kms:ListGrants" + "kms:ListGrants", + "kms:GetKeyRotationStatus", + "kms:GetKeyPolicy", + "kms:ListKeyPolicies" ], "Effect":"Allow", "Resource":"*", @@ -2547,7 +2566,9 @@ aws_managed_policies_data = """ }, { "Action":[ - "s3:GetLifecycleConfiguration" + "s3:GetLifecycleConfiguration", + "s3:GetEncryptionConfiguration", + "s3:ListAllMyBuckets" ], "Effect":"Allow", "Resource":"*", @@ -2585,6 +2606,31 @@ aws_managed_policies_data = """ "Resource":"*", "Sid":"Route53Access" }, + { + "Action":[ + "dynamodb:DescribeTable", + "dynamodb:ListTables" + ], + "Effect":"Allow", + "Resource":"*", + "Sid":"DynamoDBAccess" + }, + { + "Action":[ + "redshift:DescribeClusters" + ], + "Effect":"Allow", + "Resource":"*", + "Sid":"RedshiftAccess" + }, + { + "Action":[ + "rds:DescribeDBInstances" + ], + "Effect":"Allow", + "Resource":"*", + "Sid":"RDSAccess" + }, { "Action":[ "organizations:DescribePolicy", @@ -2650,7 +2696,7 @@ aws_managed_policies_data = """ }, "Path":"/aws-service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-05-20T16:26:09+00:00" + "UpdateDate":"2022-07-07T22:26:07+00:00" }, "AWSAutoScalingPlansEC2AutoScalingPolicy":{ "CreateDate":"2018-08-23T22:46:59+00:00", @@ -3288,7 +3334,7 @@ aws_managed_policies_data = """ }, "AWSBackupServiceLinkedRolePolicyForBackup":{ "CreateDate":"2020-06-02T23:08:40+00:00", - "DefaultVersionId":"v10", + "DefaultVersionId":"v11", "Document":{ "Statement":[ { @@ -3497,13 +3543,41 @@ aws_managed_policies_data = """ ], "Effect":"Allow", "Resource":"arn:aws:storagegateway:*:*:gateway/*/volume/*" + }, + { + "Action":[ + "events:DeleteRule", + "events:PutTargets", + "events:DescribeRule", + "events:EnableRule", + "events:PutRule", + "events:RemoveTargets", + "events:ListTargetsByRule", + "events:DisableRule" + ], + "Effect":"Allow", + "Resource":[ + "arn:aws:events:*:*:rule/AwsBackupManagedRule*" + ] + }, + { + "Action":"events:ListRules", + "Effect":"Allow", + "Resource":"*" + }, + { + "Action":[ + "sysops-sap:GetOperation" + ], + "Effect":"Allow", + "Resource":"*" } ], "Version":"2012-10-17" }, "Path":"/aws-service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-05-17T17:21:50+00:00" + "UpdateDate":"2022-07-28T17:29:44+00:00" }, "AWSBackupServiceLinkedRolePolicyForBackupTest":{ "CreateDate":"2020-05-12T17:37:29+00:00", @@ -3853,7 +3927,7 @@ aws_managed_policies_data = """ }, "AWSBackupServiceRolePolicyForRestores":{ "CreateDate":"2019-01-12T00:23:54+00:00", - "DefaultVersionId":"v12", + "DefaultVersionId":"v13", "Document":{ "Statement":[ { @@ -3994,6 +4068,13 @@ aws_managed_policies_data = """ "Effect":"Allow", "Resource":"arn:aws:ec2:*::snapshot/*" }, + { + "Action":[ + "rds:CreateDBInstance" + ], + "Effect":"Allow", + "Resource":"arn:aws:rds:*:*:db:*" + }, { "Action":[ "ec2:DeleteSnapshot", @@ -4142,7 +4223,7 @@ aws_managed_policies_data = """ }, "Path":"/service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-05-17T17:36:12+00:00" + "UpdateDate":"2022-07-19T23:22:51+00:00" }, "AWSBackupServiceRolePolicyForS3Backup":{ "CreateDate":"2022-02-18T17:40:24+00:00", @@ -8082,11 +8163,12 @@ aws_managed_policies_data = """ }, "AWSCompromisedKeyQuarantineV2":{ "CreateDate":"2021-04-21T22:30:59+00:00", - "DefaultVersionId":"v2", + "DefaultVersionId":"v3", "Document":{ "Statement":[ { "Action":[ + "cloudtrail:LookupEvents", "ec2:RequestSpotInstances", "ec2:RunInstances", "ec2:StartInstances", @@ -8153,7 +8235,7 @@ aws_managed_policies_data = """ }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2021-11-11T21:32:48+00:00" + "UpdateDate":"2022-08-10T21:15:53+00:00" }, "AWSConfigMultiAccountSetupPolicy":{ "CreateDate":"2019-06-17T18:03:16+00:00", @@ -8636,7 +8718,7 @@ aws_managed_policies_data = """ }, "AWSConfigServiceRolePolicy":{ "CreateDate":"2018-05-30T23:31:46+00:00", - "DefaultVersionId":"v32", + "DefaultVersionId":"v33", "Document":{ "Statement":[ { @@ -8650,9 +8732,20 @@ aws_managed_policies_data = """ "acm:DescribeCertificate", "acm:ListCertificates", "acm:ListTagsForCertificate", + "amplifyuibuilder:GetTheme", + "amplifyuibuilder:ExportThemes", "apigateway:GET", + "appconfig:GetApplication", + "appconfig:GetConfigurationProfile", + "appconfig:GetDeployment", + "appconfig:GetDeploymentStrategy", + "appconfig:GetEnvironment", + "appconfig:GetHostedConfigurationVersion", + "appconfig:ListTagsForResource", "application-autoscaling:DescribeScalableTargets", "application-autoscaling:DescribeScalingPolicies", + "appsync:GetGraphqlApi", + "appsync:ListGraphqlApis", "athena:GetDataCatalog", "athena:GetWorkGroup", "athena:ListDataCatalogs", @@ -8680,6 +8773,13 @@ aws_managed_policies_data = """ "batch:DescribeComputeEnvironments", "batch:DescribeJobQueues", "batch:ListTagsForResource", + "billingconductor:ListBillingGroups", + "billingconductor:ListAccountAssociations", + "billingconductor:ListTagsForResource", + "billingconductor:ListPricingRules", + "billingconductor:ListCustomLineItems", + "billingconductor:ListPricingPlans", + "billingconductor:ListPricingRulesAssociatedToPricingPlan", "cloudformation:DescribeType", "cloudformation:GetResource", "cloudformation:ListResources", @@ -8703,13 +8803,23 @@ aws_managed_policies_data = """ "config:List*", "config:Put*", "config:Select*", + "datasync:DescribeAgent", + "datasync:DescribeLocationEfs", + "datasync:DescribeLocationFsxLustre", + "datasync:DescribeLocationHdfs", + "datasync:DescribeLocationNfs", + "datasync:DescribeLocationObjectStorage", + "datasync:DescribeLocationS3", + "datasync:DescribeLocationSmb", + "datasync:DescribeTask", + "datasync:ListTagsForResource", "dax:DescribeClusters", "dax:DescribeParameterGroups", "dax:DescribeParameters", "dax:DescribeSubnetGroups", "dax:ListTags", - "detective:ListTagsForResource", "detective:ListGraphs", + "detective:ListTagsForResource", "dms:DescribeCertificates", "dms:DescribeEventSubscriptions", "dms:DescribeReplicationInstances", @@ -8739,7 +8849,10 @@ aws_managed_policies_data = """ "ecr-public:GetRepositoryPolicy", "ecr-public:ListTagsForResource", "ecr:DescribeRepositories", + "ecr:DescribePullThroughCacheRules", + "ecr:DescribeRegistry", "ecr:GetLifecyclePolicy", + "ecr:GetRegistryPolicy", "ecr:GetRepositoryPolicy", "ecr:ListTagsForResource", "ecs:DescribeClusters", @@ -8760,6 +8873,7 @@ aws_managed_policies_data = """ "eks:ListTagsForResource", "elasticache:DescribeCacheClusters", "elasticache:DescribeCacheParameterGroups", + "elasticache:DescribeCacheParameters", "elasticache:DescribeCacheSubnetGroups", "elasticache:DescribeReplicationGroups", "elasticache:DescribeSnapshots", @@ -8773,12 +8887,16 @@ aws_managed_policies_data = """ "elasticfilesystem:DescribeLifecycleConfiguration", "elasticfilesystem:DescribeMountTargets", "elasticfilesystem:DescribeMountTargetSecurityGroups", + "elasticloadbalancing:DescribeListenerCertificates", "elasticloadbalancing:DescribeListeners", "elasticloadbalancing:DescribeLoadBalancerAttributes", "elasticloadbalancing:DescribeLoadBalancerPolicies", "elasticloadbalancing:DescribeLoadBalancers", "elasticloadbalancing:DescribeRules", "elasticloadbalancing:DescribeTags", + "elasticloadbalancing:DescribeTargetGroupAttributes", + "elasticloadbalancing:DescribeTargetGroups", + "elasticloadbalancing:DescribeTargetHealth", "elasticmapreduce:DescribeCluster", "elasticmapreduce:DescribeSecurityConfiguration", "elasticmapreduce:DescribeStep", @@ -8798,11 +8916,24 @@ aws_managed_policies_data = """ "es:GetCompatibleVersions", "es:ListDomainNames", "es:ListTags", + "events:DescribeArchive", + "events:DescribeApiDestination", "firehose:DescribeDeliveryStream", "firehose:ListDeliveryStreams", "firehose:ListTagsForDeliveryStream", + "fms:ListPolicies", + "fms:GetPolicy", + "fms:ListTagsForResource", + "fms:GetNotificationChannel", "fsx:DescribeFileSystems", + "fsx:DescribeVolumes", "fsx:ListTagsForResource", + "geo:DescribeTracker", + "geo:ListTrackerConsumers", + "geo:DescribeGeofenceCollection", + "geo:DescribePlaceIndex", + "geo:DescribeRouteCalculator", + "geo:DescribeMap", "globalaccelerator:DescribeAccelerator", "globalaccelerator:DescribeEndpointGroup", "globalaccelerator:DescribeListener", @@ -8811,11 +8942,18 @@ aws_managed_policies_data = """ "globalaccelerator:ListListeners", "globalaccelerator:ListTagsForResource", "glue:BatchGetDevEndpoints", + "glue:BatchGetJobs", + "glue:BatchGetWorkflows", + "glue:GetCrawler", + "glue:GetCrawlers", "glue:GetDevEndpoint", "glue:GetDevEndpoints", + "glue:GetJob", + "glue:GetJobs", "glue:GetSecurityConfiguration", "glue:GetSecurityConfigurations", "glue:GetTags", + "glue:GetWorkflow", "glue:ListCrawlers", "glue:ListDevEndpoints", "glue:ListJobs", @@ -8859,13 +8997,24 @@ aws_managed_policies_data = """ "iam:ListRolePolicies", "iam:ListUserPolicies", "iam:ListVirtualMFADevices", + "imagebuilder:GetComponent", + "imagebuilder:GetDistributionConfiguration", + "imagebuilder:GetInfrastructureConfiguration", + "imagebuilder:ListComponentBuildVersions", + "imagebuilder:ListComponents", + "imagebuilder:ListDistributionConfigurations", + "imagebuilder:ListInfrastructureConfigurations", "kafka:DescribeCluster", + "kafka:DescribeClusterV2", "kafka:ListClusters", + "kafka:ListClustersV2", "kinesis:DescribeStreamConsumer", "kinesis:DescribeStreamSummary", "kinesis:ListStreamConsumers", "kinesis:ListStreams", "kinesis:ListTagsForStream", + "kinesisanalytics:DescribeApplication", + "kinesisanalytics:ListTagsForResource", "kms:DescribeKey", "kms:GetKeyPolicy", "kms:GetKeyRotationStatus", @@ -8891,6 +9040,9 @@ aws_managed_policies_data = """ "organizations:ListParents", "organizations:ListPolicies", "organizations:ListPoliciesForTarget", + "quicksight:DescribeDataSource", + "quicksight:DescribeDataSourcePermissions", + "quicksight:ListTagsForResource", "ram:GetResourceShareAssociations", "ram:GetResourceShares", "rds:DescribeDBClusterParameterGroups", @@ -8917,6 +9069,10 @@ aws_managed_policies_data = """ "redshift:DescribeClusterSubnetGroups", "redshift:DescribeEventSubscriptions", "redshift:DescribeLoggingStatus", + "rekognition:DescribeStreamProcessor", + "rekognition:ListTagsForResource", + "robomaker:DescribeRobotApplication", + "robomaker:DescribeSimulationApplication", "route53:GetHealthCheck", "route53:GetHostedZone", "route53:ListHealthChecks", @@ -8953,6 +9109,8 @@ aws_managed_policies_data = """ "s3:GetEncryptionConfiguration", "s3:GetLifecycleConfiguration", "s3:GetReplicationConfiguration", + "s3:GetStorageLensConfiguration", + "s3:GetStorageLensConfigurationTagging", "s3:ListAccessPoints", "s3:ListAllMyBuckets", "s3:ListBucket", @@ -8976,8 +9134,17 @@ aws_managed_policies_data = """ "secretsmanager:ListSecrets", "secretsmanager:ListSecretVersionIds", "securityhub:DescribeHub", + "servicediscovery:GetInstance", + "servicediscovery:GetNamespace", + "servicediscovery:GetService", + "servicediscovery:ListTagsForResource", + "ses:DescribeReceiptRule", + "ses:DescribeReceiptRuleSet", "ses:GetConfigurationSet", "ses:GetConfigurationSetEventDestinations", + "ses:GetContactList", + "ses:GetEmailTemplate", + "ses:GetTemplate", "ses:ListConfigurationSets", "shield:DescribeDRTAccess", "shield:DescribeProtection", @@ -8999,6 +9166,7 @@ aws_managed_policies_data = """ "ssm:ListDocuments", "sso:DescribeInstanceAccessControlAttributeConfiguration", "sso:DescribePermissionSet", + "sso:GetInlinePolicyForPermissionSet", "sso:ListManagedPoliciesInPermissionSet", "sso:ListPermissionSets", "sso:ListTagsForResource", @@ -9046,7 +9214,7 @@ aws_managed_policies_data = """ }, "Path":"/aws-service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-05-31T18:25:11+00:00" + "UpdateDate":"2022-07-15T01:41:02+00:00" }, "AWSConfigUserAccess":{ "CreateDate":"2015-02-18T19:38:41+00:00", @@ -13177,7 +13345,7 @@ aws_managed_policies_data = """ }, "AWSElasticDisasterRecoveryAgentInstallationPolicy":{ "CreateDate":"2021-11-17T10:37:54+00:00", - "DefaultVersionId":"v1", + "DefaultVersionId":"v2", "Document":{ "Statement":[ { @@ -13192,26 +13360,36 @@ aws_managed_policies_data = """ "Resource":"*" }, { - "Action":[ - "drs:TagResource", - "drs:IssueAgentCertificateForDrs" - ], + "Action":"drs:TagResource", + "Condition":{ + "StringEquals":{ + "drs:CreateAction":"CreateSourceServerForDrs" + } + }, "Effect":"Allow", "Resource":"arn:aws:drs:*:*:source-server/*" }, { - "Action":[ - "drs:TagResource" - ], + "Action":"drs:TagResource", + "Condition":{ + "StringEquals":{ + "drs:CreateAction":"CreateRecoveryInstanceForDrs" + } + }, "Effect":"Allow", "Resource":"arn:aws:drs:*:*:recovery-instance/*" + }, + { + "Action":"drs:IssueAgentCertificateForDrs", + "Effect":"Allow", + "Resource":"arn:aws:drs:*:*:source-server/*" } ], "Version":"2012-10-17" }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2021-11-17T10:37:54+00:00" + "UpdateDate":"2022-07-03T09:11:23+00:00" }, "AWSElasticDisasterRecoveryAgentPolicy":{ "CreateDate":"2021-11-17T10:32:32+00:00", @@ -13652,7 +13830,7 @@ aws_managed_policies_data = """ }, "AWSElasticDisasterRecoveryFailbackInstallationPolicy":{ "CreateDate":"2021-11-17T11:02:03+00:00", - "DefaultVersionId":"v1", + "DefaultVersionId":"v2", "Document":{ "Statement":[ { @@ -13671,6 +13849,7 @@ aws_managed_policies_data = """ "drs:IssueAgentCertificateForDrs", "drs:AssociateFailbackClientToRecoveryInstanceForDrs", "drs:GetSuggestedFailbackClientDeviceMappingForDrs", + "drs:UpdateAgentReplicationInfoForDrs", "drs:UpdateFailbackClientDeviceMappingForDrs" ], "Effect":"Allow", @@ -13681,7 +13860,7 @@ aws_managed_policies_data = """ }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2021-11-17T11:02:03+00:00" + "UpdateDate":"2022-06-27T09:13:40+00:00" }, "AWSElasticDisasterRecoveryFailbackPolicy":{ "CreateDate":"2021-11-17T10:41:40+00:00", @@ -13831,7 +14010,7 @@ aws_managed_policies_data = """ }, "AWSElasticDisasterRecoveryReplicationServerPolicy":{ "CreateDate":"2021-11-17T13:34:00+00:00", - "DefaultVersionId":"v1", + "DefaultVersionId":"v2", "Document":{ "Statement":[ { @@ -13861,7 +14040,9 @@ aws_managed_policies_data = """ "drs:UpdateAgentReplicationProcessStateForDrs", "drs:NotifyAgentReplicationProgressForDrs", "drs:NotifyAgentConnectedForDrs", - "drs:NotifyAgentDisconnectedForDrs" + "drs:NotifyAgentDisconnectedForDrs", + "drs:NotifyVolumeEventForDrs", + "drs:SendVolumeStatsForDrs" ], "Effect":"Allow", "Resource":"*" @@ -13913,11 +14094,11 @@ aws_managed_policies_data = """ }, "Path":"/service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2021-11-17T13:34:00+00:00" + "UpdateDate":"2022-07-10T12:34:15+00:00" }, "AWSElasticDisasterRecoveryServiceRolePolicy":{ "CreateDate":"2021-11-17T10:56:17+00:00", - "DefaultVersionId":"v1", + "DefaultVersionId":"v2", "Document":{ "Statement":[ { @@ -13929,12 +14110,19 @@ aws_managed_policies_data = """ }, { "Action":[ - "drs:CreateRecoveryInstanceForDrs", "drs:TagResource" ], "Effect":"Allow", "Resource":"arn:aws:drs:*:*:recovery-instance/*" }, + { + "Action":[ + "drs:CreateRecoveryInstanceForDrs", + "drs:TagResource" + ], + "Effect":"Allow", + "Resource":"arn:aws:drs:*:*:source-server/*" + }, { "Action":"iam:GetInstanceProfile", "Effect":"Allow", @@ -14014,7 +14202,8 @@ aws_managed_policies_data = """ }, { "Action":[ - "ec2:DeleteVolume" + "ec2:DeleteVolume", + "ec2:ModifyVolume" ], "Condition":{ "Null":{ @@ -14227,13 +14416,18 @@ aws_managed_policies_data = """ "Resource":[ "arn:aws:ec2:*:*:image/*" ] + }, + { + "Action":"cloudwatch:GetMetricData", + "Effect":"Allow", + "Resource":"*" } ], "Version":"2012-10-17" }, "Path":"/aws-service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2021-11-17T10:56:17+00:00" + "UpdateDate":"2022-07-10T12:44:41+00:00" }, "AWSElasticDisasterRecoveryStagingAccountPolicy":{ "CreateDate":"2022-05-26T09:49:18+00:00", @@ -18289,12 +18483,13 @@ aws_managed_policies_data = """ }, "AWSLambdaMSKExecutionRole":{ "CreateDate":"2020-08-11T17:35:05+00:00", - "DefaultVersionId":"v1", + "DefaultVersionId":"v2", "Document":{ "Statement":[ { "Action":[ "kafka:DescribeCluster", + "kafka:DescribeClusterV2", "kafka:GetBootstrapBrokers", "ec2:CreateNetworkInterface", "ec2:DescribeNetworkInterfaces", @@ -18314,7 +18509,7 @@ aws_managed_policies_data = """ }, "Path":"/service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2020-08-11T17:35:05+00:00" + "UpdateDate":"2022-08-02T20:08:02+00:00" }, "AWSLambdaReplicator":{ "CreateDate":"2017-05-23T17:53:03+00:00", @@ -18970,6 +19165,90 @@ aws_managed_policies_data = """ "PermissionsBoundaryUsageCount":0, "UpdateDate":"2021-07-30T01:43:19+00:00" }, + "AWSLicenseManagerUserSubscriptionsServiceRolePolicy":{ + "CreateDate":"2022-07-30T01:17:18+00:00", + "DefaultVersionId":"v1", + "Document":{ + "Statement":[ + { + "Action":[ + "ds:DescribeDirectories", + "ds:GetAuthorizedApplicationDetails" + ], + "Effect":"Allow", + "Resource":"*", + "Sid":"DSReadPermissions" + }, + { + "Action":[ + "ssm:GetInventory", + "ssm:GetCommandInvocation", + "ssm:ListCommandInvocations", + "ssm:DescribeInstanceInformation" + ], + "Effect":"Allow", + "Resource":"*", + "Sid":"SSMReadPermissions" + }, + { + "Action":[ + "ec2:DescribeInstances" + ], + "Effect":"Allow", + "Resource":"*", + "Sid":"EC2ReadPermissions" + }, + { + "Action":[ + "ec2:TerminateInstances", + "ec2:CreateTags" + ], + "Condition":{ + "StringEquals":{ + "ec2:productCode":[ + "bz0vcy31ooqlzk5tsash4r1ik", + "d44g89hc0gp9jdzm99rznthpw" + ] + } + }, + "Effect":"Allow", + "Resource":[ + "arn:aws:ec2:*:*:instance/*" + ], + "Sid":"EC2WritePermissions" + }, + { + "Action":[ + "ssm:SendCommand" + ], + "Effect":"Allow", + "Resource":[ + "arn:aws:ssm:*::document/AWS-RunPowerShellScript" + ], + "Sid":"SSMDocumentExecutionPermissions" + }, + { + "Action":[ + "ssm:SendCommand" + ], + "Condition":{ + "StringEquals":{ + "aws:ResourceTag/AWSLicenseManager":"UserSubscriptions" + } + }, + "Effect":"Allow", + "Resource":[ + "arn:aws:ec2:*:*:instance/*" + ], + "Sid":"SSMInstanceExecutionPermissions" + } + ], + "Version":"2012-10-17" + }, + "Path":"/aws-service-role/", + "PermissionsBoundaryUsageCount":0, + "UpdateDate":"2022-07-30T01:17:18+00:00" + }, "AWSM2ServicePolicy":{ "CreateDate":"2022-06-07T20:26:39+00:00", "DefaultVersionId":"v1", @@ -19614,7 +19893,7 @@ aws_managed_policies_data = """ }, "AWSMarketplaceSellerFullAccess":{ "CreateDate":"2019-07-02T20:40:09+00:00", - "DefaultVersionId":"v5", + "DefaultVersionId":"v6", "Document":{ "Statement":[ { @@ -19679,17 +19958,29 @@ aws_managed_policies_data = """ }, "Effect":"Allow", "Resource":"arn:aws:iam::*:role/*" + }, + { + "Action":[ + "vendor-insights:GetDataSource", + "vendor-insights:ListDataSources", + "vendor-insights:ListSecurityProfiles", + "vendor-insights:GetSecurityProfile", + "vendor-insights:GetSecurityProfileSnapshot", + "vendor-insights:ListSecurityProfileSnapshots" + ], + "Effect":"Allow", + "Resource":"*" } ], "Version":"2012-10-17" }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2021-11-30T19:26:49+00:00" + "UpdateDate":"2022-07-26T15:06:13+00:00" }, "AWSMarketplaceSellerProductsFullAccess":{ "CreateDate":"2019-07-02T21:06:25+00:00", - "DefaultVersionId":"v4", + "DefaultVersionId":"v5", "Document":{ "Statement":[ { @@ -19730,13 +20021,25 @@ aws_managed_policies_data = """ }, "Effect":"Allow", "Resource":"arn:aws:iam::*:role/*" + }, + { + "Action":[ + "vendor-insights:GetDataSource", + "vendor-insights:ListDataSources", + "vendor-insights:ListSecurityProfiles", + "vendor-insights:GetSecurityProfile", + "vendor-insights:GetSecurityProfileSnapshot", + "vendor-insights:ListSecurityProfileSnapshots" + ], + "Effect":"Allow", + "Resource":"*" } ], "Version":"2012-10-17" }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2021-11-26T18:50:50+00:00" + "UpdateDate":"2022-07-26T15:06:29+00:00" }, "AWSMarketplaceSellerProductsReadOnly":{ "CreateDate":"2019-07-02T21:40:47+00:00", @@ -21030,6 +21333,28 @@ aws_managed_policies_data = """ "PermissionsBoundaryUsageCount":0, "UpdateDate":"2020-11-17T17:17:26+00:00" }, + "AWSNetworkManagerCloudWANServiceRolePolicy":{ + "CreateDate":"2022-07-12T12:17:49+00:00", + "DefaultVersionId":"v1", + "Document":{ + "Statement":[ + { + "Action":[ + "ec2:CreateTransitGatewayRouteTableAnnouncement", + "ec2:DeleteTransitGatewayRouteTableAnnouncement", + "ec2:EnableTransitGatewayRouteTablePropagation", + "ec2:DisableTransitGatewayRouteTablePropagation" + ], + "Effect":"Allow", + "Resource":"*" + } + ], + "Version":"2012-10-17" + }, + "Path":"/aws-service-role/", + "PermissionsBoundaryUsageCount":0, + "UpdateDate":"2022-07-12T12:17:49+00:00" + }, "AWSNetworkManagerFullAccess":{ "CreateDate":"2019-12-03T17:37:58+00:00", "DefaultVersionId":"v1", @@ -21082,7 +21407,7 @@ aws_managed_policies_data = """ }, "AWSNetworkManagerServiceRolePolicy":{ "CreateDate":"2019-12-03T14:03:35+00:00", - "DefaultVersionId":"v6", + "DefaultVersionId":"v8", "Document":{ "Statement":[ { @@ -21099,6 +21424,7 @@ aws_managed_policies_data = """ "ec2:DescribeVpnConnections", "ec2:DescribeVpcs", "ec2:GetTransitGatewayRouteTableAssociations", + "ec2:GetTransitGatewayRouteTablePropagations", "ec2:SearchTransitGatewayRoutes", "ec2:DescribeTransitGatewayPeeringAttachments", "ec2:DescribeTransitGatewayConnects", @@ -21108,7 +21434,11 @@ aws_managed_policies_data = """ "organizations:DescribeOrganization", "organizations:ListAccounts", "organizations:ListAWSServiceAccessForOrganization", - "organizations:ListDelegatedAdministrators" + "organizations:ListDelegatedAdministrators", + "ec2:DescribeTransitGatewayRouteTableAnnouncements", + "ec2:DescribeTransitGatewayPolicyTables", + "ec2:GetTransitGatewayPolicyTableAssociations", + "ec2:GetTransitGatewayPolicyTableEntries" ], "Effect":"Allow", "Resource":"*" @@ -21118,7 +21448,7 @@ aws_managed_policies_data = """ }, "Path":"/aws-service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-05-24T14:42:03+00:00" + "UpdateDate":"2022-07-27T19:41:29+00:00" }, "AWSOpsWorksCMInstanceProfileRole":{ "CreateDate":"2016-11-24T09:48:22+00:00", @@ -23436,6 +23766,41 @@ aws_managed_policies_data = """ "PermissionsBoundaryUsageCount":0, "UpdateDate":"2021-09-16T21:06:10+00:00" }, + "AWSRolesAnywhereServicePolicy":{ + "CreateDate":"2022-07-05T15:26:11+00:00", + "DefaultVersionId":"v1", + "Document":{ + "Statement":[ + { + "Action":[ + "cloudwatch:PutMetricData" + ], + "Condition":{ + "StringEquals":{ + "cloudwatch:namespace":[ + "AWS/RolesAnywhere", + "AWS/Usage" + ] + } + }, + "Effect":"Allow", + "Resource":"*" + }, + { + "Action":[ + "acm-pca:GetCertificateAuthorityCertificate", + "acm-pca:DescribeCertificateAuthority" + ], + "Effect":"Allow", + "Resource":"arn:aws:acm-pca:*:*:*" + } + ], + "Version":"2012-10-17" + }, + "Path":"/aws-service-role/", + "PermissionsBoundaryUsageCount":0, + "UpdateDate":"2022-07-05T15:26:11+00:00" + }, "AWSSSMOpsInsightsServiceRolePolicy":{ "CreateDate":"2021-06-16T20:12:52+00:00", "DefaultVersionId":"v1", @@ -23654,7 +24019,7 @@ aws_managed_policies_data = """ }, "AWSSSOServiceRolePolicy":{ "CreateDate":"2017-12-05T18:36:15+00:00", - "DefaultVersionId":"v15", + "DefaultVersionId":"v16", "Document":{ "Statement":[ { @@ -23664,7 +24029,9 @@ aws_managed_policies_data = """ "iam:PutRolePolicy", "iam:UpdateRole", "iam:UpdateRoleDescription", - "iam:UpdateAssumeRolePolicy" + "iam:UpdateAssumeRolePolicy", + "iam:PutRolePermissionsBoundary", + "iam:DeleteRolePermissionsBoundary" ], "Condition":{ "StringNotEquals":{ @@ -23794,7 +24161,7 @@ aws_managed_policies_data = """ }, "Path":"/aws-service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-05-12T21:14:40+00:00" + "UpdateDate":"2022-06-28T20:08:47+00:00" }, "AWSSavingsPlansFullAccess":{ "CreateDate":"2019-11-06T22:45:18+00:00", @@ -29500,6 +29867,157 @@ aws_managed_policies_data = """ "PermissionsBoundaryUsageCount":0, "UpdateDate":"2021-04-15T16:31:44+00:00" }, + "AWSVendorInsightsAssessorFullAccess":{ + "CreateDate":"2022-07-26T15:05:40+00:00", + "DefaultVersionId":"v1", + "Document":{ + "Statement":[ + { + "Action":[ + "vendor-insights:GetProfileAccessTerms", + "vendor-insights:ListEntitledSecurityProfiles", + "vendor-insights:GetEntitledSecurityProfileSnapshot", + "vendor-insights:ListEntitledSecurityProfileSnapshots" + ], + "Effect":"Allow", + "Resource":"*" + }, + { + "Action":[ + "aws-marketplace:CreateAgreementRequest", + "aws-marketplace:GetAgreementRequest", + "aws-marketplace:AcceptAgreementRequest", + "aws-marketplace:CancelAgreementRequest", + "aws-marketplace:ListAgreementRequests", + "aws-marketplace:CancelAgreement" + ], + "Condition":{ + "ForAnyValue:StringEquals":{ + "aws-marketplace:AgreementType":"VendorInsightsAgreement" + } + }, + "Effect":"Allow", + "Resource":"*" + } + ], + "Version":"2012-10-17" + }, + "Path":"/", + "PermissionsBoundaryUsageCount":0, + "UpdateDate":"2022-07-26T15:05:40+00:00" + }, + "AWSVendorInsightsAssessorReadOnly":{ + "CreateDate":"2022-07-26T15:05:56+00:00", + "DefaultVersionId":"v1", + "Document":{ + "Statement":[ + { + "Action":[ + "vendor-insights:ListEntitledSecurityProfiles", + "vendor-insights:GetEntitledSecurityProfileSnapshot", + "vendor-insights:ListEntitledSecurityProfileSnapshots" + ], + "Effect":"Allow", + "Resource":"*" + } + ], + "Version":"2012-10-17" + }, + "Path":"/", + "PermissionsBoundaryUsageCount":0, + "UpdateDate":"2022-07-26T15:05:56+00:00" + }, + "AWSVendorInsightsVendorFullAccess":{ + "CreateDate":"2022-07-26T15:05:27+00:00", + "DefaultVersionId":"v1", + "Document":{ + "Statement":[ + { + "Action":"aws-marketplace:DescribeEntity", + "Effect":"Allow", + "Resource":"arn:aws:aws-marketplace:*:*:*/SaaSProduct/*" + }, + { + "Action":"aws-marketplace:ListEntities", + "Effect":"Allow", + "Resource":"*" + }, + { + "Action":[ + "vendor-insights:CreateDataSource", + "vendor-insights:DeleteDataSource", + "vendor-insights:GetDataSource", + "vendor-insights:ListDataSources", + "vendor-insights:CreateSecurityProfile", + "vendor-insights:ListSecurityProfiles", + "vendor-insights:GetSecurityProfile", + "vendor-insights:AssociateDataSource", + "vendor-insights:DisassociateDataSource", + "vendor-insights:UpdateSecurityProfile", + "vendor-insights:ActivateSecurityProfile", + "vendor-insights:DeactivateSecurityProfile", + "vendor-insights:GetSecurityProfileSnapshot", + "vendor-insights:ListSecurityProfileSnapshots" + ], + "Effect":"Allow", + "Resource":"*" + }, + { + "Action":[ + "aws-marketplace:AcceptAgreementApprovalRequest", + "aws-marketplace:RejectAgreementApprovalRequest", + "aws-marketplace:GetAgreementApprovalRequest", + "aws-marketplace:ListAgreementApprovalRequests" + ], + "Condition":{ + "ForAnyValue:StringEquals":{ + "aws-marketplace:AgreementType":"VendorInsightsAgreement" + } + }, + "Effect":"Allow", + "Resource":"*" + } + ], + "Version":"2012-10-17" + }, + "Path":"/", + "PermissionsBoundaryUsageCount":0, + "UpdateDate":"2022-07-26T15:05:27+00:00" + }, + "AWSVendorInsightsVendorReadOnly":{ + "CreateDate":"2022-07-26T15:05:34+00:00", + "DefaultVersionId":"v1", + "Document":{ + "Statement":[ + { + "Action":"aws-marketplace:DescribeEntity", + "Effect":"Allow", + "Resource":"arn:aws:aws-marketplace:*:*:*/SaaSProduct/*" + }, + { + "Action":"aws-marketplace:ListEntities", + "Effect":"Allow", + "Resource":"*" + }, + { + "Action":[ + "vendor-insights:GetDataSource", + "vendor-insights:ListDataSources", + "vendor-insights:ListSecurityProfiles", + "vendor-insights:GetSecurityProfile", + "vendor-insights:GetSecurityProfileSnapshot", + "vendor-insights:ListSecurityProfileSnapshots" + ], + "Effect":"Allow", + "Resource":"*" + } + ], + "Version":"2012-10-17" + }, + "Path":"/", + "PermissionsBoundaryUsageCount":0, + "UpdateDate":"2022-07-26T15:05:34+00:00" + }, "AWSWAFConsoleFullAccess":{ "CreateDate":"2020-04-06T18:38:38+00:00", "DefaultVersionId":"v4", @@ -29698,11 +30216,12 @@ aws_managed_policies_data = """ }, "AWSWellArchitectedOrganizationsServiceRolePolicy":{ "CreateDate":"2022-06-23T17:15:26+00:00", - "DefaultVersionId":"v1", + "DefaultVersionId":"v2", "Document":{ "Statement":[ { "Action":[ + "organizations:ListAWSServiceAccessForOrganization", "organizations:DescribeAccount", "organizations:DescribeOrganization", "organizations:ListAccounts", @@ -29719,7 +30238,7 @@ aws_managed_policies_data = """ }, "Path":"/aws-service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-06-23T17:15:26+00:00" + "UpdateDate":"2022-07-25T18:03:31+00:00" }, "AWSXRayDaemonWriteAccess":{ "CreateDate":"2018-08-28T23:00:33+00:00", @@ -29829,7 +30348,7 @@ aws_managed_policies_data = """ }, "AWS_ConfigRole":{ "CreateDate":"2020-09-15T20:30:30+00:00", - "DefaultVersionId":"v13", + "DefaultVersionId":"v14", "Document":{ "Statement":[ { @@ -29843,9 +30362,20 @@ aws_managed_policies_data = """ "acm:DescribeCertificate", "acm:ListCertificates", "acm:ListTagsForCertificate", + "amplifyuibuilder:GetTheme", + "amplifyuibuilder:ExportThemes", "apigateway:GET", + "appconfig:GetApplication", + "appconfig:GetConfigurationProfile", + "appconfig:GetDeployment", + "appconfig:GetDeploymentStrategy", + "appconfig:GetEnvironment", + "appconfig:GetHostedConfigurationVersion", + "appconfig:ListTagsForResource", "application-autoscaling:DescribeScalableTargets", "application-autoscaling:DescribeScalingPolicies", + "appsync:GetGraphqlApi", + "appsync:ListGraphqlApis", "athena:GetDataCatalog", "athena:GetWorkGroup", "athena:ListDataCatalogs", @@ -29873,6 +30403,13 @@ aws_managed_policies_data = """ "batch:DescribeComputeEnvironments", "batch:DescribeJobQueues", "batch:ListTagsForResource", + "billingconductor:ListBillingGroups", + "billingconductor:ListAccountAssociations", + "billingconductor:ListTagsForResource", + "billingconductor:ListPricingRules", + "billingconductor:ListCustomLineItems", + "billingconductor:ListPricingPlans", + "billingconductor:ListPricingRulesAssociatedToPricingPlan", "cloudformation:DescribeType", "cloudformation:GetResource", "cloudformation:ListResources", @@ -29896,18 +30433,28 @@ aws_managed_policies_data = """ "config:List*", "config:Put*", "config:Select*", + "datasync:DescribeAgent", + "datasync:DescribeLocationEfs", + "datasync:DescribeLocationFsxLustre", + "datasync:DescribeLocationHdfs", + "datasync:DescribeLocationNfs", + "datasync:DescribeLocationObjectStorage", + "datasync:DescribeLocationS3", + "datasync:DescribeLocationSmb", + "datasync:DescribeTask", + "datasync:ListTagsForResource", "dax:DescribeClusters", "dax:DescribeParameterGroups", "dax:DescribeParameters", "dax:DescribeSubnetGroups", "dax:ListTags", - "detective:ListTagsForResource", "detective:ListGraphs", + "detective:ListTagsForResource", "dms:DescribeCertificates", "dms:DescribeEventSubscriptions", "dms:DescribeReplicationInstances", - "dms:DescribeReplicationTasks", "dms:DescribeReplicationSubnetGroups", + "dms:DescribeReplicationTasks", "dms:ListTagsForResource", "dynamodb:DescribeContinuousBackups", "dynamodb:DescribeGlobalTable", @@ -29931,8 +30478,11 @@ aws_managed_policies_data = """ "ecr-public:GetRepositoryCatalogData", "ecr-public:GetRepositoryPolicy", "ecr-public:ListTagsForResource", + "ecr:DescribePullThroughCacheRules", + "ecr:DescribeRegistry", "ecr:DescribeRepositories", "ecr:GetLifecyclePolicy", + "ecr:GetRegistryPolicy", "ecr:GetRepositoryPolicy", "ecr:ListTagsForResource", "ecs:DescribeClusters", @@ -29953,6 +30503,7 @@ aws_managed_policies_data = """ "eks:ListTagsForResource", "elasticache:DescribeCacheClusters", "elasticache:DescribeCacheParameterGroups", + "elasticache:DescribeCacheParameters", "elasticache:DescribeCacheSubnetGroups", "elasticache:DescribeReplicationGroups", "elasticache:DescribeSnapshots", @@ -29966,12 +30517,16 @@ aws_managed_policies_data = """ "elasticfilesystem:DescribeLifecycleConfiguration", "elasticfilesystem:DescribeMountTargets", "elasticfilesystem:DescribeMountTargetSecurityGroups", + "elasticloadbalancing:DescribeListenerCertificates", "elasticloadbalancing:DescribeListeners", "elasticloadbalancing:DescribeLoadBalancerAttributes", "elasticloadbalancing:DescribeLoadBalancerPolicies", "elasticloadbalancing:DescribeLoadBalancers", "elasticloadbalancing:DescribeRules", "elasticloadbalancing:DescribeTags", + "elasticloadbalancing:DescribeTargetGroupAttributes", + "elasticloadbalancing:DescribeTargetGroups", + "elasticloadbalancing:DescribeTargetHealth", "elasticmapreduce:DescribeCluster", "elasticmapreduce:DescribeSecurityConfiguration", "elasticmapreduce:DescribeStep", @@ -29991,11 +30546,24 @@ aws_managed_policies_data = """ "es:GetCompatibleVersions", "es:ListDomainNames", "es:ListTags", + "events:DescribeArchive", + "events:DescribeApiDestination", "firehose:DescribeDeliveryStream", "firehose:ListDeliveryStreams", "firehose:ListTagsForDeliveryStream", + "fms:ListPolicies", + "fms:GetPolicy", + "fms:ListTagsForResource", + "fms:GetNotificationChannel", "fsx:DescribeFileSystems", + "fsx:DescribeVolumes", "fsx:ListTagsForResource", + "geo:DescribeTracker", + "geo:ListTrackerConsumers", + "geo:DescribeGeofenceCollection", + "geo:DescribePlaceIndex", + "geo:DescribeRouteCalculator", + "geo:DescribeMap", "globalaccelerator:DescribeAccelerator", "globalaccelerator:DescribeEndpointGroup", "globalaccelerator:DescribeListener", @@ -30004,11 +30572,18 @@ aws_managed_policies_data = """ "globalaccelerator:ListListeners", "globalaccelerator:ListTagsForResource", "glue:BatchGetDevEndpoints", + "glue:BatchGetJobs", + "glue:BatchGetWorkflows", + "glue:GetCrawler", + "glue:GetCrawlers", "glue:GetDevEndpoint", "glue:GetDevEndpoints", + "glue:GetJob", + "glue:GetJobs", "glue:GetSecurityConfiguration", "glue:GetSecurityConfigurations", "glue:GetTags", + "glue:GetWorkflow", "glue:ListCrawlers", "glue:ListDevEndpoints", "glue:ListJobs", @@ -30052,13 +30627,24 @@ aws_managed_policies_data = """ "iam:ListRolePolicies", "iam:ListUserPolicies", "iam:ListVirtualMFADevices", + "imagebuilder:GetComponent", + "imagebuilder:GetDistributionConfiguration", + "imagebuilder:GetInfrastructureConfiguration", + "imagebuilder:ListComponentBuildVersions", + "imagebuilder:ListComponents", + "imagebuilder:ListDistributionConfigurations", + "imagebuilder:ListInfrastructureConfigurations", "kafka:DescribeCluster", + "kafka:DescribeClusterV2", "kafka:ListClusters", + "kafka:ListClustersV2", "kinesis:DescribeStreamConsumer", "kinesis:DescribeStreamSummary", "kinesis:ListStreamConsumers", "kinesis:ListStreams", "kinesis:ListTagsForStream", + "kinesisanalytics:DescribeApplication", + "kinesisanalytics:ListTagsForResource", "kms:DescribeKey", "kms:GetKeyPolicy", "kms:GetKeyRotationStatus", @@ -30084,6 +30670,9 @@ aws_managed_policies_data = """ "organizations:ListParents", "organizations:ListPolicies", "organizations:ListPoliciesForTarget", + "quicksight:DescribeDataSource", + "quicksight:DescribeDataSourcePermissions", + "quicksight:ListTagsForResource", "ram:GetResourceShareAssociations", "ram:GetResourceShares", "rds:DescribeDBClusterParameterGroups", @@ -30111,6 +30700,10 @@ aws_managed_policies_data = """ "redshift:DescribeClusterSubnetGroups", "redshift:DescribeEventSubscriptions", "redshift:DescribeLoggingStatus", + "rekognition:DescribeStreamProcessor", + "rekognition:ListTagsForResource", + "robomaker:DescribeRobotApplication", + "robomaker:DescribeSimulationApplication", "route53:GetHealthCheck", "route53:GetHostedZone", "route53:ListHealthChecks", @@ -30150,6 +30743,8 @@ aws_managed_policies_data = """ "s3:ListAccessPoints", "s3:ListAllMyBuckets", "s3:ListBucket", + "s3:GetStorageLensConfiguration", + "s3:GetStorageLensConfigurationTagging", "sagemaker:DescribeCodeRepository", "sagemaker:DescribeEndpoint", "sagemaker:DescribeEndpointConfig", @@ -30170,8 +30765,17 @@ aws_managed_policies_data = """ "secretsmanager:ListSecrets", "secretsmanager:ListSecretVersionIds", "securityhub:DescribeHub", + "servicediscovery:GetInstance", + "servicediscovery:GetNamespace", + "servicediscovery:GetService", + "servicediscovery:ListTagsForResource", + "ses:DescribeReceiptRule", + "ses:DescribeReceiptRuleSet", "ses:GetConfigurationSet", "ses:GetConfigurationSetEventDestinations", + "ses:GetContactList", + "ses:GetEmailTemplate", + "ses:GetTemplate", "ses:ListConfigurationSets", "shield:DescribeDRTAccess", "shield:DescribeProtection", @@ -30193,6 +30797,7 @@ aws_managed_policies_data = """ "ssm:ListDocuments", "sso:DescribeInstanceAccessControlAttributeConfiguration", "sso:DescribePermissionSet", + "sso:GetInlinePolicyForPermissionSet", "sso:ListManagedPoliciesInPermissionSet", "sso:ListPermissionSets", "sso:ListTagsForResource", @@ -30240,7 +30845,7 @@ aws_managed_policies_data = """ }, "Path":"/service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-05-27T03:11:37+00:00" + "UpdateDate":"2022-07-15T01:37:13+00:00" }, "AccessAnalyzerServiceRolePolicy":{ "CreateDate":"2019-12-02T17:13:10+00:00", @@ -33576,7 +34181,7 @@ aws_managed_policies_data = """ }, "AmazonConnectServiceLinkedRolePolicy":{ "CreateDate":"2018-09-07T00:21:43+00:00", - "DefaultVersionId":"v6", + "DefaultVersionId":"v7", "Document":{ "Statement":[ { @@ -33653,8 +34258,7 @@ aws_managed_policies_data = """ ], "Effect":"Allow", "Resource":[ - "arn:aws:profile:*:*:domains/amazon-connect-*/object-types/CTR", - "arn:aws:profile:*:*:domains/amazon-connect-*/object-types/_asset" + "arn:aws:profile:*:*:domains/amazon-connect-*/object-types/*" ] }, { @@ -33679,7 +34283,7 @@ aws_managed_policies_data = """ }, "Path":"/aws-service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2021-12-09T22:12:26+00:00" + "UpdateDate":"2022-06-27T19:35:06+00:00" }, "AmazonConnectVoiceIDFullAccess":{ "CreateDate":"2021-09-26T19:04:10+00:00", @@ -34315,7 +34919,7 @@ aws_managed_policies_data = """ }, "AmazonDevOpsGuruServiceRolePolicy":{ "CreateDate":"2020-12-01T10:24:42+00:00", - "DefaultVersionId":"v6", + "DefaultVersionId":"v7", "Document":{ "Statement":[ { @@ -34370,7 +34974,9 @@ aws_managed_policies_data = """ "rds:DescribeOptionGroups", "rds:DescribeDBClusterParameters", "rds:DescribeDBInstanceAutomatedBackups", - "rds:DescribeAccountAttributes" + "rds:DescribeAccountAttributes", + "logs:DescribeLogGroups", + "logs:DescribeLogStreams" ], "Effect":"Allow", "Resource":"*" @@ -34445,13 +35051,26 @@ aws_managed_policies_data = """ "Effect":"Allow", "Resource":"arn:aws:events:*:*:rule/DevOpsGuruManagedRule*", "Sid":"AllowOtherOperationsOnManagedRule" + }, + { + "Action":[ + "logs:FilterLogEvents" + ], + "Condition":{ + "StringEquals":{ + "aws:ResourceTag/DevOps-Guru-Analysis":"true" + } + }, + "Effect":"Allow", + "Resource":"arn:aws:logs:*:*:log-group:*", + "Sid":"AllowTagBasedFilterLogEvents" } ], "Version":"2012-10-17" }, "Path":"/aws-service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-02-07T19:30:10+00:00" + "UpdateDate":"2022-07-08T18:03:05+00:00" }, "AmazonDocDBConsoleFullAccess":{ "CreateDate":"2019-01-09T20:37:28+00:00", @@ -38559,7 +39178,7 @@ aws_managed_policies_data = """ }, "AmazonElasticsearchServiceRolePolicy":{ "CreateDate":"2017-07-07T00:15:31+00:00", - "DefaultVersionId":"v3", + "DefaultVersionId":"v4", "Document":{ "Statement":[ { @@ -38577,13 +39196,21 @@ aws_managed_policies_data = """ "Effect":"Allow", "Resource":"*", "Sid":"Stmt1480452973134" + }, + { + "Action":[ + "acm:DescribeCertificate" + ], + "Effect":"Allow", + "Resource":"*", + "Sid":"Stmt1480452973135" } ], "Version":"2012-10-17" }, "Path":"/aws-service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2020-08-31T10:30:23+00:00" + "UpdateDate":"2022-08-02T15:31:35+00:00" }, "AmazonEventBridgeApiDestinationsServiceRolePolicy":{ "CreateDate":"2021-02-11T20:52:05+00:00", @@ -38795,7 +39422,7 @@ aws_managed_policies_data = """ }, "AmazonFISServiceRolePolicy":{ "CreateDate":"2020-12-21T21:18:19+00:00", - "DefaultVersionId":"v5", + "DefaultVersionId":"v6", "Document":{ "Statement":[ { @@ -38851,7 +39478,8 @@ aws_managed_policies_data = """ "ecs:DescribeClusters", "ecs:DescribeTasks", "ecs:ListTasks", - "eks:DescribeNodegroup" + "eks:DescribeNodegroup", + "eks:DescribeCluster" ], "Effect":"Allow", "Resource":"*", @@ -38862,7 +39490,7 @@ aws_managed_policies_data = """ }, "Path":"/aws-service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-02-07T11:13:04+00:00" + "UpdateDate":"2022-07-06T11:03:20+00:00" }, "AmazonFSxConsoleFullAccess":{ "CreateDate":"2018-11-28T16:36:05+00:00", @@ -39521,7 +40149,7 @@ aws_managed_policies_data = """ }, "AmazonGuardDutyFullAccess":{ "CreateDate":"2017-11-28T22:31:30+00:00", - "DefaultVersionId":"v2", + "DefaultVersionId":"v4", "Document":{ "Statement":[ { @@ -39533,7 +40161,10 @@ aws_managed_policies_data = """ "Action":"iam:CreateServiceLinkedRole", "Condition":{ "StringLike":{ - "iam:AWSServiceName":"guardduty.amazonaws.com" + "iam:AWSServiceName":[ + "guardduty.amazonaws.com", + "malware-protection.guardduty.amazonaws.com" + ] } }, "Effect":"Allow", @@ -39551,13 +40182,184 @@ aws_managed_policies_data = """ ], "Effect":"Allow", "Resource":"*" + }, + { + "Action":"iam:GetRole", + "Effect":"Allow", + "Resource":"arn:aws:iam::*:role/*AWSServiceRoleForAmazonGuardDutyMalwareProtection" } ], "Version":"2012-10-17" }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2021-02-16T23:39:53+00:00" + "UpdateDate":"2022-07-26T18:28:01+00:00" + }, + "AmazonGuardDutyMalwareProtectionServiceRolePolicy":{ + "CreateDate":"2022-07-19T19:06:53+00:00", + "DefaultVersionId":"v1", + "Document":{ + "Statement":[ + { + "Action":[ + "ec2:DescribeInstances", + "ec2:DescribeVolumes", + "ec2:DescribeSnapshots", + "ecs:ListClusters", + "ecs:ListContainerInstances", + "ecs:ListTasks", + "ecs:DescribeTasks", + "eks:DescribeCluster" + ], + "Effect":"Allow", + "Resource":"*" + }, + { + "Action":"ec2:CreateSnapshot", + "Condition":{ + "Null":{ + "aws:ResourceTag/GuardDutyExcluded":"true" + } + }, + "Effect":"Allow", + "Resource":"arn:aws:ec2:*:*:volume/*" + }, + { + "Action":"ec2:CreateSnapshot", + "Condition":{ + "ForAnyValue:StringEquals":{ + "aws:TagKeys":"GuardDutyScanId" + } + }, + "Effect":"Allow", + "Resource":"arn:aws:ec2:*:*:snapshot/*" + }, + { + "Action":"ec2:CreateTags", + "Condition":{ + "StringEquals":{ + "ec2:CreateAction":"CreateSnapshot" + } + }, + "Effect":"Allow", + "Resource":"arn:aws:ec2:*:*:*/*" + }, + { + "Action":"ec2:CreateTags", + "Condition":{ + "ForAllValues:StringEquals":{ + "aws:TagKeys":[ + "GuardDutyExcluded", + "GuardDutyFindingDetected" + ] + }, + "StringLike":{ + "ec2:ResourceTag/GuardDutyScanId":"*" + } + }, + "Effect":"Allow", + "Resource":"arn:aws:ec2:*:*:snapshot/*" + }, + { + "Action":[ + "ec2:DeleteSnapshot", + "ec2:ModifySnapshotAttribute" + ], + "Condition":{ + "Null":{ + "aws:ResourceTag/GuardDutyExcluded":"true" + }, + "StringLike":{ + "ec2:ResourceTag/GuardDutyScanId":"*" + } + }, + "Effect":"Allow", + "Resource":"arn:aws:ec2:*:*:snapshot/*" + }, + { + "Action":[ + "ec2:ModifySnapshotAttribute" + ], + "Condition":{ + "StringEquals":{ + "ec2:Add/group":"all" + } + }, + "Effect":"Deny", + "Resource":"arn:aws:ec2:*:*:snapshot/*" + }, + { + "Action":"kms:CreateGrant", + "Condition":{ + "Bool":{ + "kms:GrantIsForAWSResource":"true" + }, + "ForAllValues:StringEquals":{ + "kms:GrantOperations":[ + "Decrypt", + "CreateGrant", + "GenerateDataKeyWithoutPlaintext", + "ReEncryptFrom", + "ReEncryptTo", + "RetireGrant", + "DescribeKey" + ] + }, + "Null":{ + "aws:ResourceTag/GuardDutyExcluded":"true" + }, + "StringLike":{ + "kms:EncryptionContext:aws:ebs:id":"snap-*" + } + }, + "Effect":"Allow", + "Resource":"arn:aws:kms:*:*:key/*" + }, + { + "Action":[ + "kms:ReEncryptTo", + "kms:ReEncryptFrom" + ], + "Condition":{ + "Null":{ + "aws:ResourceTag/GuardDutyExcluded":"true" + }, + "StringLike":{ + "kms:ViaService":"ec2.*.amazonaws.com" + } + }, + "Effect":"Allow", + "Resource":"arn:aws:kms:*:*:key/*" + }, + { + "Action":"kms:DescribeKey", + "Effect":"Allow", + "Resource":"arn:aws:kms:*:*:key/*" + }, + { + "Action":[ + "logs:DescribeLogGroups", + "logs:CreateLogGroup", + "logs:PutRetentionPolicy" + ], + "Effect":"Allow", + "Resource":"arn:aws:logs:*:*:log-group:/aws/guardduty/*" + }, + { + "Action":[ + "logs:CreateLogStream", + "logs:PutLogEvents", + "logs:DescribeLogStreams" + ], + "Effect":"Allow", + "Resource":"arn:aws:logs:*:*:log-group:/aws/guardduty/*:log-stream:*" + } + ], + "Version":"2012-10-17" + }, + "Path":"/aws-service-role/", + "PermissionsBoundaryUsageCount":0, + "UpdateDate":"2022-07-19T19:06:53+00:00" }, "AmazonGuardDutyReadOnlyAccess":{ "CreateDate":"2017-11-28T22:29:40+00:00", @@ -39919,7 +40721,7 @@ aws_managed_policies_data = """ }, "AmazonInspector2ServiceRolePolicy":{ "CreateDate":"2021-11-16T20:27:48+00:00", - "DefaultVersionId":"v1", + "DefaultVersionId":"v3", "Document":{ "Statement":[ { @@ -39999,10 +40801,7 @@ aws_managed_policies_data = """ "ssm:DescribeAssociation", "ssm:DescribeInstanceInformation", "ssm:ListAssociations", - "ssm:ListResourceDataSync", - "ssm:StartAssociationsOnce", - "ssm:DeleteAssociation", - "ssm:UpdateAssociation" + "ssm:ListResourceDataSync" ], "Effect":"Allow", "Resource":"*", @@ -40010,13 +40809,17 @@ aws_managed_policies_data = """ }, { "Action":[ - "ssm:CreateAssociation" + "ssm:CreateAssociation", + "ssm:StartAssociationsOnce", + "ssm:DeleteAssociation", + "ssm:UpdateAssociation" ], "Effect":"Allow", "Resource":[ "arn:*:ec2:*:*:instance/*", - "arn:aws:ssm:*:*:document/AWS-GatherSoftwareInventory", - "arn:*:ssm:*:*:managed-instance/*" + "arn:*:ssm:*:*:document/AWS-GatherSoftwareInventory", + "arn:*:ssm:*:*:managed-instance/*", + "arn:*:ssm:*:*:association/*" ], "Sid":"GatherInventory" }, @@ -40051,7 +40854,7 @@ aws_managed_policies_data = """ }, "Path":"/aws-service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2021-11-16T20:27:48+00:00" + "UpdateDate":"2022-08-15T17:38:32+00:00" }, "AmazonInspectorFullAccess":{ "CreateDate":"2015-10-07T17:08:04+00:00", @@ -40294,7 +41097,7 @@ aws_managed_policies_data = """ }, "AmazonKeyspacesFullAccess":{ "CreateDate":"2020-04-23T17:06:37+00:00", - "DefaultVersionId":"v2", + "DefaultVersionId":"v3", "Document":{ "Statement":[ { @@ -40326,6 +41129,7 @@ aws_managed_policies_data = """ "Action":[ "cloudwatch:DeleteAlarms", "cloudwatch:DescribeAlarms", + "cloudwatch:GetMetricData", "cloudwatch:PutMetricAlarm" ], "Effect":"Allow", @@ -40346,11 +41150,11 @@ aws_managed_policies_data = """ }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2021-06-01T19:31:39+00:00" + "UpdateDate":"2022-07-07T15:02:41+00:00" }, "AmazonKeyspacesReadOnlyAccess":{ "CreateDate":"2020-04-23T17:07:14+00:00", - "DefaultVersionId":"v2", + "DefaultVersionId":"v3", "Document":{ "Statement":[ { @@ -40367,6 +41171,7 @@ aws_managed_policies_data = """ "application-autoscaling:DescribeScalingPolicies", "application-autoscaling:DescribeScheduledActions", "cloudwatch:DescribeAlarms", + "cloudwatch:GetMetricData", "kms:DescribeKey", "kms:ListAliases" ], @@ -40378,7 +41183,7 @@ aws_managed_policies_data = """ }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2021-06-01T19:32:47+00:00" + "UpdateDate":"2022-07-07T14:54:05+00:00" }, "AmazonKinesisAnalyticsFullAccess":{ "CreateDate":"2016-09-21T19:01:14+00:00", @@ -41551,7 +42356,7 @@ aws_managed_policies_data = """ }, "AmazonLookoutEquipmentReadOnlyAccess":{ "CreateDate":"2021-05-05T16:47:55+00:00", - "DefaultVersionId":"v1", + "DefaultVersionId":"v2", "Document":{ "Statement":[ { @@ -41565,7 +42370,8 @@ aws_managed_policies_data = """ "lookoutequipment:ListModels", "lookoutequipment:ListInferenceSchedulers", "lookoutequipment:ListInferenceExecutions", - "lookoutequipment:ListTagsForResource" + "lookoutequipment:ListTagsForResource", + "lookoutequipment:ListSensorStatistics" ], "Effect":"Allow", "Resource":"*" @@ -41575,7 +42381,7 @@ aws_managed_policies_data = """ }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2021-05-05T16:47:55+00:00" + "UpdateDate":"2022-06-30T18:33:42+00:00" }, "AmazonLookoutMetricsFullAccess":{ "CreateDate":"2021-05-07T00:43:38+00:00", @@ -42598,7 +43404,7 @@ aws_managed_policies_data = """ }, "AmazonMacieFullAccess":{ "CreateDate":"2017-08-14T14:54:30+00:00", - "DefaultVersionId":"v4", + "DefaultVersionId":"v5", "Document":{ "Statement":[ { @@ -42616,7 +43422,7 @@ aws_managed_policies_data = """ } }, "Effect":"Allow", - "Resource":"arn:aws:iam::*:role/AWSServiceRoleForAmazonMacie" + "Resource":"arn:aws:iam::*:role/aws-service-role/macie.amazonaws.com/AWSServiceRoleForAmazonMacie" }, { "Action":"pricing:GetProducts", @@ -42628,7 +43434,7 @@ aws_managed_policies_data = """ }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-03-07T18:08:14+00:00" + "UpdateDate":"2022-07-01T00:41:53+00:00" }, "AmazonMacieHandshakeRole":{ "CreateDate":"2018-06-28T15:46:10+00:00", @@ -43361,7 +44167,7 @@ aws_managed_policies_data = """ }, "AmazonOpenSearchServiceRolePolicy":{ "CreateDate":"2021-08-26T09:27:09+00:00", - "DefaultVersionId":"v3", + "DefaultVersionId":"v4", "Document":{ "Statement":[ { @@ -43457,13 +44263,21 @@ aws_managed_policies_data = """ "Effect":"Allow", "Resource":"*", "Sid":"Stmt1480452973195" + }, + { + "Action":[ + "acm:DescribeCertificate" + ], + "Effect":"Allow", + "Resource":"*", + "Sid":"Stmt1480452973196" } ], "Version":"2012-10-17" }, "Path":"/aws-service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2021-09-09T10:43:21+00:00" + "UpdateDate":"2022-07-28T13:10:24+00:00" }, "AmazonPersonalizeFullAccess":{ "CreateDate":"2018-12-04T22:24:33+00:00", @@ -45607,7 +46421,7 @@ aws_managed_policies_data = """ }, "AmazonRedshiftDataFullAccess":{ "CreateDate":"2020-09-09T19:23:55+00:00", - "DefaultVersionId":"v2", + "DefaultVersionId":"v4", "Document":{ "Statement":[ { @@ -45649,6 +46463,17 @@ aws_managed_policies_data = """ ], "Sid":"GetCredentialsForAPIUser" }, + { + "Action":"redshift-serverless:GetCredentials", + "Condition":{ + "StringLike":{ + "aws:ResourceTag/RedshiftDataFullAccess":"*" + } + }, + "Effect":"Allow", + "Resource":"*", + "Sid":"GetCredentialsForServerless" + }, { "Action":"redshift:CreateClusterUser", "Effect":"Deny", @@ -45673,16 +46498,17 @@ aws_managed_policies_data = """ }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2021-07-27T20:05:33+00:00" + "UpdateDate":"2022-07-12T03:34:16+00:00" }, "AmazonRedshiftFullAccess":{ "CreateDate":"2015-02-06T18:40:50+00:00", - "DefaultVersionId":"v4", + "DefaultVersionId":"v5", "Document":{ "Statement":[ { "Action":[ "redshift:*", + "redshift-serverless:*", "ec2:DescribeAccountAttributes", "ec2:DescribeAddresses", "ec2:DescribeAvailabilityZones", @@ -45762,7 +46588,7 @@ aws_managed_policies_data = """ }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2020-09-09T19:51:19+00:00" + "UpdateDate":"2022-07-07T23:31:13+00:00" }, "AmazonRedshiftQueryEditor":{ "CreateDate":"2018-10-04T22:50:32+00:00", @@ -48008,7 +48834,7 @@ aws_managed_policies_data = """ }, "AmazonSageMakerAdmin-ServiceCatalogProductsServiceRolePolicy":{ "CreateDate":"2020-11-27T18:48:07+00:00", - "DefaultVersionId":"v5", + "DefaultVersionId":"v7", "Document":{ "Statement":[ { @@ -48293,6 +49119,20 @@ aws_managed_policies_data = """ "arn:aws:lambda:*:*:function:sagemaker-*" ] }, + { + "Action":"lambda:TagResource", + "Condition":{ + "ForAllValues:StringLike":{ + "aws:TagKeys":[ + "sagemaker:*" + ] + } + }, + "Effect":"Allow", + "Resource":[ + "arn:aws:lambda:*:*:function:sagemaker-*" + ] + }, { "Action":[ "logs:CreateLogGroup", @@ -48369,6 +49209,27 @@ aws_managed_policies_data = """ "arn:aws:sagemaker:*:*:*" ] }, + { + "Action":[ + "sagemaker:AddTags" + ], + "Condition":{ + "ForAllValues:StringLike":{ + "aws:TagKeys":[ + "sagemaker:*" + ] + } + }, + "Effect":"Allow", + "Resource":[ + "arn:aws:sagemaker:*:*:endpoint/*", + "arn:aws:sagemaker:*:*:endpoint-config/*", + "arn:aws:sagemaker:*:*:model/*", + "arn:aws:sagemaker:*:*:pipeline/*", + "arn:aws:sagemaker:*:*:project/*", + "arn:aws:sagemaker:*:*:model-package/*" + ] + }, { "Action":[ "sagemaker:CreateImage", @@ -48408,7 +49269,7 @@ aws_managed_policies_data = """ }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-03-21T17:33:28+00:00" + "UpdateDate":"2022-08-02T19:12:55+00:00" }, "AmazonSageMakerCoreServiceRolePolicy":{ "CreateDate":"2020-12-21T21:40:47+00:00", @@ -48561,7 +49422,7 @@ aws_managed_policies_data = """ }, "AmazonSageMakerFullAccess":{ "CreateDate":"2017-11-29T13:07:59+00:00", - "DefaultVersionId":"v22", + "DefaultVersionId":"v23", "Document":{ "Statement":[ { @@ -48970,6 +49831,17 @@ aws_managed_policies_data = """ "arn:aws:glue:*:*:database/*" ] }, + { + "Action":[ + "glue:UpdateTable" + ], + "Effect":"Allow", + "Resource":[ + "arn:aws:glue:*:*:table/sagemaker_featurestore/*", + "arn:aws:glue:*:*:catalog", + "arn:aws:glue:*:*:database/sagemaker_featurestore" + ] + }, { "Action":[ "glue:DeleteTable" @@ -49044,7 +49916,7 @@ aws_managed_policies_data = """ }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-05-02T06:19:13+00:00" + "UpdateDate":"2022-06-29T18:30:43+00:00" }, "AmazonSageMakerGroundTruthExecution":{ "CreateDate":"2020-07-09T19:30:20+00:00", @@ -51391,86 +52263,6 @@ aws_managed_policies_data = """ "PermissionsBoundaryUsageCount":0, "UpdateDate":"2020-01-08T23:49:59+00:00" }, - "AmazonWorkLinkFullAccess":{ - "CreateDate":"2019-01-23T18:52:09+00:00", - "DefaultVersionId":"v2", - "Document":{ - "Statement":[ - { - "Action":[ - "worklink:*" - ], - "Effect":"Allow", - "Resource":"arn:aws:worklink:*:*:*" - } - ], - "Version":"2012-10-17" - }, - "Path":"/", - "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2019-09-23T18:37:42+00:00" - }, - "AmazonWorkLinkReadOnly":{ - "CreateDate":"2019-01-23T19:07:10+00:00", - "DefaultVersionId":"v3", - "Document":{ - "Statement":[ - { - "Action":[ - "worklink:Describe*", - "worklink:List*", - "worklink:Search*" - ], - "Effect":"Allow", - "Resource":"arn:aws:worklink:*:*:*" - } - ], - "Version":"2012-10-17" - }, - "Path":"/", - "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2019-09-23T18:37:21+00:00" - }, - "AmazonWorkLinkServiceRolePolicy":{ - "CreateDate":"2019-03-18T18:00:16+00:00", - "DefaultVersionId":"v2", - "Document":{ - "Statement":[ - { - "Action":[ - "ec2:CreateNetworkInterface", - "ec2:DeleteNetworkInterfacePermission", - "ec2:CreateNetworkInterfacePermission", - "ec2:ModifyNetworkInterfaceAttribute", - "ec2:DeleteNetworkInterface" - ], - "Effect":"Allow", - "Resource":"*" - }, - { - "Action":[ - "kinesis:PutRecord", - "kinesis:PutRecords" - ], - "Effect":"Allow", - "Resource":"arn:aws:kinesis:*:*:stream/AmazonWorkLink-*" - }, - { - "Action":[ - "elasticloadbalancing:ModifyListener", - "elasticloadbalancing:AddListenerCertificates", - "elasticloadbalancing:RemoveListenerCertificates" - ], - "Effect":"Allow", - "Resource":"*" - } - ], - "Version":"2012-10-17" - }, - "Path":"/aws-service-role/", - "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2020-02-07T20:48:49+00:00" - }, "AmazonWorkMailEventsServiceRolePolicy":{ "CreateDate":"2019-04-16T16:52:43+00:00", "DefaultVersionId":"v1", @@ -55096,7 +55888,7 @@ aws_managed_policies_data = """ }, "ConfigConformsServiceRolePolicy":{ "CreateDate":"2019-07-25T21:38:05+00:00", - "DefaultVersionId":"v4", + "DefaultVersionId":"v5", "Document":{ "Statement":[ { @@ -55186,13 +55978,25 @@ aws_managed_policies_data = """ ], "Effect":"Allow", "Resource":"arn:aws:cloudformation:*:*:stack/awsconfigconforms-*" + }, + { + "Action":[ + "cloudwatch:PutMetricData" + ], + "Condition":{ + "StringEquals":{ + "cloudwatch:namespace":"AWS/Config" + } + }, + "Effect":"Allow", + "Resource":"*" } ], "Version":"2012-10-17" }, "Path":"/aws-service-role/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2019-11-13T18:29:21+00:00" + "UpdateDate":"2022-07-26T00:33:20+00:00" }, "DAXServiceRolePolicy":{ "CreateDate":"2018-03-05T17:51:25+00:00", @@ -58010,7 +58814,7 @@ aws_managed_policies_data = """ }, "NeptuneFullAccess":{ "CreateDate":"2018-05-30T19:17:31+00:00", - "DefaultVersionId":"v5", + "DefaultVersionId":"v6", "Document":{ "Statement":[ { @@ -58040,18 +58844,23 @@ aws_managed_policies_data = """ "rds:CopyDBClusterParameterGroup", "rds:CopyDBClusterSnapshot", "rds:CopyDBParameterGroup", + "rds:CreateDBClusterEndpoint", "rds:CreateDBClusterParameterGroup", "rds:CreateDBClusterSnapshot", "rds:CreateDBParameterGroup", "rds:CreateDBSubnetGroup", "rds:CreateEventSubscription", + "rds:CreateGlobalCluster", "rds:DeleteDBCluster", + "rds:DeleteDBClusterEndpoint", "rds:DeleteDBClusterParameterGroup", "rds:DeleteDBClusterSnapshot", "rds:DeleteDBInstance", "rds:DeleteDBParameterGroup", "rds:DeleteDBSubnetGroup", "rds:DeleteEventSubscription", + "rds:DeleteGlobalCluster", + "rds:DescribeDBClusterEndpoints", "rds:DescribeAccountAttributes", "rds:DescribeCertificates", "rds:DescribeDBClusterParameterGroups", @@ -58071,29 +58880,36 @@ aws_managed_policies_data = """ "rds:DescribeEventCategories", "rds:DescribeEventSubscriptions", "rds:DescribeEvents", + "rds:DescribeGlobalClusters", "rds:DescribeOptionGroups", "rds:DescribeOrderableDBInstanceOptions", "rds:DescribePendingMaintenanceActions", "rds:DescribeValidDBInstanceModifications", "rds:DownloadDBLogFilePortion", "rds:FailoverDBCluster", + "rds:FailoverGlobalCluster", "rds:ListTagsForResource", "rds:ModifyDBCluster", + "rds:ModifyDBClusterEndpoint", "rds:ModifyDBClusterParameterGroup", "rds:ModifyDBClusterSnapshotAttribute", "rds:ModifyDBInstance", "rds:ModifyDBParameterGroup", "rds:ModifyDBSubnetGroup", "rds:ModifyEventSubscription", + "rds:ModifyGlobalCluster", "rds:PromoteReadReplicaDBCluster", "rds:RebootDBInstance", + "rds:RemoveFromGlobalCluster", "rds:RemoveRoleFromDBCluster", "rds:RemoveSourceIdentifierFromSubscription", "rds:RemoveTagsFromResource", "rds:ResetDBClusterParameterGroup", "rds:ResetDBParameterGroup", "rds:RestoreDBClusterFromSnapshot", - "rds:RestoreDBClusterToPointInTime" + "rds:RestoreDBClusterToPointInTime", + "rds:StartDBCluster", + "rds:StopDBCluster" ], "Effect":"Allow", "Resource":[ @@ -58144,17 +58960,26 @@ aws_managed_policies_data = """ }, "Effect":"Allow", "Resource":"arn:aws:iam::*:role/aws-service-role/rds.amazonaws.com/AWSServiceRoleForRDS" + }, + { + "Action":[ + "neptune-db:*" + ], + "Effect":"Allow", + "Resource":[ + "*" + ] } ], "Version":"2012-10-17" }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2020-09-02T17:24:56+00:00" + "UpdateDate":"2022-07-28T19:58:27+00:00" }, "NeptuneReadOnlyAccess":{ "CreateDate":"2018-05-30T19:16:37+00:00", - "DefaultVersionId":"v1", + "DefaultVersionId":"v2", "Document":{ "Statement":[ { @@ -58175,6 +59000,7 @@ aws_managed_policies_data = """ "rds:DescribeEventCategories", "rds:DescribeEventSubscriptions", "rds:DescribeEvents", + "rds:DescribeGlobalClusters", "rds:DescribeOrderableDBInstanceOptions", "rds:DescribePendingMaintenanceActions", "rds:DownloadDBLogFilePortion", @@ -58224,13 +59050,24 @@ aws_managed_policies_data = """ "arn:aws:logs:*:*:log-group:/aws/rds/*:log-stream:*", "arn:aws:logs:*:*:log-group:/aws/neptune/*:log-stream:*" ] + }, + { + "Action":[ + "neptune-db:Read*", + "neptune-db:Get*", + "neptune-db:List*" + ], + "Effect":"Allow", + "Resource":[ + "*" + ] } ], "Version":"2012-10-17" }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2018-05-30T19:16:37+00:00" + "UpdateDate":"2022-08-03T18:53:32+00:00" }, "NetworkAdministrator":{ "CreateDate":"2016-11-10T17:31:35+00:00", @@ -58643,7 +59480,7 @@ aws_managed_policies_data = """ }, "ReadOnlyAccess":{ "CreateDate":"2015-02-06T18:39:48+00:00", - "DefaultVersionId":"v87", + "DefaultVersionId":"v90", "Document":{ "Statement":[ { @@ -58666,6 +59503,7 @@ aws_managed_policies_data = """ "access-analyzer:ListPolicyGenerations", "access-analyzer:ListTagsForResource", "access-analyzer:ValidatePolicy", + "account:GetAlternateContact", "acm-pca:Describe*", "acm-pca:Get*", "acm-pca:List*", @@ -58849,6 +59687,7 @@ aws_managed_policies_data = """ "cloudwatch:Get*", "cloudwatch:List*", "codeartifact:DescribeDomain", + "codeartifact:DescribePackage", "codeartifact:DescribePackageVersion", "codeartifact:DescribeRepository", "codeartifact:GetAuthorizationToken", @@ -58981,6 +59820,8 @@ aws_managed_policies_data = """ "deepcomposer:ListModels", "deepcomposer:ListSampleModels", "deepcomposer:ListTrainingTopics", + "detective:BatchGetGraphMemberDatasources", + "detective:BatchGetMembershipDatasources", "detective:Get*", "detective:List*", "detective:SearchGraph", @@ -59020,6 +59861,8 @@ aws_managed_policies_data = """ "drs:GetFailbackReplicationConfiguration", "drs:GetLaunchConfiguration", "drs:GetReplicationConfiguration", + "drs:ListExtensibleSourceServers", + "drs:ListStagingAccounts", "drs:ListTagsForResource", "ds:Check*", "ds:Describe*", @@ -59119,26 +59962,30 @@ aws_managed_policies_data = """ "fms:ListPolicies", "fms:ListProtocolsLists", "fms:ListTagsForResource", + "forecast:DescribeAutoPredictor", "forecast:DescribeDataset", "forecast:DescribeDatasetGroup", "forecast:DescribeDatasetImportJob", + "forecast:DescribeExplainability", + "forecast:DescribeExplainabilityExport", "forecast:DescribeForecast", "forecast:DescribeForecastExportJob", + "forecast:DescribeMonitor", "forecast:DescribePredictor", "forecast:DescribePredictorBacktestExportJob", "forecast:GetAccuracyMetrics", "forecast:ListDatasetGroups", "forecast:ListDatasetImportJobs", "forecast:ListDatasets", + "forecast:ListExplainabilities", + "forecast:ListExplainabilityExports", "forecast:ListForecastExportJobs", "forecast:ListForecasts", + "forecast:ListMonitorEvaluations", + "forecast:ListMonitors", "forecast:ListPredictorBacktestExportJobs", "forecast:ListPredictors", "forecast:QueryForecast", - "freertos:Describe*", - "freertos:List*", - "fsx:Describe*", - "fsx:List*", "frauddetector:BatchGetVariable", "frauddetector:DescribeDetector", "frauddetector:DescribeModelVersions", @@ -59161,6 +60008,10 @@ aws_managed_policies_data = """ "frauddetector:GetVariables", "frauddetector:ListEventPredictions", "frauddetector:ListTagsForResource", + "freertos:Describe*", + "freertos:List*", + "fsx:Describe*", + "fsx:List*", "gamelift:Describe*", "gamelift:Get*", "gamelift:List*", @@ -59250,6 +60101,7 @@ aws_managed_policies_data = """ "glue:ListTriggers", "glue:ListWorkflows", "glue:QuerySchemaVersionMetadata", + "glue:SearchTables", "grafana:ListWorkspaces", "greengrass:DescribeComponent", "greengrass:Get*", @@ -59267,8 +60119,7 @@ aws_managed_policies_data = """ "groundstation:ListMissionProfiles", "groundstation:ListSatellites", "groundstation:ListTagsForResource", - "guardduty:DescribeOrganizationConfiguration", - "guardduty:DescribePublishingDestination", + "guardduty:Describe*", "guardduty:Get*", "guardduty:List*", "health:Describe*", @@ -59283,6 +60134,10 @@ aws_managed_policies_data = """ "imagebuilder:List*", "importexport:Get*", "importexport:List*", + "inspector:Describe*", + "inspector:Get*", + "inspector:List*", + "inspector:Preview*", "inspector2:BatchGetAccountStatus", "inspector2:BatchGetFreeTrialInfo", "inspector2:DescribeOrganizationConfiguration", @@ -59299,10 +60154,9 @@ aws_managed_policies_data = """ "inspector2:ListMembers", "inspector2:ListTagsForResource", "inspector2:ListUsageTotals", - "inspector:Describe*", - "inspector:Get*", - "inspector:List*", - "inspector:Preview*", + "iot:Describe*", + "iot:Get*", + "iot:List*", "iot1click:DescribeDevice", "iot1click:DescribePlacement", "iot1click:DescribeProject", @@ -59313,9 +60167,6 @@ aws_managed_policies_data = """ "iot1click:ListPlacements", "iot1click:ListProjects", "iot1click:ListTagsForResource", - "iot:Describe*", - "iot:Get*", - "iot:List*", "iotanalytics:Describe*", "iotanalytics:Get*", "iotanalytics:List*", @@ -59378,16 +60229,16 @@ aws_managed_policies_data = """ "iotwireless:ListWirelessDevices", "iotwireless:ListWirelessGateways", "iotwireless:ListWirelessGatewayTaskDefinitions", - "ivs:GetStreamSession", - "ivs:ListStreamSessions", "ivs:BatchGetChannel", "ivs:GetChannel", "ivs:GetPlaybackKeyPair", "ivs:GetRecordingConfiguration", + "ivs:GetStreamSession", "ivs:ListChannels", "ivs:ListPlaybackKeyPairs", "ivs:ListRecordingConfigurations", "ivs:ListStreams", + "ivs:ListStreamSessions", "ivs:ListTagsForResource", "ivschat:GetRoom", "ivschat:ListRooms", @@ -59532,6 +60383,9 @@ aws_managed_policies_data = """ "logs:StartQuery", "logs:StopQuery", "logs:TestMetricFilter", + "lookoutmetrics:Describe*", + "lookoutmetrics:Get*", + "lookoutmetrics:List*", "lookoutvision:DescribeDataset", "lookoutvision:DescribeModel", "lookoutvision:DescribeModelPackagingJob", @@ -59541,9 +60395,6 @@ aws_managed_policies_data = """ "lookoutvision:ListModels", "lookoutvision:ListProjects", "lookoutvision:ListTagsForResource", - "lookoutmetrics:Describe*", - "lookoutmetrics:List*", - "lookoutmetrics:Get*", "machinelearning:Describe*", "machinelearning:Get*", "macie2:BatchGetCustomDataIdentifiers", @@ -59572,8 +60423,6 @@ aws_managed_policies_data = """ "macie2:ListOrganizationAdminAccounts", "macie2:ListTagsForResource", "macie2:SearchResources", - "macie:ListMemberAccounts", - "macie:ListS3Resources", "managedblockchain:GetMember", "managedblockchain:GetNetwork", "managedblockchain:GetNode", @@ -59596,6 +60445,26 @@ aws_managed_policies_data = """ "mediaconvert:DescribeEndpoints", "mediaconvert:Get*", "mediaconvert:List*", + "medialive:DescribeChannel", + "medialive:DescribeInput", + "medialive:DescribeInputDevice", + "medialive:DescribeInputDeviceThumbnail", + "medialive:DescribeInputSecurityGroup", + "medialive:DescribeMultiplex", + "medialive:DescribeMultiplexProgram", + "medialive:DescribeOffering", + "medialive:DescribeReservation", + "medialive:DescribeSchedule", + "medialive:ListChannels", + "medialive:ListInputDevices", + "medialive:ListInputDeviceTransfers", + "medialive:ListInputs", + "medialive:ListInputSecurityGroups", + "medialive:ListMultiplexes", + "medialive:ListMultiplexPrograms", + "medialive:ListOfferings", + "medialive:ListReservations", + "medialive:ListTagsForResource", "mediapackage-vod:Describe*", "mediapackage-vod:List*", "mediapackage:Describe*", @@ -59978,7 +60847,7 @@ aws_managed_policies_data = """ }, "Path":"/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-05-23T20:16:18+00:00" + "UpdateDate":"2022-07-29T19:19:00+00:00" }, "ResourceGroupsandTagEditorFullAccess":{ "CreateDate":"2015-02-06T18:39:53+00:00", @@ -61394,7 +62263,7 @@ aws_managed_policies_data = """ }, "SupportUser":{ "CreateDate":"2016-11-10T17:21:53+00:00", - "DefaultVersionId":"v6", + "DefaultVersionId":"v7", "Document":{ "Statement":[ { @@ -61490,6 +62359,7 @@ aws_managed_policies_data = """ "ec2:DescribeNatGateways", "ec2:DescribeReservedInstancesModifications", "ec2:DescribeTags", + "ec2:SearchLocalGatewayRoutes", "ecr:GetRepositoryPolicy", "ecr:BatchCheckLayerAvailability", "ecr:DescribeRepositories", @@ -61611,7 +62481,7 @@ aws_managed_policies_data = """ }, "Path":"/job-function/", "PermissionsBoundaryUsageCount":0, - "UpdateDate":"2022-02-02T15:11:42+00:00" + "UpdateDate":"2022-07-25T22:45:38+00:00" }, "SystemAdministrator":{ "CreateDate":"2016-11-10T17:23:56+00:00", diff --git a/moto/ssm/resources/regions.json b/moto/ssm/resources/regions.json index 140197175..29b3af390 100644 --- a/moto/ssm/resources/regions.json +++ b/moto/ssm/resources/regions.json @@ -41,6 +41,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -95,6 +104,15 @@ "appflow": { "Value": "appflow" }, + "appintegrations": { + "Value": "appintegrations", + "endpoint": { + "Value": "app-integrations.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "application-autoscaling": { "Value": "application-autoscaling", "endpoint": { @@ -161,6 +179,15 @@ "Value": "HTTPS" } }, + "backup-gateway": { + "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "batch": { "Value": "batch", "endpoint": { @@ -263,6 +290,15 @@ "Value": "HTTPS" } }, + "compute-optimizer": { + "Value": "compute-optimizer", + "endpoint": { + "Value": "compute-optimizer.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "config": { "Value": "config", "endpoint": { @@ -272,6 +308,24 @@ "Value": "HTTPS" } }, + "connectparticipant": { + "Value": "connectparticipant", + "endpoint": { + "Value": "participant.connect.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "customer-profiles": { + "Value": "customer-profiles", + "endpoint": { + "Value": "profile.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "databrew": { "Value": "databrew", "endpoint": { @@ -326,6 +380,15 @@ "Value": "HTTPS" } }, + "drs": { + "Value": "drs", + "endpoint": { + "Value": "drs.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ds": { "Value": "ds", "endpoint": { @@ -596,6 +659,15 @@ "Value": "HTTPS" } }, + "kafka": { + "Value": "kafka", + "endpoint": { + "Value": "kafka.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kinesis": { "Value": "kinesis", "endpoint": { @@ -614,6 +686,15 @@ "Value": "HTTPS" } }, + "kinesisvideo": { + "Value": "kinesisvideo", + "endpoint": { + "Value": "kinesisvideo.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kms": { "Value": "kms", "endpoint": { @@ -818,6 +899,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -1206,6 +1296,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -1341,6 +1440,15 @@ "Value": "HTTPS" } }, + "backup-gateway": { + "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "batch": { "Value": "batch", "endpoint": { @@ -1458,6 +1566,15 @@ "Value": "HTTPS" } }, + "compute-optimizer": { + "Value": "compute-optimizer", + "endpoint": { + "Value": "compute-optimizer.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "config": { "Value": "config", "endpoint": { @@ -1521,6 +1638,15 @@ "Value": "HTTPS" } }, + "drs": { + "Value": "drs", + "endpoint": { + "Value": "drs.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ds": { "Value": "ds", "endpoint": { @@ -1791,6 +1917,15 @@ "Value": "HTTPS" } }, + "inspector2": { + "Value": "inspector2", + "endpoint": { + "Value": "inspector2.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iot": { "Value": "iot", "endpoint": { @@ -1836,6 +1971,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kafka": { "Value": "kafka", "endpoint": { @@ -1929,6 +2073,15 @@ "Value": "HTTPS" } }, + "managedservices": { + "Value": "managedservices", + "endpoint": { + "Value": "amscm.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "marketplace": { "Value": "marketplace" }, @@ -2088,6 +2241,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -2106,6 +2268,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -2289,6 +2460,15 @@ "Value": "HTTPS" } }, + "snow-device-management": { + "Value": "snow-device-management", + "endpoint": { + "Value": "snow-device-management.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "snowball": { "Value": "snowball", "endpoint": { @@ -2322,6 +2502,24 @@ "Value": "HTTPS" } }, + "sso": { + "Value": "sso", + "endpoint": { + "Value": "sso.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "sso-oidc": { + "Value": "sso-oidc", + "endpoint": { + "Value": "oidc.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "stepfunctions": { "Value": "stepfunctions", "endpoint": { @@ -2418,6 +2616,9 @@ "trustedadvisor": { "Value": "trustedadvisor" }, + "vmwarecloudonaws": { + "Value": "vmwarecloudonaws" + }, "vpc": { "Value": "vpc" }, @@ -2509,6 +2710,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -2533,15 +2743,6 @@ "amazonlocationservice": { "Value": "amazonlocationservice" }, - "amp": { - "Value": "amp", - "endpoint": { - "Value": "aps.ap-northeast-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, "amplify": { "Value": "amplify", "endpoint": { @@ -2560,6 +2761,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -2662,6 +2872,15 @@ "Value": "HTTPS" } }, + "aps": { + "Value": "aps", + "endpoint": { + "Value": "aps.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "artifact": { "Value": "artifact" }, @@ -2713,6 +2932,15 @@ "Value": "HTTPS" } }, + "backup-gateway": { + "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "batch": { "Value": "batch", "endpoint": { @@ -2989,7 +3217,7 @@ "controltower": { "Value": "controltower", "endpoint": { - "Value": "prod.ap-northeast-1.blackbeard.aws.a2z.com" + "Value": "controltower.ap-northeast-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -3274,6 +3502,15 @@ "Value": "HTTPS" } }, + "emr-serverless": { + "Value": "emr-serverless", + "endpoint": { + "Value": "emr-serverless.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "es": { "Value": "es", "endpoint": { @@ -3604,6 +3841,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iotsitewise": { "Value": "iotsitewise", "endpoint": { @@ -3928,6 +4174,15 @@ "Value": "HTTPS" } }, + "migration-hub-refactor-spaces": { + "Value": "migration-hub-refactor-spaces", + "endpoint": { + "Value": "refactor-spaces.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "mq": { "Value": "mq", "endpoint": { @@ -3958,6 +4213,15 @@ "Value": "HTTPS" } }, + "nimble": { + "Value": "nimble", + "endpoint": { + "Value": "nimble.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "opsworks": { "Value": "opsworks", "endpoint": { @@ -4048,6 +4312,15 @@ "Value": "HTTPS" } }, + "pinpoint-sms-voice-v2": { + "Value": "pinpoint-sms-voice-v2", + "endpoint": { + "Value": "sms-voice.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "polly": { "Value": "polly", "endpoint": { @@ -4150,6 +4423,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -4177,6 +4459,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -4384,6 +4675,15 @@ "Value": "HTTPS" } }, + "snow-device-management": { + "Value": "snow-device-management", + "endpoint": { + "Value": "snow-device-management.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "snowball": { "Value": "snowball", "endpoint": { @@ -4519,6 +4819,9 @@ "Value": "HTTPS" } }, + "timestream": { + "Value": "timestream" + }, "transcribe": { "Value": "transcribe", "endpoint": { @@ -4621,6 +4924,15 @@ "Value": "HTTPS" } }, + "workspaces-web": { + "Value": "workspaces-web", + "endpoint": { + "Value": "workspaces-web.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "xray": { "Value": "xray", "endpoint": { @@ -4681,6 +4993,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -4720,6 +5041,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -4759,6 +5089,15 @@ "Value": "HTTPS" } }, + "appintegrations": { + "Value": "appintegrations", + "endpoint": { + "Value": "app-integrations.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "application-autoscaling": { "Value": "application-autoscaling", "endpoint": { @@ -4846,6 +5185,15 @@ "Value": "HTTPS" } }, + "backup-gateway": { + "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "batch": { "Value": "batch", "endpoint": { @@ -5086,7 +5434,16 @@ "controltower": { "Value": "controltower", "endpoint": { - "Value": "prod.ap-northeast-2.blackbeard.aws.a2z.com" + "Value": "controltower.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "customer-profiles": { + "Value": "customer-profiles", + "endpoint": { + "Value": "profile.ap-northeast-2.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -5164,6 +5521,15 @@ "Value": "HTTPS, HTTP" } }, + "drs": { + "Value": "drs", + "endpoint": { + "Value": "drs.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ds": { "Value": "ds", "endpoint": { @@ -5521,6 +5887,15 @@ "Value": "HTTPS" } }, + "inspector2": { + "Value": "inspector2", + "endpoint": { + "Value": "inspector2.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iot": { "Value": "iot", "endpoint": { @@ -5593,6 +5968,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iotsitewise": { "Value": "iotsitewise", "endpoint": { @@ -6067,6 +6451,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -6085,6 +6478,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -6280,6 +6682,15 @@ "Value": "HTTPS" } }, + "snow-device-management": { + "Value": "snow-device-management", + "endpoint": { + "Value": "snow-device-management.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "snowball": { "Value": "snowball", "endpoint": { @@ -6523,6 +6934,11 @@ "Value": "HTTPS" } } + }, + "wavelength-zones": { + "apne2-wl1-sel-wlz1": { + "Value": "apne2-wl1-sel-wlz1" + } } }, "ap-northeast-3": { @@ -6563,6 +6979,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -6632,6 +7057,15 @@ "Value": "HTTPS" } }, + "appmesh": { + "Value": "appmesh", + "endpoint": { + "Value": "appmesh.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "appsync": { "Value": "appsync", "endpoint": { @@ -6684,6 +7118,9 @@ "Value": "backup-gateway", "endpoint": { "Value": "backup-gateway.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" } }, "batch": { @@ -6785,6 +7222,15 @@ "Value": "HTTPS" } }, + "compute-optimizer": { + "Value": "compute-optimizer", + "endpoint": { + "Value": "compute-optimizer.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "config": { "Value": "config", "endpoint": { @@ -6830,6 +7276,15 @@ "Value": "HTTPS" } }, + "drs": { + "Value": "drs", + "endpoint": { + "Value": "drs.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ds": { "Value": "ds", "endpoint": { @@ -7073,6 +7528,15 @@ "Value": "HTTPS" } }, + "kafka": { + "Value": "kafka", + "endpoint": { + "Value": "kafka.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kinesis": { "Value": "kinesis", "endpoint": { @@ -7283,6 +7747,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -7406,6 +7879,24 @@ "Value": "HTTPS" } }, + "servicecatalog-appregistry": { + "Value": "servicecatalog-appregistry", + "endpoint": { + "Value": "servicecatalog-appregistry.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "servicediscovery": { + "Value": "servicediscovery", + "endpoint": { + "Value": "servicediscovery.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ses": { "Value": "ses", "endpoint": { @@ -7457,6 +7948,24 @@ "Value": "HTTPS" } }, + "sso": { + "Value": "sso", + "endpoint": { + "Value": "sso.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "sso-oidc": { + "Value": "sso-oidc", + "endpoint": { + "Value": "oidc.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "stepfunctions": { "Value": "stepfunctions", "endpoint": { @@ -7614,6 +8123,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -7653,6 +8171,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -7797,6 +8324,9 @@ "Value": "backup-gateway", "endpoint": { "Value": "backup-gateway.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" } }, "batch": { @@ -8012,7 +8542,7 @@ "controltower": { "Value": "controltower", "endpoint": { - "Value": "prod.ap-south-1.blackbeard.aws.a2z.com" + "Value": "controltower.ap-south-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -8090,6 +8620,15 @@ "Value": "HTTPS, HTTP" } }, + "drs": { + "Value": "drs", + "endpoint": { + "Value": "drs.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ds": { "Value": "ds", "endpoint": { @@ -8429,6 +8968,15 @@ "Value": "HTTPS" } }, + "inspector2": { + "Value": "inspector2", + "endpoint": { + "Value": "inspector2.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iot": { "Value": "iot", "endpoint": { @@ -8510,6 +9058,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iotsitewise": { "Value": "iotsitewise", "endpoint": { @@ -8843,6 +9400,15 @@ "Value": "HTTPS" } }, + "pinpoint-sms-voice-v2": { + "Value": "pinpoint-sms-voice-v2", + "endpoint": { + "Value": "sms-voice.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "polly": { "Value": "polly", "endpoint": { @@ -8927,6 +9493,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -8945,6 +9520,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -9149,6 +9733,15 @@ "Value": "HTTPS" } }, + "snow-device-management": { + "Value": "snow-device-management", + "endpoint": { + "Value": "snow-device-management.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "snowball": { "Value": "snowball", "endpoint": { @@ -9386,6 +9979,15 @@ "Value": "HTTPS" } }, + "workspaces-web": { + "Value": "workspaces-web", + "endpoint": { + "Value": "workspaces-web.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "xray": { "Value": "xray", "endpoint": { @@ -9435,6 +10037,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -9459,15 +10070,6 @@ "amazonlocationservice": { "Value": "amazonlocationservice" }, - "amp": { - "Value": "amp", - "endpoint": { - "Value": "aps.ap-southeast-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, "amplify": { "Value": "amplify", "endpoint": { @@ -9486,6 +10088,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -9579,6 +10190,15 @@ "Value": "HTTPS" } }, + "aps": { + "Value": "aps", + "endpoint": { + "Value": "aps.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "artifact": { "Value": "artifact" }, @@ -9631,6 +10251,10 @@ } }, "backup-gateway": { + "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.ap-southeast-1.amazonaws.com" + }, "protocols": { "Value": "HTTPS" } @@ -9659,6 +10283,24 @@ "chime": { "Value": "chime" }, + "chime-sdk-media-pipelines": { + "Value": "chime-sdk-media-pipelines", + "endpoint": { + "Value": "media-pipelines-chime.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "chime-sdk-meetings": { + "Value": "chime-sdk-meetings", + "endpoint": { + "Value": "meetings-chime.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "cloud9": { "Value": "cloud9", "endpoint": { @@ -9902,7 +10544,7 @@ "controltower": { "Value": "controltower", "endpoint": { - "Value": "prod.ap-southeast-1.blackbeard.aws.a2z.com" + "Value": "controltower.ap-southeast-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10274,6 +10916,15 @@ "Value": "HTTPS" } }, + "fsx-openzfs": { + "Value": "fsx-openzfs", + "endpoint": { + "Value": "fsx.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "fsx-windows": { "Value": "fsx-windows", "endpoint": { @@ -10337,6 +10988,15 @@ "Value": "HTTPS" } }, + "groundstation": { + "Value": "groundstation", + "endpoint": { + "Value": "groundstation.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "guardduty": { "Value": "guardduty", "endpoint": { @@ -10463,6 +11123,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iotsitewise": { "Value": "iotsitewise", "endpoint": { @@ -10472,6 +11141,9 @@ "Value": "HTTPS" } }, + "iottwinmaker": { + "Value": "iottwinmaker" + }, "kafka": { "Value": "kafka", "endpoint": { @@ -10739,6 +11411,15 @@ "Value": "HTTPS" } }, + "migration-hub-refactor-spaces": { + "Value": "migration-hub-refactor-spaces", + "endpoint": { + "Value": "refactor-spaces.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "mq": { "Value": "mq", "endpoint": { @@ -10823,6 +11504,15 @@ "Value": "HTTPS" } }, + "panorama": { + "Value": "panorama", + "endpoint": { + "Value": "panorama.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "personalize": { "Value": "personalize", "endpoint": { @@ -10859,6 +11549,15 @@ "Value": "HTTPS" } }, + "pinpoint-sms-voice-v2": { + "Value": "pinpoint-sms-voice-v2", + "endpoint": { + "Value": "sms-voice.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "polly": { "Value": "polly", "endpoint": { @@ -10953,6 +11652,10 @@ } }, "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.ap-southeast-1.amazonaws.com" + }, "protocols": { "Value": "HTTPS" } @@ -10984,6 +11687,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -11188,6 +11900,15 @@ "Value": "HTTPS" } }, + "snow-device-management": { + "Value": "snow-device-management", + "endpoint": { + "Value": "snow-device-management.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "snowball": { "Value": "snowball", "endpoint": { @@ -11440,6 +12161,15 @@ "Value": "HTTPS" } }, + "workspaces-web": { + "Value": "workspaces-web", + "endpoint": { + "Value": "workspaces-web.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "xray": { "Value": "xray", "endpoint": { @@ -11489,6 +12219,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -11513,15 +12252,6 @@ "amazonlocationservice": { "Value": "amazonlocationservice" }, - "amp": { - "Value": "amp", - "endpoint": { - "Value": "aps.ap-southeast-2.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, "amplify": { "Value": "amplify", "endpoint": { @@ -11540,6 +12270,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -11638,6 +12377,15 @@ "Value": "HTTPS" } }, + "aps": { + "Value": "aps", + "endpoint": { + "Value": "aps.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "artifact": { "Value": "artifact" }, @@ -11980,6 +12728,15 @@ "Value": "HTTPS" } }, + "connectcampaigns": { + "Value": "connectcampaigns", + "endpoint": { + "Value": "connect-campaigns.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "connectparticipant": { "Value": "connectparticipant", "endpoint": { @@ -11992,7 +12749,7 @@ "controltower": { "Value": "controltower", "endpoint": { - "Value": "prod.ap-southeast-2.blackbeard.aws.a2z.com" + "Value": "controltower.ap-southeast-2.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -12379,6 +13136,15 @@ "Value": "HTTPS" } }, + "fsx-openzfs": { + "Value": "fsx-openzfs", + "endpoint": { + "Value": "fsx.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "fsx-windows": { "Value": "fsx-windows", "endpoint": { @@ -12586,6 +13352,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iotsitewise": { "Value": "iotsitewise", "endpoint": { @@ -12604,6 +13379,9 @@ "Value": "HTTPS" } }, + "iottwinmaker": { + "Value": "iottwinmaker" + }, "iotwireless": { "Value": "iotwireless", "endpoint": { @@ -12760,6 +13538,15 @@ "lumberyard": { "Value": "lumberyard" }, + "m2": { + "Value": "m2", + "endpoint": { + "Value": "m2.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "macie": { "Value": "macie", "endpoint": { @@ -12892,6 +13679,15 @@ "Value": "HTTPS" } }, + "migration-hub-refactor-spaces": { + "Value": "migration-hub-refactor-spaces", + "endpoint": { + "Value": "refactor-spaces.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "mq": { "Value": "mq", "endpoint": { @@ -12985,6 +13781,15 @@ "Value": "HTTPS" } }, + "panorama": { + "Value": "panorama", + "endpoint": { + "Value": "panorama.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "personalize": { "Value": "personalize", "endpoint": { @@ -13039,6 +13844,15 @@ "Value": "HTTPS" } }, + "pinpoint-sms-voice-v2": { + "Value": "pinpoint-sms-voice-v2", + "endpoint": { + "Value": "sms-voice.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "polly": { "Value": "polly", "endpoint": { @@ -13132,6 +13946,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -13150,6 +13973,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -13368,6 +14200,15 @@ "Value": "HTTPS" } }, + "snow-device-management": { + "Value": "snow-device-management", + "endpoint": { + "Value": "snow-device-management.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "snowball": { "Value": "snowball", "endpoint": { @@ -13512,6 +14353,9 @@ "Value": "HTTPS" } }, + "timestream": { + "Value": "timestream" + }, "transcribe": { "Value": "transcribe", "endpoint": { @@ -13631,6 +14475,15 @@ "Value": "HTTPS" } }, + "workspaces-web": { + "Value": "workspaces-web", + "endpoint": { + "Value": "workspaces-web.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "xray": { "Value": "xray", "endpoint": { @@ -13680,6 +14533,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -13689,6 +14551,15 @@ "Value": "HTTPS" } }, + "acm-pca": { + "Value": "acm-pca", + "endpoint": { + "Value": "acm-pca.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -13707,6 +14578,24 @@ "Value": "HTTPS" } }, + "application-autoscaling": { + "Value": "application-autoscaling", + "endpoint": { + "Value": "autoscaling-plans.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS, HTTP" + } + }, + "appmesh": { + "Value": "appmesh", + "endpoint": { + "Value": "appmesh.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "artifact": { "Value": "artifact" }, @@ -13737,6 +14626,15 @@ "Value": "HTTPS" } }, + "batch": { + "Value": "batch", + "endpoint": { + "Value": "batch.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "chatbot": { "Value": "chatbot" }, @@ -13749,6 +14647,24 @@ "Value": "HTTPS" } }, + "cloudfront": { + "Value": "cloudfront", + "endpoint": { + "Value": "cloudfront.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "cloudhsmv2": { + "Value": "cloudhsmv2", + "endpoint": { + "Value": "cloudhsmv2.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "cloudtrail": { "Value": "cloudtrail", "endpoint": { @@ -13767,6 +14683,15 @@ "Value": "HTTPS, HTTP" } }, + "codebuild": { + "Value": "codebuild", + "endpoint": { + "Value": "codebuild.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "codedeploy": { "Value": "codedeploy", "endpoint": { @@ -13785,6 +14710,15 @@ "Value": "HTTPS" } }, + "datasync": { + "Value": "datasync", + "endpoint": { + "Value": "datasync.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "directconnect": { "Value": "directconnect", "endpoint": { @@ -13794,6 +14728,15 @@ "Value": "HTTPS" } }, + "dlm": { + "Value": "dlm", + "endpoint": { + "Value": "dlm.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "dms": { "Value": "dms", "endpoint": { @@ -13857,6 +14800,15 @@ "Value": "HTTPS" } }, + "eks": { + "Value": "eks", + "endpoint": { + "Value": "eks.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "elasticache": { "Value": "elasticache", "endpoint": { @@ -13866,6 +14818,15 @@ "Value": "HTTPS" } }, + "elasticbeanstalk": { + "Value": "elasticbeanstalk", + "endpoint": { + "Value": "elasticbeanstalk.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "elb": { "Value": "elb", "endpoint": { @@ -13905,6 +14866,15 @@ "Value": "HTTPS" } }, + "firehose": { + "Value": "firehose", + "endpoint": { + "Value": "firehose.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "glacier": { "Value": "glacier", "endpoint": { @@ -13950,6 +14920,15 @@ "Value": "HTTPS" } }, + "kinesisanalytics": { + "Value": "kinesisanalytics", + "endpoint": { + "Value": "kinesisanalytics.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kms": { "Value": "kms", "endpoint": { @@ -13968,6 +14947,15 @@ "Value": "HTTPS" } }, + "license-manager": { + "Value": "license-manager", + "endpoint": { + "Value": "license-manager.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "logs": { "Value": "logs", "endpoint": { @@ -14007,6 +14995,15 @@ "Value": "HTTPS" } }, + "outposts": { + "Value": "outposts", + "endpoint": { + "Value": "outposts.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "phd": { "Value": "phd", "endpoint": { @@ -14016,9 +15013,27 @@ "Value": "HTTPS, HTTP" } }, + "pi": { + "Value": "pi", + "endpoint": { + "Value": "pi.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "privatelink": { "Value": "privatelink" }, + "ram": { + "Value": "ram", + "endpoint": { + "Value": "ram.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rds": { "Value": "rds", "endpoint": { @@ -14064,6 +15079,15 @@ "Value": "HTTPS" } }, + "route53resolver": { + "Value": "route53resolver", + "endpoint": { + "Value": "route53resolver.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "s3": { "Value": "s3", "endpoint": { @@ -14073,6 +15097,60 @@ "Value": "HTTPS, HTTP" } }, + "securityhub": { + "Value": "securityhub", + "endpoint": { + "Value": "securityhub.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "service-quotas": { + "Value": "service-quotas", + "endpoint": { + "Value": "servicequotas.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "servicecatalog": { + "Value": "servicecatalog", + "endpoint": { + "Value": "servicecatalog.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "servicecatalog-appregistry": { + "Value": "servicecatalog-appregistry", + "endpoint": { + "Value": "servicecatalog-appregistry.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "servicediscovery": { + "Value": "servicediscovery", + "endpoint": { + "Value": "servicediscovery.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "shield": { + "Value": "shield", + "endpoint": { + "Value": "shield.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "sns": { "Value": "sns", "endpoint": { @@ -14136,6 +15214,24 @@ "Value": "HTTPS" } }, + "synthetics": { + "Value": "synthetics", + "endpoint": { + "Value": "synthetics.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "transitgateway": { + "Value": "transitgateway", + "endpoint": { + "Value": "ec2.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "trustedadvisor": { "Value": "trustedadvisor" }, @@ -14150,6 +15246,33 @@ "protocols": { "Value": "HTTPS" } + }, + "waf": { + "Value": "waf", + "endpoint": { + "Value": "wafv2.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "waf-regional": { + "Value": "waf-regional", + "endpoint": { + "Value": "waf-regional.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "xray": { + "Value": "xray", + "endpoint": { + "Value": "xray.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } } } }, @@ -14191,6 +15314,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -14230,6 +15362,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -14314,6 +15455,15 @@ "Value": "HTTPS" } }, + "appstream": { + "Value": "appstream", + "endpoint": { + "Value": "appstream2.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "appsync": { "Value": "appsync", "endpoint": { @@ -14375,7 +15525,13 @@ } }, "backup-gateway": { - "Value": "backup-gateway" + "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } }, "batch": { "Value": "batch", @@ -14617,7 +15773,7 @@ "controltower": { "Value": "controltower", "endpoint": { - "Value": "prod.ca-central-1.blackbeard.aws.a2z.com" + "Value": "controltower.ca-central-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -14695,6 +15851,15 @@ "Value": "HTTPS, HTTP" } }, + "drs": { + "Value": "drs", + "endpoint": { + "Value": "drs.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ds": { "Value": "ds", "endpoint": { @@ -15025,6 +16190,15 @@ "Value": "HTTPS" } }, + "inspector2": { + "Value": "inspector2", + "endpoint": { + "Value": "inspector2.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iot": { "Value": "iot", "endpoint": { @@ -15070,6 +16244,24 @@ "Value": "HTTPS" } }, + "iotevents": { + "Value": "iotevents", + "endpoint": { + "Value": "iotevents.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "iotevents-data": { + "Value": "iotevents-data", + "endpoint": { + "Value": "data.iotevents.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iotfleethub": { "Value": "iotfleethub", "endpoint": { @@ -15079,6 +16271,24 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "iotsitewise": { + "Value": "iotsitewise", + "endpoint": { + "Value": "iotsitewise.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kafka": { "Value": "kafka", "endpoint": { @@ -15208,6 +16418,15 @@ "lumberyard": { "Value": "lumberyard" }, + "m2": { + "Value": "m2", + "endpoint": { + "Value": "m2.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "macie": { "Value": "macie", "endpoint": { @@ -15340,6 +16559,15 @@ "Value": "HTTPS" } }, + "panorama": { + "Value": "panorama", + "endpoint": { + "Value": "panorama.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "personalize": { "Value": "personalize", "endpoint": { @@ -15376,6 +16604,15 @@ "Value": "HTTPS" } }, + "pinpoint-sms-voice-v2": { + "Value": "pinpoint-sms-voice-v2", + "endpoint": { + "Value": "sms-voice.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "polly": { "Value": "polly", "endpoint": { @@ -15469,6 +16706,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -15487,6 +16733,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -15682,6 +16937,15 @@ "Value": "HTTPS" } }, + "snow-device-management": { + "Value": "snow-device-management", + "endpoint": { + "Value": "snow-device-management.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "snowball": { "Value": "snowball", "endpoint": { @@ -15919,6 +17183,15 @@ "Value": "HTTPS" } }, + "workspaces-web": { + "Value": "workspaces-web", + "endpoint": { + "Value": "workspaces-web.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "xray": { "Value": "xray", "endpoint": { @@ -15928,6 +17201,11 @@ "Value": "HTTPS" } } + }, + "wavelength-zones": { + "cac1-wl1-yto-wlz1": { + "Value": "cac1-wl1-yto-wlz1" + } } }, "cn-north-1": { @@ -15968,6 +17246,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.cn-northwest-1.amazonaws.com.cn" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -16244,6 +17531,15 @@ "Value": "HTTPS" } }, + "docdb": { + "Value": "docdb", + "endpoint": { + "Value": "rds.cn-north-1.amazonaws.com.cn" + }, + "protocols": { + "Value": "HTTPS, HTTP" + } + }, "ds": { "Value": "ds", "endpoint": { @@ -16601,6 +17897,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.cn-north-1.amazonaws.com.cn" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iotsitewise": { "Value": "iotsitewise", "endpoint": { @@ -16694,6 +17999,15 @@ "Value": "TLS" } }, + "memorydb": { + "Value": "memorydb", + "endpoint": { + "Value": "memory-db.cn-north-1.amazonaws.com.cn" + }, + "protocols": { + "Value": "HTTPS" + } + }, "mq": { "Value": "mq", "endpoint": { @@ -17718,6 +19032,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.cn-northwest-1.amazonaws.com.cn" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kafka": { "Value": "kafka", "endpoint": { @@ -17811,6 +19134,15 @@ "Value": "HTTPS" } }, + "memorydb": { + "Value": "memorydb", + "endpoint": { + "Value": "memory-db.cn-northwest-1.amazonaws.com.cn" + }, + "protocols": { + "Value": "HTTPS" + } + }, "mq": { "Value": "mq", "endpoint": { @@ -18238,6 +19570,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -18262,15 +19603,6 @@ "amazonlocationservice": { "Value": "amazonlocationservice" }, - "amp": { - "Value": "amp", - "endpoint": { - "Value": "aps.eu-central-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, "amplify": { "Value": "amplify", "endpoint": { @@ -18289,6 +19621,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -18388,6 +19729,15 @@ "Value": "HTTPS" } }, + "aps": { + "Value": "aps", + "endpoint": { + "Value": "aps.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "artifact": { "Value": "artifact" }, @@ -18439,6 +19789,15 @@ "Value": "HTTPS" } }, + "backup-gateway": { + "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "batch": { "Value": "batch", "endpoint": { @@ -18463,6 +19822,42 @@ "chime": { "Value": "chime" }, + "chime-sdk-identity": { + "Value": "chime-sdk-identity", + "endpoint": { + "Value": "identity-chime.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "chime-sdk-media-pipelines": { + "Value": "chime-sdk-media-pipelines", + "endpoint": { + "Value": "media-pipelines-chime.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "chime-sdk-meetings": { + "Value": "chime-sdk-meetings", + "endpoint": { + "Value": "meetings-chime.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "chime-sdk-messaging": { + "Value": "chime-sdk-messaging", + "endpoint": { + "Value": "messaging-chime.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "cloud9": { "Value": "cloud9", "endpoint": { @@ -18724,7 +20119,7 @@ "controltower": { "Value": "controltower", "endpoint": { - "Value": "prod.eu-central-1.blackbeard.aws.a2z.com" + "Value": "controltower.eu-central-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -19312,6 +20707,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iotsitewise": { "Value": "iotsitewise", "endpoint": { @@ -19321,6 +20725,9 @@ "Value": "HTTPS" } }, + "iottwinmaker": { + "Value": "iottwinmaker" + }, "ivs": { "Value": "ivs", "endpoint": { @@ -19477,6 +20884,15 @@ "lumberyard": { "Value": "lumberyard" }, + "m2": { + "Value": "m2", + "endpoint": { + "Value": "m2.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "macie": { "Value": "macie", "endpoint": { @@ -19573,6 +20989,15 @@ "Value": "HTTPS, HTTP" } }, + "memorydb": { + "Value": "memorydb", + "endpoint": { + "Value": "memory-db.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "meteringmarketplace": { "Value": "meteringmarketplace", "endpoint": { @@ -19600,6 +21025,15 @@ "Value": "HTTPS" } }, + "migration-hub-refactor-spaces": { + "Value": "migration-hub-refactor-spaces", + "endpoint": { + "Value": "refactor-spaces.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "migrationhubstrategy": { "Value": "migrationhubstrategy" }, @@ -19741,6 +21175,15 @@ "Value": "HTTPS" } }, + "pinpoint-sms-voice-v2": { + "Value": "pinpoint-sms-voice-v2", + "endpoint": { + "Value": "sms-voice.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "polly": { "Value": "polly", "endpoint": { @@ -19839,6 +21282,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -19866,6 +21318,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -20322,6 +21783,15 @@ "Value": "HTTPS" } }, + "workspaces-web": { + "Value": "workspaces-web", + "endpoint": { + "Value": "workspaces-web.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "xray": { "Value": "xray", "endpoint": { @@ -20382,6 +21852,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -20406,15 +21885,6 @@ "amazonlocationservice": { "Value": "amazonlocationservice" }, - "amp": { - "Value": "amp", - "endpoint": { - "Value": "aps.eu-north-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, "amplify": { "Value": "amplify", "endpoint": { @@ -20433,6 +21903,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -20499,6 +21978,15 @@ "Value": "HTTPS" } }, + "aps": { + "Value": "aps", + "endpoint": { + "Value": "aps.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "artifact": { "Value": "artifact" }, @@ -20538,6 +22026,15 @@ "Value": "HTTPS" } }, + "backup-gateway": { + "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "batch": { "Value": "batch", "endpoint": { @@ -20742,7 +22239,7 @@ "controltower": { "Value": "controltower", "endpoint": { - "Value": "prod.eu-north-1.blackbeard.aws.a2z.com" + "Value": "controltower.eu-north-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -20811,6 +22308,15 @@ "Value": "HTTPS" } }, + "drs": { + "Value": "drs", + "endpoint": { + "Value": "drs.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ds": { "Value": "ds", "endpoint": { @@ -21117,6 +22623,15 @@ "Value": "HTTPS" } }, + "inspector2": { + "Value": "inspector2", + "endpoint": { + "Value": "inspector2.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iot": { "Value": "iot", "endpoint": { @@ -21171,6 +22686,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kafka": { "Value": "kafka", "endpoint": { @@ -21387,6 +22911,15 @@ "Value": "HTTPS" } }, + "migration-hub-refactor-spaces": { + "Value": "migration-hub-refactor-spaces", + "endpoint": { + "Value": "refactor-spaces.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "mq": { "Value": "mq", "endpoint": { @@ -21501,6 +23034,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -21519,6 +23061,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -21714,6 +23265,15 @@ "Value": "HTTPS" } }, + "snow-device-management": { + "Value": "snow-device-management", + "endpoint": { + "Value": "snow-device-management.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "snowball": { "Value": "snowball", "endpoint": { @@ -21976,6 +23536,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -22108,6 +23677,15 @@ "Value": "HTTPS" } }, + "backup-gateway": { + "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.eu-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "batch": { "Value": "batch", "endpoint": { @@ -22228,6 +23806,15 @@ "Value": "HTTPS" } }, + "compute-optimizer": { + "Value": "compute-optimizer", + "endpoint": { + "Value": "compute-optimizer.eu-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "config": { "Value": "config", "endpoint": { @@ -22291,6 +23878,24 @@ "Value": "HTTPS" } }, + "docdb": { + "Value": "docdb", + "endpoint": { + "Value": "rds.eu-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS, HTTP" + } + }, + "drs": { + "Value": "drs", + "endpoint": { + "Value": "drs.eu-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ds": { "Value": "ds", "endpoint": { @@ -22552,6 +24157,15 @@ "Value": "HTTPS" } }, + "inspector2": { + "Value": "inspector2", + "endpoint": { + "Value": "inspector2.eu-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kafka": { "Value": "kafka", "endpoint": { @@ -22747,6 +24361,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.eu-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -22963,6 +24586,24 @@ "Value": "HTTPS" } }, + "sso": { + "Value": "sso", + "endpoint": { + "Value": "sso.eu-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "sso-oidc": { + "Value": "sso-oidc", + "endpoint": { + "Value": "oidc.eu-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "stepfunctions": { "Value": "stepfunctions", "endpoint": { @@ -23120,6 +24761,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -23144,15 +24794,6 @@ "amazonlocationservice": { "Value": "amazonlocationservice" }, - "amp": { - "Value": "amp", - "endpoint": { - "Value": "aps.eu-west-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, "amplify": { "Value": "amplify", "endpoint": { @@ -23171,6 +24812,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -23264,6 +24914,15 @@ "Value": "HTTPS" } }, + "aps": { + "Value": "aps", + "endpoint": { + "Value": "aps.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "artifact": { "Value": "artifact" }, @@ -23315,6 +24974,15 @@ "Value": "HTTPS" } }, + "backup-gateway": { + "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "batch": { "Value": "batch", "endpoint": { @@ -23381,15 +25049,6 @@ "Value": "HTTPS" } }, - "cloudhsm": { - "Value": "cloudhsm", - "endpoint": { - "Value": "cloudhsm.eu-west-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, "cloudhsmv2": { "Value": "cloudhsmv2", "endpoint": { @@ -23591,7 +25250,7 @@ "controltower": { "Value": "controltower", "endpoint": { - "Value": "prod.eu-west-1.blackbeard.aws.a2z.com" + "Value": "controltower.eu-west-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -23858,6 +25517,15 @@ "Value": "HTTPS" } }, + "emr-serverless": { + "Value": "emr-serverless", + "endpoint": { + "Value": "emr-serverless.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "es": { "Value": "es", "endpoint": { @@ -24125,6 +25793,15 @@ "Value": "HTTPS" } }, + "inspector2": { + "Value": "inspector2", + "endpoint": { + "Value": "inspector2.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iot": { "Value": "iot", "endpoint": { @@ -24224,6 +25901,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iotsitewise": { "Value": "iotsitewise", "endpoint": { @@ -24242,6 +25928,9 @@ "Value": "HTTPS" } }, + "iottwinmaker": { + "Value": "iottwinmaker" + }, "iotwireless": { "Value": "iotwireless", "endpoint": { @@ -24260,6 +25949,15 @@ "Value": "HTTPS" } }, + "ivschat": { + "Value": "ivschat", + "endpoint": { + "Value": "ivschat.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kafka": { "Value": "kafka", "endpoint": { @@ -24425,6 +26123,15 @@ "lumberyard": { "Value": "lumberyard" }, + "m2": { + "Value": "m2", + "endpoint": { + "Value": "m2.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "machinelearning": { "Value": "machinelearning", "endpoint": { @@ -24575,6 +26282,15 @@ "Value": "HTTPS" } }, + "migration-hub-refactor-spaces": { + "Value": "migration-hub-refactor-spaces", + "endpoint": { + "Value": "refactor-spaces.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "mq": { "Value": "mq", "endpoint": { @@ -24659,6 +26375,15 @@ "Value": "HTTPS" } }, + "panorama": { + "Value": "panorama", + "endpoint": { + "Value": "panorama.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "personalize": { "Value": "personalize", "endpoint": { @@ -24713,6 +26438,15 @@ "Value": "HTTPS" } }, + "pinpoint-sms-voice-v2": { + "Value": "pinpoint-sms-voice-v2", + "endpoint": { + "Value": "sms-voice.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "polly": { "Value": "polly", "endpoint": { @@ -24815,6 +26549,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -24842,6 +26585,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -25310,12 +27062,6 @@ "Value": "HTTPS" } }, - "worklink": { - "Value": "worklink", - "endpoint": { - "Value": "worklink.eu-west-1.amazonaws.com" - } - }, "workmail": { "Value": "workmail", "endpoint": { @@ -25343,6 +27089,15 @@ "Value": "HTTPS" } }, + "workspaces-web": { + "Value": "workspaces-web", + "endpoint": { + "Value": "workspaces-web.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "xray": { "Value": "xray", "endpoint": { @@ -25392,6 +27147,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -25431,6 +27195,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -25524,6 +27297,15 @@ "Value": "HTTPS" } }, + "aps": { + "Value": "aps", + "endpoint": { + "Value": "aps.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "artifact": { "Value": "artifact" }, @@ -25575,19 +27357,19 @@ "Value": "HTTPS" } }, - "batch": { - "Value": "batch", + "backup-gateway": { + "Value": "backup-gateway", "endpoint": { - "Value": "batch.eu-west-2.amazonaws.com" + "Value": "backup-gateway.eu-west-2.amazonaws.com" }, "protocols": { "Value": "HTTPS" } }, - "braket": { - "Value": "braket", + "batch": { + "Value": "batch", "endpoint": { - "Value": "braket.eu-west-2.amazonaws.com" + "Value": "batch.eu-west-2.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -25848,6 +27630,15 @@ "Value": "HTTPS" } }, + "connectcampaigns": { + "Value": "connectcampaigns", + "endpoint": { + "Value": "connect-campaigns.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "connectparticipant": { "Value": "connectparticipant", "endpoint": { @@ -25860,7 +27651,7 @@ "controltower": { "Value": "controltower", "endpoint": { - "Value": "prod.eu-west-2.blackbeard.aws.a2z.com" + "Value": "controltower.eu-west-2.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -26187,6 +27978,15 @@ "Value": "HTTPS" } }, + "fsx-openzfs": { + "Value": "fsx-openzfs", + "endpoint": { + "Value": "fsx.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "fsx-windows": { "Value": "fsx-windows", "endpoint": { @@ -26295,6 +28095,15 @@ "Value": "HTTPS" } }, + "inspector2": { + "Value": "inspector2", + "endpoint": { + "Value": "inspector2.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iot": { "Value": "iot", "endpoint": { @@ -26376,6 +28185,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kafka": { "Value": "kafka", "endpoint": { @@ -26637,6 +28455,15 @@ "Value": "HTTPS" } }, + "migration-hub-refactor-spaces": { + "Value": "migration-hub-refactor-spaces", + "endpoint": { + "Value": "refactor-spaces.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "mq": { "Value": "mq", "endpoint": { @@ -26730,6 +28557,15 @@ "Value": "HTTPS" } }, + "pinpoint-sms-voice-v2": { + "Value": "pinpoint-sms-voice-v2", + "endpoint": { + "Value": "sms-voice.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "polly": { "Value": "polly", "endpoint": { @@ -26823,6 +28659,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -26841,6 +28686,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -27036,6 +28890,15 @@ "Value": "HTTPS" } }, + "snow-device-management": { + "Value": "snow-device-management", + "endpoint": { + "Value": "snow-device-management.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "snowball": { "Value": "snowball", "endpoint": { @@ -27276,6 +29139,15 @@ "Value": "HTTPS" } }, + "workspaces-web": { + "Value": "workspaces-web", + "endpoint": { + "Value": "workspaces-web.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "xray": { "Value": "xray", "endpoint": { @@ -27330,6 +29202,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -27369,6 +29250,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.eu-west-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -27483,6 +29373,15 @@ "Value": "HTTPS" } }, + "backup-gateway": { + "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.eu-west-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "batch": { "Value": "batch", "endpoint": { @@ -27669,7 +29568,7 @@ "controltower": { "Value": "controltower", "endpoint": { - "Value": "prod.eu-west-3.blackbeard.aws.a2z.com" + "Value": "controltower.eu-west-3.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -27747,6 +29646,15 @@ "Value": "HTTPS, HTTP" } }, + "drs": { + "Value": "drs", + "endpoint": { + "Value": "drs.eu-west-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ds": { "Value": "ds", "endpoint": { @@ -28080,6 +29988,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.eu-west-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kafka": { "Value": "kafka", "endpoint": { @@ -28407,6 +30324,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.eu-west-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -28425,6 +30351,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.eu-west-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -28620,12 +30555,24 @@ "Value": "HTTPS" } }, + "snow-device-management": { + "Value": "snow-device-management", + "endpoint": { + "Value": "snow-device-management.eu-west-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "snowball": { "Value": "snowball", "endpoint": { "Value": "snowball.eu-west-3.amazonaws.com" } }, + "snowcone": { + "Value": "snowcone" + }, "sns": { "Value": "sns", "endpoint": { @@ -28894,6 +30841,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -28933,6 +30889,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -29038,6 +31003,15 @@ "Value": "HTTPS" } }, + "backup-gateway": { + "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "batch": { "Value": "batch", "endpoint": { @@ -29164,6 +31138,15 @@ "Value": "HTTPS" } }, + "compute-optimizer": { + "Value": "compute-optimizer", + "endpoint": { + "Value": "compute-optimizer.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "config": { "Value": "config", "endpoint": { @@ -29218,6 +31201,15 @@ "Value": "HTTPS" } }, + "drs": { + "Value": "drs", + "endpoint": { + "Value": "drs.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ds": { "Value": "ds", "endpoint": { @@ -29497,6 +31489,15 @@ "Value": "HTTPS" } }, + "inspector2": { + "Value": "inspector2", + "endpoint": { + "Value": "inspector2.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iot": { "Value": "iot", "endpoint": { @@ -29542,6 +31543,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kafka": { "Value": "kafka", "endpoint": { @@ -29626,6 +31636,15 @@ "Value": "HTTPS" } }, + "managedservices": { + "Value": "managedservices", + "endpoint": { + "Value": "amscm.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "marketplace": { "Value": "marketplace" }, @@ -29767,6 +31786,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -29785,6 +31813,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -29995,6 +32032,24 @@ "Value": "HTTPS" } }, + "sso": { + "Value": "sso", + "endpoint": { + "Value": "sso.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "sso-oidc": { + "Value": "sso-oidc", + "endpoint": { + "Value": "oidc.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "stepfunctions": { "Value": "stepfunctions", "endpoint": { @@ -30170,6 +32225,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -30209,6 +32273,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -30325,6 +32398,9 @@ }, "backup-gateway": { "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.sa-east-1.amazonaws.com" + }, "protocols": { "Value": "HTTPS" } @@ -30515,7 +32591,7 @@ "controltower": { "Value": "controltower", "endpoint": { - "Value": "prod.sa-east-1.blackbeard.aws.a2z.com" + "Value": "controltower.sa-east-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -30593,6 +32669,15 @@ "Value": "HTTPS, HTTP" } }, + "drs": { + "Value": "drs", + "endpoint": { + "Value": "drs.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ds": { "Value": "ds", "endpoint": { @@ -30851,6 +32936,15 @@ "Value": "HTTPS" } }, + "groundstation": { + "Value": "groundstation", + "endpoint": { + "Value": "groundstation.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "guardduty": { "Value": "guardduty", "endpoint": { @@ -30923,6 +33017,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kafka": { "Value": "kafka", "endpoint": { @@ -31016,6 +33119,15 @@ "lumberyard": { "Value": "lumberyard" }, + "m2": { + "Value": "m2", + "endpoint": { + "Value": "m2.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "macie": { "Value": "macie", "endpoint": { @@ -31250,6 +33362,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -31268,6 +33389,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -31472,6 +33602,15 @@ "Value": "HTTPS" } }, + "snow-device-management": { + "Value": "snow-device-management", + "endpoint": { + "Value": "snow-device-management.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "snowball": { "Value": "snowball", "endpoint": { @@ -31817,15 +33956,6 @@ "amazonlocationservice": { "Value": "amazonlocationservice" }, - "amp": { - "Value": "amp", - "endpoint": { - "Value": "aps.us-east-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, "amplify": { "Value": "amplify", "endpoint": { @@ -31844,6 +33974,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -31949,6 +34088,15 @@ "Value": "HTTPS" } }, + "aps": { + "Value": "aps", + "endpoint": { + "Value": "aps.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "artifact": { "Value": "artifact" }, @@ -32000,6 +34148,15 @@ "Value": "HTTPS" } }, + "backup-gateway": { + "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "batch": { "Value": "batch", "endpoint": { @@ -32009,6 +34166,15 @@ "Value": "HTTPS" } }, + "billingconductor": { + "Value": "billingconductor", + "endpoint": { + "Value": "billingconductor.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "braket": { "Value": "braket", "endpoint": { @@ -32045,6 +34211,24 @@ "Value": "HTTPS" } }, + "chime-sdk-media-pipelines": { + "Value": "chime-sdk-media-pipelines", + "endpoint": { + "Value": "media-pipelines-chime.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "chime-sdk-meetings": { + "Value": "chime-sdk-meetings", + "endpoint": { + "Value": "meetings-chime.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "chime-sdk-messaging": { "Value": "chime-sdk-messaging", "endpoint": { @@ -32321,6 +34505,15 @@ "Value": "HTTPS" } }, + "connectcampaigns": { + "Value": "connectcampaigns", + "endpoint": { + "Value": "connect-campaigns.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "connectparticipant": { "Value": "connectparticipant", "endpoint": { @@ -32333,7 +34526,7 @@ "controltower": { "Value": "controltower", "endpoint": { - "Value": "prod.us-east-1.blackbeard.aws.a2z.com" + "Value": "controltower.us-east-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -32657,6 +34850,15 @@ "Value": "HTTPS" } }, + "emr-serverless": { + "Value": "emr-serverless", + "endpoint": { + "Value": "emr-serverless.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "es": { "Value": "es", "endpoint": { @@ -32816,6 +35018,15 @@ "Value": "HTTPS" } }, + "gamesparks": { + "Value": "gamesparks", + "endpoint": { + "Value": "gamesparks.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "glacier": { "Value": "glacier", "endpoint": { @@ -32934,6 +35145,10 @@ } }, "inspector2": { + "Value": "inspector2", + "endpoint": { + "Value": "inspector2.us-east-1.amazonaws.com" + }, "protocols": { "Value": "HTTPS" } @@ -33037,6 +35252,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iotsitewise": { "Value": "iotsitewise", "endpoint": { @@ -33055,6 +35279,9 @@ "Value": "HTTPS" } }, + "iottwinmaker": { + "Value": "iottwinmaker" + }, "iotwireless": { "Value": "iotwireless", "endpoint": { @@ -33073,6 +35300,15 @@ "Value": "HTTPS" } }, + "ivschat": { + "Value": "ivschat", + "endpoint": { + "Value": "ivschat.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kafka": { "Value": "kafka", "endpoint": { @@ -33238,6 +35474,15 @@ "lumberyard": { "Value": "lumberyard" }, + "m2": { + "Value": "m2", + "endpoint": { + "Value": "m2.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "machinelearning": { "Value": "machinelearning", "endpoint": { @@ -33277,6 +35522,15 @@ "marketplace": { "Value": "marketplace" }, + "marketplace-catalog": { + "Value": "marketplace-catalog", + "endpoint": { + "Value": "catalog.marketplace.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "marketplace-entitlement": { "Value": "marketplace-entitlement", "endpoint": { @@ -33406,6 +35660,15 @@ "Value": "HTTPS" } }, + "migration-hub-refactor-spaces": { + "Value": "migration-hub-refactor-spaces", + "endpoint": { + "Value": "refactor-spaces.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "mobile": { "Value": "mobile", "endpoint": { @@ -33517,6 +35780,15 @@ "Value": "HTTPS" } }, + "panorama": { + "Value": "panorama", + "endpoint": { + "Value": "panorama.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "personalize": { "Value": "personalize", "endpoint": { @@ -33571,6 +35843,15 @@ "Value": "HTTPS" } }, + "pinpoint-sms-voice-v2": { + "Value": "pinpoint-sms-voice-v2", + "endpoint": { + "Value": "sms-voice.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "polly": { "Value": "polly", "endpoint": { @@ -33685,6 +35966,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -33712,6 +36002,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -34198,12 +36497,6 @@ "Value": "HTTPS" } }, - "worklink": { - "Value": "worklink", - "endpoint": { - "Value": "worklink.us-east-1.amazonaws.com" - } - }, "workmail": { "Value": "workmail", "endpoint": { @@ -34235,6 +36528,9 @@ "Value": "workspaces-web", "endpoint": { "Value": "workspaces-web.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" } }, "xray": { @@ -34251,6 +36547,9 @@ "use1-wl1-atl-wlz1": { "Value": "use1-wl1-atl-wlz1" }, + "use1-wl1-bna-wlz1": { + "Value": "use1-wl1-bna-wlz1" + }, "use1-wl1-bos-wlz1": { "Value": "use1-wl1-bos-wlz1" }, @@ -34269,6 +36568,9 @@ "use1-wl1-nyc-wlz1": { "Value": "use1-wl1-nyc-wlz1" }, + "use1-wl1-tpa-wlz1": { + "Value": "use1-wl1-tpa-wlz1" + }, "use1-wl1-was-wlz1": { "Value": "use1-wl1-was-wlz1" } @@ -34312,6 +36614,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -34345,15 +36656,6 @@ "amazonlocationservice": { "Value": "amazonlocationservice" }, - "amp": { - "Value": "amp", - "endpoint": { - "Value": "aps.us-east-2.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, "amplify": { "Value": "amplify", "endpoint": { @@ -34372,6 +36674,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -34453,6 +36764,15 @@ "Value": "HTTPS" } }, + "appstream": { + "Value": "appstream", + "endpoint": { + "Value": "appstream2.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "appsync": { "Value": "appsync", "endpoint": { @@ -34462,6 +36782,15 @@ "Value": "HTTPS" } }, + "aps": { + "Value": "aps", + "endpoint": { + "Value": "aps.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "artifact": { "Value": "artifact" }, @@ -34517,6 +36846,9 @@ "Value": "backup-gateway", "endpoint": { "Value": "backup-gateway.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" } }, "batch": { @@ -34777,7 +37109,7 @@ "controltower": { "Value": "controltower", "endpoint": { - "Value": "prod.us-east-2.blackbeard.aws.a2z.com" + "Value": "controltower.us-east-2.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -35289,6 +37621,15 @@ "Value": "HTTPS" } }, + "inspector2": { + "Value": "inspector2", + "endpoint": { + "Value": "inspector2.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iot": { "Value": "iot", "endpoint": { @@ -35379,6 +37720,24 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "iotsitewise": { + "Value": "iotsitewise", + "endpoint": { + "Value": "iotsitewise.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kafka": { "Value": "kafka", "endpoint": { @@ -35583,6 +37942,15 @@ "Value": "HTTPS" } }, + "memorydb": { + "Value": "memorydb", + "endpoint": { + "Value": "memory-db.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "meteringmarketplace": { "Value": "meteringmarketplace", "endpoint": { @@ -35601,6 +37969,15 @@ "Value": "HTTPS" } }, + "migration-hub-refactor-spaces": { + "Value": "migration-hub-refactor-spaces", + "endpoint": { + "Value": "refactor-spaces.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "mq": { "Value": "mq", "endpoint": { @@ -35814,6 +38191,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -35841,6 +38227,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -36039,6 +38434,15 @@ "Value": "HTTPS" } }, + "snow-device-management": { + "Value": "snow-device-management", + "endpoint": { + "Value": "snow-device-management.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "snowball": { "Value": "snowball", "endpoint": { @@ -36273,12 +38677,6 @@ "Value": "HTTPS" } }, - "worklink": { - "Value": "worklink", - "endpoint": { - "Value": "worklink.us-east-2.amazonaws.com" - } - }, "xray": { "Value": "xray", "endpoint": { @@ -36433,6 +38831,15 @@ "Value": "HTTPS" } }, + "backup-gateway": { + "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "batch": { "Value": "batch", "endpoint": { @@ -36442,6 +38849,15 @@ "Value": "HTTPS" } }, + "chime-sdk-meetings": { + "Value": "chime-sdk-meetings", + "endpoint": { + "Value": "meetings-chime.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "cloudenduremigration": { "Value": "cloudenduremigration" }, @@ -36463,6 +38879,15 @@ "Value": "HTTPS" } }, + "cloudshell": { + "Value": "cloudshell", + "endpoint": { + "Value": "cloudshell.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "cloudtrail": { "Value": "cloudtrail", "endpoint": { @@ -36712,6 +39137,15 @@ "Value": "HTTPS" } }, + "fis": { + "Value": "fis", + "endpoint": { + "Value": "fis.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "fms": { "Value": "fms", "endpoint": { @@ -36874,6 +39308,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kafka": { "Value": "kafka", "endpoint": { @@ -36910,6 +39353,15 @@ "Value": "HTTPS" } }, + "lakeformation": { + "Value": "lakeformation", + "endpoint": { + "Value": "lakeformation.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "lambda": { "Value": "lambda", "endpoint": { @@ -36949,6 +39401,15 @@ "marketplace": { "Value": "marketplace" }, + "mcs": { + "Value": "mcs", + "endpoint": { + "Value": "cassandra.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "TLS" + } + }, "meteringmarketplace": { "Value": "meteringmarketplace", "endpoint": { @@ -36979,7 +39440,7 @@ "network-firewall": { "Value": "network-firewall", "endpoint": { - "Value": "network-firewall-fips.us-gov-east-1.amazonaws.com" + "Value": "network-firewall.us-gov-east-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -37090,6 +39551,15 @@ "s3control": { "Value": "s3control" }, + "s3outposts": { + "Value": "s3outposts", + "endpoint": { + "Value": "s3-outposts.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "secretsmanager": { "Value": "secretsmanager", "endpoint": { @@ -37153,15 +39623,6 @@ "Value": "HTTPS" } }, - "signer": { - "Value": "signer", - "endpoint": { - "Value": "signer.us-gov-east-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, "sms": { "Value": "sms", "endpoint": { @@ -37216,6 +39677,15 @@ "Value": "HTTPS" } }, + "sso-oidc": { + "Value": "sso-oidc", + "endpoint": { + "Value": "oidc.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "stepfunctions": { "Value": "stepfunctions", "endpoint": { @@ -37510,6 +39980,9 @@ }, "backup-gateway": { "Value": "backup-gateway", + "endpoint": { + "Value": "backup-gateway.us-gov-west-1.amazonaws.com" + }, "protocols": { "Value": "HTTPS" } @@ -37523,6 +39996,15 @@ "Value": "HTTPS" } }, + "chime-sdk-meetings": { + "Value": "chime-sdk-meetings", + "endpoint": { + "Value": "meetings-chime.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "clouddirectory": { "Value": "clouddirectory", "endpoint": { @@ -37562,6 +40044,15 @@ "Value": "HTTPS" } }, + "cloudshell": { + "Value": "cloudshell", + "endpoint": { + "Value": "cloudshell.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "cloudtrail": { "Value": "cloudtrail", "endpoint": { @@ -37892,6 +40383,15 @@ "Value": "HTTPS" } }, + "fis": { + "Value": "fis", + "endpoint": { + "Value": "fis.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "fms": { "Value": "fms", "endpoint": { @@ -38081,6 +40581,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iotsitewise": { "Value": "iotsitewise", "endpoint": { @@ -38192,6 +40701,15 @@ "marketplace": { "Value": "marketplace" }, + "mcs": { + "Value": "mcs", + "endpoint": { + "Value": "cassandra.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "TLS" + } + }, "mediaconvert": { "Value": "mediaconvert", "endpoint": { @@ -38231,7 +40749,7 @@ "network-firewall": { "Value": "network-firewall", "endpoint": { - "Value": "network-firewall-fips.us-gov-west-1.amazonaws.com" + "Value": "network-firewall.us-gov-west-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -38282,6 +40800,15 @@ "Value": "HTTPS" } }, + "pinpoint-sms-voice-v2": { + "Value": "pinpoint-sms-voice-v2", + "endpoint": { + "Value": "sms-voice.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "polly": { "Value": "polly", "endpoint": { @@ -38366,6 +40893,15 @@ "Value": "HTTPS" } }, + "robomaker": { + "Value": "robomaker", + "endpoint": { + "Value": "robomaker.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "route53resolver": { "Value": "route53resolver", "endpoint": { @@ -38387,6 +40923,15 @@ "s3control": { "Value": "s3control" }, + "s3outposts": { + "Value": "s3outposts", + "endpoint": { + "Value": "s3-outposts.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "sagemaker": { "Value": "sagemaker", "endpoint": { @@ -38477,15 +41022,6 @@ "Value": "HTTPS" } }, - "signer": { - "Value": "signer", - "endpoint": { - "Value": "signer.us-gov-west-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, "sms": { "Value": "sms", "endpoint": { @@ -38742,6 +41278,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -38781,6 +41326,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.us-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -39186,6 +41740,15 @@ "Value": "HTTPS" } }, + "drs": { + "Value": "drs", + "endpoint": { + "Value": "drs.us-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ds": { "Value": "ds", "endpoint": { @@ -39489,6 +42052,15 @@ "Value": "HTTPS" } }, + "inspector2": { + "Value": "inspector2", + "endpoint": { + "Value": "inspector2.us-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iot": { "Value": "iot", "endpoint": { @@ -39534,6 +42106,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.us-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kafka": { "Value": "kafka", "endpoint": { @@ -39882,6 +42463,15 @@ "Value": "HTTPS" } }, + "resiliencehub": { + "Value": "resiliencehub", + "endpoint": { + "Value": "resiliencehub.us-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "resource-groups": { "Value": "resource-groups", "endpoint": { @@ -39900,6 +42490,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.us-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -40104,6 +42703,15 @@ "Value": "HTTPS" } }, + "snow-device-management": { + "Value": "snow-device-management", + "endpoint": { + "Value": "snow-device-management.us-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "snowball": { "Value": "snowball", "endpoint": { @@ -40386,6 +42994,15 @@ "Value": "HTTPS" } }, + "account": { + "Value": "account", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "acm": { "Value": "acm", "endpoint": { @@ -40419,15 +43036,6 @@ "amazonlocationservice": { "Value": "amazonlocationservice" }, - "amp": { - "Value": "amp", - "endpoint": { - "Value": "aps.us-west-2.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, "amplify": { "Value": "amplify", "endpoint": { @@ -40446,6 +43054,15 @@ "Value": "HTTPS" } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "endpoint": { + "Value": "amplifyuibuilder.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "apigateway": { "Value": "apigateway", "endpoint": { @@ -40548,6 +43165,15 @@ "Value": "HTTPS" } }, + "aps": { + "Value": "aps", + "endpoint": { + "Value": "aps.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "artifact": { "Value": "artifact" }, @@ -40641,6 +43267,24 @@ "chime": { "Value": "chime" }, + "chime-sdk-media-pipelines": { + "Value": "chime-sdk-media-pipelines", + "endpoint": { + "Value": "media-pipelines-chime.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "chime-sdk-meetings": { + "Value": "chime-sdk-meetings", + "endpoint": { + "Value": "meetings-chime.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "cloud9": { "Value": "cloud9", "endpoint": { @@ -40899,6 +43543,15 @@ "Value": "HTTPS" } }, + "connectcampaigns": { + "Value": "connectcampaigns", + "endpoint": { + "Value": "connect-campaigns.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "connectparticipant": { "Value": "connectparticipant", "endpoint": { @@ -40911,7 +43564,7 @@ "controltower": { "Value": "controltower", "endpoint": { - "Value": "prod.us-west-2.blackbeard.aws.a2z.com" + "Value": "controltower.us-west-2.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -41106,6 +43759,15 @@ "Value": "HTTPS" } }, + "ecr-public": { + "Value": "ecr-public", + "endpoint": { + "Value": "ecr-public.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ecs": { "Value": "ecs", "endpoint": { @@ -41196,6 +43858,15 @@ "Value": "HTTPS" } }, + "emr-serverless": { + "Value": "emr-serverless", + "endpoint": { + "Value": "emr-serverless.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "es": { "Value": "es", "endpoint": { @@ -41472,6 +44143,15 @@ "Value": "HTTPS" } }, + "inspector2": { + "Value": "inspector2", + "endpoint": { + "Value": "inspector2.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iot": { "Value": "iot", "endpoint": { @@ -41580,6 +44260,15 @@ "Value": "HTTPS" } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "endpoint": { + "Value": "api.tunneling.iot.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "iotsitewise": { "Value": "iotsitewise", "endpoint": { @@ -41598,6 +44287,9 @@ "Value": "HTTPS" } }, + "iottwinmaker": { + "Value": "iottwinmaker" + }, "iotwireless": { "Value": "iotwireless", "endpoint": { @@ -41616,6 +44308,15 @@ "Value": "HTTPS" } }, + "ivschat": { + "Value": "ivschat", + "endpoint": { + "Value": "ivschat.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "kafka": { "Value": "kafka", "endpoint": { @@ -41772,6 +44473,15 @@ "lumberyard": { "Value": "lumberyard" }, + "m2": { + "Value": "m2", + "endpoint": { + "Value": "m2.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "macie": { "Value": "macie", "endpoint": { @@ -41904,6 +44614,15 @@ "Value": "HTTPS" } }, + "migration-hub-refactor-spaces": { + "Value": "migration-hub-refactor-spaces", + "endpoint": { + "Value": "refactor-spaces.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "migrationhubstrategy": { "Value": "migrationhubstrategy" }, @@ -42018,6 +44737,15 @@ "Value": "HTTPS" } }, + "panorama": { + "Value": "panorama", + "endpoint": { + "Value": "panorama.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "personalize": { "Value": "personalize", "endpoint": { @@ -42072,6 +44800,15 @@ "Value": "HTTPS" } }, + "pinpoint-sms-voice-v2": { + "Value": "pinpoint-sms-voice-v2", + "endpoint": { + "Value": "sms-voice.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "polly": { "Value": "polly", "endpoint": { @@ -42178,6 +44915,7 @@ } }, "resiliencehub": { + "Value": "resiliencehub", "endpoint": { "Value": "resiliencehub.us-west-2.amazonaws.com" }, @@ -42212,6 +44950,15 @@ "Value": "HTTPS" } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "endpoint": { + "Value": "rolesanywhere.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "rosa": { "Value": "rosa" }, @@ -42698,12 +45445,6 @@ "Value": "HTTPS" } }, - "worklink": { - "Value": "worklink", - "endpoint": { - "Value": "worklink.us-west-2.amazonaws.com" - } - }, "workmail": { "Value": "workmail", "endpoint": { @@ -42732,7 +45473,13 @@ } }, "workspaces-web": { - "Value": "workspaces-web" + "Value": "workspaces-web", + "endpoint": { + "Value": "workspaces-web.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } }, "xray": { "Value": "xray", diff --git a/moto/ssm/resources/services.json b/moto/ssm/resources/services.json index 44d0a9dc6..ad7d3016a 100644 --- a/moto/ssm/resources/services.json +++ b/moto/ssm/resources/services.json @@ -251,6 +251,177 @@ "Value": "AWS Account Management" }, "regions": { + "af-south-1": { + "Value": "af-south-1", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-east-1": { + "Value": "ap-east-1", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-northeast-1": { + "Value": "ap-northeast-1", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-northeast-2": { + "Value": "ap-northeast-2", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-northeast-3": { + "Value": "ap-northeast-3", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-south-1": { + "Value": "ap-south-1", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-1": { + "Value": "ap-southeast-1", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-2": { + "Value": "ap-southeast-2", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "cn-north-1": { + "Value": "cn-north-1", + "endpoint": { + "Value": "account.cn-northwest-1.amazonaws.com.cn" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-central-1": { + "Value": "eu-central-1", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-north-1": { + "Value": "eu-north-1", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-south-1": { + "Value": "eu-south-1", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-1": { + "Value": "eu-west-1", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-2": { + "Value": "eu-west-2", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-3": { + "Value": "eu-west-3", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "me-south-1": { + "Value": "me-south-1", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "sa-east-1": { + "Value": "sa-east-1", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-east-1": { "Value": "us-east-1", "endpoint": { @@ -259,6 +430,33 @@ "protocols": { "Value": "HTTPS" } + }, + "us-east-2": { + "Value": "us-east-2", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-1": { + "Value": "us-west-1", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-2": { + "Value": "us-west-2", + "endpoint": { + "Value": "account.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } } } }, @@ -585,6 +783,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "acm-pca.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -892,95 +1099,6 @@ } } }, - "amp": { - "Value": "amp", - "longName": { - "Value": "Amazon Managed Service for Prometheus" - }, - "regions": { - "ap-northeast-1": { - "Value": "ap-northeast-1", - "endpoint": { - "Value": "aps.ap-northeast-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, - "ap-southeast-1": { - "Value": "ap-southeast-1", - "endpoint": { - "Value": "aps.ap-southeast-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, - "ap-southeast-2": { - "Value": "ap-southeast-2", - "endpoint": { - "Value": "aps.ap-southeast-2.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, - "eu-central-1": { - "Value": "eu-central-1", - "endpoint": { - "Value": "aps.eu-central-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, - "eu-north-1": { - "Value": "eu-north-1", - "endpoint": { - "Value": "aps.eu-north-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, - "eu-west-1": { - "Value": "eu-west-1", - "endpoint": { - "Value": "aps.eu-west-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, - "us-east-1": { - "Value": "us-east-1", - "endpoint": { - "Value": "aps.us-east-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, - "us-east-2": { - "Value": "us-east-2", - "endpoint": { - "Value": "aps.us-east-2.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, - "us-west-2": { - "Value": "us-west-2", - "endpoint": { - "Value": "aps.us-west-2.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - } - } - }, "amplify": { "Value": "amplify", "longName": { @@ -1324,6 +1442,167 @@ } } }, + "amplifyuibuilder": { + "Value": "amplifyuibuilder", + "longName": { + "Value": "AmplifyUIBuilder" + }, + "regions": { + "ap-northeast-1": { + "Value": "ap-northeast-1", + "endpoint": { + "Value": "amplifyuibuilder.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-northeast-2": { + "Value": "ap-northeast-2", + "endpoint": { + "Value": "amplifyuibuilder.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-south-1": { + "Value": "ap-south-1", + "endpoint": { + "Value": "amplifyuibuilder.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-1": { + "Value": "ap-southeast-1", + "endpoint": { + "Value": "amplifyuibuilder.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-2": { + "Value": "ap-southeast-2", + "endpoint": { + "Value": "amplifyuibuilder.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "amplifyuibuilder.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-central-1": { + "Value": "eu-central-1", + "endpoint": { + "Value": "amplifyuibuilder.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-north-1": { + "Value": "eu-north-1", + "endpoint": { + "Value": "amplifyuibuilder.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-1": { + "Value": "eu-west-1", + "endpoint": { + "Value": "amplifyuibuilder.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-2": { + "Value": "eu-west-2", + "endpoint": { + "Value": "amplifyuibuilder.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-3": { + "Value": "eu-west-3", + "endpoint": { + "Value": "amplifyuibuilder.eu-west-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "me-south-1": { + "Value": "me-south-1", + "endpoint": { + "Value": "amplifyuibuilder.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "sa-east-1": { + "Value": "sa-east-1", + "endpoint": { + "Value": "amplifyuibuilder.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "amplifyuibuilder.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-2": { + "Value": "us-east-2", + "endpoint": { + "Value": "amplifyuibuilder.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-1": { + "Value": "us-west-1", + "endpoint": { + "Value": "amplifyuibuilder.us-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-2": { + "Value": "us-west-2", + "endpoint": { + "Value": "amplifyuibuilder.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } + } + }, "apigateway": { "Value": "apigateway", "longName": { @@ -2394,6 +2673,15 @@ "Value": "AmazonAppIntegrationService" }, "regions": { + "af-south-1": { + "Value": "af-south-1", + "endpoint": { + "Value": "app-integrations.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-northeast-1": { "Value": "ap-northeast-1", "endpoint": { @@ -2403,6 +2691,15 @@ "Value": "HTTPS" } }, + "ap-northeast-2": { + "Value": "ap-northeast-2", + "endpoint": { + "Value": "app-integrations.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-southeast-1": { "Value": "ap-southeast-1", "endpoint": { @@ -2549,6 +2846,15 @@ "Value": "HTTPS, HTTP" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "autoscaling-plans.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS, HTTP" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -2993,6 +3299,15 @@ "Value": "HTTPS" } }, + "ap-northeast-3": { + "Value": "ap-northeast-3", + "endpoint": { + "Value": "appmesh.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-south-1": { "Value": "ap-south-1", "endpoint": { @@ -3020,6 +3335,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "appmesh.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -3264,6 +3588,15 @@ "Value": "HTTPS" } }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "appstream2.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "eu-central-1": { "Value": "eu-central-1", "endpoint": { @@ -3300,6 +3633,15 @@ "Value": "HTTPS" } }, + "us-east-2": { + "Value": "us-east-2", + "endpoint": { + "Value": "appstream2.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-gov-west-1": { "Value": "us-gov-west-1", "endpoint": { @@ -3529,6 +3871,107 @@ } } }, + "aps": { + "Value": "aps", + "longName": { + "Value": "Amazon Managed Service for Prometheus" + }, + "marketingHomeURL": { + "Value": "https://aws.amazon.com/prometheus/" + }, + "regions": { + "ap-northeast-1": { + "Value": "ap-northeast-1", + "endpoint": { + "Value": "aps.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-1": { + "Value": "ap-southeast-1", + "endpoint": { + "Value": "aps.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-2": { + "Value": "ap-southeast-2", + "endpoint": { + "Value": "aps.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-central-1": { + "Value": "eu-central-1", + "endpoint": { + "Value": "aps.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-north-1": { + "Value": "eu-north-1", + "endpoint": { + "Value": "aps.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-1": { + "Value": "eu-west-1", + "endpoint": { + "Value": "aps.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-2": { + "Value": "eu-west-2", + "endpoint": { + "Value": "aps.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "aps.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-2": { + "Value": "us-east-2", + "endpoint": { + "Value": "aps.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-2": { + "Value": "us-west-2", + "endpoint": { + "Value": "aps.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } + } + }, "artifact": { "Value": "artifact", "longName": { @@ -4261,9 +4704,6 @@ }, "autoscaling": { "Value": "autoscaling", - "longName": { - "Value": "Auto Scaling" - }, "regions": { "af-south-1": { "Value": "af-south-1", @@ -4819,14 +5259,58 @@ "Value": "ap-southeast-2", "endpoint": { "Value": "backup-gateway.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "backup-gateway.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-central-1": { + "Value": "eu-central-1", + "endpoint": { + "Value": "backup-gateway.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-north-1": { + "Value": "eu-north-1", + "endpoint": { + "Value": "backup-gateway.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" } }, "eu-south-1": { + "Value": "eu-south-1", "endpoint": { "Value": "backup-gateway.eu-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-1": { + "Value": "eu-west-1", + "endpoint": { + "Value": "backup-gateway.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" } }, "eu-west-2": { + "Value": "eu-west-2", "endpoint": { "Value": "backup-gateway.eu-west-2.amazonaws.com" }, @@ -4998,6 +5482,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "batch.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -5153,6 +5646,23 @@ } } }, + "billingconductor": { + "Value": "billingconductor", + "longName": { + "Value": "AWS Billing Conductor" + }, + "regions": { + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "billingconductor.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } + } + }, "braket": { "Value": "braket", "longName": { @@ -5162,15 +5672,6 @@ "Value": "https://aws.amazon.com/braket/" }, "regions": { - "eu-west-2": { - "Value": "eu-west-2", - "endpoint": { - "Value": "braket.eu-west-2.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, "us-east-1": { "Value": "us-east-1", "endpoint": { @@ -5515,6 +6016,15 @@ "Value": "ChimeSDK Identity" }, "regions": { + "eu-central-1": { + "Value": "eu-central-1", + "endpoint": { + "Value": "identity-chime.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-east-1": { "Value": "us-east-1", "endpoint": { @@ -5526,10 +6036,110 @@ } } }, + "chime-sdk-media-pipelines": { + "Value": "chime-sdk-media-pipelines", + "longName": { + "Value": "Amazon Chime SDK Media Pipelines" + }, + "regions": { + "ap-southeast-1": { + "Value": "ap-southeast-1", + "endpoint": { + "Value": "media-pipelines-chime.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-central-1": { + "Value": "eu-central-1", + "endpoint": { + "Value": "media-pipelines-chime.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "media-pipelines-chime.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-2": { + "Value": "us-west-2", + "endpoint": { + "Value": "media-pipelines-chime.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } + } + }, "chime-sdk-meetings": { "Value": "chime-sdk-meetings", "longName": { "Value": "AWS Chime Meetings SDK" + }, + "regions": { + "ap-southeast-1": { + "Value": "ap-southeast-1", + "endpoint": { + "Value": "meetings-chime.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-central-1": { + "Value": "eu-central-1", + "endpoint": { + "Value": "meetings-chime.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "meetings-chime.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-gov-east-1": { + "Value": "us-gov-east-1", + "endpoint": { + "Value": "meetings-chime.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-gov-west-1": { + "Value": "us-gov-west-1", + "endpoint": { + "Value": "meetings-chime.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-2": { + "Value": "us-west-2", + "endpoint": { + "Value": "meetings-chime.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } } }, "chime-sdk-messaging": { @@ -5538,6 +6148,15 @@ "Value": "Amazon Chime Messaging" }, "regions": { + "eu-central-1": { + "Value": "eu-central-1", + "endpoint": { + "Value": "messaging-chime.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-east-1": { "Value": "us-east-1", "endpoint": { @@ -6336,6 +6955,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "cloudfront.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -6479,15 +7107,6 @@ "Value": "AWS CloudHSM" }, "regions": { - "eu-west-1": { - "Value": "eu-west-1", - "endpoint": { - "Value": "cloudhsm.eu-west-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, "us-east-1": { "Value": "us-east-1", "endpoint": { @@ -6589,6 +7208,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "cloudhsmv2.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -6899,6 +7527,24 @@ "Value": "HTTPS" } }, + "us-gov-east-1": { + "Value": "us-gov-east-1", + "endpoint": { + "Value": "cloudshell.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-gov-west-1": { + "Value": "us-gov-west-1", + "endpoint": { + "Value": "cloudshell.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-west-2": { "Value": "us-west-2", "endpoint": { @@ -7609,6 +8255,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "codebuild.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -9755,6 +10410,24 @@ "Value": "https://aws.amazon.com/compute-optimizer/" }, "regions": { + "af-south-1": { + "Value": "af-south-1", + "endpoint": { + "Value": "compute-optimizer.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-east-1": { + "Value": "ap-east-1", + "endpoint": { + "Value": "compute-optimizer.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-northeast-1": { "Value": "ap-northeast-1", "endpoint": { @@ -9773,6 +10446,15 @@ "Value": "HTTPS" } }, + "ap-northeast-3": { + "Value": "ap-northeast-3", + "endpoint": { + "Value": "compute-optimizer.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-south-1": { "Value": "ap-south-1", "endpoint": { @@ -9845,6 +10527,15 @@ "Value": "HTTPS" } }, + "eu-south-1": { + "Value": "eu-south-1", + "endpoint": { + "Value": "compute-optimizer.eu-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "eu-west-1": { "Value": "eu-west-1", "endpoint": { @@ -9872,6 +10563,15 @@ "Value": "HTTPS" } }, + "me-south-1": { + "Value": "me-south-1", + "endpoint": { + "Value": "compute-optimizer.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "sa-east-1": { "Value": "sa-east-1", "endpoint": { @@ -10345,12 +11045,65 @@ } } }, + "connectcampaigns": { + "Value": "connectcampaigns", + "longName": { + "Value": "Amazon Connect Campaign Service" + }, + "regions": { + "ap-southeast-2": { + "Value": "ap-southeast-2", + "endpoint": { + "Value": "connect-campaigns.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-2": { + "Value": "eu-west-2", + "endpoint": { + "Value": "connect-campaigns.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "connect-campaigns.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-2": { + "Value": "us-west-2", + "endpoint": { + "Value": "connect-campaigns.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } + } + }, "connectparticipant": { "Value": "connectparticipant", "longName": { "Value": "Amazon Connect Participant Service" }, "regions": { + "af-south-1": { + "Value": "af-south-1", + "endpoint": { + "Value": "participant.connect.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-northeast-1": { "Value": "ap-northeast-1", "endpoint": { @@ -10455,7 +11208,7 @@ "ap-northeast-1": { "Value": "ap-northeast-1", "endpoint": { - "Value": "prod.ap-northeast-1.blackbeard.aws.a2z.com" + "Value": "controltower.ap-northeast-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10464,7 +11217,7 @@ "ap-northeast-2": { "Value": "ap-northeast-2", "endpoint": { - "Value": "prod.ap-northeast-2.blackbeard.aws.a2z.com" + "Value": "controltower.ap-northeast-2.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10473,7 +11226,7 @@ "ap-south-1": { "Value": "ap-south-1", "endpoint": { - "Value": "prod.ap-south-1.blackbeard.aws.a2z.com" + "Value": "controltower.ap-south-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10482,7 +11235,7 @@ "ap-southeast-1": { "Value": "ap-southeast-1", "endpoint": { - "Value": "prod.ap-southeast-1.blackbeard.aws.a2z.com" + "Value": "controltower.ap-southeast-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10491,7 +11244,7 @@ "ap-southeast-2": { "Value": "ap-southeast-2", "endpoint": { - "Value": "prod.ap-southeast-2.blackbeard.aws.a2z.com" + "Value": "controltower.ap-southeast-2.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10500,7 +11253,7 @@ "ca-central-1": { "Value": "ca-central-1", "endpoint": { - "Value": "prod.ca-central-1.blackbeard.aws.a2z.com" + "Value": "controltower.ca-central-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10509,7 +11262,7 @@ "eu-central-1": { "Value": "eu-central-1", "endpoint": { - "Value": "prod.eu-central-1.blackbeard.aws.a2z.com" + "Value": "controltower.eu-central-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10518,7 +11271,7 @@ "eu-north-1": { "Value": "eu-north-1", "endpoint": { - "Value": "prod.eu-north-1.blackbeard.aws.a2z.com" + "Value": "controltower.eu-north-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10527,7 +11280,7 @@ "eu-west-1": { "Value": "eu-west-1", "endpoint": { - "Value": "prod.eu-west-1.blackbeard.aws.a2z.com" + "Value": "controltower.eu-west-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10536,7 +11289,7 @@ "eu-west-2": { "Value": "eu-west-2", "endpoint": { - "Value": "prod.eu-west-2.blackbeard.aws.a2z.com" + "Value": "controltower.eu-west-2.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10545,7 +11298,7 @@ "eu-west-3": { "Value": "eu-west-3", "endpoint": { - "Value": "prod.eu-west-3.blackbeard.aws.a2z.com" + "Value": "controltower.eu-west-3.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10554,7 +11307,7 @@ "sa-east-1": { "Value": "sa-east-1", "endpoint": { - "Value": "prod.sa-east-1.blackbeard.aws.a2z.com" + "Value": "controltower.sa-east-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10563,7 +11316,7 @@ "us-east-1": { "Value": "us-east-1", "endpoint": { - "Value": "prod.us-east-1.blackbeard.aws.a2z.com" + "Value": "controltower.us-east-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10572,7 +11325,7 @@ "us-east-2": { "Value": "us-east-2", "endpoint": { - "Value": "prod.us-east-2.blackbeard.aws.a2z.com" + "Value": "controltower.us-east-2.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10581,7 +11334,7 @@ "us-west-2": { "Value": "us-west-2", "endpoint": { - "Value": "prod.us-west-2.blackbeard.aws.a2z.com" + "Value": "controltower.us-west-2.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -10653,6 +11406,15 @@ "Value": "Amazon Connect Customer Profiles" }, "regions": { + "af-south-1": { + "Value": "af-south-1", + "endpoint": { + "Value": "profile.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-northeast-1": { "Value": "ap-northeast-1", "endpoint": { @@ -10662,6 +11424,15 @@ "Value": "HTTPS" } }, + "ap-northeast-2": { + "Value": "ap-northeast-2", + "endpoint": { + "Value": "profile.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-southeast-1": { "Value": "ap-southeast-1", "endpoint": { @@ -11180,6 +11951,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "datasync.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -12250,6 +13030,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "dlm.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -12713,6 +13502,15 @@ "Value": "HTTPS, HTTP" } }, + "cn-north-1": { + "Value": "cn-north-1", + "endpoint": { + "Value": "rds.cn-north-1.amazonaws.com.cn" + }, + "protocols": { + "Value": "HTTPS, HTTP" + } + }, "cn-northwest-1": { "Value": "cn-northwest-1", "endpoint": { @@ -12731,6 +13529,15 @@ "Value": "HTTPS, HTTP" } }, + "eu-south-1": { + "Value": "eu-south-1", + "endpoint": { + "Value": "rds.eu-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS, HTTP" + } + }, "eu-west-1": { "Value": "eu-west-1", "endpoint": { @@ -12814,6 +13621,24 @@ "Value": "https://aws.amazon.com/disaster-recovery/" }, "regions": { + "af-south-1": { + "Value": "af-south-1", + "endpoint": { + "Value": "drs.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-east-1": { + "Value": "ap-east-1", + "endpoint": { + "Value": "drs.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-northeast-1": { "Value": "ap-northeast-1", "endpoint": { @@ -12823,6 +13648,33 @@ "Value": "HTTPS" } }, + "ap-northeast-2": { + "Value": "ap-northeast-2", + "endpoint": { + "Value": "drs.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-northeast-3": { + "Value": "ap-northeast-3", + "endpoint": { + "Value": "drs.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-south-1": { + "Value": "ap-south-1", + "endpoint": { + "Value": "drs.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-southeast-1": { "Value": "ap-southeast-1", "endpoint": { @@ -12841,6 +13693,15 @@ "Value": "HTTPS" } }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "drs.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "eu-central-1": { "Value": "eu-central-1", "endpoint": { @@ -12850,6 +13711,24 @@ "Value": "HTTPS" } }, + "eu-north-1": { + "Value": "eu-north-1", + "endpoint": { + "Value": "drs.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-south-1": { + "Value": "eu-south-1", + "endpoint": { + "Value": "drs.eu-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "eu-west-1": { "Value": "eu-west-1", "endpoint": { @@ -12868,6 +13747,33 @@ "Value": "HTTPS" } }, + "eu-west-3": { + "Value": "eu-west-3", + "endpoint": { + "Value": "drs.eu-west-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "me-south-1": { + "Value": "me-south-1", + "endpoint": { + "Value": "drs.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "sa-east-1": { + "Value": "sa-east-1", + "endpoint": { + "Value": "drs.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-east-1": { "Value": "us-east-1", "endpoint": { @@ -12886,6 +13792,15 @@ "Value": "HTTPS" } }, + "us-west-1": { + "Value": "us-west-1", + "endpoint": { + "Value": "drs.us-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-west-2": { "Value": "us-west-2", "endpoint": { @@ -14369,6 +15284,15 @@ "protocols": { "Value": "HTTPS" } + }, + "us-west-2": { + "Value": "us-west-2", + "endpoint": { + "Value": "ecr-public.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } } } }, @@ -14934,6 +15858,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "eks.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -15480,6 +16413,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "elasticbeanstalk.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -16378,6 +17320,50 @@ } } }, + "emr-serverless": { + "Value": "emr-serverless", + "longName": { + "Value": "Amazon EMR Serverless" + }, + "regions": { + "ap-northeast-1": { + "Value": "ap-northeast-1", + "endpoint": { + "Value": "emr-serverless.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-1": { + "Value": "eu-west-1", + "endpoint": { + "Value": "emr-serverless.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "emr-serverless.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-2": { + "Value": "us-west-2", + "endpoint": { + "Value": "emr-serverless.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } + } + }, "es": { "Value": "es", "longName": { @@ -17316,6 +18302,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "firehose.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -17642,6 +18637,24 @@ "Value": "HTTPS" } }, + "us-gov-east-1": { + "Value": "us-gov-east-1", + "endpoint": { + "Value": "fis.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-gov-west-1": { + "Value": "us-gov-west-1", + "endpoint": { + "Value": "fis.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-west-1": { "Value": "us-west-1", "endpoint": { @@ -19040,6 +20053,24 @@ "Value": "HTTPS" } }, + "ap-southeast-1": { + "Value": "ap-southeast-1", + "endpoint": { + "Value": "fsx.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-2": { + "Value": "ap-southeast-2", + "endpoint": { + "Value": "fsx.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -19067,6 +20098,15 @@ "Value": "HTTPS" } }, + "eu-west-2": { + "Value": "eu-west-2", + "endpoint": { + "Value": "fsx.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-east-1": { "Value": "us-east-1", "endpoint": { @@ -19508,6 +20548,23 @@ } } }, + "gamesparks": { + "Value": "gamesparks", + "longName": { + "Value": "Amazon GameSparks" + }, + "regions": { + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "gamesparks.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } + } + }, "glacier": { "Value": "glacier", "longName": { @@ -20460,6 +21517,15 @@ "Value": "HTTPS" } }, + "ap-southeast-1": { + "Value": "ap-southeast-1", + "endpoint": { + "Value": "groundstation.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-southeast-2": { "Value": "ap-southeast-2", "endpoint": { @@ -20505,6 +21571,15 @@ "Value": "HTTPS" } }, + "sa-east-1": { + "Value": "sa-east-1", + "endpoint": { + "Value": "groundstation.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-east-1": { "Value": "us-east-1", "endpoint": { @@ -21558,9 +22633,6 @@ "longName": { "Value": "Amazon Inspector" }, - "marketingHomeURL": { - "Value": "https://aws.amazon.com/inspector/" - }, "regions": { "ap-northeast-1": { "Value": "ap-northeast-1", @@ -21695,6 +22767,9 @@ "longName": { "Value": "Amazon Inspector" }, + "marketingHomeURL": { + "Value": "https://aws.amazon.com/inspector/" + }, "regions": { "ap-east-1": { "Value": "ap-east-1", @@ -23125,7 +24200,7 @@ "iotevents": { "Value": "iotevents", "longName": { - "Value": " AWS IoT Events" + "Value": "AWS IoT Events" }, "marketingHomeURL": { "Value": "https://aws.amazon.com/iot-events/" @@ -23176,6 +24251,15 @@ "Value": "HTTPS" } }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "iotevents.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "cn-north-1": { "Value": "cn-north-1", "endpoint": { @@ -23253,10 +24337,7 @@ "iotevents-data": { "Value": "iotevents-data", "longName": { - "Value": "AWS IoT Events" - }, - "marketingHomeURL": { - "Value": "https://aws.amazon.com/iot-events/" + "Value": "AWS IoT Events Data" }, "regions": { "ap-northeast-1": { @@ -23304,6 +24385,15 @@ "Value": "HTTPS" } }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "data.iotevents.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "cn-north-1": { "Value": "cn-north-1", "endpoint": { @@ -23503,6 +24593,212 @@ } } }, + "iotsecuretunneling": { + "Value": "iotsecuretunneling", + "longName": { + "Value": "AWS IoT Secured Tunneling" + }, + "regions": { + "ap-east-1": { + "Value": "ap-east-1", + "endpoint": { + "Value": "api.tunneling.iot.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-northeast-1": { + "Value": "ap-northeast-1", + "endpoint": { + "Value": "api.tunneling.iot.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-northeast-2": { + "Value": "ap-northeast-2", + "endpoint": { + "Value": "api.tunneling.iot.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-south-1": { + "Value": "ap-south-1", + "endpoint": { + "Value": "api.tunneling.iot.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-1": { + "Value": "ap-southeast-1", + "endpoint": { + "Value": "api.tunneling.iot.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-2": { + "Value": "ap-southeast-2", + "endpoint": { + "Value": "api.tunneling.iot.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "api.tunneling.iot.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "cn-north-1": { + "Value": "cn-north-1", + "endpoint": { + "Value": "api.tunneling.iot.cn-north-1.amazonaws.com.cn" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "cn-northwest-1": { + "Value": "cn-northwest-1", + "endpoint": { + "Value": "api.tunneling.iot.cn-northwest-1.amazonaws.com.cn" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-central-1": { + "Value": "eu-central-1", + "endpoint": { + "Value": "api.tunneling.iot.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-north-1": { + "Value": "eu-north-1", + "endpoint": { + "Value": "api.tunneling.iot.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-1": { + "Value": "eu-west-1", + "endpoint": { + "Value": "api.tunneling.iot.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-2": { + "Value": "eu-west-2", + "endpoint": { + "Value": "api.tunneling.iot.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-3": { + "Value": "eu-west-3", + "endpoint": { + "Value": "api.tunneling.iot.eu-west-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "me-south-1": { + "Value": "me-south-1", + "endpoint": { + "Value": "api.tunneling.iot.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "sa-east-1": { + "Value": "sa-east-1", + "endpoint": { + "Value": "api.tunneling.iot.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "api.tunneling.iot.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-2": { + "Value": "us-east-2", + "endpoint": { + "Value": "api.tunneling.iot.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-gov-east-1": { + "Value": "us-gov-east-1", + "endpoint": { + "Value": "api.tunneling.iot.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-gov-west-1": { + "Value": "us-gov-west-1", + "endpoint": { + "Value": "api.tunneling.iot.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-1": { + "Value": "us-west-1", + "endpoint": { + "Value": "api.tunneling.iot.us-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-2": { + "Value": "us-west-2", + "endpoint": { + "Value": "api.tunneling.iot.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } + } + }, "iotsitewise": { "Value": "iotsitewise", "longName": { @@ -23557,6 +24853,15 @@ "Value": "HTTPS" } }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "iotsitewise.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "cn-north-1": { "Value": "cn-north-1", "endpoint": { @@ -23593,6 +24898,15 @@ "Value": "HTTPS" } }, + "us-east-2": { + "Value": "us-east-2", + "endpoint": { + "Value": "iotsitewise.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-gov-west-1": { "Value": "us-gov-west-1", "endpoint": { @@ -23678,6 +24992,35 @@ } } }, + "iottwinmaker": { + "Value": "iottwinmaker", + "longName": { + "Value": "AWS IoT TwinMaker" + }, + "marketingHomeURL": { + "Value": "https://aws.amazon.com/iot-twinmaker/" + }, + "regions": { + "ap-southeast-1": { + "Value": "ap-southeast-1" + }, + "ap-southeast-2": { + "Value": "ap-southeast-2" + }, + "eu-central-1": { + "Value": "eu-central-1" + }, + "eu-west-1": { + "Value": "eu-west-1" + }, + "us-east-1": { + "Value": "us-east-1" + }, + "us-west-2": { + "Value": "us-west-2" + } + } + }, "iotwireless": { "Value": "iotwireless", "longName": { @@ -23805,6 +25148,41 @@ } } }, + "ivschat": { + "Value": "ivschat", + "longName": { + "Value": "Amazon IVS Chat" + }, + "regions": { + "eu-west-1": { + "Value": "eu-west-1", + "endpoint": { + "Value": "ivschat.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "ivschat.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-2": { + "Value": "us-west-2", + "endpoint": { + "Value": "ivschat.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } + } + }, "kafka": { "Value": "kafka", "longName": { @@ -23814,6 +25192,15 @@ "Value": "https://aws.amazon.com/msk/" }, "regions": { + "af-south-1": { + "Value": "af-south-1", + "endpoint": { + "Value": "kafka.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-east-1": { "Value": "ap-east-1", "endpoint": { @@ -23841,6 +25228,15 @@ "Value": "HTTPS" } }, + "ap-northeast-3": { + "Value": "ap-northeast-3", + "endpoint": { + "Value": "kafka.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-south-1": { "Value": "ap-south-1", "endpoint": { @@ -24584,6 +25980,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "kinesisanalytics.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -24748,6 +26153,15 @@ "Value": "https://aws.amazon.com/kinesis/video-streams/" }, "regions": { + "af-south-1": { + "Value": "af-south-1", + "endpoint": { + "Value": "kinesisvideo.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-east-1": { "Value": "ap-east-1", "endpoint": { @@ -25328,6 +26742,15 @@ "Value": "HTTPS" } }, + "us-gov-east-1": { + "Value": "us-gov-east-1", + "endpoint": { + "Value": "lakeformation.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-gov-west-1": { "Value": "us-gov-west-1", "endpoint": { @@ -25989,6 +27412,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "license-manager.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -26789,6 +28221,77 @@ } } }, + "m2": { + "Value": "m2", + "longName": { + "Value": "AWS Mainframe Modernization" + }, + "regions": { + "ap-southeast-2": { + "Value": "ap-southeast-2", + "endpoint": { + "Value": "m2.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "m2.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-central-1": { + "Value": "eu-central-1", + "endpoint": { + "Value": "m2.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-1": { + "Value": "eu-west-1", + "endpoint": { + "Value": "m2.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "sa-east-1": { + "Value": "sa-east-1", + "endpoint": { + "Value": "m2.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "m2.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-2": { + "Value": "us-west-2", + "endpoint": { + "Value": "m2.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } + } + }, "machinelearning": { "Value": "machinelearning", "longName": { @@ -27089,6 +28592,15 @@ "Value": "https://aws.amazon.com/managed-services/" }, "regions": { + "ap-east-1": { + "Value": "ap-east-1", + "endpoint": { + "Value": "amscm.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-northeast-1": { "Value": "ap-northeast-1", "endpoint": { @@ -27188,6 +28700,15 @@ "Value": "HTTPS" } }, + "me-south-1": { + "Value": "me-south-1", + "endpoint": { + "Value": "amscm.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "sa-east-1": { "Value": "sa-east-1", "endpoint": { @@ -27354,6 +28875,23 @@ } } }, + "marketplace-catalog": { + "Value": "marketplace-catalog", + "longName": { + "Value": "AWS Marketplace Catalog API" + }, + "regions": { + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "catalog.marketplace.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } + } + }, "marketplace-entitlement": { "Value": "marketplace-entitlement", "longName": { @@ -27559,6 +29097,24 @@ "Value": "TLS" } }, + "us-gov-east-1": { + "Value": "us-gov-east-1", + "endpoint": { + "Value": "cassandra.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "TLS" + } + }, + "us-gov-west-1": { + "Value": "us-gov-west-1", + "endpoint": { + "Value": "cassandra.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "TLS" + } + }, "us-west-1": { "Value": "us-west-1", "endpoint": { @@ -28603,6 +30159,33 @@ "Value": "HTTPS" } }, + "cn-north-1": { + "Value": "cn-north-1", + "endpoint": { + "Value": "memory-db.cn-north-1.amazonaws.com.cn" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "cn-northwest-1": { + "Value": "cn-northwest-1", + "endpoint": { + "Value": "memory-db.cn-northwest-1.amazonaws.com.cn" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-central-1": { + "Value": "eu-central-1", + "endpoint": { + "Value": "memory-db.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "eu-north-1": { "Value": "eu-north-1", "endpoint": { @@ -28648,6 +30231,15 @@ "Value": "HTTPS" } }, + "us-east-2": { + "Value": "us-east-2", + "endpoint": { + "Value": "memory-db.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-west-1": { "Value": "us-west-1", "endpoint": { @@ -29166,6 +30758,104 @@ } } }, + "migration-hub-refactor-spaces": { + "Value": "migration-hub-refactor-spaces", + "longName": { + "Value": "AWS Migration Hub Refactor Spaces" + }, + "regions": { + "ap-northeast-1": { + "Value": "ap-northeast-1", + "endpoint": { + "Value": "refactor-spaces.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-1": { + "Value": "ap-southeast-1", + "endpoint": { + "Value": "refactor-spaces.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-2": { + "Value": "ap-southeast-2", + "endpoint": { + "Value": "refactor-spaces.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-central-1": { + "Value": "eu-central-1", + "endpoint": { + "Value": "refactor-spaces.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-north-1": { + "Value": "eu-north-1", + "endpoint": { + "Value": "refactor-spaces.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-1": { + "Value": "eu-west-1", + "endpoint": { + "Value": "refactor-spaces.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-2": { + "Value": "eu-west-2", + "endpoint": { + "Value": "refactor-spaces.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "refactor-spaces.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-2": { + "Value": "us-east-2", + "endpoint": { + "Value": "refactor-spaces.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-2": { + "Value": "us-west-2", + "endpoint": { + "Value": "refactor-spaces.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } + } + }, "migrationhubstrategy": { "Value": "migrationhubstrategy", "longName": { @@ -29940,7 +31630,7 @@ "us-gov-east-1": { "Value": "us-gov-east-1", "endpoint": { - "Value": "network-firewall-fips.us-gov-east-1.amazonaws.com" + "Value": "network-firewall.us-gov-east-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -29949,7 +31639,7 @@ "us-gov-west-1": { "Value": "us-gov-west-1", "endpoint": { - "Value": "network-firewall-fips.us-gov-west-1.amazonaws.com" + "Value": "network-firewall.us-gov-west-1.amazonaws.com" }, "protocols": { "Value": "HTTPS" @@ -30010,6 +31700,15 @@ "Value": "https://aws.amazon.com/nimble-studio/" }, "regions": { + "ap-northeast-1": { + "Value": "ap-northeast-1", + "endpoint": { + "Value": "nimble.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-southeast-2": { "Value": "ap-southeast-2", "endpoint": { @@ -30802,6 +32501,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "outposts.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -30939,6 +32647,68 @@ } } }, + "panorama": { + "Value": "panorama", + "longName": { + "Value": "AWS Panorama" + }, + "regions": { + "ap-southeast-1": { + "Value": "ap-southeast-1", + "endpoint": { + "Value": "panorama.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-2": { + "Value": "ap-southeast-2", + "endpoint": { + "Value": "panorama.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "panorama.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-1": { + "Value": "eu-west-1", + "endpoint": { + "Value": "panorama.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "panorama.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-2": { + "Value": "us-west-2", + "endpoint": { + "Value": "panorama.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } + } + }, "personalize": { "Value": "personalize", "longName": { @@ -31381,6 +33151,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "pi.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -31761,6 +33540,113 @@ } } }, + "pinpoint-sms-voice-v2": { + "Value": "pinpoint-sms-voice-v2", + "longName": { + "Value": "Amazon Pinpoint SMS Voice V2" + }, + "regions": { + "ap-northeast-1": { + "Value": "ap-northeast-1", + "endpoint": { + "Value": "sms-voice.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-south-1": { + "Value": "ap-south-1", + "endpoint": { + "Value": "sms-voice.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-1": { + "Value": "ap-southeast-1", + "endpoint": { + "Value": "sms-voice.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-2": { + "Value": "ap-southeast-2", + "endpoint": { + "Value": "sms-voice.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "sms-voice.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-central-1": { + "Value": "eu-central-1", + "endpoint": { + "Value": "sms-voice.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-1": { + "Value": "eu-west-1", + "endpoint": { + "Value": "sms-voice.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-2": { + "Value": "eu-west-2", + "endpoint": { + "Value": "sms-voice.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "sms-voice.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-gov-west-1": { + "Value": "us-gov-west-1", + "endpoint": { + "Value": "sms-voice.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-2": { + "Value": "us-west-2", + "endpoint": { + "Value": "sms-voice.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } + } + }, "polly": { "Value": "polly", "longName": { @@ -32567,6 +34453,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "ram.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -33936,6 +35831,24 @@ "Value": "https://aws.amazon.com/resilience-hub/" }, "regions": { + "af-south-1": { + "Value": "af-south-1", + "endpoint": { + "Value": "resiliencehub.af-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-east-1": { + "Value": "ap-east-1", + "endpoint": { + "Value": "resiliencehub.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-northeast-1": { "Value": "ap-northeast-1", "endpoint": { @@ -33945,6 +35858,24 @@ "Value": "HTTPS" } }, + "ap-northeast-2": { + "Value": "ap-northeast-2", + "endpoint": { + "Value": "resiliencehub.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-south-1": { + "Value": "ap-south-1", + "endpoint": { + "Value": "resiliencehub.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-southeast-1": { "Value": "ap-southeast-1", "endpoint": { @@ -33954,6 +35885,24 @@ "Value": "HTTPS" } }, + "ap-southeast-2": { + "Value": "ap-southeast-2", + "endpoint": { + "Value": "resiliencehub.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "resiliencehub.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "eu-central-1": { "Value": "eu-central-1", "endpoint": { @@ -33963,6 +35912,24 @@ "Value": "HTTPS" } }, + "eu-north-1": { + "Value": "eu-north-1", + "endpoint": { + "Value": "resiliencehub.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-south-1": { + "Value": "eu-south-1", + "endpoint": { + "Value": "resiliencehub.eu-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "eu-west-1": { "Value": "eu-west-1", "endpoint": { @@ -33972,6 +35939,42 @@ "Value": "HTTPS" } }, + "eu-west-2": { + "Value": "eu-west-2", + "endpoint": { + "Value": "resiliencehub.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-3": { + "Value": "eu-west-3", + "endpoint": { + "Value": "resiliencehub.eu-west-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "me-south-1": { + "Value": "me-south-1", + "endpoint": { + "Value": "resiliencehub.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "sa-east-1": { + "Value": "sa-east-1", + "endpoint": { + "Value": "resiliencehub.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-east-1": { "Value": "us-east-1", "endpoint": { @@ -33990,6 +35993,15 @@ "Value": "HTTPS" } }, + "us-west-1": { + "Value": "us-west-1", + "endpoint": { + "Value": "resiliencehub.us-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-west-2": { "Value": "us-west-2", "endpoint": { @@ -34548,6 +36560,15 @@ "Value": "HTTPS" } }, + "us-gov-west-1": { + "Value": "us-gov-west-1", + "endpoint": { + "Value": "robomaker.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-west-2": { "Value": "us-west-2", "endpoint": { @@ -34559,6 +36580,185 @@ } } }, + "rolesanywhere": { + "Value": "rolesanywhere", + "longName": { + "Value": "AWS Identity and Access Management Roles Anywhere" + }, + "regions": { + "ap-east-1": { + "Value": "ap-east-1", + "endpoint": { + "Value": "rolesanywhere.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-northeast-1": { + "Value": "ap-northeast-1", + "endpoint": { + "Value": "rolesanywhere.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-northeast-2": { + "Value": "ap-northeast-2", + "endpoint": { + "Value": "rolesanywhere.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-northeast-3": { + "Value": "ap-northeast-3", + "endpoint": { + "Value": "rolesanywhere.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-south-1": { + "Value": "ap-south-1", + "endpoint": { + "Value": "rolesanywhere.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-1": { + "Value": "ap-southeast-1", + "endpoint": { + "Value": "rolesanywhere.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-2": { + "Value": "ap-southeast-2", + "endpoint": { + "Value": "rolesanywhere.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "rolesanywhere.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-central-1": { + "Value": "eu-central-1", + "endpoint": { + "Value": "rolesanywhere.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-north-1": { + "Value": "eu-north-1", + "endpoint": { + "Value": "rolesanywhere.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-1": { + "Value": "eu-west-1", + "endpoint": { + "Value": "rolesanywhere.eu-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-2": { + "Value": "eu-west-2", + "endpoint": { + "Value": "rolesanywhere.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-3": { + "Value": "eu-west-3", + "endpoint": { + "Value": "rolesanywhere.eu-west-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "me-south-1": { + "Value": "me-south-1", + "endpoint": { + "Value": "rolesanywhere.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "sa-east-1": { + "Value": "sa-east-1", + "endpoint": { + "Value": "rolesanywhere.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-1": { + "Value": "us-east-1", + "endpoint": { + "Value": "rolesanywhere.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-east-2": { + "Value": "us-east-2", + "endpoint": { + "Value": "rolesanywhere.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-1": { + "Value": "us-west-1", + "endpoint": { + "Value": "rolesanywhere.us-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-2": { + "Value": "us-west-2", + "endpoint": { + "Value": "rolesanywhere.us-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + } + } + }, "rosa": { "Value": "rosa", "longName": { @@ -35148,6 +37348,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "route53resolver.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -35894,6 +38103,24 @@ "Value": "HTTPS" } }, + "us-gov-east-1": { + "Value": "us-gov-east-1", + "endpoint": { + "Value": "s3-outposts.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-gov-west-1": { + "Value": "us-gov-west-1", + "endpoint": { + "Value": "s3-outposts.us-gov-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-west-1": { "Value": "us-west-1", "endpoint": { @@ -37348,6 +39575,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "securityhub.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -37790,6 +40026,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "servicequotas.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -38008,6 +40253,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "servicecatalog.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -38205,6 +40459,15 @@ "Value": "HTTPS" } }, + "ap-northeast-3": { + "Value": "ap-northeast-3", + "endpoint": { + "Value": "servicecatalog-appregistry.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-south-1": { "Value": "ap-south-1", "endpoint": { @@ -38232,6 +40495,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "servicecatalog-appregistry.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -38414,6 +40686,15 @@ "Value": "HTTPS" } }, + "ap-northeast-3": { + "Value": "ap-northeast-3", + "endpoint": { + "Value": "servicediscovery.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-south-1": { "Value": "ap-south-1", "endpoint": { @@ -38441,6 +40722,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "servicediscovery.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -38877,6 +41167,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "shield.us-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -39182,24 +41481,6 @@ "Value": "HTTPS" } }, - "us-gov-east-1": { - "Value": "us-gov-east-1", - "endpoint": { - "Value": "signer.us-gov-east-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, - "us-gov-west-1": { - "Value": "us-gov-west-1", - "endpoint": { - "Value": "signer.us-gov-west-1.amazonaws.com" - }, - "protocols": { - "Value": "HTTPS" - } - }, "us-west-1": { "Value": "us-west-1", "endpoint": { @@ -39515,6 +41796,69 @@ "Value": "SnowDeviceManagement" }, "regions": { + "ap-east-1": { + "Value": "ap-east-1", + "endpoint": { + "Value": "snow-device-management.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-northeast-1": { + "Value": "ap-northeast-1", + "endpoint": { + "Value": "snow-device-management.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-northeast-2": { + "Value": "ap-northeast-2", + "endpoint": { + "Value": "snow-device-management.ap-northeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-south-1": { + "Value": "ap-south-1", + "endpoint": { + "Value": "snow-device-management.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-1": { + "Value": "ap-southeast-1", + "endpoint": { + "Value": "snow-device-management.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-2": { + "Value": "ap-southeast-2", + "endpoint": { + "Value": "snow-device-management.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "snow-device-management.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "eu-central-1": { "Value": "eu-central-1", "endpoint": { @@ -39524,6 +41868,15 @@ "Value": "HTTPS" } }, + "eu-north-1": { + "Value": "eu-north-1", + "endpoint": { + "Value": "snow-device-management.eu-north-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "eu-west-1": { "Value": "eu-west-1", "endpoint": { @@ -39533,6 +41886,33 @@ "Value": "HTTPS" } }, + "eu-west-2": { + "Value": "eu-west-2", + "endpoint": { + "Value": "snow-device-management.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-west-3": { + "Value": "eu-west-3", + "endpoint": { + "Value": "snow-device-management.eu-west-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "sa-east-1": { + "Value": "sa-east-1", + "endpoint": { + "Value": "snow-device-management.sa-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-east-1": { "Value": "us-east-1", "endpoint": { @@ -39542,6 +41922,24 @@ "Value": "HTTPS" } }, + "us-east-2": { + "Value": "us-east-2", + "endpoint": { + "Value": "snow-device-management.us-east-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "us-west-1": { + "Value": "us-west-1", + "endpoint": { + "Value": "snow-device-management.us-west-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-west-2": { "Value": "us-west-2", "endpoint": { @@ -39738,6 +42136,9 @@ "eu-west-1": { "Value": "eu-west-1" }, + "eu-west-3": { + "Value": "eu-west-3" + }, "sa-east-1": { "Value": "sa-east-1" }, @@ -40832,6 +43233,15 @@ "Value": "https://aws.amazon.com/single-sign-on/" }, "regions": { + "ap-east-1": { + "Value": "ap-east-1", + "endpoint": { + "Value": "sso.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-northeast-1": { "Value": "ap-northeast-1", "endpoint": { @@ -40850,6 +43260,15 @@ "Value": "HTTPS" } }, + "ap-northeast-3": { + "Value": "ap-northeast-3", + "endpoint": { + "Value": "sso.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-south-1": { "Value": "ap-south-1", "endpoint": { @@ -40904,6 +43323,15 @@ "Value": "HTTPS" } }, + "eu-south-1": { + "Value": "eu-south-1", + "endpoint": { + "Value": "sso.eu-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "eu-west-1": { "Value": "eu-west-1", "endpoint": { @@ -40931,6 +43359,15 @@ "Value": "HTTPS" } }, + "me-south-1": { + "Value": "me-south-1", + "endpoint": { + "Value": "sso.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "sa-east-1": { "Value": "sa-east-1", "endpoint": { @@ -40993,6 +43430,15 @@ "Value": "AWS Single Sign-On (SSO) OpenID Connect Service" }, "regions": { + "ap-east-1": { + "Value": "ap-east-1", + "endpoint": { + "Value": "oidc.ap-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-northeast-1": { "Value": "ap-northeast-1", "endpoint": { @@ -41011,6 +43457,15 @@ "Value": "HTTPS" } }, + "ap-northeast-3": { + "Value": "ap-northeast-3", + "endpoint": { + "Value": "oidc.ap-northeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ap-south-1": { "Value": "ap-south-1", "endpoint": { @@ -41065,6 +43520,15 @@ "Value": "HTTPS" } }, + "eu-south-1": { + "Value": "eu-south-1", + "endpoint": { + "Value": "oidc.eu-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "eu-west-1": { "Value": "eu-west-1", "endpoint": { @@ -41092,6 +43556,15 @@ "Value": "HTTPS" } }, + "me-south-1": { + "Value": "me-south-1", + "endpoint": { + "Value": "oidc.me-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "sa-east-1": { "Value": "sa-east-1", "endpoint": { @@ -41119,6 +43592,15 @@ "Value": "HTTPS" } }, + "us-gov-east-1": { + "Value": "us-gov-east-1", + "endpoint": { + "Value": "oidc.us-gov-east-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-gov-west-1": { "Value": "us-gov-west-1", "endpoint": { @@ -42585,6 +45067,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "synthetics.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -42895,6 +45386,12 @@ "Value": "https://aws.amazon.com/timestream" }, "regions": { + "ap-northeast-1": { + "Value": "ap-northeast-1" + }, + "ap-southeast-2": { + "Value": "ap-southeast-2" + }, "eu-central-1": { "Value": "eu-central-1" }, @@ -43509,6 +46006,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "ec2.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -43926,6 +46432,9 @@ "Value": "https://aws.amazon.com/vmware/" }, "regions": { + "ap-east-1": { + "Value": "ap-east-1" + }, "ap-northeast-1": { "Value": "ap-northeast-1" }, @@ -44456,6 +46965,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "wafv2.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -44689,6 +47207,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "waf-regional.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { @@ -45170,41 +47697,6 @@ } } }, - "worklink": { - "Value": "worklink", - "longName": { - "Value": "Amazon WorkLink" - }, - "marketingHomeURL": { - "Value": "https://aws.amazon.com/worklink/" - }, - "regions": { - "eu-west-1": { - "Value": "eu-west-1", - "endpoint": { - "Value": "worklink.eu-west-1.amazonaws.com" - } - }, - "us-east-1": { - "Value": "us-east-1", - "endpoint": { - "Value": "worklink.us-east-1.amazonaws.com" - } - }, - "us-east-2": { - "Value": "us-east-2", - "endpoint": { - "Value": "worklink.us-east-2.amazonaws.com" - } - }, - "us-west-2": { - "Value": "us-west-2", - "endpoint": { - "Value": "worklink.us-west-2.amazonaws.com" - } - } - } - }, "workmail": { "Value": "workmail", "longName": { @@ -45420,7 +47912,64 @@ "longName": { "Value": "Amazon WorkSpaces Web" }, + "marketingHomeURL": { + "Value": "https://aws.amazon.com/workspaces/web/" + }, "regions": { + "ap-northeast-1": { + "Value": "ap-northeast-1", + "endpoint": { + "Value": "workspaces-web.ap-northeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-south-1": { + "Value": "ap-south-1", + "endpoint": { + "Value": "workspaces-web.ap-south-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-1": { + "Value": "ap-southeast-1", + "endpoint": { + "Value": "workspaces-web.ap-southeast-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ap-southeast-2": { + "Value": "ap-southeast-2", + "endpoint": { + "Value": "workspaces-web.ap-southeast-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "ca-central-1": { + "Value": "ca-central-1", + "endpoint": { + "Value": "workspaces-web.ca-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, + "eu-central-1": { + "Value": "eu-central-1", + "endpoint": { + "Value": "workspaces-web.eu-central-1.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "eu-west-1": { "Value": "eu-west-1", "endpoint": { @@ -45430,6 +47979,15 @@ "Value": "HTTPS" } }, + "eu-west-2": { + "Value": "eu-west-2", + "endpoint": { + "Value": "workspaces-web.eu-west-2.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "us-east-1": { "Value": "us-east-1", "endpoint": { @@ -45531,6 +48089,15 @@ "Value": "HTTPS" } }, + "ap-southeast-3": { + "Value": "ap-southeast-3", + "endpoint": { + "Value": "xray.ap-southeast-3.amazonaws.com" + }, + "protocols": { + "Value": "HTTPS" + } + }, "ca-central-1": { "Value": "ca-central-1", "endpoint": { diff --git a/tests/test_ec2/test_instance_type_offerings.py b/tests/test_ec2/test_instance_type_offerings.py index 29326ea75..bb5e233ac 100644 --- a/tests/test_ec2/test_instance_type_offerings.py +++ b/tests/test_ec2/test_instance_type_offerings.py @@ -55,7 +55,7 @@ def test_describe_instance_type_offering_filter_by_zone(): offerings.should.have.key("InstanceTypeOfferings") offerings = offerings["InstanceTypeOfferings"] - offerings.should.have.length_of(486) + offerings.should.have.length_of(548) assert all([o["LocationType"] == "availability-zone" for o in offerings]) assert all([o["Location"] == "us-east-1c" for o in offerings]) assert any([o["InstanceType"] == "a1.2xlarge" for o in offerings])