Merge branch 'main' into cloud-formation-script

Author: kcantrel

Management-Utilities/Workload-Factory-API-Samples/bluexp_organization_delete

@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# This script adds an organization to a BlueXP account.
+# This script deletes an organization from a BlueXP account.
 #
 ################################################################################
 # Display usage information then exists the script.

Management-Utilities/Workload-Factory-API-Samples/list_bluexp_workspaces

@@ -14,16 +14,15 @@
 ################################################################################
 usage () {
   cat >&2 <<EOF
-This script is used to list all the BlueXP connectors that you have access to.
+This script is used to list all the BlueXP workspaces that you have access to.
 
-Usage is: $(basename $0) -t refresh_token -a blueXP_account_ID [-x]
+Usage is: $(basename $0) -t refresh_token -a blueXP_account_ID
 
 Where: refresh_token - Is a refresh token used to obtain an access token needed
                        to run the Workload Factory APIs. You can obtain a refresh
                        token by going to https://services.cloud.netapp.com/refresh-token
        blueXP_account_ID - is the BlueXP account ID. Run 'list_bluexp_accts' to get a
                            list of accounts you have access to.
-      -x - Means to show all the inactive connectors as well.
 
 Note, instead of passing parameters on the command line, you can set the
 following environment variables instead:
@@ -55,12 +54,10 @@ fi
 . "$wf_utils"
 #
 # Parse the command line options.
-showAll=false
-while getopts ht:a:x opt; do
+while getopts ht:a: opt; do
   case $opt in
     t) REFRESH_TOKEN="$OPTARG" ;;
     a) BLUEXP_ACCOUNT_ID="$OPTARG" ;;
-    x) showAll=true ;;
     *) usage ;;
   esac
 done

Management-Utilities/Workload-Factory-API-Samples/list_filesystems

@@ -84,7 +84,7 @@ required_options["REFRESH_TOKEN"]='Error: A BlueXP refresh tokon is required to
 required_options["BLUEXP_ACCOUNT_ID"]='Error: A BlueXP account ID is required to run this script.
 You can get the list of accounts you have access to by running the "list_bluexp_accts" script
 found in this GitHub repository: https://github.com/NetApp/FSx-ONTAP-samples-scripts/tree/main/Management-Utilities/Workload-Factory-API-Samples\n\n'
-required_options["CREDENTIALS_ID"]='Error: The ID of the credentials to delete is required.
+required_options["CREDENTIALS_ID"]='Error: The ID of the credentials to use to list the file systems is required.
 You can get a list of credentials by running the "list_credentials" script
 found in this GitHub repository: https://github.com/NetApp/FSx-ONTAP-samples-scripts/tree/main/Management-Utilities/Workload-Factory-API-Samples\n\n'
 required_options["AWS_REGION"]='Error: The AWS region where the file system is located is required.\n\n'
@@ -129,4 +129,28 @@ while [ "$nextToken" != "null" ]; do
   fi
   nextToken=$(jq -r '.nextToken' $tmpout)
 done
+
+jq_query='.items[] | .clusterUuid + "," + .name + ",N/A,On-Prem," + if(.connected) then "AVAILABLE" else "UNKNOWN" end'
+run_curl GET "$token" "https://api.workloads.netapp.com/accounts/${BLUEXP_ACCOUNT_ID}/onprem/v1/onprems" $tmpout $tmperr
+if jq -r "$jq_query" $tmpout >> $tmpout2 2> $tmperr; then
+  :
+else
+  echo "Error: Failed to parse the output from the API." >&2
+  cat $tmperr >&2
+  exit 1
+fi
+#
+# Check to see if there are more.
+nextToken=$(jq -r '.nextToken' $tmpout)
+while [ "$nextToken" != "null" ]; do
+  run_curl GET "$token" "https://api.workloads.netapp.com/accounts/${BLUEXP_ACCOUNT_ID}/onprem/v1/onprems?${nextToken}" $tmpout $tmperr
+  if jq -r "$jq_query" $tmpout >> $tmpout2 2> $tmperr; then
+    :
+  else
+    echo "Error: Failed to parse the output from the API." >&2
+    cat $tmperr >&2
+    exit 1
+  fi
+  nextToken=$(jq -r '.nextToken' $tmpout)
+done
 sort -t, -f -k 2,2 $tmpout2 | column -t -s, -N ID,Name,Region,Deployment_Type,Status

Management-Utilities/Workload-Factory-API-Samples/list_links

@@ -94,10 +94,9 @@ if [ -z "$token" ]; then
   exit 1
 fi
 
-jq_query='.items[] | if(.cloudResourceId == null) then "\(.name);\(.id);\(.state.status);\(.region);\(.vpcId);N/A;\(.associatedTargets.items)" else "\(.name);\(.id);\(.state.status);\(.region);\(.vpcId);\(.cloudResourceId | split(":") | .[6]);\(.associatedTargets.items)" end'
+jq_query='.items[] | if(.type == "connector") then "\(.name);\(.id);\(.type);\(.state.status);N/A;N/A;N/A;\(.associatedTargets.items)" else "\(.name);\(.id);\(.type);\(.state.status);\(.region);\(.vpcId);\(.cloudResourceId | split(":") | .[6]);\(.associatedTargets.items)" end'
 
-filter=$(urlencode "type eq 'lambda'")
-run_curl GET "$token" "https://api.workloads.netapp.com/accounts/${BLUEXP_ACCOUNT_ID}/links/v1/links?filter=${filter}&include=associatedTargets,state,features" $tmpout $tmperr
+run_curl GET "$token" "https://api.workloads.netapp.com/accounts/${BLUEXP_ACCOUNT_ID}/links/v1/links?include=associatedTargets,state,features" $tmpout $tmperr
 if jq -r "$jq_query" $tmpout > $tmpout2 2> $tmperr; then
   :
 else
