Add shfmt linter (#308)

Author: rdavid

.github/workflows/pre-main.yml

@@ -39,6 +39,8 @@ jobs:
           SHELLCHECK_OPTS: --external-sources
         with:
           ignore_names: mo
+      - uses: mfinelli/setup-shfmt@v2
+      - run: shfmt -d scripts/*.sh
       - uses: crate-ci/typos@master
       - uses: ibiqlik/action-yamllint@v3
         with:

scripts/create-local-registry.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+
 # TODO: needs refactoring to work with kind
 # Initialization
 # shellcheck disable=SC1001,SC2215
@@ -16,70 +17,62 @@ CONTAINER_CLIENT="${CONTAINER_EXECUTABLE:-$TNF_CONTAINER_CLIENT}"
 CERT_EXE_UBUNTU=update-ca-certificates
 CERT_EXE_REDHAT=update-ca-trust
 echo "$(which $CERT_EXE_UBUNTU 2>/dev/null)"]
-if [[ -n "$(which $CERT_EXE_UBUNTU 2>/dev/null)" ]];
-then
-  echo "Running on Ubuntu Linux"
-  CERT_UPDATER=$CERT_EXE_UBUNTU
-  CERT_PATH=/usr/local/share/ca-certificates/$REGISTRY_NAME.crt
-
-elif [[ -n "$(which $CERT_EXE_REDHAT 2>/dev/null)" ]];
-then
-  echo "Running on Redhat/Fedora Linux"
-  CERT_UPDATER=$CERT_EXE_REDHAT
-  CERT_PATH=/etc/pki/ca-trust/source/anchors/$REGISTRY_NAME.crt
+if [[ -n "$(which $CERT_EXE_UBUNTU 2>/dev/null)" ]]; then
+	echo "Running on Ubuntu Linux"
+	CERT_UPDATER=$CERT_EXE_UBUNTU
+	CERT_PATH=/usr/local/share/ca-certificates/$REGISTRY_NAME.crt
+elif [[ -n "$(which $CERT_EXE_REDHAT 2>/dev/null)" ]]; then
+	echo "Running on Redhat/Fedora Linux"
+	CERT_UPDATER=$CERT_EXE_REDHAT
+	CERT_PATH=/etc/pki/ca-trust/source/anchors/$REGISTRY_NAME.crt
 else
-  echo "OS unknown, don't know how to update certificates"
-  exit 1
+	echo "OS unknown, don't know how to update certificates"
+	exit 1
 fi
- 
+
 # Create certificates for registry authentication
 rm -rf "$SCRIPT_DIR"/certs
 mkdir "$SCRIPT_DIR"/certs
-openssl req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes  -keyout "$SCRIPT_DIR"/certs/registry.key -out "$SCRIPT_DIR"/certs/registry.crt -subj "/CN=registry"  -addext "subjectAltName=DNS:${REGISTRY_NAME},IP:127.0.0.1"
+openssl req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes -keyout "$SCRIPT_DIR"/certs/registry.key -out "$SCRIPT_DIR"/certs/registry.crt -subj "/CN=registry" -addext "subjectAltName=DNS:${REGISTRY_NAME},IP:127.0.0.1"
 openssl x509 -in "$SCRIPT_DIR"/certs/registry.crt -out "$SCRIPT_DIR"/certs/registry.pem -outform PEM
 chmod 666 "$SCRIPT_DIR"/certs/*
 
 # Enable the new certificates for use in the current host
-sudo cp "$SCRIPT_DIR"/certs/registry.crt  "$CERT_PATH"
+sudo cp "$SCRIPT_DIR"/certs/registry.crt "$CERT_PATH"
 sudo $CERT_UPDATER
 
-
 # Add the hostname to /etc/hosts
 # shellcheck disable=SC2143 # Use grep -q.
-if [ -z "$( grep "$REGISTRY_NAME" /etc/hosts)" ]
-then
-  REGISTRY_ADDRESS=$(hostname -I|awk '{print $1}')
-  echo REGISTRY_ADDRESS= "$REGISTRY_ADDRESS" 
-  sudo REGISTRY_ADDRESS1="$REGISTRY_ADDRESS" REGISTRY1="$REGISTRY_NAME" sh -c 'echo "$REGISTRY_ADDRESS1 $REGISTRY1" >> /etc/hosts'
+if [ -z "$(grep "$REGISTRY_NAME" /etc/hosts)" ]; then
+	REGISTRY_ADDRESS=$(hostname -I | awk '{print $1}')
+	echo REGISTRY_ADDRESS= "$REGISTRY_ADDRESS"
+	sudo REGISTRY_ADDRESS1="$REGISTRY_ADDRESS" REGISTRY1="$REGISTRY_NAME" sh -c 'echo "$REGISTRY_ADDRESS1 $REGISTRY1" >> /etc/hosts'
 else
-  echo "entry already present"
+	echo "entry already present"
 fi
 cat /etc/hosts
 
-
 # Delete previous Registry
 ${CONTAINER_CLIENT} rm -f registry
 
 # Copy the certificate to the minikube directory for use by minikube
 mkdir -p "$HOME"/.minikube/certs
-cp "$SCRIPT_DIR"/certs/registry.pem "$HOME"/.minikube/certs/. 
+cp "$SCRIPT_DIR"/certs/registry.pem "$HOME"/.minikube/certs/.
 
-# Remove the docker registry 
+# Remove the docker registry
 ${CONTAINER_CLIENT} rm -f registry
 
 # Create the docker registry
-${CONTAINER_CLIENT} run -d \Linux
-  -v "$(pwd)"/"$SCRIPT_DIR"/certs:/certs:Z \
-  -e REGISTRY_HTTP_ADDR=0.0.0.0:443 \
-  -e REGISTRY_HTTP_TLS_CERTIFICATE=/certs/registry.crt \
-  -e REGISTRY_HTTP_TLS_KEY=/certs/registry.key \
-  -p 443:443 \
-  registry:2
+${CONTAINER_CLIENT} run -d Linux \
+	-v "$(pwd)"/"$SCRIPT_DIR"/certs:/certs:Z \
+	-e REGISTRY_HTTP_ADDR=0.0.0.0:443 \
+	-e REGISTRY_HTTP_TLS_CERTIFICATE=/certs/registry.crt \
+	-e REGISTRY_HTTP_TLS_KEY=/certs/registry.key \
+	-p 443:443 \
+	registry:2
 
-# Restart docker 
-if [ "${CONTAINER_CLIENT}" = "docker" ];
-then
-  sudo systemctl restart docker
+# Restart docker
+if [ "${CONTAINER_CLIENT}" = "docker" ]; then
+	sudo systemctl restart docker
 fi
-
 echo "Created local registry at: ${REGISTRY_NAME}:443"

scripts/create-operator-bundle.sh

@@ -29,50 +29,50 @@ mkdir -p config/manifests/bases
 
 # Create configuration.
 cat >config/manifests/bases/nginx-operator.clusterserviceversion.yaml <<-'EOF'
-apiVersion: operators.coreos.com/v1alpha1
-kind: ClusterServiceVersion
-metadata:
-  annotations:
-    alm-examples: '[]'
-    capabilities: Basic Install
-    test-network-function.com/subscription_name: '["nginx-operator-v0-0-1-sub"]'
-  name: nginx-operator.v0.0.0
-  namespace: placeholder
-  labels:
-    test-network-function.com/operator: target
-spec:
-  apiservicedefinitions: {}
-  customresourcedefinitions: {}
-  description: cnftest
-  displayName: test-operator
-  icon:
-  - base64data: ""
-    mediatype: ""
-  install:
-    spec:
-      deployments: null
-    strategy: ""
-  installModes:
-  - supported: false
-    type: OwnNamespace
-  - supported: false
-    type: SingleNamespace
-  - supported: false
-    type: MultiNamespace
-  - supported: true
-    type: AllNamespaces
-  keywords:
-  - cnftest
-  links:
-  - name: Nginx Operator
-    url: https://nginx-operator.domain
-  maintainers:
-  - email: [email protected]
-    name: david
-  maturity: alpha
-  provider:
-    name: redhat
-  version: 0.0.0
+	apiVersion: operators.coreos.com/v1alpha1
+	kind: ClusterServiceVersion
+	metadata:
+	  annotations:
+	    alm-examples: '[]'
+	    capabilities: Basic Install
+	    test-network-function.com/subscription_name: '["nginx-operator-v0-0-1-sub"]'
+	  name: nginx-operator.v0.0.0
+	  namespace: placeholder
+	  labels:
+	    test-network-function.com/operator: target
+	spec:
+	  apiservicedefinitions: {}
+	  customresourcedefinitions: {}
+	  description: cnftest
+	  displayName: test-operator
+	  icon:
+	  - base64data: ""
+	    mediatype: ""
+	  install:
+	    spec:
+	      deployments: null
+	    strategy: ""
+	  installModes:
+	  - supported: false
+	    type: OwnNamespace
+	  - supported: false
+	    type: SingleNamespace
+	  - supported: false
+	    type: MultiNamespace
+	  - supported: true
+	    type: AllNamespaces
+	  keywords:
+	  - cnftest
+	  links:
+	  - name: Nginx Operator
+	    url: https://nginx-operator.domain
+	  maintainers:
+	  - email: [email protected]
+	    name: david
+	  maturity: alpha
+	  provider:
+	    name: redhat
+	  version: 0.0.0
 EOF
 
 # Make and push the operator bundle

scripts/create-redhat-registry-secrets.sh

@@ -5,15 +5,13 @@ SCRIPT_DIR=$(dirname "$0")
 
 # shellcheck disable=SC1091 # Not following.
 source "$SCRIPT_DIR"/init-env.sh
-
 oc create secret docker-registry redhat-registry-secret \
-    --docker-server=registry.redhat.io \
-    --docker-username="$LOGIN_REGISTRY" \
-    --docker-password="$PASSWORD_REGISTRY" \
-    [email protected] -n "$TNF_EXAMPLE_CNF_NAMESPACE"
-
+	--docker-server=registry.redhat.io \
+	--docker-username="$LOGIN_REGISTRY" \
+	--docker-password="$PASSWORD_REGISTRY" \
+	[email protected] -n "$TNF_EXAMPLE_CNF_NAMESPACE"
 oc create secret docker-registry redhat-connect-registry-secret \
-    --docker-server=registry.connect.redhat.com \
-    --docker-username="$LOGIN_REGISTRY" \
-    --docker-password="$PASSWORD_REGISTRY" \
-    [email protected] -n "$TNF_EXAMPLE_CNF_NAMESPACE"
+	--docker-server=registry.connect.redhat.com \
+	--docker-username="$LOGIN_REGISTRY" \
+	--docker-password="$PASSWORD_REGISTRY" \
+	[email protected] -n "$TNF_EXAMPLE_CNF_NAMESPACE"

scripts/delete-debug-ds.sh

@@ -7,5 +7,7 @@ SCRIPT_DIR=$(dirname "$0")
 source "$SCRIPT_DIR"/init-env.sh
 
 # Delete debug daemonset
-oc delete  daemonsets.apps/debug -n "${DEFAULT_NAMESPACE}" --ignore-not-found=true
-until [[ -z "$(oc get ds debug -n "${DEFAULT_NAMESPACE}" 2>/dev/null)" ]]; do sleep 5; done
+oc delete daemonsets.apps/debug -n "${DEFAULT_NAMESPACE}" --ignore-not-found=true
+until [[ -z "$(oc get ds debug -n "${DEFAULT_NAMESPACE}" 2>/dev/null)" ]]; do
+	sleep 5
+done

scripts/delete-istio.sh

@@ -2,19 +2,17 @@
 
 # Initialization
 SCRIPT_DIR=$(dirname "$0")
-# shellcheck source=scripts/init-env.sh
-source "$SCRIPT_DIR"/init-env.sh
 
+# shellcheck disable=SC1091 # Not following.
+source "$SCRIPT_DIR"/init-env.sh
 ISTIO_DIR=istio-1.18.0
-
 if [ ! -d "$ISTIO_DIR" ]; then
-    curl -L https://istio.io/downloadIstio | ISTIO_VERSION=1.18.0 sh -
+	curl -L https://istio.io/downloadIstio | ISTIO_VERSION=1.18.0 sh -
 fi
-
 ./$ISTIO_DIR/bin/istioctl uninstall -y --purge
 oc label namespace "$TNF_EXAMPLE_CNF_NAMESPACE" istio-injection-
 if ! $TNF_NON_OCP_CLUSTER; then
-    oc adm policy remove-scc-from-group anyuid system:serviceaccounts:"$TNF_EXAMPLE_CNF_NAMESPACE"
-    oc -n "$TNF_EXAMPLE_CNF_NAMESPACE" delete network-attachment-definition istio-cni
+	oc adm policy remove-scc-from-group anyuid system:serviceaccounts:"$TNF_EXAMPLE_CNF_NAMESPACE"
+	oc -n "$TNF_EXAMPLE_CNF_NAMESPACE" delete network-attachment-definition istio-cni
 fi
 oc delete namespace istio-system

scripts/delete-network-policies.sh

@@ -5,14 +5,13 @@ SCRIPT_DIR=$(dirname "$0")
 
 # shellcheck disable=SC1091 # Not following.
 source "$SCRIPT_DIR"/init-env.sh
-
 oc delete --filename ./test-target/ingress-deny-all-np.yaml --namespace "$TNF_EXAMPLE_CNF_NAMESPACE" --ignore-not-found
 oc delete --filename ./test-target/egress-deny-all-np.yaml --namespace "$TNF_EXAMPLE_CNF_NAMESPACE" --ignore-not-found
 
 # Render the script with vars
 mkdir -p ./temp
 
 # shellcheck disable=SC2002 # Useless cat.
-cat ./test-target/pod-to-pod-np.yaml | TNF_EXAMPLE_CNF_NAMESPACE=$TNF_EXAMPLE_CNF_NAMESPACE "$SCRIPT_DIR"/mo > ./temp/rendered-pod-to-pod-np.yaml
+cat ./test-target/pod-to-pod-np.yaml | TNF_EXAMPLE_CNF_NAMESPACE=$TNF_EXAMPLE_CNF_NAMESPACE "$SCRIPT_DIR"/mo >./temp/rendered-pod-to-pod-np.yaml
 oc delete --filename ./temp/rendered-pod-to-pod-np.yaml --namespace "$TNF_EXAMPLE_CNF_NAMESPACE" --ignore-not-found
 rm ./temp/rendered-pod-to-pod-np.yaml

scripts/delete-operator-crd-scaling.sh

@@ -7,8 +7,8 @@ source "$SCRIPT_DIR"/init-env.sh
 
 # Skip the delete if MacOS
 if [[ "$(uname -s)" == "Darwin"* ]]; then
-  echo "Skipping operator crd scaling delete on MacOS"
-  exit 0
+	echo "Skipping operator crd scaling delete on MacOS"
+	exit 0
 fi
 
 # clone the repo

scripts/delete-pod-disruption-budget.sh

@@ -10,6 +10,6 @@ source "$SCRIPT_DIR"/init-env.sh
 mkdir -p ./temp
 
 # shellcheck disable=SC2002 # Useless cat.
-cat ./test-target/pod-disruption-budget.yaml | APP_1="testdp" APP_2="testss" "$SCRIPT_DIR"/mo > ./temp/rendered-pod-disruption-budget-template.yaml
+cat ./test-target/pod-disruption-budget.yaml | APP_1="testdp" APP_2="testss" "$SCRIPT_DIR"/mo >./temp/rendered-pod-disruption-budget-template.yaml
 oc delete --filename ./temp/rendered-pod-disruption-budget-template.yaml --namespace "$TNF_EXAMPLE_CNF_NAMESPACE" --ignore-not-found=true
 rm ./temp/rendered-pod-disruption-budget-template.yaml

scripts/delete-prometheus-operator.sh

@@ -5,10 +5,8 @@ SCRIPT_DIR=$(dirname "$0")
 
 # shellcheck disable=SC1091 # Not following.
 source "$SCRIPT_DIR"/init-env.sh
-
-if ! $TNF_NON_OCP_CLUSTER;then
+if ! $TNF_NON_OCP_CLUSTER; then
 	echo "OCP cluster detected, skipping prometheus operator deletion"
 	exit 0
 fi
-
-oc delete  --filename ./kube-prometheus -n "monitoring" --ignore-not-found=true
+oc delete --filename ./kube-prometheus -n "monitoring" --ignore-not-found=true