From 5903aad07b79e6ec26d11b4a572544623df33ebe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= <thozza@redhat.com>
Date: Thu, 21 Sep 2023 13:26:17 +0200
Subject: [PATCH] tools/provision.sh: fix unbound variable bug if no OCI
 secrets are set
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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 <thozza@redhat.com>
---
 tools/provision.sh | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/tools/provision.sh b/tools/provision.sh
index 1ede409e8..3769afe4d 100755
--- 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"