update connections yaml files with new image uri

retentionscience · Oct 23, 2024 · 6b99732 · 6b99732
1 parent 20f7b0f
commit 6b99732
Show file tree

Hide file tree

Showing 30 changed files with 150 additions and 30 deletions.
diff --git a/athena-aws-cmdb/athena-aws-cmdb-connection.yaml b/athena-aws-cmdb/athena-aws-cmdb-connection.yaml
@@ -36,6 +36,8 @@ Conditions:
   HasKmsKeyId: !Not [ !Equals [ !Ref KmsKeyId, "" ] ]
   NotHasLambdaRole: !Equals [ !Ref LambdaRoleArn, "" ]
   CreateKmsPolicy: !And [ !Condition HasKmsKeyId, !Condition NotHasLambdaRole ]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   ConnectorConfig:
@@ -46,7 +48,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-aws-cmdb:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-aws-cmdb:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       Description: "Enables Amazon Athena to communicate with various AWS Services, making your resource inventories accessible via SQL."
       Timeout: 900
       MemorySize: 3008

diff --git a/athena-cloudera-hive/athena-cloudera-hive-connection.yaml b/athena-cloudera-hive/athena-cloudera-hive-connection.yaml
@@ -44,6 +44,8 @@ Conditions:
   NotHasLambdaRole: !Equals [ !Ref LambdaRoleArn, "" ]
   HasKmsKeyId: !Not [ !Equals [ !Ref KmsKeyId, "" ] ]
   CreateKmsPolicy: !And [!Condition NotHasLambdaRole, !Condition HasKmsKeyId]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 Resources:
   JdbcConnectorConfig:
     Type: 'AWS::Serverless::Function'
@@ -53,7 +55,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudera-hive:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudera-hive:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       ImageConfig:
         Command: [ "com.amazonaws.athena.connectors.cloudera.HiveCompositeHandler" ]
       Description: "Enables Amazon Athena to communicate with Cloudera Hive using JDBC"

diff --git a/athena-cloudera-impala/athena-cloudera-impala-connection.yaml b/athena-cloudera-impala/athena-cloudera-impala-connection.yaml
@@ -44,6 +44,8 @@ Conditions:
   HasKmsKeyId: !Not [ !Equals [ !Ref KmsKeyId, "" ] ]
   NotHasLambdaRole: !Equals [ !Ref LambdaRoleArn, "" ]
   CreateKmsPolicy: !And [!Condition NotHasLambdaRole, !Condition HasKmsKeyId]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 Resources:
   JdbcConnectorConfig:
     Type: 'AWS::Serverless::Function'
@@ -53,7 +55,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudera-impala:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudera-impala:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       ImageConfig:
         Command: [ "com.amazonaws.athena.connectors.cloudera.ImpalaCompositeHandler" ]
       Description: "Enables Amazon Athena to communicate with Cloudera Impala using JDBC"

diff --git a/athena-cloudwatch-metrics/athena-cloudwatch-metrics-connection.yaml b/athena-cloudwatch-metrics/athena-cloudwatch-metrics-connection.yaml
@@ -36,6 +36,8 @@ Conditions:
   HasKmsKeyId: !Not [ !Equals [ !Ref KmsKeyId, "" ] ]
   NotHasLambdaRole: !Equals [ !Ref LambdaRoleArn, "" ]
   CreateKmsPolicy: !And [ !Condition HasKmsKeyId, !Condition NotHasLambdaRole ]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   ConnectorConfig:
@@ -46,7 +48,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudwatch-metrics:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudwatch-metrics:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       Description: "Enables Amazon Athena to communicate with Cloudwatch Metrics, making your metrics data accessible via SQL"
       Timeout: 900
       MemorySize: 3008

diff --git a/athena-cloudwatch/athena-cloudwatch-connection.yaml b/athena-cloudwatch/athena-cloudwatch-connection.yaml
@@ -36,6 +36,8 @@ Conditions:
   HasKmsKeyId: !Not [!Equals [!Ref KmsKeyId, ""]]
   NotHasLambdaRole: !Equals [!Ref LambdaRole, ""]
   CreateKmsPolicy: !And [ !Condition HasKmsKeyId, !Condition NotHasLambdaRole ]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   ConnectorConfig:
