pcf_blue_green 0.43.38 → 0.43.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 896304e9ffc251378dc9eb4a5562c8bb835e33fa
-  data.tar.gz: c04a170ad8ebd1b6fe912e4c1e1b44e1d4364939
+SHA256:
+  metadata.gz: 34e3f7a1aec41a57d429d0ff406e1140b72558e2ee03fb06815492aab8b684d6
+  data.tar.gz: 5cd23931c440025a520d5b60eb269946e62cb562971c1af10465360c9ac1a11e
 SHA512:
-  metadata.gz: 69df2976e9bf3dce7a698b07bc74f18f094b093b85d4d70d3e47d4539331f62c66d103fb3c990d6b38b367ec7b8f6a5bff685ae0093b1d6e00e39e781707e28d
-  data.tar.gz: c943781045afe0a4da7a277ba19bb0ba2d7988ecbe71f8de322d86e57efb33c1cdd2a0e8d93dacdb89e0cb79bdb56322f9d6f50fc79a78bfeef45602d5043d5e
+  metadata.gz: ddfae920b9857d551fc93e867cd36ecb696981864c026ca00c38ef739d29036cd29948dd545e98de8b1999ecb891465dc59e7b2909c8ffeeef67c567f8c39669
+  data.tar.gz: e7cf065b654bfc53005f755ff22d2bd667200d43a95a377cc72c40a5bb6fdb2627b9cdaee1a509bec0fd534a15eab62dadd5921cee419b525c23b6f867dc6c5d

data/lib/pcf_blue_green/version.rb

@@ -1,3 +1,3 @@
 module PcfBlueGreen
-  VERSION = "0.43.38"
+  VERSION = "0.43.43"
 end

data/lib/pcf_blue_green.rb

@@ -17,6 +17,7 @@ module PcfBlueGreen
       @org = org
       @space = space
       @login_options = @options[:login]
+      ENV['maitenance_enabled'] = maitenance_enabled?.to_s
       login if call_login
       cmd = "echo $(gem which pcf_blue_green)"
       shell = Mixlib::ShellOut.new(cmd)
@@ -90,6 +91,11 @@ module PcfBlueGreen
       mapped_routes.uniq.join(",\n")
     end
 
+    def maitenance_enabled?
+      entity = entity_for(ENV['cf_app'])
+      entity ? entity['environment_json']['MAINTENANCE_ENABLED'] : false
+    end
+
     private
 
     def entity_for(app_name)
@@ -130,7 +136,7 @@ module PcfBlueGreen
 
     def routes_stdout(entity)
       routes_url = entity['routes_url']
-      app_routes_cmd = "cf curl #{routes_url}"
+      app_routes_cmd = "cf curl #{routes_url}?results-per-page=100"
       app_routes_shell = Mixlib::ShellOut.new(app_routes_cmd)
       app_routes_shell.run_command
       JSON.parse(app_routes_shell.stdout)
@@ -146,7 +152,7 @@ module PcfBlueGreen
 
     def login
       puts "Logging in to #{@url}"
-      cf_login = "cf login -a #{@url} -u #{@user} -p '#{@pass}' -o #{@org} -s #{@space} #{@login_options} > /dev/null"
+      cf_login = "cf login -a #{@url} -u #{@user} -p '#{@pass}' -o #{@org} -s '#{@space}' #{@login_options} > /dev/null"
       cmd = "#{cf_login}"
       shell = Mixlib::ShellOut.new(cmd)
       shell.run_command

data/lib/shared-deploy-functions.sh

@@ -33,7 +33,7 @@ function announce-success {
 
 function run-cmd {
   echo -e "\n\n${Cya}${@}${RCol}\n"
-  $@
+  "$@"
 }
 
 function set-ruby {
@@ -56,22 +56,33 @@ function cf-setup {
   run-cmd cf api ${cf_api} --skip-ssl-validation
   set +x
   cf auth ${cf_user} ${cf_password}
-  run-cmd cf target -o ${cf_org} -s ${cf_space}
+  run-cmd cf target -o ${cf_org} -s "${cf_space}"
 }
 
 function cf-push {
   local app_name=$1
   local manifest=$2
+
+  if [ -z ${health_check_timeout+x} ]; then
+    announce-task "Pushing ${app_name}"
+    run-cmd cf push ${app_name} -f ${cf_manifest} --hostname ${app_name} -s cflinuxfs3
+  else
+    announce-task "Pushing ${app_name}. ${health_check_timeout} seconds health-check timeout set"
+    run-cmd cf push ${app_name} -f ${cf_manifest} --hostname ${app_name} -t ${health_check_timeout} -s cflinuxfs3
+  fi
+}
+
+function cf-push-healthcheck {
+  local app_name=$1
+  local manifest=$2
+  local health_check_type=$3
   announce-task "Pushing ${app_name}"
-  run-cmd cf push ${app_name} -f ${cf_manifest} --hostname ${app_name}
+  run-cmd cf push ${app_name} -f ${cf_manifest} --hostname ${app_name} --health-check-type ${health_check_type} -s cflinuxfs3
 }
 
 function check-health {
   local app_url=$1
   announce-task "Checking health"
-  sleep 300
-  maitenance_enabled=$(echo $(cf curl '/v2/apps' -X GET -H 'Content-Type: application/x-www-form-urlencoded' -d "q=name:$cf_app" | jq '.resources[0].entity.environment_json.MAINTENANCE_ENABLED'))
-  maitenance_enabled=$(echo ${maitenance_enabled//\"} | awk '{ print tolower($1) }')
   if [ $maitenance_enabled == "true" ] ; then
     status=$(curl -sSIL --header "x-digital-auth: ${JWT}" -X GET -o /dev/null -w "%{http_code}" ${app_url} --insecure)
     if [ $status == 503 ] ; then
@@ -118,13 +129,20 @@ function remove-blue {
 }
 
 function get-domain {
-  export domain=$(cf routes | grep ${cf_app} | awk '{print $3}' | grep "^apps\\." | tail -1)
+  arr=($cf_space)
+  num=$(($(echo ${#arr[@]}) + 2))
+  export domain=$(cf routes | grep ${cf_app} | awk -v env_var="$num" '{print $'$num'}' | grep "^apps\\." | tail -1)
   announce-task "Domain is ${domain}"
 }
+function join { local IFS="$1"; shift; echo "$*"; }
 
 function prep-green {
   blue=${cf_app}
-  export green="${cf_app}-${cf_space}-g"
+  arr=($cf_space)
+  space="$(join - ${arr[@]})"
+  space="$(echo "${space//_/$'-'}")"
+  export green="${cf_app}-${space}-g"
+  echo "exported green: ${green}"
   if [ -z ${cf_manifest+x }]; then
     generate-manifest
   else
@@ -153,9 +171,16 @@ function blue-green {
   cd $app_directory
   cf-setup
 
-  prep-green
+  if [ $maitenance_enabled == "true" ] ; then
+    cf set-health-check ${cf_app} port
+  fi
 
-  cf-push ${green} ${cf_manifest}
+  prep-green
+  if [ $maitenance_enabled == "false" ] ; then
+    cf-push-healthcheck ${green} ${cf_manifest} 'http'
+  else
+    cf-push ${green} ${cf_manifest}
+  fi
   health_check_domain="${health_check_domain:-$domain}"
   if [ -z ${app_path+x} ]; then
     check-health "https://${green}.${health_check_domain}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pcf_blue_green
 version: !ruby/object:Gem::Version
-  version: 0.43.38
+  version: 0.43.43
 platform: ruby
 authors:
 - Pawel Bardzinski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2019-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: gem encapsualting blue-green bash script