Merge branch 'master' into improve-st2client-homepage

Author: blag

CHANGELOG.rst

@@ -4,6 +4,10 @@ Changelog
 in development
 --------------
 
+Changed
+~~~~~~~~~
+* Improve the st2-self-check script to echo to stderr and exit if it isn't run with a
+  ST2_AUTH_TOKEN or ST2_API_KEY environment variable. (improvement) #5068
 
 3.3.0 - October 06, 2020
 ------------------------

st2common/bin/st2-self-check

@@ -57,7 +57,14 @@ shift $(($OPTIND-1))
 
 ## Script to install samples, tests, and run all workflows in tests pack.
 if [[ `id -u` != 0 ]]; then
-  echo "st2-self-check must be run as root"
+  echo >&2 "st2-self-check must be run as root"
+  exit 1
+fi
+
+if [[ -z "$ST2_AUTH_TOKEN" && -z "$ST2_API_KEY" ]]; then
+  echo >&2 "st2-self-check must be run with an auth token or API key in an environment variable"
+  echo >&2 "Please export a valid auth token in ST2_AUTH_TOKEN or a valid API key in ST2_API_KEY"
+  echo >&2 "and re-run st2-self-check"
   exit 1
 fi
 
@@ -89,7 +96,7 @@ git clone --depth 1 --branch ${ST2_TESTS_BRANCH} https://github.com/StackStorm/s
 EXIT_CODE=$?
 
 if [ ${EXIT_CODE} -ne 0 ]; then
-    echo "Failed to clone st2tests repo"
+    echo >&2 "Failed to clone st2tests repo"
     exit 1
 fi
 

st2common/st2common/util/crypto.py

@@ -325,9 +325,9 @@ def keyczar_symmetric_encrypt(encrypt_key, plaintext):
 
     :rtype: ``str``
     """
-    from keyczar.keys import AesKey as KeyczarAesKey
-    from keyczar.keys import HmacKey as KeyczarHmacKey
-    from keyczar.keyinfo import GetMode
+    from keyczar.keys import AesKey as KeyczarAesKey  # pylint: disable=import-error
+    from keyczar.keys import HmacKey as KeyczarHmacKey  # pylint: disable=import-error
+    from keyczar.keyinfo import GetMode  # pylint: disable=import-error
 
     encrypt_key = KeyczarAesKey(encrypt_key.aes_key_string,
                                 KeyczarHmacKey(encrypt_key.hmac_key_string,
@@ -352,9 +352,9 @@ def keyczar_symmetric_decrypt(decrypt_key, ciphertext):
 
     :rtype: ``str``
     """
-    from keyczar.keys import AesKey as KeyczarAesKey
-    from keyczar.keys import HmacKey as KeyczarHmacKey
-    from keyczar.keyinfo import GetMode
+    from keyczar.keys import AesKey as KeyczarAesKey  # pylint: disable=import-error
+    from keyczar.keys import HmacKey as KeyczarHmacKey  # pylint: disable=import-error
+    from keyczar.keyinfo import GetMode  # pylint: disable=import-error
 
     decrypt_key = KeyczarAesKey(decrypt_key.aes_key_string,
                                 KeyczarHmacKey(decrypt_key.hmac_key_string,