@@ -46,7 +48,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudwatch:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-cloudwatch:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       Description: "Enables Amazon Athena to communicate with Cloudwatch, making your log accessible via SQL"
       Timeout: 900
       MemorySize: 3008

diff --git a/athena-datalakegen2/athena-datalakegen2-connection.yaml b/athena-datalakegen2/athena-datalakegen2-connection.yaml
@@ -51,6 +51,8 @@ Conditions:
   HasKmsKeyId: !Not [ !Equals [ !Ref KmsKeyId, "" ] ]
   NotHasLambdaRole: !Equals [ !Ref LambdaRoleArn, "" ]
   CreateKmsPolicy: !And [ !Condition HasKmsKeyId, !Condition NotHasLambdaRole ]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   JdbcConnectorConfig:
@@ -61,7 +63,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-datalakegen2:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-datalakegen2:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       ImageConfig:
         Command: [ "com.amazonaws.athena.connectors.datalakegen2.DataLakeGen2CompositeHandler" ]
       Description: "Enables Amazon Athena to communicate with DataLake Gen2 using JDBC"

diff --git a/athena-db2-as400/athena-db2-as400-connection.yaml b/athena-db2-as400/athena-db2-as400-connection.yaml
@@ -52,6 +52,8 @@ Conditions:
   HasKmsKeyId: !Not [!Equals [!Ref KmsKeyId, ""]]
   NotHasLambdaRole: !Equals [!Ref LambdaRoleArn, ""]
   CreateKmsPolicy: !And [!Condition HasKmsKeyId, !Condition NotHasLambdaRole]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   JdbcConnectorConfig:
@@ -62,7 +64,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-db2-as400:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-db2-as400:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       ImageConfig:
         Command: [ "com.amazonaws.athena.connectors.db2as400.Db2As400CompositeHandler" ]
       Description: "Enables Amazon Athena to communicate with DB2 on iSeries (AS400) using JDBC"

diff --git a/athena-db2/athena-db2-connection.yaml b/athena-db2/athena-db2-connection.yaml
@@ -52,6 +52,8 @@ Conditions:
   HasKmsKeyId: !Not [ !Equals [ !Ref KmsKeyId, "" ] ]
   NotHasLambdaRole: !Equals [ !Ref LambdaRoleArn, "" ]
   CreateKmsPolicy: !And [ !Condition HasKmsKeyId, !Condition NotHasLambdaRole ]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   JdbcConnectorConfig:
@@ -62,7 +64,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-db2:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-db2:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       ImageConfig:
         Command: [ "com.amazonaws.athena.connectors.db2.Db2CompositeHandler" ]
       Description: "Enables Amazon Athena to communicate with DB2 using JDBC"

diff --git a/athena-docdb/athena-docdb-connection.yaml b/athena-docdb/athena-docdb-connection.yaml
@@ -45,6 +45,8 @@ Conditions:
   HasKmsKeyId: !Not [!Equals [!Ref KmsKeyId, ""]]
   NotHasLambdaRole: !Equals [!Ref LambdaRoleArn, ""]
   CreateKmsPolicy: !And [!Condition HasKmsKeyId, !Condition NotHasLambdaRole]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   ConnectorConfig:
@@ -55,7 +57,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-docdb:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-docdb:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       Description: "Enables Amazon Athena to communicate with DocumentDB, making your DocumentDB data accessible via SQL."
       Timeout: 900
       MemorySize: 3008

diff --git a/athena-dynamodb/athena-dynamodb-connection.yaml b/athena-dynamodb/athena-dynamodb-connection.yaml
@@ -36,6 +36,8 @@ Conditions:
   HasKmsKeyId: !Not [!Equals [!Ref KmsKeyId, ""]]
   NotHasLambdaRole: !Equals [!Ref LambdaRoleArn, ""]
   CreateKmsPolicy: !And [!Condition HasKmsKeyId, !Condition NotHasLambdaRole]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   ConnectorConfig:
