Update test scripts to credentials from json config file

openworkload · Aug 11, 2024 · d33d1c2 · d33d1c2
1 parent 6636bdf
commit d33d1c2
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 30 deletions.
diff --git a/scripts/azure/api/create-partition.sh b/scripts/azure/api/create-partition.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source ~/.swm/azure.env
 source $(dirname "$0")/helpers.sh
 
+CREDS=$(read_credentials azure)
 CERT=~/.swm/cert.pem
 KEY=~/.swm/key.pem
 CA=/opt/swm/spool/secure/cluster/ca-chain-cert.pem
@@ -13,9 +13,9 @@ HOST=$(hostname -s)
 
 REQUEST=POST
 HEADER1="Accept: application/json"
-HEADER2="subscriptionid: ${SUBSCRIPTION_ID}"
-HEADER3="tenantid: ${TENANT_ID}"
-HEADER4="appid: ${APP_ID}"
+HEADER2="subscriptionid: $(echo $CREDS | jq -r '.subscription_id')"
+HEADER3="tenantid: $(echo $CREDS | jq -r '.tenant_id')"
+HEADER4="appid: $(echo $CREDS | jq -r '.app_id')"
 HEADER5="osversion: ubuntu-22.04"
 HEADER6="containerimage: swmregistry.azurecr.io/jupyter/datascience-notebook:hub-3.1.1"
 HEADER7="containerregistryuser: $ACR_TOKEN_NAME"

diff --git a/scripts/azure/api/delete-partition.sh b/scripts/azure/api/delete-partition.sh
@@ -3,9 +3,9 @@
 PARTIOTION_ID=$1
 #PARTITION_ID=/subscriptions/3f2fc2c5-8446-4cd5-af2f-a6af7f85ea75/resourceGroups/swm-02ccc5c0-resource-group
 
-source ~/.swm/azure.env
 source $(dirname "$0")/helpers.sh
 
+CREDS=$(read_credentials azure)
 CERT=~/.swm/cert.pem
 KEY=~/.swm/key.pem
 CA=/opt/swm/spool/secure/cluster/ca-chain-cert.pem
@@ -16,9 +16,9 @@ HOST=$(hostname -s)
 
 REQUEST=DELETE
 HEADER1="Accept: application/json"
-HEADER2="subscriptionid: ${SUBSCRIPTION_ID}"
-HEADER3="tenantid: ${TENANT_ID}"
-HEADER4="appid: ${APP_ID}"
+HEADER2="subscriptionid: $(echo $CREDS | jq -r '.subscription_id')"
+HEADER3="tenantid: $(echo $CREDS | jq -r '.tenant_id')"
+HEADER4="appid: $(echo $CREDS | jq -r '.app_id')"
 URL="https://${HOST}:${PORT}/azure/partitions/$PARTIOTION_ID"
 BODY='{"pem_data": '${PEM_DATA}'}'
 

diff --git a/scripts/azure/api/get-image.sh b/scripts/azure/api/get-image.sh
@@ -3,9 +3,9 @@
 IMAGE_ID=$1
 #IMAGE_ID=/Subscriptions/3f2fc2c5-8446-4cd5-af2f-a6af7f85ea75/Providers/Microsoft.Compute/Locations/eastus/Publishers/Canonical/ArtifactTypes/VMImage/Offers/0001-com-ubuntu-server-jammy/Skus/22_04-lts/Versions/22.04.202407010
 
-source ~/.swm/azure.env
 source $(dirname "$0")/helpers.sh
 
+CREDS=$(read_credentials azure)
 CERT=~/.swm/cert.pem
 KEY=~/.swm/key.pem
 CA=/opt/swm/spool/secure/cluster/ca-chain-cert.pem
@@ -16,15 +16,19 @@ HOST=$(hostname -s)
 
 REQUEST=GET
 HEADER1="Accept: application/json"
-HEADER2="subscriptionid: ${SUBSCRIPTION_ID}"
-HEADER3="tenantid: ${TENANT_ID}"
-HEADER4="appid: ${APP_ID}"
+HEADER2="subscriptionid: $(echo $CREDS | jq -r '.subscription_id')"
+HEADER3="tenantid: $(echo $CREDS | jq -r '.tenant_id')"
+HEADER4="appid: $(echo $CREDS | jq -r '.app_id')"
 URL="https://${HOST}:${PORT}/azure/images/${IMAGE_ID}"
 BODY='{"pem_data": '${PEM_DATA}'}'
 
 echo $URL
 echo
 
