fix: console docker compose [ci skip]

Author: Maurice Faber

Dockerfile

@@ -1,14 +1,17 @@
 FROM node:14-slim as ci
 
+ARG SKIP_TESTS='false'
+ENV EXIT_FAST='true'
+
 ENV APP_HOME=/home/app/stack
 RUN mkdir -p $APP_HOME
 WORKDIR $APP_HOME
 
 COPY package*.json ./
 COPY . .
-RUN npm install
+RUN [ "$SKIP_TESTS" = 'false' ] && npm install || true
 COPY ./.cspell.json .
-RUN npm run spellcheck
+RUN [ "$SKIP_TESTS" = 'false' ] && npm run spellcheck || true
 
 FROM otomi/tools:1.4.7 as test
 ENV APP_HOME=/home/app/stack
@@ -18,8 +21,8 @@ WORKDIR $APP_HOME
 COPY . .
 RUN cp -r .demo/ env/ 
 
-RUN bin/validate-values.sh
-RUN EXIT_FAST=1 bin/validate-templates.sh
+RUN [ "$SKIP_TESTS" = 'false' ] && bin/validate-values.sh || true
+RUN [ "$SKIP_TESTS" = 'false' ] && bin/validate-templates.sh || true
 
 #-----------------------------
 FROM otomi/tools:1.4.8 as prod

bin/bootstrap.sh

@@ -29,7 +29,7 @@ mkdir -p $bin_path &>/dev/null
 
 # The very first time we use latest image
 img='otomi/core:latest'
-[[ "$has_otomi" == "true" ]] && img="otomi/core:$(otomi_image_tag)"
+[ "$has_otomi" = 'true' ] && img="otomi/core:$(otomi_image_tag)"
 echo "Installing artifacts from $img"
 for f in 'aliases' 'common.sh' 'otomi'; do
   cp $PWD/bin/$f $bin_path/

bin/check-console.sh

@@ -12,7 +12,12 @@ api_settings="$ENV_DIR/env/charts/otomi-api.yaml"
 api_secrets="$ENV_DIR/env/charts/secrets.otomi-api.yaml"
 
 # decrypt secrets if needed
-[ -f "$ENV_DIR/.sops.yaml" ] && set +e && helm secrets dec $api_secrets $settings_secrets >/dev/null && set -e
+if [ -f "$ENV_DIR/.sops.yaml" ]; then
+  set +e
+  helm secrets dec $api_secrets >/dev/null
+  helm secrets dec $settings_secrets >/dev/null
+  set -e
+fi
 [ -f "$api_secrets.dec" ] && api_secrets="$api_secrets.dec"
 [ -f "$settings_secrets.dec" ] && settings_secrets="$settings_secrets.dec"
 pull_secret="$(yq m $settings $settings_secrets | yq r - 'otomi.pullSecret')"
@@ -23,11 +28,11 @@ user=$(yq m $api_secrets $api_settings | yq r - 'charts[otomi-api].git.user')
 password=$(yq m $api_secrets $api_settings | yq r - 'charts[otomi-api].git.password')
 
 # all present?
-[ "$pull_secret" == "" ] && echo "Error: otomi.pullSecret not set in $ENV_DIR/env/secrets.settings.yaml!" >&2 && err=1
-[ "$repo_url" == "" ] || [ "$repo_url" == "github.com/redkubes/otomi-values-demo.git" ] && error="\nrepoUrl: $repo_url "
-[ "$email" == "" ] || [ "$email" == "some@secret.value" ] && error="$error\nemail: $email"
-[ "$user" == "" ] || [ "$user" == "somesecretvalue" ] && error="$error\nuser: $user"
-[ "$password" == "" ] || [ "$password" == "somesecretvalue" ] && error="$error\npassword: $password"
+[ "$pull_secret" = "" ] && echo "Error: otomi.pullSecret not set in $ENV_DIR/env/secrets.settings.yaml!" >&2 && err=1
+[ "$repo_url" = "" ] || [ "$repo_url" = "github.com/redkubes/otomi-values-demo.git" ] && error="\nrepoUrl: $repo_url "
+[ "$email" = "" ] || [ "$email" = "some@secret.value" ] && error="$error\nemail: $email"
+[ "$user" = "" ] || [ "$user" = "somesecretvalue" ] && error="$error\nuser: $user"
+[ "$password" = "" ] || [ "$password" = "somesecretvalue" ] && error="$error\npassword: $password"
 [ "$error" != "" ] && printf "Error: Make sure the git details are correctly added to 'charts/*otomi-api.yaml'. Incorrect values found for git: $error\n" >&2
 [ "$err" != "" ] || [ "$error" != "" ] && exit 1
 

