Skip to content

Commit ee9e328

Browse files
committed
Obtained the region from 'aws configuration' in a more supportable way.
1 parent 3d2a8a5 commit ee9e328

File tree

9 files changed

+9
-13
lines changed

9 files changed

+9
-13
lines changed

Management-Utilities/fsx-ontap-aws-cli-scripts/create_fsxn_filesystem

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ done
8686
# Set some defaults.
8787
size=1024
8888
throughput=128
89-
region=$(aws configure list | egrep '^.*egion ' | awk '{print $2}')
89+
region=$(aws configure get region)
9090
securityGroupOption=""
9191
endpointips=""
9292
availType=multi

Management-Utilities/fsx-ontap-aws-cli-scripts/create_fsxn_svm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ else
4646
fi
4747
#
4848
# Set some defaults.
49-
region=$(aws configure list | egrep '^.*egion ' | awk '{print $2}')
49+
region=$(aws configure get region)
5050
waitForCompletion=false
5151
maxIterations=24
5252
sleepTime=5

Management-Utilities/fsx-ontap-aws-cli-scripts/create_fsxn_volume

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ intergerRegex='^[0-9]+$'
5252
#
5353
# Set some defaults.
5454
size=20
55-
region=$(aws configure list | egrep '^.*egion ' | awk '{print $2}')
55+
region=$(aws configure get region)
5656
waitForCompletion=false
5757
volumeStyle="flexvol"
5858
aggregateOption=""

Management-Utilities/fsx-ontap-aws-cli-scripts/delete_fsxn_filesystem

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ for cmd in jq aws delete_fsxn_svm delete_fsxn_volume; do
8383
done
8484
#
8585
# Get the default region.
86-
region=$(aws configure list | egrep '^.*egion ' | awk '{print $2}')
86+
region=$(aws configure get region)
8787
enableBackup=false
8888
waitForCompletion=false
8989
#

Management-Utilities/fsx-ontap-aws-cli-scripts/delete_fsxn_svm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ for cmd in aws jq delete_fsxn_volume; do
5151
done
5252
#
5353
# Set any defaults.
54-
region=$(aws configure list | egrep '^.*egion ' | awk '{print $2}')
54+
region=$(aws configure get region)
5555
waitForDelete=false
5656
noQuery=false
5757
enableBackup=false

Management-Utilities/fsx-ontap-aws-cli-scripts/delete_fsxn_volume

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ tmpout=/tmp/delete-volume.$$
7777
trap 'rm -f $tmpout' exit
7878
#
7979
# Set some defaults.
80-
region=$(aws configure list | egrep '^.*egion ' | awk '{print $2}')
80+
region=$(aws configure get region)
8181
skipBackup=true
8282
waitForCompletion=false
8383
quiet=false

Management-Utilities/fsx-ontap-aws-cli-scripts/list_fsxn_filesystems

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ contents=false
7979
showStatus=false
8080
showARN=false
8181
showBackup=false
82-
region=$(aws configure list | egrep '^.*egion ' | awk '{print $2}')
82+
region=$(aws configure get region)
8383
#
8484
# Process command line arguments.
8585
while getopts "bhcxsanr:i:f:" option; do

Management-Utilities/fsx-ontap-aws-cli-scripts/list_fsxn_svms

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fi
5858
allRegions=false
5959
includeFsName=false
6060
includeIp=false
61-
region=$(aws configure list | egrep '^.*egion ' | awk '{print $2}')
61+
region=$(aws configure get region)
6262
while getopts "hanr:i:f:p" option; do
6363
case "$option" in
6464
r) region="$OPTARG"

Management-Utilities/fsx-ontap-aws-cli-scripts/list_fsxn_volumes

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fi
5959
#
6060
# Process command line arguments.
6161
allRegions=false
62-
region=$(aws configure list | egrep '^.*egion ' | awk '{print $2}')
62+
region=$(aws configure get region)
6363
includeFsName=false
6464
excludeRoot=false
6565
filter=""
@@ -103,10 +103,6 @@ fi
103103

104104
if [ ! -z "$fsid" -a -z "$fileSystemName" ]; then
105105
fileSystemName=$(aws fsx describe-file-systems --region $region --output=json 2> /dev/null | jq -r ".FileSystems[] | if(.FileSystemId == \"$fsid\") then (.Tags[] | select(.Key == \"Name\") .Value) else empty end" 2> /dev/null)
106-
if [ -z "$fileSystemName" ]; then
107-
echo "Error, failed to find the file system with the file system ID of '$fsid'." 1>&2
108-
exit 1
109-
fi
110106
filter='--filters [{"Name":"file-system-id","Values":["'$fsid'"]}]'
111107
fi
112108

0 commit comments

Comments
 (0)