+echo $HEADER2
+echo $HEADER3
+echo $HEADER4
+
 json=$(curl --request ${REQUEST}\
      --cacert ${CA}\
      --cert ${CERT}\

diff --git a/scripts/azure/api/get-partition.sh b/scripts/azure/api/get-partition.sh
@@ -3,9 +3,9 @@
 PARTITION_ID=$1
 #PARTITION_ID=/subscriptions/3f2fc2c5-8446-4cd5-af2f-a6af7f85ea75/resourceGroups/swm-02ccc5c0-resource-group
 
-source ~/.swm/azure.env
 source $(dirname "$0")/helpers.sh
 
+CREDS=$(read_credentials azure)
 CERT=~/.swm/cert.pem
 KEY=~/.swm/key.pem
 CA=/opt/swm/spool/secure/cluster/ca-chain-cert.pem
@@ -16,8 +16,8 @@ HOST=$(hostname -s)
 
 REQUEST=GET
 HEADER1="Accept: application/json"
-HEADER2="tenantid: ${TENANT_ID}"
-HEADER3="appid: ${APP_ID}"
+HEADER2="tenantid: $(echo $CREDS | jq -r '.tenant_id')"
+HEADER3="appid: $(echo $CREDS | jq -r '.app_id')"
 URL="https://${HOST}:${PORT}/azure/partitions/${PARTITION_ID}"
 BODY='{"pem_data": '${PEM_DATA}'}'
 

diff --git a/scripts/azure/api/helpers.sh b/scripts/azure/api/helpers.sh
@@ -1,4 +1,4 @@
-function make_pem_data() {
+make_pem_data() {
     local cert=$1
     local key=$2
     local joined_content
@@ -11,3 +11,21 @@ function make_pem_data() {
 
     printf "%s" "$joined_content"
 }
+
+read_credentials() {
+    local provider="$1"
+    local credentials_file="$HOME/.swm/credentials.json"
+
+    if [[ ! -f "$credentials_file" ]]; then
+        echo "Credentials file not found: $credentials_file" >&2
+        return 1
+    fi
+
+    local credentials=$(jq -r ".$provider" "$credentials_file")
+    if [[ -z "$credentials" ]]; then
+        echo "Provider '$provider' not found in credentials file" >&2
+        return 1
+    fi
+
+    echo "$credentials"
+}
diff --git a/scripts/azure/api/list-flavors.sh b/scripts/azure/api/list-flavors.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
-source ~/.swm/azure.env
 source $(dirname "$0")/helpers.sh
 
+CREDS=$(read_credentials azure)
 CERT=~/.swm/cert.pem
 KEY=~/.swm/key.pem
 CA=/opt/swm/spool/secure/cluster/ca-chain-cert.pem
@@ -13,9 +13,9 @@ HOST=$(hostname -s)
 
 REQUEST=GET
 HEADER1="Accept: application/json"
-HEADER2="subscriptionid: ${SUBSCRIPTION_ID}"
-HEADER3="tenantid: ${TENANT_ID}"
-HEADER4="appid: ${APP_ID}"
+HEADER2="subscriptionid: $(echo $CREDS | jq -r '.subscription_id')"
+HEADER3="tenantid: $(echo $CREDS | jq -r '.tenant_id')"
+HEADER4="appid: $(echo $CREDS | jq -r '.app_id')"
 HEADER5="location: eastus"
 URL="https://${HOST}:${PORT}/azure/flavors"
 BODY='{"pem_data": '${PEM_DATA}'}'

diff --git a/scripts/azure/api/list-images.sh b/scripts/azure/api/list-images.sh
@@ -1,14 +1,13 @@
 #!/bin/bash
 
-source ~/.swm/azure.env
 source $(dirname "$0")/helpers.sh
 
+CREDS=$(read_credentials azure)
 CERT=~/.swm/cert.pem
 KEY=~/.swm/key.pem
 CA=/opt/swm/spool/secure/cluster/ca-chain-cert.pem
 PEM_DATA=$(make_pem_data $CERT $KEY)
 
-LOCATION=eastus
 PUBLISHER=Canonical
 OFFER=0001-com-ubuntu-server-jammy
 #SKUS=22_04-lts
@@ -18,10 +17,10 @@ HOST=$(hostname -s)
 
 REQUEST=GET
 HEADER1="Accept: application/json"
-HEADER2="subscriptionid: ${SUBSCRIPTION_ID}"
-HEADER3="tenantid: ${TENANT_ID}"
-HEADER4="appid: ${APP_ID}"
-HEADER5="location: ${LOCATION}"
+HEADER2="subscriptionid: $(echo $CREDS | jq -r '.subscription_id')"
+HEADER3="tenantid: $(echo $CREDS | jq -r '.tenant_id')"
+HEADER4="appid: $(echo $CREDS | jq -r '.app_id')"
+HEADER5="location: $(echo $CREDS | jq -r '.location')"
 HEADER6="publisher: ${PUBLISHER}"
 HEADER7="offer: ${OFFER}"
 HEADER8="skus: ${SKUS}"

diff --git a/scripts/azure/api/list-partitions.sh b/scripts/azure/api/list-partitions.sh
@@ -3,9 +3,9 @@
 PARTIOTION_ID=$1
 #PARTITION_ID=/subscriptions/3f2fc2c5-8446-4cd5-af2f-a6af7f85ea75/resourceGroups/swm-02ccc5c0-resource-group
 
-source ~/.swm/azure.env
 source $(dirname "$0")/helpers.sh
 
+CREDS=$(read_credentials azure)
 CERT=~/.swm/cert.pem
 KEY=~/.swm/key.pem
 CA=/opt/swm/spool/secure/cluster/ca-chain-cert.pem
@@ -16,9 +16,9 @@ HOST=$(hostname -s)
 
 REQUEST=GET
 HEADER1="Accept: application/json"
-HEADER2="subscriptionid: ${SUBSCRIPTION_ID}"
-HEADER3="tenantid: ${TENANT_ID}"
-HEADER4="appid: ${APP_ID}"
+HEADER2="subscriptionid: $(echo $CREDS | jq -r '.subscription_id')"
+HEADER3="tenantid: $(echo $CREDS | jq -r '.tenant_id')"
+HEADER4="appid: $(echo $CREDS | jq -r '.app_id')"
 URL="https://${HOST}:${PORT}/azure/partitions"
 BODY='{"pem_data": '${PEM_DATA}'}'