Skip to content

Commit 6c2b7cb

Browse files
authored
Merge pull request #280 from NetApp/fix_cf_extension_scripts
Changed the way to get the default region from the aws cli.
2 parents a2a0559 + 82bca71 commit 6c2b7cb

6 files changed

Lines changed: 6 additions & 6 deletions

File tree

Infrastructure_as_Code/CloudFormation/NetApp-FSxN-Custom-Resources-Samples/scripts/createClone.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ def usage():
127127
sys.exit(2)
128128
#
129129
# Check that all the required parameters are present.
130-
if secretArn == "" or secretKey == "" or linkArn == "" or fsxId == "" or svmName == "" or parentVolumeName == "" or cloneVolumeName == "":
130+
if secretArn == "" or secretKey == "" or linkArn == "" or fsxId == "" or svmName == "" or parentVolumeName == "" or cloneVolumeName == "" or region == "":
131131
print("Missing required parameters.")
132132
usage()
133133
sys.exit(1)

Infrastructure_as_Code/CloudFormation/NetApp-FSxN-Custom-Resources-Samples/scripts/create_SM_relationship

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ destinationAggregate="aggr1"
3939
template=""
4040
#
4141
# Get the default region from the AWS CLI configuration
42-
region=$(aws configure list | awk '/region/{print $2}')
42+
region=$(aws configure get region)
4343
#
4444
# Parse the command line arguments
4545
while [ ! -z "$1" ]; do

Infrastructure_as_Code/CloudFormation/NetApp-FSxN-Custom-Resources-Samples/scripts/create_clone

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ parentVolumeName=""
2727
cloneVolumeName=""
2828
template=""
2929

30-
region=$(aws configure list | awk '/region/{print $2}')
30+
region=$(aws configure get region)
3131

3232
while getopts "hr:l:s:k:f:v:p:c:t:" opt; do
3333
case $opt in

Infrastructure_as_Code/CloudFormation/NetApp-FSxN-Custom-Resources-Samples/scripts/create_export_policy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protocols="any"
3030
matchCidr="0.0.0.0/0"
3131
template=""
3232

33-
region=$(aws configure list | awk '/region/{print $2}')
33+
region=$(aws configure get region)
3434

3535
while getopts "hr:l:s:k:f:v:n:p:c:t:" opt; do
3636
case $opt in

Infrastructure_as_Code/CloudFormation/NetApp-FSxN-Custom-Resources-Samples/scripts/create_snapshot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ volumeName=""
2727
snapshotName=""
2828
template=""
2929

30-
region=$(aws configure list | awk '/region/{print $2}')
30+
region=$(aws configure get region)
3131

3232
while getopts "hr:l:s:k:f:v:n:p:t:" opt; do
3333
case $opt in

Infrastructure_as_Code/CloudFormation/NetApp-FSxN-Custom-Resources-Samples/scripts/create_volume

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ svmName=""
2929
size="$((20*1024*1024))"
3030
aggregates="aggr1"
3131

32-
region=$(aws configure list | awk '/region/{print $2}')
32+
region=$(aws configure get region)
3333

3434
while getopts "hr:l:s:k:f:v:n:z:a:t:" opt; do
3535
case $opt in

0 commit comments

Comments
 (0)