get api_key from an env variable

contrib/containerized-pbench/pbench_demo

@@ -20,10 +20,19 @@ export PB_AGENT_IMAGE_NAME=quay.io/pbench/pbench-agent-all-fedora-36:main
 
 mkdir -p ${FIOTEST}
 
-# Before we run the demo, we need a Pbench authentication token. The token
-# location need to be supplied to this script as an argument.
-token_location=$1
-token=$(< ${token_location})
+# Before we run the demo, we need a Pbench API key. The key can be an
+# environment variable of PBENCH_API_KEY or need to be supplied to this
+# script as an argument.
+if [[ $# == 1 ]]; then
+  api_key=$1
+else
+  api_key=${PBENCH_API_KEY}
+fi
+
+if [[ -z "${api_key}" ]]; then
+  echo "PBENCH_API_KEY is not provided"
+  exit 1
+fi
 #+
 # Run the demo!
 #-
@@ -33,5 +42,4 @@ pbench pbench-user-benchmark --config example-workload -- \
     fio --directory=/fiotest --name fio_test_file --direct=1 --rw=randread \
         --bs=16k --size=100M --numjobs=8 --time_based --runtime=5s \
         --group_reporting --norandommap
-# Note that the token file location below is evaluated -outside- the container.
-pbench pbench-results-move --token=token
+pbench pbench-results-move --token=${api_key}

server/pbenchinacan/load-canned-data.sh

@@ -31,9 +31,17 @@ then
   exit 2
 fi
 
-# Get the Pbench authentication token
-token_location=$1
-token=$(< ${token_location})
+# Get the Pbench authentication API_KEY
+if [[ $# == 1 ]]; then
+  api_key=$1
+else
+  api_key=${PBENCH_API_KEY}
+fi
+
+if [[ -z "${api_key}" ]]; then
+  echo "PBENCH_API_KEY is not provided"
+  exit 1
+fi
 
 # We skip test-7.8, test-7.12, and test-7.15, which have controllers that are
 # not legal nodenames, so the server refuses to accept them.  We skip test-7.14,
@@ -52,7 +60,7 @@ done
 for ctlr_dir in ${tmp}/pbench/archive/fs-version-001/*; do
   for tarball in ${ctlr_dir}/*.tar.xz; do
     echo "Pushing $(basename ${ctlr_dir}) $(basename ${tarball}):"
-    pbench-results-push --token ${token} $(basename ${ctlr_dir}) ${tarball}
+    pbench-results-push --token ${api_key} $(basename ${ctlr_dir}) ${tarball}
   done
 done