From ce228c10e0c1a59870ac94db6694af682556900d Mon Sep 17 00:00:00 2001
From: anastasia prasolova <anastasia@nspcc.ru>
Date: Thu, 7 Jul 2022 18:19:48 +0300
Subject: [PATCH] [#193] Add error pretty printing for
 `services/nats/generate_cert.sh`

Signed-off-by: anastasia prasolova <anastasia@nspcc.ru>
---
 services/nats/generate_cert.sh | 37 ++++++++++++----------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/services/nats/generate_cert.sh b/services/nats/generate_cert.sh
index 120a79d..071f9df 100755
--- a/services/nats/generate_cert.sh
+++ b/services/nats/generate_cert.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source bin/helper.sh
+
 WORKDIR=$(dirname "$0")
 LOCAL_DOMAIN=$1
 
@@ -17,43 +19,30 @@ CLI_CRT=$WORKDIR/client-cert.pem
 SUBJ="/O=NSPCC"
 
 if [[ ! -f $CA_KEY || ! -f $CA_CRT ]]; then
-	OUT=$(openssl req -newkey rsa:4096 -x509 -days 365 -nodes -keyout $CA_KEY -out $CA_CRT -subj $SUBJ 2>&1) || {
-		echo "CA certificate was not created"
-		echo $OUT
-		exit 1
-	}
+	openssl req -newkey rsa:4096 -x509 -days 365 -nodes -keyout $CA_KEY -out $CA_CRT -subj $SUBJ 2>&1 ||
+		die "CA certificate was not created"
 fi
 
 if [[ ! -f $SRV_KEY || ! -f $SRV_CRT ]]; then
-	OUT=$(openssl req -newkey rsa:4096 -nodes -keyout $SRV_KEY -out $SRV_REQ -subj $SUBJ 2>&1 ) || {
-		echo "Server certificate was not created"
-		echo $OUT
-		exit 1
-	}
+	openssl req -newkey rsa:4096 -nodes -keyout $SRV_KEY -out $SRV_REQ -subj $SUBJ 2>&1 ||
+		die "Server certificate was not created"
 
-	OUT=$(openssl x509 -req -days 365 -set_serial 01 -in $SRV_REQ -out $SRV_CRT -CA $CA_CRT -CAkey $CA_KEY \
- 		-extensions san -extfile <(printf "[san]\nsubjectAltName=DNS:nats.$LOCAL_DOMAIN") 2>&1)|| {
-		echo "Server certificate was not signed by CA"
-		echo $OUT
+	openssl x509 -req -days 365 -set_serial 01 -in $SRV_REQ -out $SRV_CRT -CA $CA_CRT -CAkey $CA_KEY \
+ 		-extensions san -extfile <(printf "[san]\nsubjectAltName=DNS:nats.$LOCAL_DOMAIN") 2>&1 || {
 		rm $SRV_REQ
-		exit 1
+		die "Server certificate was not signed by CA"
 	}
 
 	rm $SRV_REQ
 fi
 
 if [[ ! -f $CLI_KEY || ! -f $CLI_CRT ]]; then
-	OUT=$(openssl req -newkey rsa:4096 -nodes -keyout $CLI_KEY -out $CLI_REQ -subj $SUBJ 2>&1) || {
-		echo "Client certificate was not created"
-		echo $OUT
-		exit 1
-	}
+	openssl req -newkey rsa:4096 -nodes -keyout $CLI_KEY -out $CLI_REQ -subj $SUBJ 2>&1 ||
+		die "Client certificate was not created"
 
-	OUT=$(openssl x509 -req -days 365 -set_serial 01 -in $CLI_REQ -out $CLI_CRT -CA $CA_CRT -CAkey $CA_KEY 2>&1) || {
-		echo "Client certificate was not signed by CA"
-		echo $OUT
+	openssl x509 -req -days 365 -set_serial 01 -in $CLI_REQ -out $CLI_CRT -CA $CA_CRT -CAkey $CA_KEY 2>&1 || {
 		rm $CLI_REQ
-		exit 1
+		die "Client certificate was not signed by CA"
 	}
 
 	rm $CLI_REQ