@@ -46,7 +48,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-dynamodb:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-dynamodb:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       Description: "Enables Amazon Athena to communicate with DynamoDB, making your tables accessible via SQL"
       Timeout: 900
       MemorySize: 3008

diff --git a/athena-elasticsearch/athena-elasticsearch-connection.yaml b/athena-elasticsearch/athena-elasticsearch-connection.yaml
@@ -53,6 +53,8 @@ Conditions:
   HasKmsKeyId: !Not [ !Equals [ !Ref KmsKeyId, "" ] ]
   NotHasLambdaRole: !Equals [ !Ref LambdaRoleArn, "" ]
   CreateKmsPolicy: !And [ !Condition HasKmsKeyId, !Condition NotHasLambdaRole ]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   ConnectorConfig:
@@ -63,7 +65,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-elasticsearch:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-elasticsearch:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       Description: "The Elasticsearch Lambda Connector provides Athena users the ability to query data stored on Elasticsearch clusters."
       Timeout: 900
       MemorySize: 3008

diff --git a/athena-gcs/athena-gcs-connection.yaml b/athena-gcs/athena-gcs-connection.yaml
@@ -40,6 +40,8 @@ Conditions:
   HasKmsKeyId: !Not [!Equals [!Ref KmsKeyId, ""]]
   NotHasLambdaRole: !Equals [!Ref LambdaRoleArn, ""]
   CreateKmsPolicy: !And [!Condition HasKmsKeyId, !Condition NotHasLambdaRole]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   AthenaGCSConnector:
@@ -50,7 +52,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-gcs:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-gcs:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       Description: "Amazon Athena GCS Connector"
       Timeout: 900
       MemorySize: 3008

diff --git a/athena-google-bigquery/athena-google-bigquery-connection.yaml b/athena-google-bigquery/athena-google-bigquery-connection.yaml
@@ -52,6 +52,8 @@ Conditions:
   HasKmsKeyId: !Not [ !Equals [ !Ref KmsKeyId, "" ] ]
   NotHasLambdaRole: !Equals [ !Ref LambdaRoleArn, "" ]
   CreateKmsPolicy: !And [ !Condition HasKmsKeyId, !Condition NotHasLambdaRole ]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   AthenaBigQueryConnector:
@@ -63,7 +65,9 @@ Resources:
           GOOGLE_APPLICATION_CREDENTIALS: '/tmp/service-account.json'
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-google-bigquery:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-google-bigquery:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       Description: "Enables Amazon Athena to communicate with BigQuery using Google SDK"
       Timeout: 900
       MemorySize: 3008

diff --git a/athena-hbase/athena-hbase-connection.yaml b/athena-hbase/athena-hbase-connection.yaml
@@ -45,6 +45,8 @@ Conditions:
   HasKmsKeyId: !Not [ !Equals [ !Ref KmsKeyId, "" ] ]
   NotHasLambdaRole: !Equals [ !Ref LambdaRoleArn, "" ]
   CreateKmsPolicy: !And [ !Condition HasKmsKeyId, !Condition NotHasLambdaRole ]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   ConnectorConfig:
@@ -55,7 +57,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-hbase:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-hbase:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       Description: "Enables Amazon Athena to communicate with HBase, making your HBase data accessible via SQL"
       Timeout: 900
       MemorySize: 3008

diff --git a/athena-hortonworks-hive/athena-hortonworks-hive-connection.yaml b/athena-hortonworks-hive/athena-hortonworks-hive-connection.yaml
@@ -49,6 +49,8 @@ Conditions:
   HasKmsKeyId: !Not [ !Equals [ !Ref KmsKeyId, "" ] ]
   NotHasLambdaRole: !Equals [ !Ref LambdaRoleArn, "" ]
   CreateKmsPolicy: !And [ !Condition HasKmsKeyId, !Condition NotHasLambdaRole ]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   JdbcConnectorConfig:
