Merge branch 'release' of https://github.com/appsmithorg/appsmith into release

app/client/yarn.lock

@@ -7875,8 +7875,9 @@ eventemitter2@4.1.2:
   resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-4.1.2.tgz#0e1a8477af821a6ef3995b311bf74c23a5247f15"
 
 eventemitter3@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
 events@^1.1.0, events@^1.1.1:
   version "1.1.1"
@@ -8375,10 +8376,9 @@ follow-redirects@1.5.10:
     debug "=3.1.0"
 
 follow-redirects@^1.0.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.10.0.tgz#01f5263aee921c6a54fb91667f08f4155ce169eb"
-  dependencies:
-    debug "^3.0.0"
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db"
+  integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA==
 
 for-in@^0.1.3:
   version "0.1.8"
@@ -9209,8 +9209,9 @@ http-proxy-middleware@0.19.1:
     micromatch "^3.1.10"
 
 http-proxy@^1.17.0:
-  version "1.18.0"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
   dependencies:
     eventemitter3 "^4.0.0"
     follow-redirects "^1.0.0"
@@ -14813,6 +14814,7 @@ require-main-filename@^2.0.0:
 requires-port@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
 
 reselect@^4.0.0:
   version "4.0.0"

deploy/install.sh

@@ -91,6 +91,7 @@ check_os() {
     if is_mac; then
         package_manager="brew"
         desired_os=1
+        os="Mac"
         return
     fi
 
@@ -99,18 +100,22 @@ check_os() {
     case "$os_name" in
         Ubuntu*)
             desired_os=1
+            os="Ubuntu"
             package_manager="apt-get"
             ;;
         Red\ Hat*)
             desired_os=1
+            os="Red Hat"
             package_manager="yum"
             ;;
         CentOS*)
             desired_os=1
+            os="CentOS"
             package_manager="yum"
             ;;
         *)
             desired_os=0
+            os="Not Found"
     esac
 }
 
@@ -207,7 +212,7 @@ confirm() {
     fi
 
     local answer
-    read -n1 -rp "$prompt [$options] " answer
+    read -rp "$prompt [$options] " answer
     if [[ -z $answer ]]; then
         # No answer given, the user just hit the Enter key. Take the default value as the answer.
         answer="$default"
@@ -311,7 +316,8 @@ bye() {  # Prints a friendly good bye message and exits the script.
       "userId": "'"$email"'",
       "event": "Installation Support",
       "data": {
-          "os": '$desired_os'
+          "os": "'"$os"'",
+          "instanceId": "'"$APPSMITH_INSTALLATION_ID"'"
        }
     }'
     echo -e "\nExiting for now. Bye! \U1F44B\n"
@@ -324,15 +330,18 @@ echo ""
 
 # Checking OS and assigning package manager
 desired_os=0
+os=""
 echo -e "\U1F575  Detecting your OS"
 check_os
+APPSMITH_INSTALLATION_ID=$(curl -s 'https://api6.ipify.org')
 
 curl -s -O --location --request POST 'https://hook.integromat.com/dkwb6i52am93pi30ojeboktvj32iw0fa' \
 --header 'Content-Type: text/plain' \
 --data-raw '{
   "event": "Installation Started",
   "data": {
-      "os": '$desired_os'
+      "os": "'"$os"'",
+      "instanceId": "'"$APPSMITH_INSTALLATION_ID"'"
    }
 }'
 
@@ -468,7 +477,8 @@ if confirm n "Do you have a custom domain that you would like to link? (Only for
     --data-raw '{
       "event": "Installation Custom Domain",
       "data": {
-          "os": '$desired_os'
+          "os": "'"$os"'",
+          "instanceId": "'"$APPSMITH_INSTALLATION_ID"'"
        }
     }'
     echo ""
@@ -562,7 +572,8 @@ if [[ $status_code -ne 401 ]]; then
       "userId": "'"$email"'",
       "event": "Installation Support",
       "data": {
-          "os": '$desired_os'
+          "os": "'"$os"'",
+          "instanceId": "'"$APPSMITH_INSTALLATION_ID"'"
        }
     }'
 else
@@ -571,7 +582,8 @@ else
     --data-raw '{
       "event": "Installation Success",
       "data": {
-          "os": '$desired_os'
+          "os": "'"$os"'",
+          "instanceId": "'"$APPSMITH_INSTALLATION_ID"'"
        }
     }'
     echo "+++++++++++ SUCCESS ++++++++++++++++++++++++++++++"
@@ -595,7 +607,8 @@ else
       "userId": "'"$email"'",
       "event": "Identify Successful Installation",
       "data": {
-          "os": '$desired_os'
+          "os": "'"$os"'",
+          "instanceId": "'"$APPSMITH_INSTALLATION_ID"'"
        }
     }'
 fi