From c8f2278172f81ace25618ff3eaf3f16161141585 Mon Sep 17 00:00:00 2001 From: Antonio Tirado Date: Thu, 17 Aug 2023 12:32:37 -0400 Subject: [PATCH 1/3] Added GB-1 region to script --- .../aws-cf-well-architected-review-tool/configure-stack.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Conformity/Integration/aws-cf-well-architected-review-tool/configure-stack.py b/Conformity/Integration/aws-cf-well-architected-review-tool/configure-stack.py index 96145e89..e210a739 100755 --- a/Conformity/Integration/aws-cf-well-architected-review-tool/configure-stack.py +++ b/Conformity/Integration/aws-cf-well-architected-review-tool/configure-stack.py @@ -16,7 +16,7 @@ parser.add_argument('--accountId', type=str, required=True, help='Cloud One Account Id') parser.add_argument('--region', type=str, required=True, choices=[ - 'trend-us-1', 'us-1', 'au-1', 'ie-1', 'sg-1', 'in-1', 'jp-1', 'ca-1', 'de-1'], help='Cloud One Service region') + 'trend-us-1', 'us-1', 'au-1', 'ie-1', 'sg-1', 'in-1', 'jp-1', 'ca-1', 'de-1', 'gb-1'], help='Cloud One Service region') parser.add_argument('--apiKey', type=str, required=True, help='Cloud One API Key with Admin Rights') parser.add_argument('--conformityAccountId', type=str, required=True, From dd779ddc7a8a30d4b9f864af4b7b836855d89861 Mon Sep 17 00:00:00 2001 From: Antonio Tirado Date: Thu, 17 Aug 2023 12:33:43 -0400 Subject: [PATCH 2/3] Added gb-1 region to stack --- .../conformity-wellarchitected-sync.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Conformity/Integration/aws-cf-well-architected-review-tool/conformity-wellarchitected-sync.yaml b/Conformity/Integration/aws-cf-well-architected-review-tool/conformity-wellarchitected-sync.yaml index 28fab6c8..5264793e 100644 --- a/Conformity/Integration/aws-cf-well-architected-review-tool/conformity-wellarchitected-sync.yaml +++ b/Conformity/Integration/aws-cf-well-architected-review-tool/conformity-wellarchitected-sync.yaml @@ -17,6 +17,7 @@ Parameters: - jp-1 - ca-1 - de-1 + - gb-1 - trend-us-1 CloudOneAPIKey: Type: String From 37097e056b48713965caf684eee0c5f9bf90a10f Mon Sep 17 00:00:00 2001 From: Antonio Tirado Date: Thu, 17 Aug 2023 12:38:52 -0400 Subject: [PATCH 3/3] Reviewed Cloud One Region and added link for help --- .../configure-stack.py | 2 +- .../conformity-wellarchitected-sync.yaml | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Conformity/Integration/aws-cf-well-architected-review-tool/configure-stack.py b/Conformity/Integration/aws-cf-well-architected-review-tool/configure-stack.py index e210a739..c319950c 100755 --- a/Conformity/Integration/aws-cf-well-architected-review-tool/configure-stack.py +++ b/Conformity/Integration/aws-cf-well-architected-review-tool/configure-stack.py @@ -16,7 +16,7 @@ parser.add_argument('--accountId', type=str, required=True, help='Cloud One Account Id') parser.add_argument('--region', type=str, required=True, choices=[ - 'trend-us-1', 'us-1', 'au-1', 'ie-1', 'sg-1', 'in-1', 'jp-1', 'ca-1', 'de-1', 'gb-1'], help='Cloud One Service region') + 'trend-us-1', 'us-1', 'in-1', 'gb-1', 'jp-1', 'de-1', 'au-1', 'ca-1', 'sg-1'], help='Cloud One Service region. See https://cloudone.trendmicro.com/docs/identity-and-account-management/c1-regions/') parser.add_argument('--apiKey', type=str, required=True, help='Cloud One API Key with Admin Rights') parser.add_argument('--conformityAccountId', type=str, required=True, diff --git a/Conformity/Integration/aws-cf-well-architected-review-tool/conformity-wellarchitected-sync.yaml b/Conformity/Integration/aws-cf-well-architected-review-tool/conformity-wellarchitected-sync.yaml index 5264793e..330ed3ec 100644 --- a/Conformity/Integration/aws-cf-well-architected-review-tool/conformity-wellarchitected-sync.yaml +++ b/Conformity/Integration/aws-cf-well-architected-review-tool/conformity-wellarchitected-sync.yaml @@ -10,14 +10,13 @@ Parameters: Default: us-1 AllowedValues: - us-1 - - au-1 - - ie-1 - - sg-1 - in-1 + - gb-1 - jp-1 - - ca-1 - de-1 - - gb-1 + - au-1 + - ca-1 + - sg-1 - trend-us-1 CloudOneAPIKey: Type: String