From 5ed725f9c9849f7439416dbb18d7c6bc8e8be0d0 Mon Sep 17 00:00:00 2001
From: brucec <brucec@jfrog.com>
Date: Mon, 25 Mar 2019 16:25:06 -0700
Subject: [PATCH] Shortened the productId

---
 AzureResourceManager/scripts/install_artifactory.sh | 4 ++--
 CloudFormation/artifactory-enterprise.json          | 6 +++---
 Terraform/userdata.sh                               | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/AzureResourceManager/scripts/install_artifactory.sh b/AzureResourceManager/scripts/install_artifactory.sh
index 3fc0b91..118ec68 100644
--- a/AzureResourceManager/scripts/install_artifactory.sh
+++ b/AzureResourceManager/scripts/install_artifactory.sh
@@ -214,10 +214,10 @@ EOF
 mkdir -p /var/opt/jfrog/artifactory/etc/info
 cat <<EOF >/var/opt/jfrog/artifactory/etc/info/installer-info.json
 {
-  "productId": "JFrogInstaller_Azure_SQL/1.0.0"
+  "productId": "JFrogInstaller_ARM/1.0.0"
   "features": [
   {
-    "featureId": "Artifactory/${artifactoryVersion}"
+    "featureId": "SQLServer"
   }
 }
 EOF
diff --git a/CloudFormation/artifactory-enterprise.json b/CloudFormation/artifactory-enterprise.json
index 80e5fa3..f26f836 100644
--- a/CloudFormation/artifactory-enterprise.json
+++ b/CloudFormation/artifactory-enterprise.json
@@ -906,10 +906,10 @@
               "/var/opt/jfrog/artifactory/etc/info/installer-info.json" : {
                 "content" : { "Fn::Join" : ["", [
                   "{\n",
-                  "  \"productId\": \"JFrogInstaller_Cloudformation_MySQL/1.0.0\"\n",
+                  "  \"productId\": \"JFrogInstaller_Cloudformation/1.0.0\"\n",
                   "  \"features\": [\n",
                   "  {\n",
-                  "    \"featureId\": \"Artifactory/", { "Ref": "ArtifactoryVersion" }, "\"\n",
+                  "    \"featureId\": \"MySql/5.5\"\n",
                   "  }\n",
                   "}\n"
                 ]]},
@@ -1275,7 +1275,7 @@
                   "  \"productId\": \"JFrogInstaller_Cloudformation_MySQL/1.0.0\"\n",
                   "  \"features\": [\n",
                   "  {\n",
-                  "    \"featureId\": \"Artifactory/", { "Ref": "ArtifactoryVersion" }, "\"\n",
+                  "    \"featureId\": \"MySql/5.5\"\n",
                   "  }\n",
                   "}\n"
                 ]]},
diff --git a/Terraform/userdata.sh b/Terraform/userdata.sh
index 551064f..0e33ea0 100644
--- a/Terraform/userdata.sh
+++ b/Terraform/userdata.sh
@@ -175,10 +175,10 @@ EOF
 mkdir -p /var/opt/jfrog/artifactory/etc/info
 cat <<EOF >/var/opt/jfrog/artifactory/etc/info/installer-info.json
 {
-  "productId": "JFrog_TerraformInstaller_Mysql/1.0.0"
+  "productId": "JFrog_TerraformInstaller/1.0.0"
   "features": [
   {
-    "featureId": "Artifactory/${artifactory_version}"
+    "featureId": "MySql/5.5"
   }
 }
 EOF