- Remove long timeouts added for debugging. (#74)

rlubke · web-flow · commit 070d2b26e227 · 2023-08-17T10:49:00.000-07:00
- Remove long timeouts added for debugging.
- Update keys.sh to function properly on OL7
- Update to gRPC 1.9.x
diff --git a/bin/docker-utils.sh b/bin/docker-utils.sh
@@ -22,7 +22,7 @@ function coh_up() {
   while [ ${SECONDS} -le 60 ]; do
     READY=$(curl -o /dev/null -s -w "%{http_code}" "http://127.0.0.1:6676/ready") || true
     if [ "${READY}" -eq "200" ]; then
-      sleep 20
+      sleep 5
       echo "Coherence is ready!"
       return
     fi
diff --git a/bin/keys.sh b/bin/keys.sh
@@ -19,6 +19,13 @@ if [ -z "${CERTS_DIR}" ] ; then
   exit 1
 fi
 
+# check for location of openssl.cnf
+if [ -f "/etc/ssl/openssl.cnf" ]; then
+  export SSL_CNF=/etc/ssl/openssl.cnf
+else
+  export SSL_CNF=/etc/pki/tls/openssl.cnf
+fi
+
 mkdir -p "${CERTS_DIR}"
 
 # Generate random passwords for each run
@@ -31,7 +38,7 @@ echo "${CAPASS}" | openssl genrsa -passout stdin -aes256 \
 echo Generate Guardians CA certificate:
 echo "${CAPASS}" | openssl req -passin stdin -new -x509 -days 3650 \
     -reqexts SAN \
-    -config <(cat /etc/ssl/openssl.cnf \
+    -config <(cat "${SSL_CNF}" \
         <(printf "\n[SAN]\nsubjectAltName=DNS:localhost,DNS:127.0.0.1")) \
     -key "${CERTS_DIR}"/guardians-ca.key \
     -out "${CERTS_DIR}"/guardians-ca.crt \
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,7 +12,7 @@
   "repository": "https://github.com/oracle/coherence-js-client",
   "dependencies": {
     "@grpc/proto-loader": "^0.7",
-    "@grpc/grpc-js": "^1.8",
+    "@grpc/grpc-js": "^1.9",
     "google-protobuf": "^3.21",
     "decimal.js": "^10.4"
   },