@@ -59,7 +61,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-hortonworks-hive:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-hortonworks-hive:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       ImageConfig:
         Command: [ "com.amazonaws.athena.connectors.hortonworks.HiveCompositeHandler" ]
       Description: "Enables Amazon Athena to communicate with Hortonworks Hive using JDBC"

diff --git a/athena-msk/athena-msk-connection.yaml b/athena-msk/athena-msk-connection.yaml
@@ -51,6 +51,8 @@ Conditions:
   HasKmsKeyId: !Not [ !Equals [ !Ref KmsKeyId, "" ] ]
   NotHasLambdaRole: !Equals [ !Ref LambdaRoleArn, "" ]
   CreateKmsPolicy: !And [ !Condition HasKmsKeyId, !Condition NotHasLambdaRole ]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   AthenaMSKConnector:
@@ -61,7 +63,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-msk:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-msk:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       Description: "Enables Amazon Athena to communicate with MSK clusters"
       Timeout: 900
       MemorySize: 3008

diff --git a/athena-mysql/athena-mysql-connection.yaml b/athena-mysql/athena-mysql-connection.yaml
@@ -45,6 +45,8 @@ Conditions:
   HasKmsKeyId: !Not [ !Equals [ !Ref KmsKeyId, "" ] ]
   NotHasLambdaRole: !Equals [ !Ref LambdaRoleArn, "" ]
   CreateKmsPolicy: !And [ !Condition HasKmsKeyId, !Condition NotHasLambdaRole ]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   JdbcConnectorConfig:
@@ -55,7 +57,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-mysql:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-mysql:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       ImageConfig:
         Command: [ "com.amazonaws.athena.connectors.mysql.MySqlCompositeHandler" ]
       Description: "Enables Amazon Athena to communicate with MySQL using JDBC"

diff --git a/athena-neptune/athena-neptune-connection.yaml b/athena-neptune/athena-neptune-connection.yaml
@@ -47,6 +47,8 @@ Conditions:
   HasKmsKeyId: !Not [ !Equals [ !Ref KmsKeyId, "" ] ]
   NotHasLambdaRole: !Equals [ !Ref LambdaRoleArn, "" ]
   CreateKmsPolicy: !And [ !Condition HasKmsKeyId, !Condition NotHasLambdaRole ]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 
 Resources:
   ConnectorConfig:
@@ -58,7 +60,9 @@ Resources:
           SERVICE_REGION: !Ref AWS::Region
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-neptune:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-neptune:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       Description: "Enables Amazon Athena to communicate with Neptune, making your Neptune graph data accessible via SQL."
       Timeout: 900
       MemorySize: 3008

diff --git a/athena-oracle/athena-oracle-connection.yaml b/athena-oracle/athena-oracle-connection.yaml
@@ -47,6 +47,8 @@ Conditions:
   HasKmsKeyId: !Not [ !Equals [ !Ref KmsKeyId, "" ] ]
   NotHasLambdaRole: !Equals [ !Ref LambdaRoleArn, "" ]
   CreateKmsPolicy: !And [ !Condition HasKmsKeyId, !Condition NotHasLambdaRole ]
+  IsRegionBAH: !Equals [!Ref "AWS::Region", "me-south-1"]
+  IsRegionHKG: !Equals [!Ref "AWS::Region", "ap-east-1"]
 Resources:
   JdbcConnectorConfig:
     Type: 'AWS::Serverless::Function'
@@ -56,7 +58,9 @@ Resources:
           glue_connection: !Ref GlueConnection
       FunctionName: !Ref LambdaFunctionName
       PackageType: "Image"
-      ImageUri: !Sub '292517598671.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-oracle:2022.47.1'
+      ImageUri: !Sub
+        - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-oracle:2022.47.1'
+        - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
       ImageConfig:
         Command: [ "com.amazonaws.athena.connectors.oracle.OracleCompositeHandler" ]
       Description: "Enables Amazon Athena to communicate with ORACLE using JDBC"