tools/provision.sh: fix unbound variable bug if no OCI secrets are set

This was hit in c9s CI: https://gitlab.com/redhat/centos-stream/rpms/osbuild-composer/-/merge_requests/88 https://artifacts.dev.testing-farm.io/658332f8-8705-4727-84d3-f27b57775037/ ``` /usr/libexec/osbuild-composer-test/provision.sh: line 141: OCI_SECRETS: unbound variable ``` Signed-off-by: Tomáš Hozza <[email protected]>
osbuild · Sep 26, 2023 · 5903aad · 5903aad
1 parent 41aacd8
commit 5903aad
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/tools/provision.sh b/tools/provision.sh
@@ -137,17 +137,18 @@ EOF
     fi
 
     # if OCI credentials are defined in the ENV, add them to the worker's configuration
+    OCI_SECRETS="${OCI_SECRETS:-}"
+    OCI_PRIVATE_KEY="${OCI_PRIVATE_KEY:-}"
+    if [[ -n "$OCI_SECRETS" && -n "$OCI_PRIVATE_KEY" ]]; then
+        OCI_USER=$(jq -r '.user' "$OCI_SECRETS")
+        OCI_TENANCY=$(jq -r '.tenancy' "$OCI_SECRETS")
+        OCI_REGION=$(jq -r '.region' "$OCI_SECRETS")
+        OCI_FINGERPRINT=$(jq -r '.fingerprint' "$OCI_SECRETS")
+        OCI_BUCKET_NAME=$(jq -r '.bucket' "$OCI_SECRETS")
+        OCI_NAMESPACE=$(jq -r '.namespace' "$OCI_SECRETS")
+        OCI_COMPARTMENT=$(jq -r '.compartment' "$OCI_SECRETS")
+        OCI_PRIV_KEY=$(cat "$OCI_PRIVATE_KEY")
 
-    OCI_USER=$(jq -r '.user' "$OCI_SECRETS")
-    OCI_TENANCY=$(jq -r '.tenancy' "$OCI_SECRETS")
-    OCI_REGION=$(jq -r '.region' "$OCI_SECRETS")
-    OCI_FINGERPRINT=$(jq -r '.fingerprint' "$OCI_SECRETS")
-    OCI_BUCKET_NAME=$(jq -r '.bucket' "$OCI_SECRETS")
-    OCI_NAMESPACE=$(jq -r '.namespace' "$OCI_SECRETS")
-    OCI_COMPARTMENT=$(jq -r '.compartment' "$OCI_SECRETS")
-    OCI_PRIV_KEY=$(cat "$OCI_PRIVATE_KEY")
-
-    if [[ -n "$OCI_TENANCY" ]]; then
         set +x
         sudo tee /etc/osbuild-worker/oci-credentials.toml > /dev/null << EOF
 user = "$OCI_USER"