bin/common.sh

@@ -33,7 +33,7 @@ hf() {
 }
 
 hf_values() {
-  [ "${VERBOSE-0}" == "0" ] && quiet='--quiet'
+  [ "${VERBOSE-'true'}" = 'true' ] && quiet='--quiet'
   helmfile ${quiet-} -e "$CLOUD-$CLUSTER" -f helmfile.tpl/helmfile-dump.yaml build | grep -Ev $helmfileOutputHide | sed -e $replacePathsPattern |
     yq read -P - 'releases[0].values[0]'
 }

bin/crypt.sh

@@ -14,7 +14,7 @@ function rotate() {
 
 function crypt() {
   cd $ENV_DIR/env >/dev/null
-  if [ "$command" == "encrypt" ]; then
+  if [ "$command" = 'encrypt' ]; then
     find . -type f -name 'secrets.*.yaml' -exec helm secrets enc {} \;
   else
     find . -type f -name 'secrets.*.yaml' -exec helm secrets dec {} \;
@@ -23,18 +23,18 @@ function crypt() {
 }
 
 case $command in
-encrypt | decrypt)
-  printf "${COLOR_LIGHT_PURPLE}${command}ing secrets...${COLOR_NC}\n"
-  crypt
-  printf "${COLOR_LIGHT_PURPLE}DONE!${COLOR_NC}\n"
-  ;;
-rotate)
-  printf "${COLOR_LIGHT_PURPLE}rotating secrets...${COLOR_NC}\n"
-  rotate
-  printf "${COLOR_LIGHT_PURPLE}DONE!${COLOR_NC}\n"
-  ;;
-*)
-  echo "Invalid command: $command. Should be one of: decrypt|encrypt|rotate"
-  exit 1
-  ;;
+  encrypt | decrypt)
+    printf "${COLOR_LIGHT_PURPLE}${command}ing secrets...${COLOR_NC}\n"
+    crypt
+    printf "${COLOR_LIGHT_PURPLE}DONE!${COLOR_NC}\n"
+    ;;
+  rotate)
+    printf "${COLOR_LIGHT_PURPLE}rotating secrets...${COLOR_NC}\n"
+    rotate
+    printf "${COLOR_LIGHT_PURPLE}DONE!${COLOR_NC}\n"
+    ;;
+  *)
+    echo "Invalid command: $command. Should be one of: decrypt|encrypt|rotate"
+    exit 1
+    ;;
 esac

bin/gen-drone.sh

@@ -13,7 +13,7 @@ readonly receiver=$(echo "$values" | yq r - alerts.receiver)
 readonly templatePath=$PWD/tpl/.drone.tpl.$receiver.yml
 readonly customer_name=$(customer_name)
 
-if [ "$receiver" == "slack" ]; then
+if [ "$receiver" = 'slack' ]; then
   key="url"
 else
   key="lowPrio"
