pcf_blue_green 0.27 → 0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e7d3e5b1c7a229ff7dcce2289072e1b509bb169
-  data.tar.gz: 1f233c982995aea7b941f14b4be4c5de662a8672
+  metadata.gz: 327efdf015700c02e2eb763f3c9615f1446efd75
+  data.tar.gz: 7fd129d6e8b35938a45a88e6d1a4ed28d74389f8
 SHA512:
-  metadata.gz: 3bcf15f653a4b4852afa21d1bf42298ea4b50cba9367f252830149260e0715565a467ec9fc0596b4ac9af46ca7483579d0f7d7888f1926fcf70bb307353d32d3
-  data.tar.gz: 84def66c6415626b510308a80c4c63831006e466fe053a606f9057451f3710b71932ac2a1f73397a95e72e7e13f9f131cb188e39ba9403cb34eaef7143f49ba0
+  metadata.gz: d6a80d063f348fa1c300854bea0bb5b25ea01d5f1bc587cf170e3df03a640a3e03273ec5ef4bec733b065b0c9b707cf0eb329a8c3f7455b385e03871fce573fe
+  data.tar.gz: d5b2b8a3ac2718ddc10a05c36c153b752e7b87571b23a6f24c3bdb71d591711b9c8aa6ccb6321dc1250c3c4413af49764a8171331527a4be503e33dea262c8d5

data/lib/pcf_blue_green/version.rb

@@ -1,3 +1,3 @@
 module PcfBlueGreen
-  VERSION = "0.27"
+  VERSION = "0.28"
 end

data/lib/shared-deploy-functions.sh

@@ -132,37 +132,44 @@ function remap-routes {
   set -x
   run-cmd cf routes
 
-  if [ -z ${sso_hostname+x} ] && [ -z ${handle_all_green_paths+x} ]; then
+  # Variables used:
+
+  # Some applications have extra routes that contain paths. If that's the case
+  # then handle_all_green_paths environmental variable is used to manage paths.
+  # to a different hostname
+
+  # Code logic:
+
+  # execute the code below:
+  if [ -z ${handle_all_green_paths+x} ]; then
     run-cmd cf routes | tail -n +4 | grep ${cf_app} | awk '{print $3" -n "$2}'
     cf routes | tail -n +4 | grep ${cf_app} | awk '{print $3" -n "$2}' |  xargs -n 3 cf map-route ${green}
   fi
-  
-  if [ -n "$sso_hostname" ]; then
-    run-cmd cf routes | tail -n +4 | awk  '($2==ENVIRON["sso_hostname"]) && ($5==ENVIRON["cf_app"]) {print $3" -n "$2 " --path "substr($4,2) }'
-    cf routes | tail -n +4 | awk  '($2==ENVIRON["sso_hostname"]) && ($5==ENVIRON["cf_app"]) {print $3" -n "$2 " --path "substr($4,2) }' |  xargs -n 5 cf map-route ${green}
-  fi
 
+  # if map_main_route environmental variable is set then the main route gets mapped:
   if [ -n "$map_main_route" ]; then
-    run-cmd cf routes | tail -n +4 | awk  '($3==ENVIRON["domain"]) && ($2==ENVIRON["cf_app"]) {print $3" -n " $2 }' |  xargs -n 3 cf map-route ${green}
+    run-cmd cf routes | awk  '($4==ENVIRON["cf_app"]) {print $3" -n " $2 }' |  xargs -n 3 cf map-route ${green}
   fi
 
+  # if handle_all_green_paths variable is set then
+  # 1. routes that's app name is cf_app are found
+  # 2. paths are mapped to the green app
   if [ -n "$handle_all_green_paths" ]; then
     run-cmd cf routes | tail -n +4 | awk  '($5==ENVIRON["cf_app"]) {print $3" -n "$2 " --path "substr($4,2) }'
     cf routes | tail -n +4 | awk  '($5==ENVIRON["cf_app"]) {print $3" -n "$2 " --path "substr($4,2) }' |  xargs -n 5 cf map-route ${green}
   fi
-
-
   set +x
 }
 
 function remove-blue {
   run-cmd cf delete ${blue} -f
   run-cmd cf rename $green $blue
-  run-cmd cf delete-route $domain -n $green -f
-  if [ -n "$sso_hostname" ] || [ -n "$handle_all_green_paths" ]; then
+  run-cmd cf routes | awk '($4==ENVIRON["green"]) {print $3" -n " $2 " -f"}' |  xargs -n 4 cf delete-route
+
+  if [ -n "$handle_all_green_paths" ]; then
     set -x
-    run-cmd cf routes | tail -n +4 | awk '($2==ENVIRON["green"]) && $4 {print $3" -n "$2 " --path "substr($4,2)" -f"}' | xargs -n 6
-    cf routes | tail -n +4 | awk '($2==ENVIRON["green"]) && $4 {print $3" -n "$2 " --path "substr($4,2)" -f"}' | xargs -n 6 cf delete-route
+    run-cmd cf routes | tail -n +4 | awk '($5==ENVIRON["green"]) {print $3" -n "$2 " --path "substr($4,2)" -f"}' | xargs -n 6
+    cf routes | tail -n +4 | awk '($5==ENVIRON["green"]) {print $3" -n "$2 " --path "substr($4,2)" -f"}' | xargs -n 6 cf delete-route
     set +x
   fi
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pcf_blue_green
 version: !ruby/object:Gem::Version
-  version: '0.27'
+  version: '0.28'
 platform: ruby
 authors:
 - Pawel Bardzinski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-15 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout