From a53f9eb294e72d59519ed1836fa792960234d960 Mon Sep 17 00:00:00 2001 From: Sergio Garcia <38561120+sergargar@users.noreply.github.com> Date: Thu, 22 Dec 2022 15:39:50 +0100 Subject: [PATCH] fix(aws-cn partition): solve aws-cn partition errors (#1576) Co-authored-by: sergargar Co-authored-by: Pepe Fagoaga --- .../providers/aws/aws_regions_by_service.json | 852 +++++++++--------- .../iam_root_hardware_mfa_enabled.py | 40 +- .../providers/aws/services/iam/iam_service.py | 1 + .../providers/aws/aws_regions_by_service.json | 842 ++++++++--------- util/update_aws_services_regions.py | 8 +- 5 files changed, 873 insertions(+), 870 deletions(-) diff --git a/prowler/providers/aws/aws_regions_by_service.json b/prowler/providers/aws/aws_regions_by_service.json index 46b13858..05b3a390 100644 --- a/prowler/providers/aws/aws_regions_by_service.json +++ b/prowler/providers/aws/aws_regions_by_service.json @@ -30,11 +30,11 @@ "me-central-1", "us-east-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -67,8 +67,8 @@ "sa-east-1", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -81,8 +81,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "aiq": { @@ -110,8 +110,8 @@ "us-west-2", "ap-northeast-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "alexaforbusiness": { @@ -119,8 +119,8 @@ "aws": [ "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "amazonlocationservice": { @@ -140,8 +140,8 @@ "eu-west-1", "sa-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "amplify": { @@ -167,8 +167,8 @@ "us-east-1", "us-west-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "apigateway": { @@ -201,11 +201,11 @@ "us-west-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -231,8 +231,8 @@ "eu-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "application-autoscaling": { @@ -261,11 +261,11 @@ "us-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -297,11 +297,11 @@ "ap-northeast-2", "ca-central-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": {} + "aws-us-gov": {} } }, "appstream": { @@ -321,8 +321,8 @@ "us-east-1", "us-east-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -353,11 +353,11 @@ "eu-west-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": {} + "aws-us-gov": {} } }, "aps": { @@ -374,8 +374,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "artifact": { @@ -408,8 +408,8 @@ "eu-west-1", "us-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -441,11 +441,11 @@ "eu-south-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -467,8 +467,8 @@ "ap-northeast-1", "ap-southeast-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "augmentedairuntime": { @@ -487,8 +487,8 @@ "ap-northeast-2", "ap-south-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "aurora": { @@ -521,11 +521,11 @@ "us-west-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -561,11 +561,11 @@ "us-west-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -597,11 +597,11 @@ "sa-east-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -633,11 +633,11 @@ "ca-central-1", "me-south-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -650,8 +650,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "budgets": { @@ -673,11 +673,11 @@ "us-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": {} + "aws-us-gov": {} } }, "chatbot": { @@ -710,8 +710,8 @@ "sa-east-1", "us-east-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "chime": { @@ -736,8 +736,8 @@ "us-east-2", "us-west-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -768,8 +768,8 @@ "us-west-2", "eu-west-3" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "clouddirectory": { @@ -785,8 +785,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -816,8 +816,8 @@ "us-east-1", "me-south-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "cloudenduremigration": { @@ -845,11 +845,11 @@ "eu-west-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -885,11 +885,11 @@ "us-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -925,11 +925,11 @@ "eu-central-2", "eu-south-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": {} + "aws-us-gov": {} } }, "cloudhsmv2": { @@ -960,8 +960,8 @@ "me-central-1", "sa-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -981,8 +981,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "cloudshell": { @@ -1000,8 +1000,8 @@ "ca-central-1", "us-east-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1037,11 +1037,11 @@ "us-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1077,11 +1077,11 @@ "eu-west-2", "eu-west-3" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -1104,8 +1104,8 @@ "ap-southeast-1", "us-east-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "codebuild": { @@ -1134,11 +1134,11 @@ "sa-east-1", "us-east-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1169,11 +1169,11 @@ "ap-northeast-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1209,11 +1209,11 @@ "eu-west-3", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1233,8 +1233,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "codepipeline": { @@ -1259,11 +1259,11 @@ "us-west-1", "ap-southeast-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -1285,8 +1285,8 @@ "eu-central-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "cognito-identity": { @@ -1311,10 +1311,10 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -1335,8 +1335,8 @@ "ap-southeast-2", "us-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -1352,8 +1352,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -1383,11 +1383,11 @@ "ap-east-1", "eu-south-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": {} + "aws-us-gov": {} } }, "config": { @@ -1420,11 +1420,11 @@ "sa-east-1", "us-east-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -1444,8 +1444,8 @@ "us-west-2", "eu-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -1469,8 +1469,8 @@ "eu-west-3", "sa-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -1481,10 +1481,10 @@ "aws": [ "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1" ], - "gov": {} + "aws-us-gov": {} } }, "cur": { @@ -1492,10 +1492,10 @@ "aws": [ "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1" ], - "gov": {} + "aws-us-gov": {} } }, "dataexchange": { @@ -1513,8 +1513,8 @@ "us-west-2", "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "datapipeline": { @@ -1526,8 +1526,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "datasync": { @@ -1557,11 +1557,11 @@ "me-central-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -1572,8 +1572,8 @@ "aws": [ "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "deeplens": { @@ -1583,8 +1583,8 @@ "eu-central-1", "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "deepracer": { @@ -1592,8 +1592,8 @@ "aws": [ "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "detective": { @@ -1620,8 +1620,8 @@ "us-west-2", "ca-central-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -1632,8 +1632,8 @@ "aws": [ "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "devops-guru": { @@ -1656,8 +1656,8 @@ "eu-west-2", "us-west-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "directconnect": { @@ -1690,11 +1690,11 @@ "me-south-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -1711,8 +1711,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "dms": { @@ -1745,11 +1745,11 @@ "eu-north-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -1774,11 +1774,11 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -1809,8 +1809,8 @@ "eu-north-1", "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "ds": { @@ -1840,11 +1840,11 @@ "us-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1880,11 +1880,11 @@ "us-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1920,11 +1920,11 @@ "us-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1960,11 +1960,11 @@ "me-south-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2000,11 +2000,11 @@ "us-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2040,11 +2040,11 @@ "sa-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2078,11 +2078,11 @@ "us-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2115,11 +2115,11 @@ "me-central-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2135,8 +2135,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "elasticache": { @@ -2169,11 +2169,11 @@ "us-west-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2205,11 +2205,11 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2227,8 +2227,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "elb": { @@ -2261,11 +2261,11 @@ "eu-south-2", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2301,11 +2301,11 @@ "us-east-2", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2341,11 +2341,11 @@ "me-south-1", "sa-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2381,11 +2381,11 @@ "eu-south-2", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2421,11 +2421,11 @@ "us-east-2", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2445,8 +2445,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "firehose": { @@ -2476,11 +2476,11 @@ "me-south-1", "sa-east-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2510,8 +2510,8 @@ "us-east-1", "us-east-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2542,11 +2542,11 @@ "eu-north-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2566,8 +2566,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "frauddetector": { @@ -2580,8 +2580,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "freertosota": { @@ -2606,11 +2606,11 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": {} + "aws-us-gov": {} } }, "fsx-lustre": { @@ -2639,11 +2639,11 @@ "sa-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2672,8 +2672,8 @@ "us-east-1", "eu-north-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2697,8 +2697,8 @@ "eu-north-1", "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "fsx-windows": { @@ -2727,11 +2727,11 @@ "eu-west-3", "me-south-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2762,11 +2762,11 @@ "ap-northeast-3", "eu-central-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": {} + "aws-us-gov": {} } }, "globalaccelerator": { @@ -2794,8 +2794,8 @@ "us-west-1", "eu-west-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "glue": { @@ -2824,11 +2824,11 @@ "eu-west-2", "me-south-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2848,8 +2848,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "greengrass": { @@ -2868,10 +2868,10 @@ "eu-central-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2893,8 +2893,8 @@ "eu-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "guardduty": { @@ -2925,11 +2925,11 @@ "eu-north-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2940,8 +2940,8 @@ "aws": [ "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "iam": { @@ -2974,11 +2974,11 @@ "sa-east-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3000,8 +3000,8 @@ "eu-west-1", "us-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -3030,8 +3030,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "iot": { @@ -3057,11 +3057,11 @@ "eu-central-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3078,8 +3078,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "iotanalytics": { @@ -3094,10 +3094,10 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1" ], - "gov": {} + "aws-us-gov": {} } }, "iotdevicedefender": { @@ -3121,11 +3121,11 @@ "us-west-2", "ap-northeast-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -3154,11 +3154,11 @@ "eu-west-1", "sa-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -3180,10 +3180,10 @@ "ap-southeast-1", "eu-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -3203,10 +3203,10 @@ "ap-northeast-2", "us-east-2" ], - "cn": [ + "aws-cn": [ "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -3221,8 +3221,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "ivs": { @@ -3236,8 +3236,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "kafka": { @@ -3266,11 +3266,11 @@ "sa-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3287,8 +3287,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -3323,11 +3323,11 @@ "me-south-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3359,11 +3359,11 @@ "eu-central-1", "eu-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3389,8 +3389,8 @@ "ca-central-1", "eu-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "kms": { @@ -3423,11 +3423,11 @@ "us-west-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3458,11 +3458,11 @@ "sa-east-1", "us-east-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3498,11 +3498,11 @@ "sa-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -3520,8 +3520,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -3552,11 +3552,11 @@ "us-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3580,8 +3580,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "lookoutmetrics": { @@ -3597,8 +3597,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "lookoutvision": { @@ -3612,8 +3612,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "lumberyard": { @@ -3638,8 +3638,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "m2": { @@ -3658,8 +3658,8 @@ "ca-central-1", "sa-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "macie": { @@ -3687,8 +3687,8 @@ "us-west-2", "eu-south-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "managedblockchain": { @@ -3701,8 +3701,8 @@ "eu-west-2", "us-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -3729,8 +3729,8 @@ "me-south-1", "sa-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -3766,11 +3766,11 @@ "eu-west-2", "eu-west-3" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3798,11 +3798,11 @@ "us-west-1", "ap-southeast-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -3828,8 +3828,8 @@ "us-east-2", "us-west-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "mediaconvert": { @@ -3853,10 +3853,10 @@ "sa-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -3879,8 +3879,8 @@ "eu-west-1", "eu-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "mediapackage": { @@ -3902,8 +3902,8 @@ "sa-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "mediastore": { @@ -3919,8 +3919,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "mediatailor": { @@ -3934,8 +3934,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "memorydb": { @@ -3960,11 +3960,11 @@ "us-east-1", "us-east-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": {} + "aws-us-gov": {} } }, "mgh": { @@ -3978,8 +3978,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "mgn": { @@ -4008,8 +4008,8 @@ "eu-central-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "mq": { @@ -4039,11 +4039,11 @@ "ap-south-1", "eu-south-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -4068,8 +4068,8 @@ "eu-central-1", "us-east-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "neptune": { @@ -4095,11 +4095,11 @@ "af-south-1", "ca-central-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4130,8 +4130,8 @@ "sa-east-1", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -4147,8 +4147,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "opsworks": { @@ -4170,8 +4170,8 @@ "sa-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "opsworkschefautomate": { @@ -4187,8 +4187,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "opsworkspuppetenterprise": { @@ -4204,8 +4204,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "organizations": { @@ -4238,11 +4238,11 @@ "sa-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4274,8 +4274,8 @@ "eu-north-1", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4296,10 +4296,10 @@ "ap-northeast-1", "ap-northeast-2" ], - "cn": [ + "aws-cn": [ "cn-north-1" ], - "gov": {} + "aws-us-gov": {} } }, "phd": { @@ -4332,11 +4332,11 @@ "eu-west-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4358,8 +4358,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -4387,10 +4387,10 @@ "sa-east-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -4425,11 +4425,11 @@ "me-central-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4450,8 +4450,8 @@ "us-west-2", "ap-southeast-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "qldb": { @@ -4469,8 +4469,8 @@ "us-west-2", "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "quicksight": { @@ -4492,8 +4492,8 @@ "eu-north-1", "us-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -4528,11 +4528,11 @@ "sa-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4568,11 +4568,11 @@ "eu-south-2", "eu-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -4583,8 +4583,8 @@ "aws": [ "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "redshift": { @@ -4617,11 +4617,11 @@ "sa-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4644,8 +4644,8 @@ "eu-west-2", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -4674,8 +4674,8 @@ "sa-east-1", "us-west-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "robomaker": { @@ -4689,8 +4689,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -4721,8 +4721,8 @@ "eu-west-3", "sa-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "route53": { @@ -4755,11 +4755,11 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": {} + "aws-us-gov": {} } }, "s3": { @@ -4792,11 +4792,11 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4829,11 +4829,11 @@ "ap-southeast-1", "sa-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -4868,11 +4868,11 @@ "sa-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -4904,11 +4904,11 @@ "ap-south-1", "eu-central-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -4925,8 +4925,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "serverlessrepo": { @@ -4951,11 +4951,11 @@ "ca-central-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4987,11 +4987,11 @@ "eu-west-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -5024,11 +5024,11 @@ "sa-east-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -5059,8 +5059,8 @@ "ca-central-1", "us-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -5091,8 +5091,8 @@ "ap-southeast-2", "ca-central-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "sms": { @@ -5119,11 +5119,11 @@ "ap-southeast-2", "eu-central-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -5154,11 +5154,11 @@ "us-east-2", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5182,8 +5182,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "snowmobile": { @@ -5194,8 +5194,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5231,11 +5231,11 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5271,11 +5271,11 @@ "sa-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5311,11 +5311,11 @@ "eu-west-3", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5347,8 +5347,8 @@ "ca-central-1", "eu-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5384,11 +5384,11 @@ "eu-north-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5421,11 +5421,11 @@ "us-east-1", "us-east-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5451,8 +5451,8 @@ "us-east-1", "us-east-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "support": { @@ -5485,11 +5485,11 @@ "eu-west-3", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -5525,11 +5525,11 @@ "us-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5552,8 +5552,8 @@ "eu-central-1", "eu-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -5570,8 +5570,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -5599,11 +5599,11 @@ "us-west-2", "ap-southeast-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -5630,8 +5630,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "transfer": { @@ -5660,11 +5660,11 @@ "eu-south-1", "eu-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5696,11 +5696,11 @@ "me-south-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5726,8 +5726,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -5761,11 +5761,11 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5795,8 +5795,8 @@ "sa-east-1", "us-west-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5832,11 +5832,11 @@ "me-south-1", "sa-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5872,8 +5872,8 @@ "us-east-1", "us-west-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -5905,11 +5905,11 @@ "eu-south-1", "eu-west-3" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -5924,8 +5924,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "wellarchitectedtool": { @@ -5950,8 +5950,8 @@ "us-east-2", "us-west-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5967,8 +5967,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "workmail": { @@ -5978,8 +5978,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "workspaces": { @@ -5999,10 +5999,10 @@ "eu-west-1", "eu-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -6021,8 +6021,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "xray": { @@ -6055,11 +6055,11 @@ "sa-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] diff --git a/prowler/providers/aws/services/iam/iam_root_hardware_mfa_enabled/iam_root_hardware_mfa_enabled.py b/prowler/providers/aws/services/iam/iam_root_hardware_mfa_enabled/iam_root_hardware_mfa_enabled.py index 2ed0d7e4..bd8d54e9 100644 --- a/prowler/providers/aws/services/iam/iam_root_hardware_mfa_enabled/iam_root_hardware_mfa_enabled.py +++ b/prowler/providers/aws/services/iam/iam_root_hardware_mfa_enabled/iam_root_hardware_mfa_enabled.py @@ -5,26 +5,28 @@ from prowler.providers.aws.services.iam.iam_client import iam_client class iam_root_hardware_mfa_enabled(Check): def execute(self) -> Check_Report_AWS: findings = [] - virtual_mfa = False - report = Check_Report_AWS(self.metadata()) - report.region = iam_client.region - report.resource_id = "root" - report.resource_arn = f"arn:aws:iam::{iam_client.account}:root" + # This check is only avaible in Commercial Partition + if iam_client.partition == "aws": + virtual_mfa = False + report = Check_Report_AWS(self.metadata()) + report.region = iam_client.region + report.resource_id = "root" + report.resource_arn = f"arn:aws:iam::{iam_client.account}:root" - if iam_client.account_summary["SummaryMap"]["AccountMFAEnabled"] > 0: - virtual_mfas = iam_client.virtual_mfa_devices - for mfa in virtual_mfas: - if "root" in mfa["SerialNumber"]: - virtual_mfa = True - report.status = "FAIL" - report.status_extended = "Root account has a virtual MFA instead of a hardware MFA enabled." - if not virtual_mfa: - report.status = "PASS" - report.status_extended = "Root account has hardware MFA enabled." - else: - report.status = "FAIL" - report.status_extended = "MFA is not enabled for root account." + if iam_client.account_summary["SummaryMap"]["AccountMFAEnabled"] > 0: + virtual_mfas = iam_client.virtual_mfa_devices + for mfa in virtual_mfas: + if "root" in mfa["SerialNumber"]: + virtual_mfa = True + report.status = "FAIL" + report.status_extended = "Root account has a virtual MFA instead of a hardware MFA enabled." + if not virtual_mfa: + report.status = "PASS" + report.status_extended = "Root account has hardware MFA enabled." + else: + report.status = "FAIL" + report.status_extended = "MFA is not enabled for root account." - findings.append(report) + findings.append(report) return findings diff --git a/prowler/providers/aws/services/iam/iam_service.py b/prowler/providers/aws/services/iam/iam_service.py index eac6f45d..41c4d7c8 100644 --- a/prowler/providers/aws/services/iam/iam_service.py +++ b/prowler/providers/aws/services/iam/iam_service.py @@ -12,6 +12,7 @@ class IAM: self.service = "iam" self.session = audit_info.audit_session self.account = audit_info.audited_account + self.partition = audit_info.audited_partition self.client = self.session.client(self.service) self.region = get_region_global_service(audit_info) self.users = self.__get_users__() diff --git a/tests/providers/aws/aws_regions_by_service.json b/tests/providers/aws/aws_regions_by_service.json index d1145c2b..e7eb2e28 100644 --- a/tests/providers/aws/aws_regions_by_service.json +++ b/tests/providers/aws/aws_regions_by_service.json @@ -29,11 +29,11 @@ "me-central-1", "us-east-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -46,8 +46,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "aiq": { @@ -75,8 +75,8 @@ "us-west-2", "ap-northeast-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "alexaforbusiness": { @@ -84,8 +84,8 @@ "aws": [ "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "amazonlocationservice": { @@ -101,8 +101,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "amplify": { @@ -128,8 +128,8 @@ "us-east-1", "us-west-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "apigateway": { @@ -161,11 +161,11 @@ "us-west-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -191,8 +191,8 @@ "eu-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "application-autoscaling": { @@ -221,11 +221,11 @@ "us-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -257,11 +257,11 @@ "ap-northeast-2", "ca-central-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": {} + "aws-us-gov": {} } }, "appstream": { @@ -280,8 +280,8 @@ "us-east-1", "us-east-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -312,11 +312,11 @@ "eu-west-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": {} + "aws-us-gov": {} } }, "aps": { @@ -333,8 +333,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "artifact": { @@ -366,8 +366,8 @@ "eu-west-1", "us-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -399,11 +399,11 @@ "eu-south-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -425,8 +425,8 @@ "ap-northeast-1", "ap-southeast-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "augmentedairuntime": { @@ -445,8 +445,8 @@ "ap-northeast-2", "ap-south-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "aurora": { @@ -478,11 +478,11 @@ "us-west-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -517,11 +517,11 @@ "us-west-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -553,11 +553,11 @@ "sa-east-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -589,11 +589,11 @@ "ca-central-1", "me-south-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -606,8 +606,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "budgets": { @@ -629,11 +629,11 @@ "us-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": {} + "aws-us-gov": {} } }, "chatbot": { @@ -663,8 +663,8 @@ "sa-east-1", "us-east-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "chime": { @@ -689,8 +689,8 @@ "us-east-2", "us-west-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -721,8 +721,8 @@ "us-west-2", "eu-west-3" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "clouddirectory": { @@ -738,8 +738,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -769,8 +769,8 @@ "us-east-1", "me-south-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "cloudenduremigration": { @@ -798,11 +798,11 @@ "eu-west-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -837,11 +837,11 @@ "sa-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -876,11 +876,11 @@ "eu-central-2", "eu-south-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": {} + "aws-us-gov": {} } }, "cloudhsmv2": { @@ -910,8 +910,8 @@ "me-central-1", "sa-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -931,8 +931,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "cloudshell": { @@ -950,8 +950,8 @@ "ca-central-1", "us-east-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -986,11 +986,11 @@ "us-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1025,11 +1025,11 @@ "eu-west-2", "eu-west-3" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -1052,8 +1052,8 @@ "ap-southeast-1", "us-east-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "codebuild": { @@ -1082,11 +1082,11 @@ "sa-east-1", "us-east-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1117,11 +1117,11 @@ "ap-northeast-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1156,11 +1156,11 @@ "eu-west-3", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1180,8 +1180,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "codepipeline": { @@ -1206,11 +1206,11 @@ "us-west-1", "ap-southeast-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -1232,8 +1232,8 @@ "eu-central-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "cognito-identity": { @@ -1257,10 +1257,10 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -1281,8 +1281,8 @@ "ap-southeast-2", "us-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -1298,8 +1298,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -1329,11 +1329,11 @@ "ap-east-1", "eu-south-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": {} + "aws-us-gov": {} } }, "config": { @@ -1365,11 +1365,11 @@ "me-central-1", "us-east-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -1389,8 +1389,8 @@ "us-west-2", "eu-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -1414,8 +1414,8 @@ "eu-west-3", "sa-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -1426,10 +1426,10 @@ "aws": [ "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1" ], - "gov": {} + "aws-us-gov": {} } }, "cur": { @@ -1437,10 +1437,10 @@ "aws": [ "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1" ], - "gov": {} + "aws-us-gov": {} } }, "dataexchange": { @@ -1458,8 +1458,8 @@ "us-west-2", "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "datapipeline": { @@ -1471,8 +1471,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "datasync": { @@ -1502,8 +1502,8 @@ "me-central-1", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1514,8 +1514,8 @@ "aws": [ "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "deeplens": { @@ -1525,8 +1525,8 @@ "eu-central-1", "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "deepracer": { @@ -1534,8 +1534,8 @@ "aws": [ "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "detective": { @@ -1562,8 +1562,8 @@ "us-west-2", "ca-central-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -1574,8 +1574,8 @@ "aws": [ "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "devops-guru": { @@ -1598,8 +1598,8 @@ "eu-west-2", "us-west-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "directconnect": { @@ -1631,11 +1631,11 @@ "me-south-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -1652,8 +1652,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "dms": { @@ -1685,11 +1685,11 @@ "eu-north-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -1714,11 +1714,11 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -1749,8 +1749,8 @@ "eu-north-1", "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "ds": { @@ -1780,11 +1780,11 @@ "us-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1819,11 +1819,11 @@ "sa-east-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1858,11 +1858,11 @@ "us-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1897,11 +1897,11 @@ "me-south-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -1936,11 +1936,11 @@ "eu-south-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -1975,11 +1975,11 @@ "sa-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2012,11 +2012,11 @@ "us-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2049,11 +2049,11 @@ "me-central-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2069,8 +2069,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "elasticache": { @@ -2102,11 +2102,11 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2138,11 +2138,11 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2160,8 +2160,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "elb": { @@ -2193,11 +2193,11 @@ "eu-south-2", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2232,11 +2232,11 @@ "us-east-2", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2271,11 +2271,11 @@ "me-south-1", "sa-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2310,11 +2310,11 @@ "eu-south-2", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2349,11 +2349,11 @@ "us-east-2", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2373,8 +2373,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "firehose": { @@ -2404,11 +2404,11 @@ "me-south-1", "sa-east-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2438,8 +2438,8 @@ "us-east-1", "us-east-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2470,11 +2470,11 @@ "eu-north-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2494,8 +2494,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "frauddetector": { @@ -2508,8 +2508,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "freertosota": { @@ -2534,11 +2534,11 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": {} + "aws-us-gov": {} } }, "fsx-lustre": { @@ -2567,11 +2567,11 @@ "sa-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2600,8 +2600,8 @@ "us-east-1", "eu-north-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2621,8 +2621,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "fsx-windows": { @@ -2651,11 +2651,11 @@ "eu-west-3", "me-south-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2686,11 +2686,11 @@ "ap-northeast-3", "eu-central-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": {} + "aws-us-gov": {} } }, "globalaccelerator": { @@ -2718,8 +2718,8 @@ "us-west-1", "eu-west-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "glue": { @@ -2748,11 +2748,11 @@ "eu-west-2", "me-south-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2772,8 +2772,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "greengrass": { @@ -2792,10 +2792,10 @@ "eu-central-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2817,8 +2817,8 @@ "eu-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "guardduty": { @@ -2848,11 +2848,11 @@ "eu-north-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -2863,8 +2863,8 @@ "aws": [ "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "iam": { @@ -2896,11 +2896,11 @@ "sa-east-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2929,8 +2929,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "iot": { @@ -2956,11 +2956,11 @@ "eu-central-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -2977,8 +2977,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "iotanalytics": { @@ -2993,10 +2993,10 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1" ], - "gov": {} + "aws-us-gov": {} } }, "iotdevicedefender": { @@ -3020,11 +3020,11 @@ "us-west-2", "ap-northeast-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -3052,11 +3052,11 @@ "eu-west-1", "sa-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -3078,10 +3078,10 @@ "ap-southeast-1", "eu-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -3101,10 +3101,10 @@ "ap-northeast-2", "us-east-2" ], - "cn": [ + "aws-cn": [ "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -3119,8 +3119,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "ivs": { @@ -3134,8 +3134,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "kafka": { @@ -3164,11 +3164,11 @@ "sa-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3185,8 +3185,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -3220,11 +3220,11 @@ "me-south-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3256,11 +3256,11 @@ "eu-central-1", "eu-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3286,8 +3286,8 @@ "ca-central-1", "eu-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "kms": { @@ -3319,11 +3319,11 @@ "us-west-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3354,11 +3354,11 @@ "sa-east-1", "us-east-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3393,11 +3393,11 @@ "sa-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -3418,8 +3418,8 @@ "us-west-2", "ap-southeast-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "license-manager": { @@ -3448,11 +3448,11 @@ "us-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3476,8 +3476,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "lookoutmetrics": { @@ -3493,8 +3493,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "lookoutvision": { @@ -3508,8 +3508,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "lumberyard": { @@ -3534,8 +3534,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "m2": { @@ -3554,8 +3554,8 @@ "ca-central-1", "sa-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "macie": { @@ -3583,8 +3583,8 @@ "us-west-2", "eu-south-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "managedblockchain": { @@ -3597,8 +3597,8 @@ "eu-west-2", "us-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -3625,8 +3625,8 @@ "me-south-1", "sa-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -3661,11 +3661,11 @@ "eu-west-2", "eu-west-3" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -3693,11 +3693,11 @@ "us-west-1", "ap-southeast-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -3723,8 +3723,8 @@ "us-east-2", "us-west-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "mediaconvert": { @@ -3747,10 +3747,10 @@ "sa-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -3773,8 +3773,8 @@ "eu-west-1", "eu-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "mediapackage": { @@ -3796,8 +3796,8 @@ "sa-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "mediastore": { @@ -3813,8 +3813,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "mediatailor": { @@ -3828,8 +3828,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "memorydb": { @@ -3854,11 +3854,11 @@ "us-east-1", "us-east-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": {} + "aws-us-gov": {} } }, "mgh": { @@ -3872,8 +3872,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "mgn": { @@ -3902,8 +3902,8 @@ "eu-central-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "mq": { @@ -3932,11 +3932,11 @@ "ap-northeast-3", "ap-south-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -3961,8 +3961,8 @@ "eu-central-1", "us-east-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "neptune": { @@ -3988,11 +3988,11 @@ "af-south-1", "ca-central-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4023,8 +4023,8 @@ "sa-east-1", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -4040,8 +4040,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "opsworks": { @@ -4063,8 +4063,8 @@ "sa-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "opsworkschefautomate": { @@ -4080,8 +4080,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "opsworkspuppetenterprise": { @@ -4097,8 +4097,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "organizations": { @@ -4130,11 +4130,11 @@ "sa-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4166,8 +4166,8 @@ "eu-north-1", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4188,10 +4188,10 @@ "ap-northeast-1", "ap-northeast-2" ], - "cn": [ + "aws-cn": [ "cn-north-1" ], - "gov": {} + "aws-us-gov": {} } }, "phd": { @@ -4223,11 +4223,11 @@ "eu-west-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4249,8 +4249,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -4278,10 +4278,10 @@ "sa-east-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -4315,11 +4315,11 @@ "me-central-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4340,8 +4340,8 @@ "us-west-2", "ap-southeast-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "qldb": { @@ -4359,8 +4359,8 @@ "us-west-2", "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "quicksight": { @@ -4380,8 +4380,8 @@ "eu-central-1", "us-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -4413,11 +4413,11 @@ "me-central-1", "me-south-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4452,11 +4452,11 @@ "eu-south-2", "eu-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -4467,8 +4467,8 @@ "aws": [ "us-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "redshift": { @@ -4500,11 +4500,11 @@ "sa-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4527,8 +4527,8 @@ "eu-west-2", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -4557,8 +4557,8 @@ "sa-east-1", "us-west-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "robomaker": { @@ -4572,8 +4572,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -4604,8 +4604,8 @@ "eu-west-3", "sa-east-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "route53": { @@ -4637,11 +4637,11 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": {} + "aws-us-gov": {} } }, "s3": { @@ -4673,11 +4673,11 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4709,11 +4709,11 @@ "ap-southeast-1", "sa-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -4747,11 +4747,11 @@ "sa-east-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -4783,11 +4783,11 @@ "ap-south-1", "eu-central-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -4815,11 +4815,11 @@ "ca-central-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -4851,11 +4851,11 @@ "eu-west-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -4888,11 +4888,11 @@ "sa-east-1", "us-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -4923,8 +4923,8 @@ "ca-central-1", "us-east-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -4955,8 +4955,8 @@ "ap-southeast-2", "ca-central-1" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "sms": { @@ -4983,11 +4983,11 @@ "ap-southeast-2", "eu-central-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -5018,11 +5018,11 @@ "us-east-2", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5046,8 +5046,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "snowmobile": { @@ -5058,8 +5058,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5094,11 +5094,11 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5133,11 +5133,11 @@ "sa-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5172,11 +5172,11 @@ "eu-west-1", "eu-west-3" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5205,8 +5205,8 @@ "us-west-2", "eu-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5241,11 +5241,11 @@ "eu-north-1", "us-west-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5278,11 +5278,11 @@ "us-east-1", "us-east-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5308,8 +5308,8 @@ "us-east-1", "us-east-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "support": { @@ -5341,11 +5341,11 @@ "eu-west-3", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -5380,11 +5380,11 @@ "us-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5407,8 +5407,8 @@ "eu-central-1", "eu-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -5425,8 +5425,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -5454,11 +5454,11 @@ "us-west-2", "ap-southeast-1" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -5485,8 +5485,8 @@ "us-east-2", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "transfer": { @@ -5515,11 +5515,11 @@ "eu-south-1", "eu-west-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5551,11 +5551,11 @@ "me-south-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5581,8 +5581,8 @@ "us-west-1", "us-west-2" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1" ] } @@ -5615,11 +5615,11 @@ "us-east-2", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5648,8 +5648,8 @@ "sa-east-1", "us-west-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5684,11 +5684,11 @@ "me-south-1", "sa-east-1" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5723,8 +5723,8 @@ "us-east-1", "us-west-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -5756,11 +5756,11 @@ "eu-south-1", "eu-west-3" ], - "cn": [ + "aws-cn": [ "cn-north-1", "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1", "us-gov-east-1" ] @@ -5775,8 +5775,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "wellarchitectedtool": { @@ -5801,8 +5801,8 @@ "us-east-2", "us-west-1" ], - "cn": {}, - "gov": [ + "aws-cn": {}, + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] @@ -5818,8 +5818,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "workmail": { @@ -5829,8 +5829,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "workspaces": { @@ -5850,10 +5850,10 @@ "eu-west-1", "eu-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-west-1" ] } @@ -5872,8 +5872,8 @@ "us-east-1", "us-west-2" ], - "cn": {}, - "gov": {} + "aws-cn": {}, + "aws-us-gov": {} } }, "xray": { @@ -5905,15 +5905,15 @@ "sa-east-1", "us-west-2" ], - "cn": [ + "aws-cn": [ "cn-northwest-1", "cn-north-1" ], - "gov": [ + "aws-us-gov": [ "us-gov-east-1", "us-gov-west-1" ] } } } -} +} \ No newline at end of file diff --git a/util/update_aws_services_regions.py b/util/update_aws_services_regions.py index 46516189..caae230b 100644 --- a/util/update_aws_services_regions.py +++ b/util/update_aws_services_regions.py @@ -41,8 +41,8 @@ for item in original_matrix_regions_aws["prices"]: old_service = service regions = {} regions["aws"] = {} - regions["cn"] = {} - regions["gov"] = {} + regions["aws-cn"] = {} + regions["aws-us-gov"] = {} regions_dict["regions"] = {} regions_aws = [] regions_cn = [] @@ -51,11 +51,11 @@ for item in original_matrix_regions_aws["prices"]: # Include the region in their AWS partition if "cn-" in region: regions_cn.append(region) - regions["cn"] = regions_cn + regions["aws-cn"] = regions_cn elif "gov-" in region: regions_gov.append(region) - regions["gov"] = regions_gov + regions["aws-us-gov"] = regions_gov else: regions_aws.append(region) regions["aws"] = regions_aws