From a206ae33ff7b466f5cd72c037e205748a3bd588a Mon Sep 17 00:00:00 2001
From: Alex Hung <alexh@jfrog.com>
Date: Thu, 7 Jan 2021 09:49:39 -0800
Subject: [PATCH] Update product map versions and ami ids

---
 ...rog-artifactory-ec2-instance.template.yaml | 36 +++++++++----------
 .../jfrog-xray-ec2-instance.template.yaml     | 32 ++++++++---------
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/Amazon/Marketplace/v7125/templates/jfrog-artifactory-ec2-instance.template.yaml b/Amazon/Marketplace/v7125/templates/jfrog-artifactory-ec2-instance.template.yaml
index 91f8775..a4dca4e 100644
--- a/Amazon/Marketplace/v7125/templates/jfrog-artifactory-ec2-instance.template.yaml
+++ b/Amazon/Marketplace/v7125/templates/jfrog-artifactory-ec2-instance.template.yaml
@@ -105,43 +105,43 @@ Parameters:
 Mappings:
   AWSAMIRegionMap:
     us-east-1:
-      "Artifactory7112": ami-0ea7d62825c941e92
+      "Artifactory7125": ami-02dc25a6b0c7c20f9
     us-east-2:
-      "Artifactory7112": ami-0a282b74eef1c84b5
+      "Artifactory7125": ami-0a282b74eef1c84b5
     us-west-1:
-      "Artifactory7112": ami-02fa6dd21f023b9e3
+      "Artifactory7125": ami-0e426b68e4ce468ff
     us-west-2:
-      "Artifactory7112": ami-0ea26f5ddc490f184
+      "Artifactory7125": ami-0ea26f5ddc490f184
     ca-central-1:
-      "Artifactory7112": ami-0f422f5980aeba60f
+      "Artifactory7125": ami-0f422f5980aeba60f
     eu-central-1:
-      "Artifactory7112": ami-05df4fbab56afe702
+      "Artifactory7125": ami-05df4fbab56afe702
     eu-west-1:
-      "Artifactory7112": ami-05386b580a110a49a
+      "Artifactory7125": ami-05386b580a110a49a
     eu-west-2:
-      "Artifactory7112": ami-094b79d303c9e1e0d
+      "Artifactory7125": ami-094b79d303c9e1e0d
     eu-west-3:
-      "Artifactory7112": ami-0ed4d6971439caf27
+      "Artifactory7125": ami-0ed4d6971439caf27
     ap-southeast-1:
-      "Artifactory7112": ami-01ec4e8b4ffbf7dc1
+      "Artifactory7125": ami-01ec4e8b4ffbf7dc1
     ap-southeast-2:
-      "Artifactory7112": ami-0ccb1a939c83d8062
+      "Artifactory7125": ami-0ccb1a939c83d8062
     ap-south-1:
-      "Artifactory7112": ami-078c43a083b6500be
+      "Artifactory7125": ami-078c43a083b6500be
     ap-northeast-1:
-      "Artifactory7112": ami-0695fd32ca193cccd
+      "Artifactory7125": ami-0695fd32ca193cccd
     ap-northeast-2:
-      "Artifactory7112": ami-0a03d23e6dc213b5e
+      "Artifactory7125": ami-0a03d23e6dc213b5e
     sa-east-1:
-      "Artifactory7112": ami-0b831f8403d6979d4
+      "Artifactory7125": ami-0b831f8403d6979d4
     us-gov-west-1:
-      "Artifactory7112": ami-0842d7e7becc59c39
+      "Artifactory7125": ami-0a626a31c3b8854d6
   ArtifactoryProductMap:
     JFrog-Container-Registry:
-      "7112": "Jcr7112"
+      "7125": "Jcr7125"
       product: "jcr"
     JFrog-Artifactory-Pro:
-      "7112": "Artifactory7112"
+      "7125": "Artifactory7125"
       product: "artifactory"
 Resources:
   ArtifactoryScalingGroup:
diff --git a/Amazon/Marketplace/v7125/templates/jfrog-xray-ec2-instance.template.yaml b/Amazon/Marketplace/v7125/templates/jfrog-xray-ec2-instance.template.yaml
index 2561e86..db5390c 100644
--- a/Amazon/Marketplace/v7125/templates/jfrog-xray-ec2-instance.template.yaml
+++ b/Amazon/Marketplace/v7125/templates/jfrog-xray-ec2-instance.template.yaml
@@ -68,37 +68,37 @@ Parameters:
 Mappings:
   AWSAMIRegionMap:
     us-east-1:
-      "3112": ami-04954176e0e714377
+      "3151": ami-0569c7c79a4dcf3e8
     us-east-2:
-      "3112": ami-0dde651cd599d64e8
+      "3151": ami-0dde651cd599d64e8
     us-west-1:
-      "3112": ami-0926fb027c339d991
+      "3151": ami-03fdb28548522d872
     us-west-2:
-      "3112": ami-0e48dd6310c205c33
+      "3151": ami-0e48dd6310c205c33
     ca-central-1:
-      "3112": ami-056bafb407aa8e445
+      "3151": ami-056bafb407aa8e445
     eu-central-1:
-      "3112": ami-05ab6de966f830b8a
+      "3151": ami-05ab6de966f830b8a
     eu-west-1:
-      "3112": ami-055507b35a350806d
+      "3151": ami-055507b35a350806d
     eu-west-2:
-      "3112": ami-007c8adf17c3bee79
+      "3151": ami-007c8adf17c3bee79
     eu-west-3:
-      "3112": ami-033e74f7f2e7b43ae
+      "3151": ami-033e74f7f2e7b43ae
     ap-southeast-1:
-      "3112": ami-0114ff3241c5a86a8
+      "3151": ami-0114ff3241c5a86a8
     ap-southeast-2:
-      "3112": ami-0c753f85c64c4169d
+      "3151": ami-0c753f85c64c4169d
     ap-south-1:
-      "3112": ami-09f40817a8786b93c
+      "3151": ami-09f40817a8786b93c
     ap-northeast-1:
-      "3112": ami-00f6ec6314c6ddd27
+      "3151": ami-00f6ec6314c6ddd27
     ap-northeast-2:
-      "3112": ami-05a10d14c3289f2b3
+      "3151": ami-05a10d14c3289f2b3
     sa-east-1:
-      "3112": ami-0c2acb2f23c3e6743
+      "3151": ami-0c2acb2f23c3e6743
     us-gov-west-1:
-      "3112": ami-0f0208b759ab47734
+      "3151": ami-019ab5372c3e3c7ea
 
 Resources:
   XrayScalingGroup: