updating zone method

Author: brentley

Dockerfile

@@ -7,7 +7,7 @@ WORKDIR /usr/src/app
 RUN apt-get update && apt-get -y install iproute2 curl jq libgmp3-dev ruby-dev build-essential sqlite libsqlite3-dev python3 python3-pip && \
     gem install bundler:1.17.3 && \
     bundle install && \
-    pip3 install awscli && \
+    pip3 install awscli netaddr && \
     apt-get autoremove -y --purge && \
     apt-get remove -y --auto-remove --purge ruby-dev libgmp3-dev build-essential libsqlite3-dev && \
     apt-get clean && \

startup-cdk.sh

@@ -7,7 +7,6 @@ IP=$(ip route show |grep -o src.* |cut -f2 -d" ")
 if [[ ${IP} == "" ]]; then
   IP=$(hostname -i)
 fi
-
 SUBNET=$(echo ${IP} | cut -f1 -d.)
 NETWORK=$(echo ${IP} | cut -f3 -d.)
 
@@ -80,19 +79,18 @@ fi
 # Still no luck? Perhaps we're running fargate!
 if [[ -z ${zone} ]]; then
   export AWS_DEFAULT_REGION=$REGION
-  ip_addr=$(curl -m2 -s ${ECS_CONTAINER_METADATA_URI} | jq '.Networks[].IPv4Addresses[]')
-  declare -a subnets=( $(aws ec2 describe-subnets | jq .Subnets[].CidrBlock| sed ':a;N;$!ba;s/\n/ /g') )
+  ip_addr=$(curl -m2 -s ${ECS_CONTAINER_METADATA_URI} | jq -r '.Networks[].IPv4Addresses[]')
+  declare -a subnets=( $(aws ec2 describe-subnets | jq -r .Subnets[].CidrBlock| sed ':a;N;$!ba;s/\n/ /g') )
   for sub in "${subnets[@]}"; do
-    if $(ruby -e "puts(IPAddr.new($sub.to_s).include? $ip_addr.to_s)") == 'true'; then
-      details=$(aws ec2 describe-subnets | jq -r ".Subnets[] | select(.CidrBlock==$sub)")
-      if [[ $(echo $details | jq .Tags) != "null" ]]; then
-        zone=$(echo $details | jq -r 'select(.Tags[].Value=="ecsworkshop") | .AvailabilityZone' | sort -u | grep -o .$)
-      fi
+    ip_match=$(echo -e "from netaddr import IPNetwork, IPAddress\nif IPAddress('$ip_addr') in IPNetwork('$sub'):\n    print('true')" | python3)
+    if [[ $ip_match == "true" ]];then
+      zone=$(aws ec2 describe-subnets | jq -r --arg sub "$sub" '.Subnets[] | select(.CidrBlock==$sub) | .AvailabilityZone' | grep -o .$)
     fi
   done
 fi
 
 export CODE_HASH="$(cat code_hash.txt)"
+export IP
 export AZ="${IP} in AZ-${zone}"
 
 # exec bundle exec thin start