feat: trap ERR and format shell

Signed-off-by: Abirdcfly <[email protected]>

Author: Abirdcfly

scripts/e2e.sh

@@ -16,54 +16,55 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
+trap 'exit $?' ERR
 # step 1. create namespace
-kubectl create namespace u4a-system;
+kubectl create namespace u4a-system
 
 # step 2. get node name and node ip
 ingressNode="kind-worker"
 kubeProxyNode="kind-worker2"
-ingressNodeIP=$(kubectl get node ${ingressNode} -owide | grep -v "NAME"|awk '{print $6}')
-kubeProxyNodeIP=$(kubectl get node ${kubeProxyNode} -owide | grep -v "NAME"|awk '{print $6}')
-kubectl get node -owide;
+ingressNodeIP=$(kubectl get node ${ingressNode} -owide | grep -v "NAME" | awk '{print $6}')
+kubeProxyNodeIP=$(kubectl get node ${kubeProxyNode} -owide | grep -v "NAME" | awk '{print $6}')
+kubectl get node -owide
 echo "ingressNodeIp ${ingressNodeIP}"
 echo "kubeProxyNodeIP ${kubeProxyNodeIP}"
 
 # step 3. repalce nginx and proxy node name
-cat u4a-component/charts/cluster-component/values.yaml|sed "s/<replaced-ingress-node-name>/${ingressNode}/g" \
-    > u4a-component/charts/cluster-component/values1.yaml
+cat u4a-component/charts/cluster-component/values.yaml | sed "s/<replaced-ingress-node-name>/${ingressNode}/g" \
+	>u4a-component/charts/cluster-component/values1.yaml
 
 # step 4. install cluster-compoent
-helm -nu4a-system install cluster-component --wait -f u4a-component/charts/cluster-component/values1.yaml u4a-component/charts/cluster-component 
+helm -nu4a-system install cluster-component --wait -f u4a-component/charts/cluster-component/values1.yaml u4a-component/charts/cluster-component
 
 echo "deploy cluster component succeffsully"
 kubectl get po -nu4a-system -owide
 
 # step 5. replace nginx and proxy node name
-cat u4a-component/values.yaml|sed "s/<replaced-ingress-nginx-ip>/${ingressNodeIP}/g"| \
-    sed "s/<replaced-oidc-proxy-node-name>/${kubeProxyNode}/g"| \
-    sed "s/<replaced-k8s-ip-with-oidc-enabled>/${kubeProxyNodeIP}/g" \
-    > u4a-component/values1.yaml
+cat u4a-component/values.yaml | sed "s/<replaced-ingress-nginx-ip>/${ingressNodeIP}/g" |
+	sed "s/<replaced-oidc-proxy-node-name>/${kubeProxyNode}/g" |
+	sed "s/<replaced-k8s-ip-with-oidc-enabled>/${kubeProxyNodeIP}/g" \
+		>u4a-component/values1.yaml
 
 helm -nu4a-system install u4a-component --wait -f u4a-component/values1.yaml u4a-component
+
 # step 6. install u4a component
 
 echo "deploy u4a component successfully"
 kubectl get po -nu4a-system -owide
 
 # step 7. replace iam server and get oidc-server client secret
-secret=$(kubectl get cm oidc-server -nu4a-system -oyaml|grep secret|head -n1|awk '{print $2}')
+secret=$(kubectl get cm oidc-server -nu4a-system -oyaml | grep secret | head -n1 | awk '{print $2}')
 
-cat fabric-operator/values.yaml| sed "s/<replaced-ingress-nginx-ip>/${ingressNodeIP}/g" |\
-    sed "s/<replaced-iam-server>/https:\/\/oidc-server.u4a-system.svc/g" |\
-    sed "s/<replace-with-k8s-oidc-proxy-url>/https:\/\/${kubeProxyNodeIP}/g" |\
-    sed "s/<replace-with-oidc-server-url>/https:\/\/portal.${ingressNodeIP}.nip.io\/oidc/g" |\
-    sed "s/<replace-with-oidc-client-id>/bff-client/g"| \
-    sed "s/<replace-with-oidc-client-secret>/${secret}/g" \
-    > fabric-operator/values1.yaml
+cat fabric-operator/values.yaml | sed "s/<replaced-ingress-nginx-ip>/${ingressNodeIP}/g" |
+	sed "s/<replaced-iam-server>/https:\/\/oidc-server.u4a-system.svc/g" |
+	sed "s/<replace-with-k8s-oidc-proxy-url>/https:\/\/${kubeProxyNodeIP}/g" |
+	sed "s/<replace-with-oidc-server-url>/https:\/\/portal.${ingressNodeIP}.nip.io\/oidc/g" |
+	sed "s/<replace-with-oidc-client-id>/bff-client/g" |
+	sed "s/<replace-with-oidc-client-secret>/${secret}/g" \
+		>fabric-operator/values1.yaml
 
 # step 8. install fabric operator
-kubectl create namespace baas-system;
-helm -nbaas-system install fabric -f fabric-operator/values1.yaml --wait fabric-operator;
+kubectl create namespace baas-system
+helm -nbaas-system install fabric -f fabric-operator/values1.yaml --wait fabric-operator
 echo "deploy fabric-operator successfully"
 kubectl get po -nbaas-system

scripts/kind.sh

@@ -41,16 +41,15 @@ function kind_up_cluster {
 
 function pre_load_image() {
 	pre_load_images=(hyperledgerk8s/ubi-minimal:latest hyperledgerk8s/fabric-ca:iam-20230131
-			hyperledgerk8s/fabric-peer:2.4.7 hyperledgerk8s/fabric-peer:2.4.7
-			hyperledgerk8s/couchdb:3.2.2 hyperledgerk8s/fabric-orderer:2.4.7
-			hyperledgerk8s/fabric-console:latest hyperledgerk8s/grpc-web:latest)
-	for image in ${pre_load_images[*]}
-	do
+		hyperledgerk8s/fabric-peer:2.4.7 hyperledgerk8s/fabric-peer:2.4.7
+		hyperledgerk8s/couchdb:3.2.2 hyperledgerk8s/fabric-orderer:2.4.7
+		hyperledgerk8s/fabric-console:latest hyperledgerk8s/grpc-web:latest)
+	for image in ${pre_load_images[*]}; do
 		docker pull $image
 		kind load docker-image $image
 	done
 }
 
-
-export K8S_VERSION=v1.24; kind_up_cluster
-pre_load_image
+export K8S_VERSION=v1.24
+kind_up_cluster
+pre_load_image