@@ -124,4 +123,4 @@ done
 if [ ! -z "$COLUMNS" ]; then
   colsOpt="-c $COLUMNS -W Associations"
 fi
-column -t -s\; -N "Name,Link ID,Status,Region,VPC,Lambda Name,Associations" $colsOpt $tmpout2
+column -t -s\; -N "Name,Link ID,Type,Status,Region,VPC,Lambda Name,Associations" $colsOpt $tmpout2

Management-Utilities/Workload-Factory-API-Samples/snapmirror_create

@@ -26,14 +26,14 @@ Where: refresh_token - Is a refresh token used to obtain an access token needed
                        token by going to https://services.cloud.netapp.com/refresh-token
        blueXP_account_ID - is the BlueXP account ID. Run 'list_bluexp_accts' to get a
                            list of accounts you have access to
-       aws_region - is the AWS region where you want the list of FSx file system from.
        throttle - is the network throughput limit during transfers (optional, defaults to 100 MiB/s. 0 means unlimited)
        schedule - is the schedule to use for the SnapMirror relationship (optional, defaults to "hourly")
 
        source_credentials_ID - is the Workload Factory credentials ID for the AWS account. Run
-                              'list_credentials' to get a list of credentials you have access to
-       source_aws_region - is the AWS region of the source file system
-       source_fs_ID - is the file system ID of the FSx file system that is the source of the SnapMirror relationship
+                              'list_credentials' to get a list of credentials you have access to.
+       source_aws_region - is the AWS region of the source file system. Not required if the source is on-prem.
+       source_fs_ID - is the file system ID of the file system that is the source of the SnapMirror relationship. Run
+                      'list_filesystems' to get a list of file systems you have access to.
        source_svm_ID - is the SVM ID on the source file system where you want the volume replicated from
        source_svm_name - is the name of the SVM on the source file system where you want the volume replicated from
        source_type - is the file system type of the source cluster. Either 'FSx' or 'on-prem' (optional, defaults to "FSx")

Management-Utilities/Workload-Factory-API-Samples/wf_utils

@@ -24,8 +24,6 @@
 get_token() {
 
   tokenFile="$HOME/.blueXP_token"
-  tmpfile=$(mktemp -t get_token.XXXXXX)
-  trap 'rm -f "$tmpfile"' RETURN
 
   if [ -z "$REFRESH_TOKEN" ]; then
     echo "Error: The REFRESH_TOKEN environment variable has not been set." >&2
@@ -55,14 +53,13 @@ get_token() {
   fi
 
   if [ $createToken == "true" ]; then
-    curl -s -X POST 'https://netapp-cloud-account.auth0.com/oauth/token' \
+    token=$(curl -s -X POST 'https://netapp-cloud-account.auth0.com/oauth/token' \
     -H 'Content-Type: application/json' \
     --data-raw '{
       "grant_type": "refresh_token",
       "refresh_token": "'$REFRESH_TOKEN'",
       "client_id": "Mu0V1ywgYteI6w1MbD15fKfVIUrNXGWC"
-    }' > $tmpfile 2>&1
-    token=$(sed -ne 's/."access_token":"\([^"]*\).*/\1/p' < $tmpfile)
+    }' | sed -ne 's/."access_token":"\([^"]*\).*/\1/p')
 
     if [ -z "$token" ]; then
       echo "Error: Unable to obtain a bearer token. Error message:" >&2
@@ -97,7 +94,13 @@ run_curl () {
   errorOutput="$5"
   data="$6"
   accept="$7"
-  shift 7
+
+  if [ -z "$accept" ]; then
+    accept="application/json, text/plain, */*"
+    shift 6
+  else
+    shift 7
+  fi
 
   declare -a extraHeaders
   while [ $# -gt 0 ]; do
@@ -112,27 +115,27 @@ run_curl () {
     echo "Error: Missing required parameters for run_curl function." >&2
     exit 1
   fi
-  if [ -z "$accept" ]; then
-    accept="application/json, text/plain, */*"
-  fi
+  #
+  # Since older versions of curl don't support the %{stderr} variable, using the -o option
+  # to redirect output to the $output file and getting the http_code from standard out.
   case "$method" in
     GET)
-      curl -sw "%{stderr}%{http_code},%{errormsg}" "$url" \
+      curl -sw "%{http_code},%{errormsg}" "$url" \
          -H "Accept: $accept" "${extraHeaders[@]}" \
-         -H "Authorization: Bearer $token" > $output 2> $errorOutput
+         -H "Authorization: Bearer $token" -o $output > $errorOutput
       exitCode=$?
       ;;
     POST|PUT)
-      curl -X "$method" -sw "%{stderr}%{http_code},%{errormsg}" "$url" \
+      curl -X "$method" -sw "%{http_code},%{errormsg}" "$url" \
          -H "Accept: $accept" "${extraHeaders[@]}" \
          -H "Content-Type:application/json" \
-         -H "Authorization: Bearer $token" --data "$data" > $output 2> $errorOutput
+         -H "Authorization: Bearer $token" --data "$data" -o $output > $errorOutput
       exitCode=$?
       ;;
     DELETE)
-      curl -X DELETE -sw "%{stderr}%{http_code},%{errormsg}" "$url" \
+      curl -X DELETE -sw "%{http_code},%{errormsg}" "$url" \
          -H "Accept: $accept" "${extraHeaders[@]}" \
-         -H "Authorization: Bearer $token" > $output 2> $errorOutput
+         -H "Authorization: Bearer $token" -o $output > $errorOutput
       exitCode=$?
       ;;
     *)