Merge pull request #423 from StackStorm/improve-upgrade-script

Reformat and improve Bashisms in upgrade script

Author: blag

actions/st2_upgrade_to_enterprise.sh

@@ -14,15 +14,15 @@ LDAP_GROUP_DN=${10}
 ST2_USERNAME=st2admin
 REPO=enterprise
 
-if [ $VERSION = "None" ]; then
+if [[ "$VERSION" = "None" ]]; then
     VERSION=''
 fi
 
-if [ "${PKG_ENV}" = "staging" ]; then
+if [[ "${PKG_ENV}" = "staging" ]]; then
     REPO="${PKG_ENV}-${REPO}"
 fi
 
-if [ "${RELEASE}" = "unstable" ]; then
+if [[ "${RELEASE}" = "unstable" ]]; then
     REPO="${REPO}-${RELEASE}"
 fi
 
@@ -55,9 +55,9 @@ install_enterprise_bits() {
     echo "Downloading from repo ${REPO}..."
     echo "Version: $VERSION"
 
-    if [[ ${DISTRO} = \UBUNTU* ]]; then
+    if [[ "${DISTRO}" = UBUNTU* ]]; then
         curl -s https://${LICENSE_KEY}:@packagecloud.io/install/repositories/StackStorm/${REPO}/script.deb.sh | bash
-        if [[ -z $VERSION ]]; then
+        if [[ -z "$VERSION" ]]; then
             apt-get install -y bwc-enterprise
         else
             local BWC_ENTERPRISE_PKG_VERSION=$(get_apt_pkg_latest_revision bwc-enterprise $VERSION)
@@ -85,7 +85,7 @@ install_enterprise_bits() {
         fi
     else
         curl -s https://${LICENSE_KEY}:@packagecloud.io/install/repositories/StackStorm/${REPO}/script.rpm.sh | sudo bash
-        if [[ -z $VERSION ]]; then
+        if [[ -z "$VERSION" ]]; then
             yum install -y bwc-enterprise
         else
             yum install -y yum-utils # need repoquery
@@ -140,45 +140,44 @@ CONF
 }
 
 enable_and_configure_rbac() {
-  echo "Enabling and configuring RBAC in st2.conf"
+    echo "Enabling and configuring RBAC in st2.conf"
 
-  if [[ ${DISTRO} = \UBUNTU* ]]; then
+    if [[ "${DISTRO}" = UBUNTU* ]]; then
       sudo apt-get install -y crudini
-  else
+    else
       sudo yum install -y crudini
-  fi
+    fi
 
-  # Enable RBAC
-  echo "Enabling rbac in st2.conf"
+    # Enable RBAC
+    echo "Enabling rbac in st2.conf"
 
-  sudo crudini --set /etc/st2/st2.conf rbac enable 'True'
-  sudo crudini --set /etc/st2/st2.conf rbac backend 'enterprise'
+    sudo crudini --set /etc/st2/st2.conf rbac enable 'True'
+    sudo crudini --set /etc/st2/st2.conf rbac backend 'enterprise'
 
-  # TODO: Move directory creation to package
-  sudo mkdir -p /opt/stackstorm/rbac/assignments/
-  sudo mkdir -p /opt/stackstorm/rbac/roles/
+    # TODO: Move directory creation to package
+    sudo mkdir -p /opt/stackstorm/rbac/assignments/
+    sudo mkdir -p /opt/stackstorm/rbac/roles/
 
-  # Write role assignment for admin user
-  ROLE_ASSIGNMENT_FILE="/opt/stackstorm/rbac/assignments/${ST2_USERNAME}.yaml"
-  sudo bash -c "cat > ${ROLE_ASSIGNMENT_FILE}" <<EOL
+    # Write role assignment for admin user
+    ROLE_ASSIGNMENT_FILE="/opt/stackstorm/rbac/assignments/${ST2_USERNAME}.yaml"
+    sudo bash -c "cat > ${ROLE_ASSIGNMENT_FILE}" <<EOL
 ---
   username: "${ST2_USERNAME}"
   roles:
     - "system_admin"
 EOL
 
-  # Write role assignment for stanley (system) user
-  ROLE_ASSIGNMENT_FILE="/opt/stackstorm/rbac/assignments/stanley.yaml"
-  sudo bash -c "cat > ${ROLE_ASSIGNMENT_FILE}" <<EOL
+    # Write role assignment for stanley (system) user
+    ROLE_ASSIGNMENT_FILE="/opt/stackstorm/rbac/assignments/stanley.yaml"
+    sudo bash -c "cat > ${ROLE_ASSIGNMENT_FILE}" <<EOL
 ---
   username: "stanley"
   roles:
     - "admin"
 EOL
 
-  # Sync roles and assignments
-  sudo st2-apply-rbac-definitions --config-file /etc/st2/st2.conf
-
+    # Sync roles and assignments
+    sudo st2-apply-rbac-definitions --config-file /etc/st2/st2.conf
 }