pcf_blue_green 0.43.50 → 0.43.312

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: ebb2290f5bc9d8dab6508b108de347c4d9364bb096e4ce80cb5f6d5fbde9da9b
-  data.tar.gz: 5c953009bd7d96c0423c81e303d472ef1822dc73bf7ba804d36d2e62c8043777
+SHA1:
+  metadata.gz: 3248836c1143805b124cfefd334bda9c906f1a0f
+  data.tar.gz: ebf169201cafac7a379c0748fb0891fe4190d43a
 SHA512:
-  metadata.gz: efc06e04a67d494e83f9d826f7844f3f826ee6d61043ebd2c03163c808002ae1b99b205fce3370779a8082ba002e084c4817c9eeb8fc959fd34eeb4b4a715a11
-  data.tar.gz: b967d4be74083aa4ce4f0a6fa6db04636991eaecf5dd027709cd331d7187fbf9e4692703970ac77d196ef5e0e351f0737319ecc0bc5dcac52df0824dacdd4674
+  metadata.gz: 8aa2f964597b2cc0bb33aa21bbb9c09f03d9440200af83c33e768e7d4fb514990d9699b617e716f76ba10e4c6c094219f0b48a299bb8cf270442569c93789da2
+  data.tar.gz: 8f963844e99eeb6088f4473968d86ca3c0182dc96df79545009432963eda151fd1cf257b14d581d1abe927c4e2277c4a149d4e8145b95edba911e941de8898c4

data/lib/pcf_blue_green/version.rb

@@ -1,3 +1,3 @@
 module PcfBlueGreen
-  VERSION = "0.43.50"
+  VERSION = "0.43.312"
 end

data/lib/pcf_blue_green.rb

@@ -17,7 +17,6 @@ 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)
@@ -91,11 +90,6 @@ 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)
@@ -136,7 +130,7 @@ module PcfBlueGreen
 
     def routes_stdout(entity)
       routes_url = entity['routes_url']
-      app_routes_cmd = "cf curl #{routes_url}?results-per-page=100"
+      app_routes_cmd = "cf curl #{routes_url}"
       app_routes_shell = Mixlib::ShellOut.new(app_routes_cmd)
       app_routes_shell.run_command
       JSON.parse(app_routes_shell.stdout)
@@ -152,7 +146,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,33 +56,22 @@ function cf-setup {
   run-cmd cf api ${cf_api} --skip-ssl-validation
   set +x
   cf auth ${cf_user} ${cf_password}
+  echo "aaaaaa"
   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} --health-check-type ${health_check_type} -s cflinuxfs3
+  run-cmd cf push ${app_name} -f ${cf_manifest} --hostname ${app_name}
 }
 
 function check-health {
   local app_url=$1
   announce-task "Checking health"
+  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
@@ -129,24 +118,13 @@ function remove-blue {
 }
 
 function get-domain {
-  if [ -z ${domain+x} ]; then
-    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}"
-  else
-    announce-task "app Domain is ${domain}"
-  fi
+  export domain=$(cf routes | grep ${cf_app} | awk '{print $3}' | grep "^apps\\." | tail -1)
+  announce-task "Domain is ${domain}"
 }
-function join { local IFS="$1"; shift; echo "$*"; }
 
 function prep-green {
   blue=${cf_app}
-  arr=($cf_space)
-  space="$(join - ${arr[@]})"
-  space="$(echo "${space//_/$'-'}")"
-  export green="${cf_app}-${space}-g"
-  echo "exported green: ${green}"
+  export green="${cf_app}-${cf_space}-g"
   if [ -z ${cf_manifest+x }]; then
     generate-manifest
   else
@@ -175,16 +153,9 @@ function blue-green {
   cd $app_directory
   cf-setup
 
-  if [[ $maitenance_enabled == "true" ]] ; then
-    cf set-health-check ${cf_app} port
-  fi
-
   prep-green
-  if [[ $maitenance_enabled == "false" ]] ; then
-    cf-push-healthcheck ${green} ${cf_manifest} 'http'
-  else
-    cf-push ${green} ${cf_manifest}
-  fi
+
+  cf-push ${green} ${cf_manifest}
   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.50
+  version: 0.43.312
 platform: ruby
 authors:
 - Pawel Bardzinski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-03 00:00:00.000000000 Z
+date: 2018-07-24 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.7.7
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: gem encapsualting blue-green bash script