From d1dc50f0441898fbebdb80f5ab5ba2936e883268 Mon Sep 17 00:00:00 2001
From: Jeff Bachtel <70534449+mariadb-JeffBachtel@users.noreply.github.com>
Date: Thu, 13 May 2021 15:36:26 -0600
Subject: [PATCH 1/3] Create -e option for skipping AWS profile use

Allow STS credentials in environment more easily
---
 lw_aws_inventory.sh | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/lw_aws_inventory.sh b/lw_aws_inventory.sh
index fbd5652..e8e0d01 100755
--- a/lw_aws_inventory.sh
+++ b/lw_aws_inventory.sh
@@ -3,6 +3,7 @@
 # Requirements: awscli, jq
 
 # You can specify a profile with the -p flag, or get JSON output with the -j flag.
+# You can specify to use environment variables and not specify a profile with -e flag.
 # Note that the script takes a while to run in large accounts with many resources.
 
 
@@ -17,6 +18,9 @@ while getopts ":jp:" opt; do
     j )
       JSON="true"
       ;;
+    e )
+      SKIP_PROFILE="true"
+      ;;
     \? )
       echo "Usage: ./lw_aws_inventory.sh [-p profile] [-j]" 1>&2
       exit 1
@@ -37,38 +41,44 @@ ELB_V1=0
 ELB_V2=0
 NAT_GATEWAYS=0
 
+if [ "x$SKIP_PROFILE" = "xtrue" ]; then
+  AWS_PROFILE_STR=""
+else
+  AWS_PROFILE_STR="--profile $AWS_PROFILE"
+fi
+
 function getRegions {
-  aws --profile $AWS_PROFILE ec2 describe-regions --output json | jq -r '.[] | .[] | .RegionName'
+  aws $AWS_PROFILE_STR ec2 describe-regions --output json | jq -r '.[] | .[] | .RegionName'
 }
 
 function getInstances {
   region=$1
-  aws --profile $AWS_PROFILE ec2 describe-instances --query 'Reservations[*].Instances[*].[InstanceId]' --region $r --output json --no-paginate | jq 'flatten | length'
+  aws $AWS_PROFILE_STR ec2 describe-instances --query 'Reservations[*].Instances[*].[InstanceId]' --region $r --output json --no-paginate | jq 'flatten | length'
 }
 
 function getRDSInstances {
   region=$1
-  aws --profile $AWS_PROFILE rds describe-db-instances --region $r --output json --no-paginate | jq '.DBInstances | length'
+  aws $AWS_PROFILE_STR rds describe-db-instances --region $r --output json --no-paginate | jq '.DBInstances | length'
 }
 
 function getRedshift {
   region=$1
-  aws --profile $AWS_PROFILE redshift describe-clusters --region $r --output json --no-paginate | jq '.Clusters | length'
+  aws $AWS_PROFILE_STR redshift describe-clusters --region $r --output json --no-paginate | jq '.Clusters | length'
 }
 
 function getElbv1 {
   region=$1
-  aws --profile $AWS_PROFILE elb describe-load-balancers --region $r  --output json --no-paginate | jq '.LoadBalancerDescriptions | length'
+  aws $AWS_PROFILE_STR elb describe-load-balancers --region $r  --output json --no-paginate | jq '.LoadBalancerDescriptions | length'
 }
 
 function getElbv2 {
   region=$1
-  aws --profile $AWS_PROFILE elbv2 describe-load-balancers --region $r --output json --no-paginate | jq '.LoadBalancers | length'
+  aws $AWS_PROFILE_STR elbv2 describe-load-balancers --region $r --output json --no-paginate | jq '.LoadBalancers | length'
 }
 
 function getNatGateways {
   region=$1
-  aws --profile $AWS_PROFILE ec2 describe-nat-gateways --region $r --output json --no-paginate | jq '.NatGateways | length'
+  aws $AWS_PROFILE_STR ec2 describe-nat-gateways --region $r --output json --no-paginate | jq '.NatGateways | length'
 }
 
 for r in $(getRegions); do

From ad0f8b4489843b9b1f8c181adc3bd178cada026e Mon Sep 17 00:00:00 2001
From: Jeff Bachtel <70534449+mariadb-JeffBachtel@users.noreply.github.com>
Date: Thu, 13 May 2021 16:32:16 -0600
Subject: [PATCH 2/3] Missing flag

---
 lw_aws_inventory.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lw_aws_inventory.sh b/lw_aws_inventory.sh
index e8e0d01..3fb526b 100755
--- a/lw_aws_inventory.sh
+++ b/lw_aws_inventory.sh
@@ -10,7 +10,7 @@
 AWS_PROFILE=default
 
 # Usage: ./lw_aws_inventory.sh
-while getopts ":jp:" opt; do
+while getopts ":jpe:" opt; do
   case ${opt} in
     p )
       AWS_PROFILE=$OPTARG

From 55e92ee655b9904f4fc89b2adc1b4fc4d6bba898 Mon Sep 17 00:00:00 2001
From: Jeff Bachtel <70534449+mariadb-JeffBachtel@users.noreply.github.com>
Date: Thu, 13 May 2021 16:35:00 -0600
Subject: [PATCH 3/3] Clean up

---
 lw_aws_inventory.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lw_aws_inventory.sh b/lw_aws_inventory.sh
index 3fb526b..c5e1650 100755
--- a/lw_aws_inventory.sh
+++ b/lw_aws_inventory.sh
@@ -10,7 +10,7 @@
 AWS_PROFILE=default
 
 # Usage: ./lw_aws_inventory.sh
-while getopts ":jpe:" opt; do
+while getopts ":jep:" opt; do
   case ${opt} in
     p )
       AWS_PROFILE=$OPTARG
@@ -22,11 +22,11 @@ while getopts ":jpe:" opt; do
       SKIP_PROFILE="true"
       ;;
     \? )
-      echo "Usage: ./lw_aws_inventory.sh [-p profile] [-j]" 1>&2
+      echo "Usage: ./lw_aws_inventory.sh [-p profile] [-e] [-j]" 1>&2
       exit 1
       ;;
     : )
-      echo "Usage: ./lw_aws_inventory.sh [-p profile] [-j]" 1>&2
+      echo "Usage: ./lw_aws_inventory.sh [-p profile] [-e] [-j]" 1>&2
       exit 1
       ;;
   esac