@openstax/ts-utils 1.21.12 → 1.24.1-hotfix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openstax/ts-utils",
-  "version": "1.21.12",
+  "version": "1.24.1-hotfix",
   "bin": {
     "ts-utils": "./script/bin-entry.bash"
   },
@@ -23,6 +23,7 @@
     "uuid": "^9.0.0"
   },
   "devDependencies": {
+    "@opensearch-project/opensearch": "^1.2.0",
     "@types/cookie": "^0.5.0",
     "@types/cors": "^2.8.13",
     "@types/deep-equal": "^1.0.1",
@@ -200,6 +201,7 @@
   "license": "MIT",
   "main": "index.js",
   "peerDependencies": {
+    "@opensearch-project/opensearch": "^1.2.0",
     "cors": "^2.8.5",
     "express": "^4.17.3",
     "multer": "^1.4.5-lts.1",

package/script/bin/deploy.bash

@@ -38,4 +38,12 @@ if [ ! -f "./deploy/deploy.bash" ]; then
   exit 1
 fi;
 
+source $(yarn -s ts-utils which init-params-script)
+
+missing_params=$(get_missing_param_names)
+if [ -n "$missing_params" ]; then
+  echo "please upload the following params before deploying: $missing_params"
+  exit 1
+fi
+
 ./deploy/deploy.bash

package/script/bin/get-env-param.bash

@@ -5,12 +5,12 @@ set -euo pipefail; if [ -n "${DEBUG-}" ]; then set -x; fi
 source $(yarn -s ts-utils which init-constants-script)
 source $(yarn -s ts-utils which init-params-script)
 
-environment=$(yarn -s ts-utils get-arg 0 "$@")
+ENVIRONMENT=$(yarn -s ts-utils get-arg 0 "$@")
 param=$(yarn -s ts-utils get-arg 1 "$@")
 
-if [ -z "$environment" ] || [ -z "$param" ]; then
+if [ -z "$ENVIRONMENT" ] || [ -z "$param" ]; then
   cat <<HEREDOC
-  Usage: $(basename ${BASH_SOURCE[0]}) <environment> <parameter name> 
+  Usage: $(basename ${BASH_SOURCE[0]}) <environment> <parameter name>
 
   Shows secret value from AWS parameter store
 HEREDOC

package/script/bin/init-params-script.bash

@@ -37,7 +37,7 @@ if [ -z "${aws_version##aws-cli/1.*}" ]; then
 fi
 
 function get_param_name() {
-  echo "/$APPLICATION/$environment/api/$param"
+  echo "/$APPLICATION/$ENVIRONMENT/api/$param"
 }
 
 function get_value() {
@@ -50,6 +50,15 @@ function get_parameter() {
      --query Parameter.Value --output text 2>&1
 }
 
+function get_missing_param_names() {
+  names=()
+  for param in "${PARAMS[@]}"; do
+    name=$param
+    names+=($(get_param_name))
+  done
+  aws ssm get-parameters --region "$region" --names "${names[@]}" --query InvalidParameters --output text 2>&1
+}
+
 function upload_parameter() {
   set +e
   previous_value=$(get_parameter)

package/script/bin/upload-params.bash

@@ -7,9 +7,9 @@ source $(yarn -s ts-utils which init-params-script)
 
 if [ -z "${PARAMS:-}" ]; then echo "PARAMS must be set" > /dev/stderr; exit 1; fi
 
-environment=$(yarn -s ts-utils get-arg 0 "$@")
+ENVIRONMENT=$(yarn -s ts-utils get-arg 0 "$@")
 
-if [ -z "$environment" ]; then
+if [ -z "$ENVIRONMENT" ]; then
   cat <<HEREDOC
   Usage: $(basename "${BASH_SOURCE[0]}") <environment> [options]
 
@@ -56,4 +56,4 @@ for param in $params_with_value; do
   upload_parameter
 done
 
-printf "\nSuccessfully uploaded %sparameters for %s-%s\n\n" "${partial:+partial }" "$environment" "$APPLICATION"
+printf "\nSuccessfully uploaded %sparameters for %s-%s\n\n" "${partial:+partial }" "$ENVIRONMENT" "$APPLICATION"