@@ -27,7 +27,7 @@ function template_drone_config() {
   printf "${COLOR_LIGHT_PURPLE}Creating $targetPath ${COLOR_NC}\n"
 
   local target=$targetPath
-  [ "${DRY_RUN-0}" == "1" ] && target="/dev/stdout"
+  [ "${DRY_RUN-'false'}" = 'false' ] && target="/dev/stdout"
 
   cat $templatePath | sed -e "s/__CLOUD/${CLOUD}/g" -e "s/__CLUSTER/${CLUSTER}/g" \
     -e "s/__IMAGE_TAG/${otomi_image_tag}/g" -e "s|__WEBHOOK|${webhook}|g" \

bin/otomi

@@ -14,9 +14,9 @@
 set -e
 
 command=$1
-[ "$ENV_DIR" == "" ] && env_unset=1
+[ "$ENV_DIR" = "" ] && env_unset=1
 ENV_DIR=${ENV_DIR:-$PWD}
-[ "$ENV_DIR" == "/home/app/stack" ] && ENV_DIR=$ENV_DIR/env
+[ "$ENV_DIR" = "/home/app/stack" ] && ENV_DIR=$ENV_DIR/env
 
 . bin/common.sh
 
@@ -33,9 +33,9 @@ function verbose_env() {
 }
 
 # VERBOSE - export this varibale to run this script in verbose mode
-VERBOSE=${VERBOSE:-"0"}
+VERBOSE=${VERBOSE:-'true'}
 # EXIT_FAST - export this varaibale to exit the script on error
-EXIT_FAST=${EXIT_FAST:-"1"}
+EXIT_FAST=${EXIT_FAST:-'true'}
 
 # check_kube_context - a flag to indicate to use kube context and to refresh kube access token before running command in docker
 check_kube_context=1
@@ -55,10 +55,10 @@ readme_url='https://github.com/redkubes/otomi-core'
 
 function set_env_and_stack_dir() {
   local cwd=$(basename "$PWD")
-  [ "$VERBOSE" == "1" ] && echo "CWD: $cwd"
-  if [[ "$cwd" == "otomi-core" ]]; then
-    [ "$env_unset" == "1" ] && echo "Error: The ENV_DIR environment variable is not set" && exit 1
-    [ "$VERBOSE" == "1" ] && echo "Mounting otomi-core dir"
+  [ "$VERBOSE" = "1" ] && echo "CWD: $cwd"
+  if [ "$cwd" = "otomi-core" ]; then
+    [ "$env_unset" = "1" ] && echo "Error: The ENV_DIR environment variable is not set" >&2 && exit 1
+    [ "$VERBOSE" = "1" ] && echo "Mounting otomi-core dir"
     stack_dir=$PWD
     mount_stack_dir=1
   fi
@@ -106,16 +106,15 @@ function check_docker_running() {
   if [ "$?" = "0" ]; then
     has_docker=1
   else
-    echo "Otomi CLI expects a running docker daemon!"
-    exit 1
+    echo "Otomi CLI expects a running docker daemon!" >&2 && exit 1
   fi
 }
 
 function evaluate_k8s_context() {
   local env_path="${ENV_DIR}/env/clouds/${CLOUD}/${CLUSTER}/.env"
-  [ ! -f $env_path ] && echo "Error: The file '${env_path}' does not exist" && exit 1
+  [ ! -f $env_path ] && echo "Error: The file '${env_path}' does not exist" >&2 && exit 1
   source $env_path
-  [[ -z "$K8S_CONTEXT" ]] && echo "Error: The K8S_CONTEXT env is not defined in $env_path" && exit 1
+  [[ -z "$K8S_CONTEXT" ]] && echo "Error: The K8S_CONTEXT env is not defined in $env_path" >&2 && exit 1
   return 0
 }
 
@@ -144,9 +143,9 @@ evaluate_secrets() {
     echo "Info: The 'secrets.*.yaml files' are not decrypted, because $ENV_DIR/.sops.yaml file is not present"
     return 0
   }
-  if [ "$CI" == "" ]; then
+  if [ "$CI" = "" ]; then
     local secrets_path="$ENV_DIR/.secrets"
-    [[ ! -r "$secrets_path" ]] && echo "Error: Unable to find the '$secrets_path' file.\nPlease follow to documentation: $readme_url" && exit 2
+    [[ ! -r "$secrets_path" ]] && echo "Error: Unable to find the '$secrets_path' file.\nPlease follow to documentation: $readme_url" >&2 && exit 2
     source $secrets_path
   fi
   prepare_crypt
@@ -155,13 +154,15 @@ evaluate_secrets() {
 
 validate_cluster_env() {
   evaluate_secrets
-  [[ -z "$CLOUD" ]] && echo "Error: The CLOUD environment variable is not set" && exit 2
-  [[ -z "$CLUSTER" ]] && echo "Error: The CLUSTER environment variable is not set" && exit 2
+  local err
+  [[ -z "$CLOUD" ]] && echo "Error: The CLOUD environment variable is not set" >&2 && err=1
+  [[ -z "$CLUSTER" ]] && echo "Error: The CLUSTER environment variable is not set" >&2 && err=1
+  [[ ! -z "$err" ]] && exit 2
   return 0
 }
 
 is_repo() {
-  [[ "$(basename "$PWD")" == "otomi-core" ]] && echo "Error: Should not be ran from otomi-core" && exit 2
+  [[ "$(basename "$PWD")" = "otomi-core" ]] && echo "Error: Should not be ran from otomi-core" >&2 && exit 2
   return 0
 }
 
@@ -188,7 +189,7 @@ function drun() {
   local socket_volume=''
 
   if [ "$CI" != "" ]; then
-    echo "Running in CI: $CI"
+    [ "$VERBOSE" = "1" ] && echo "Running in CI: $CI"
     check_kube_context=0
   else
     socket_volume="-v /var/run/docker.sock:/var/run/docker.sock"
@@ -205,15 +206,15 @@ function drun() {
     stack_volume="-v ${stack_dir}:${stack_dir}"
   fi
 
-  if [ "$VERBOSE" == "1" ]; then
+  if [ "$VERBOSE" = "1" ]; then
     verbose_env
   fi
 
   # use docker run if has_docker AND either:
   # - not in docker
   # - in docker AND force docker
-  if [[ ("$CI" == "") && $has_docker -eq 1 && ("$IN_DOCKER" != "1" || $dind -eq 1) ]]; then
-    [ "$VERBOSE" == "1" ] && echo "Running dockerized version of command: $command"
+  if [[ ("$CI" = "") && $has_docker -eq 1 && ("$IN_DOCKER" != "1" || $dind -eq 1) ]]; then
+    [ "$VERBOSE" = "1" ] && echo "Running dockerized version of command: $command"
     docker run $docker_terminal_params --rm \
       $stack_volume $socket_volume -v /tmp:/tmp \
       -v $GOOGLE_APPLICATION_CREDENTIALS:$GOOGLE_APPLICATION_CREDENTIALS \
@@ -237,7 +238,7 @@ function drun() {
       $cmd_image \
       $command
   else
-    [ "$VERBOSE" == "1" ] && echo "Running native version of command: $command"
+    [ "$VERBOSE" = "1" ] && echo "Running native version of command: $command"
     $command
   fi
 }
@@ -383,13 +384,12 @@ function execute() {
       ;;
     *)
       show_usage
-      [ "$1" != "" ] && echo "Error: Unknown command: $@"
-      exit 1
+      [ "$1" != "" ] && echo "Error: Unknown command: $@" >&2 && exit 1
       ;;
   esac
 }
 
-[[ -z "$command" ]] && echo "Error: Missing command argument" && show_usage && exit 2
+[[ -z "$command" ]] && echo "Error: Missing command argument" >&2 && show_usage && exit 2
 
 set_env_and_stack_dir
 set_otomi_image

bin/validate-templates.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 set -uo pipefail
-EXIT_FAST=${EXIT_FAST:-"1"}
-[[ $EXIT_FAST == "1" ]] && set -e
+EXIT_FAST=${EXIT_FAST:-'true'}
+[ $EXIT_FAST = 'true' ] && set -e
 
 schemaOutputPath="/tmp/otomi/kubernetes-json-schema/master"
 outputPath="/tmp/otomi/generated-crd-schemas"
@@ -14,9 +14,9 @@ exitcode=1
 . bin/common.sh
 
 cleanup() {
-  [[ $exitcode -eq 0 ]] && echo "Validation Success" || echo "Validation Failed"
+  [ $exitcode -eq 0 ] && echo "Validation Success" || echo "Validation Failed"
   rm -rf $extractCrdSchemaJQFile
-  [[ "${MOUNT_TMP_DIR-0}" != "1" ]] && rm -rf $k8sResourcesPath $outputPath $schemaOutputPath
+  rm -rf $k8sResourcesPath $outputPath $schemaOutputPath
   exit $exitcode
 }
 trap cleanup EXIT ERR
@@ -62,7 +62,7 @@ process_crd() {
       jq -S -c --raw-output -f "$extractCrdSchemaJQFile" >>"$schemasBundleFile"
   } || {
     echo "ERROR Processing: $document"
-    [[ $EXIT_FAST == "1" ]] && exit 1
+    [ $EXIT_FAST = 'true' ] && exit 1
   }
 }
 

bin/validate-values.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
 
 set -uo pipefail
-EXIT_FAST=${EXIT_FAST:-"1"}
-[[ $EXIT_FAST == "1" ]] && set -e
+EXIT_FAST=${EXIT_FAST:-'true'}
+[ $EXIT_FAST = 'true' ] && set -e
 
 . bin/common.sh
 
@@ -11,7 +11,7 @@ mkdir -p $tmp_path >/dev/null
 
 cleanup() {
   local exitcode=$?
-  [[ "${MOUNT_TMP_DIR-0}" != "1" ]] && rm -rf $tmp_path
+  rm -rf $tmp_path
   return $exitcode
 }
 trap cleanup EXIT ERR