pcf_blue_green 0.38 → 0.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5a4b01fd2e2906620666e420eee9f96b88a3550
-  data.tar.gz: 3532f96e58df630b0c81c4da1af33c5bac15d8b8
+  metadata.gz: ce9a0ff7f133579929ed18fe91e3a65268e3636e
+  data.tar.gz: 5278c466264ea93c6b5109abb631ff43dcffacee
 SHA512:
-  metadata.gz: e3597d5a968b161ec9b8b5a3f40fcf42cb5a93b11e3399caddce117fe542862c0960c0d2175fc0092bcb2120e2ef588d8624de7b4c019c2611f455dedf51d5f9
-  data.tar.gz: 0e8d217a163109db34000150e0082dc3160049e9bd55ade7d9bd6fe8a23a03c32a460c6cc977283b183601b1a66c90b75c5410cbe8d58eca97cba026ac881331
+  metadata.gz: 0822749fe7e78ecb9aba92babd9fa3924af5a4238fdf4932708e3366f9688a72af996912beb37e0d2643ad63cc7749179b9a397f4dff07291b2046e8d9c14a71
+  data.tar.gz: 6f36118d59fa0b4705661a263965e139b93f6da3a63db82f3bbd2d1f752ab08aa02465db0db556a082f8d6edf7f558ed70b2a20723d584cc0ab983cea114d13a

data/lib/pcf_blue_green/version.rb

@@ -1,3 +1,3 @@
 module PcfBlueGreen
-  VERSION = "0.38"
+  VERSION = "0.41"
 end

data/lib/pcf_blue_green.rb

@@ -4,13 +4,9 @@ require 'shellwords'
 require "json"
 
 module PcfBlueGreen
-  class BlueGreenDeployFailed < StandardError
+  class BlueGreenDeploymentFailed < StandardError
   end
 
-  class CleanupBlueFailed < StandardError
-  end
-
-
   class Routing
 
     def initialize(url, user, pass, org, space, call_login = false, opts = {})
@@ -33,43 +29,115 @@ module PcfBlueGreen
     def cleanup_blue
       remap_routes
       status = bash("#{@source_cmd} && remove-blue")
-      raise PcfBlueGreen::CleanupBlueFailed unless status
+      raise PcfBlueGreen::BlueGreenDeploymentFailed unless status
+      remove_routes
       bash("#{@source_cmd} && announce-success")
     end
 
+    def remove_routes
+      removed_routes = []
+      if entity = entity_for(ENV['green'])
+        routes_stdout(entity)['resources'].each do |resource|
+          domain_url = resource['entity']['domain_url']
+          domain = domain_for(domain_url)
+          if resource['entity']['path'].empty?
+            cmd = "#{delete_route_command} #{domain} -n #{resource['entity']['host']} -f"
+          else
+            cmd = "#{delete_route_command} #{domain} -n #{resource['entity']['host']} --path #{resource['entity']['path']} -f"
+          end
+          puts cmd
+          shell = Mixlib::ShellOut.new(cmd)
+          shell.run_command
+          removed_routes += shell.stdout.split("\n")
+
+          unless shell.stderr.empty?
+            puts shell.stderr
+            raise PcfBlueGreen::BlueGreenDeploymentFailed
+          end
+        end
+      end
+      puts "Removed routes: #{removed_routes.uniq.join(',  ')} "
+      removed_routes.uniq.join(",\n")
+    end
+
     def remap_routes
       puts "Remapping routes..."
       puts "cf_app is #{ENV['cf_app']}"
       puts "green is #{ENV['green']}"
-
       mapped_routes = []
-
-      if ENV['handle_all_paths']
-        cmd = "#{cf_routes_output} | tail -n +4 | awk  '($5==ENVIRON[\"cf_app\"]) {print $3\" -n \"$2 \" --path \"substr($4,2) }' |  xargs -n 5 #{map_route_command} #{ENV['green']}"
-        puts cmd
-        shell = Mixlib::ShellOut.new(cmd)
-        shell.run_command
-        unless shell.stderr.empty?
-          puts shell.stderr
-          raise PcfBlueGreen::CleanupBlueFailed
+      if entity = entity_for(ENV['cf_app'])
+        routes_stdout(entity)['resources'].each do |resource|
+          domain_url = resource['entity']['domain_url']
+          domain = domain_for(domain_url)
+          if resource['entity']['path'].empty?
+            cmd = "#{map_route_command} #{ENV['green']} #{domain} -n #{resource['entity']['host']}"
+          else
+            cmd = "#{map_route_command} #{ENV['green']} #{domain} -n #{resource['entity']['host']} --path #{resource['entity']['path']}"
+          end
+          puts cmd
+          shell = Mixlib::ShellOut.new(cmd)
+          shell.run_command
+          mapped_routes += shell.stdout.split("\n")
+          unless shell.stderr.empty?
+            puts shell.stderr
+            raise PcfBlueGreen::BlueGreenDeploymentFailed
+          end
         end
-        mapped_routes += shell.stdout.split("\n")
-      end
-      cmd = "#{cf_routes_output} | tail -n +4  | awk  '($4==ENVIRON[\"cf_app\"]) {print $3\" -n \" $2}' |  xargs -n 3 #{map_route_command} #{ENV['green']}"
-      puts cmd
-      shell = Mixlib::ShellOut.new(cmd)
-      shell.run_command
-      unless shell.stderr.empty?
-        puts shell.stderr
-        raise PcfBlueGreen::CleanupBlueFailed
       end
-      mapped_routes += shell.stdout.split("\n")
       puts "Mappped routes: #{mapped_routes.uniq.join(',  ')} "
       mapped_routes.uniq.join(",\n")
     end
 
     private
 
+    def entity_for(app_name)
+      app_data_cmd = "cf curl \"/v2/apps\" -X GET -H \"Content-Type: application/x-www-form-urlencoded\" -d 'q=name:#{app_name}'"
+      app_data_shell = Mixlib::ShellOut.new(app_data_cmd)
+      app_data_shell.run_command
+      app_stdout = JSON.parse(app_data_shell.stdout)
+      app_stdout['resources'].each do |resource|
+        if resource['entity']['name'] == app_name && resource['entity']['space_guid'] == fetch_space_guid
+          @entity = resource['entity']
+        end
+      end
+
+      unless app_data_shell.stderr.empty?
+        puts app_data_shell.stderr
+        raise PcfBlueGreen::BlueGreenDeploymentFailed
+      end
+      @entity
+    end
+
+    def routes_stdout(entity)
+      routes_url = entity['routes_url']
+      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)
+    end
+
+    def domain_for(domain_url)
+      app_domain_cmd = "cf curl #{domain_url}"
+      app_domain_shell = Mixlib::ShellOut.new(app_domain_cmd)
+      app_domain_shell.run_command
+      domain_stdout = JSON.parse(app_domain_shell.stdout)
+      domain_stdout['entity']['name']
+    end
+
+    def fetch_space_guid
+      command = 'cf curl /v2/spaces'
+      shell = Mixlib::ShellOut.new(command)
+      shell.run_command
+      space_guid = nil
+      raise Csaa::Pcf::Unauthorized unless space_guid_json(shell.stdout)['resources']
+      space_guid_json(shell.stdout)['resources'].each do |resource|
+        if resource['entity']['name'] == @space
+          space_guid = resource['metadata']['guid']
+        end
+      end
+      space_guid
+    end
+
     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"
@@ -78,8 +146,8 @@ module PcfBlueGreen
       shell.run_command
     end
 
-    def cf_routes_output
-      "cf routes"
+    def delete_route_command
+      "cf delete-route"
       # cmd = "cf routes"
       # shell = Mixlib::ShellOut.new(cmd)
       # shell.run_command
@@ -90,6 +158,7 @@ module PcfBlueGreen
       "cf map-route"
     end
 
+
     def bash(command)
      escaped_command = Shellwords.escape(command)
      system "bash -c #{escaped_command}"
@@ -109,7 +178,7 @@ module PcfBlueGreen
 
     def blue_green_deploy
       status = bash("#{@source_cmd} && blue-green")
-      raise PcfBlueGreen::BlueGreenDeployFailed unless status
+      raise PcfBlueGreen::BlueGreenDeploymentFailed unless status
     end
 
     def env_var_manifest_update
@@ -140,7 +209,10 @@ module PcfBlueGreen
     def bash(command)
      escaped_command = Shellwords.escape(command)
      system "bash -c #{escaped_command}"
-   end
+    end
 
+    def space_guid_json(stdout)
+      JSON.parse(stdout)
+    end
   end
 end

data/lib/shared-deploy-functions.sh

@@ -69,32 +69,18 @@ function cf-push {
 function check-health {
   local app_url=$1
   announce-task "Checking health"
-  cf_output=$(echo $(cf env ${cf_app})| grep -o 'User-Provided:.*')
-  echo "Executing curl of ${app_url}\n\n"
-  if echo $cf_output| egrep -o 'MAINTENANCE_ENABLED: \S*'
-  then
-    kv=$(echo $cf_output| egrep -o 'MAINTENANCE_ENABLED: \S*')
-    arrkv=(${kv// / })
-    if [ ${arrkv[1]} == true ] ; then
-      status=$(curl -sSIL -X GET -o /dev/null -w "%{http_code}" ${app_url} --insecure)
-      if [ $status == 503 ] ; then
-        echo -e "${BGre}curl of ${app_url} 503 OK"
-      else
-          echo ERROR: Expecting 503 status
-          exit 1
-      fi
+  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
+      echo -e "${BGre}curl of ${app_url} 503 OK"
     else
-      curl -fsSIL --header "x-digital-auth: ${JWT}" --user "${BASIC_AUTH_USERNAME}:${BASIC_AUTH_PASSWORD}" ${app_url} --insecure
-      status=$(curl -sSIL --header "x-digital-auth: ${JWT}" -X GET -o /dev/null -w "%{http_code}" ${app_url} --insecure)
-      if [ $status == 200 ] ; then
-        echo -e "${BGre}curl of ${app_url} 200 OK"
-      else
-        echo -e "${BGre}curl of ${app_url} ${status} ERR"
+        echo ERROR: Expecting 503 status
         exit 1
-      fi
     fi
   else
-    curl -fsSIL -X GET --header "x-digital-auth: ${JWT}" --user "${BASIC_AUTH_USERNAME}:${BASIC_AUTH_PASSWORD}" ${app_url} --insecure
+    curl -fsSIL --header "x-digital-auth: ${JWT}" --user "${BASIC_AUTH_USERNAME}:${BASIC_AUTH_PASSWORD}" ${app_url} --insecure
     status=$(curl -sSIL --header "x-digital-auth: ${JWT}" -X GET -o /dev/null -w "%{http_code}" ${app_url} --insecure)
     if [ $status == 200 ] ; then
       echo -e "${BGre}curl of ${app_url} 200 OK"
@@ -125,53 +111,9 @@ function generate-manifest {
   fi
 }
 
-function remap-routes {
-  announce-task "Remapping routes..."
-  echo "cf_app is ${cf_app}"
-  echo "green is ${green}"
-  set -x
-  run-cmd cf routes
-
-  # Variables used:
-
-  # Some applications have extra routes that contain paths. If that's the case
-  # then handle_all_paths environmental variable is used to manage paths.
-  # to a different hostname
-
-  # Code logic:
-
-  # execute the code below:
-  if [ -z ${handle_all_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 map_main_route environmental variable is set then the main route gets mapped:
-  if [ -n "$map_main_route" ]; then
-    run-cmd cf routes | awk  '($4==ENVIRON["cf_app"]) {print $3" -n " $2 }' |  xargs -n 3 cf map-route ${green}
-  fi
-
-  # if handle_all_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_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 routes | awk '($2==ENVIRON["green"]) {print $3" -n " $2 " -f"}' |  xargs -n 4 cf delete-route
-
-  if [ -n "$handle_all_paths" ]; then
-    set -x
-    run-cmd cf routes | tail -n +4 | awk '($2==ENVIRON["green"]) {print $3" -n "$2 " --path "substr($4,2)" -f"}' | xargs -n 6
-    cf routes | tail -n +4 | awk '($2==ENVIRON["green"]) {print $3" -n "$2 " --path "substr($4,2)" -f"}' | xargs -n 6 cf delete-route
-    set +x
-  fi
 }
 
 function get-domain {

data/spec/mocks/routes_stdout.json

@@ -0,0 +1,43 @@
+{
+  "resources": [
+    {
+      "metadata": {
+        "guid": "ddbc3214-eg68-44ed-836a-a2defae75547",
+        "url": "/v2/routes/XXXXXXXXXXXXXXXXXXXX",
+        "created_at": "2017-02-08T16:28:08Z",
+        "updated_at": null
+      },
+      "entity": {
+        "host": "app-prod",
+        "path": "",
+        "domain_url": "/v2/shared_domains/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+      }
+    },
+    {
+      "metadata": {
+        "guid": "ddsc3214-eg38-44ed-836a-a2defae75547",
+        "url": "/v2/routes/XXXXXXXXXXXXXXXXXXXX",
+        "created_at": "2017-02-08T16:28:08Z",
+        "updated_at": null
+      },
+      "entity": {
+        "host": "app-prod",
+        "path": "/some_path",
+        "domain_url": "/v2/shared_domains/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
+      }
+    },
+    {
+      "metadata": {
+        "guid": "dd3c3214-eg68-44ed-836a-a2defae74547",
+        "url": "/v2/routes/XXXXXXXXXXXXXXXXXXXX",
+        "created_at": "2017-02-08T16:28:08Z",
+        "updated_at": null
+      },
+      "entity": {
+        "host": "app-prod",
+        "path": "/other_domain_path",
+        "domain_url": "/v2/shared_domains/YYYYYYYYYYYYYYYYYYYYYYYYYYYY"
+      }
+    }
+  ]
+}

data/spec/mocks/simple_entity.json

@@ -0,0 +1,16 @@
+{
+  "name": "app-prod",
+  "production": false,
+  "detected_buildpack_guid": null,
+  "environment_json": {
+  },
+  "ports": [
+    8080
+  ],
+  "space_url": "/v2/spaces/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+  "stack_url": "/v2/stacks/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX",
+  "routes_url": "/v2/apps/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX/routes",
+  "events_url": "/v2/apps/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX/events",
+  "service_bindings_url": "/v2/apps/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX/service_bindings",
+  "route_mappings_url": "/v2/apps/XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX/route_mappings"
+}

data/spec/pcf_blue_green_spec.rb

@@ -5,11 +5,42 @@ describe PcfBlueGreen do
     expect(PcfBlueGreen::VERSION).not_to be nil
   end
 
-  describe "blue green deploy clean-up" do
-    context 'main route domain' do
-      it 're-maps routes correctly for simple routes' do
+  describe "blue green deploy remap_routes" do
+    it 're-maps routes correctly for an application' do
+      expected_routes = %{simpleapp-app-space-green app.domain.com -n app-prod,
+simpleapp-app-space-green app.domain.com -n app-prod --path /some_path,
+simpleapp-app-space-green app.domain.com -n app-prod --path /other_domain_path}
+
+      ENV['APP_SPACE']    = 'app-space'
+      ENV['APP_NAME']     = 'simpleapp'
+      ENV['cf_app']       = 'simpleapp'
+      ENV['cf_api']       = 'https://api.sys.sandbox.test.com'
+      ENV['cf_user']      = 'testuser'
+      ENV['cf_password']  = 'password'
+      ENV['cf_org']       = 'ds'
+      ENV['green']        = 'simpleapp-app-space-green'
 
-        expected_routes = %{simpleapp-app-space-green apps.prod.domain.com -n simpleapp}
+      space                          = ENV['APP_SPACE']
+      api_url                        = ENV['cf_api']
+      username                       = ENV['cf_user']
+      password                       = ENV['cf_password']
+      org                            = ENV['cf_org']
+
+
+      @pcf_blue_green = PcfBlueGreen::Routing.new(api_url, username, password, org, space, login = false)
+      @pcf_blue_green.stub(:entity_for).and_return(JSON.parse(File.read('spec/mocks/simple_entity.json')))
+      @pcf_blue_green.stub(:routes_stdout).and_return(JSON.parse(File.read('spec/mocks/routes_stdout.json')))
+      @pcf_blue_green.stub(:domain_for).and_return("app.domain.com")
+      @pcf_blue_green.stub(:map_route_command).and_return('echo')
+
+      expect(expected_routes).to eq(@pcf_blue_green.remap_routes)
+    end
+  end
+  describe "blue green deploy remove_routes" do
+      it 'removes routes correctly for an application' do
+        expected_routes = %{app.domain.com -n app-prod -f,
+app.domain.com -n app-prod --path /some_path -f,
+app.domain.com -n app-prod --path /other_domain_path -f}
 
         ENV['APP_SPACE']    = 'app-space'
         ENV['APP_NAME']     = 'simpleapp'
@@ -21,7 +52,6 @@ describe PcfBlueGreen do
         ENV['green']        = 'simpleapp-app-space-green'
 
         space                          = ENV['APP_SPACE']
-        app                            = ENV['APP_NAME']
         api_url                        = ENV['cf_api']
         username                       = ENV['cf_user']
         password                       = ENV['cf_password']
@@ -29,139 +59,12 @@ describe PcfBlueGreen do
 
 
         @pcf_blue_green = PcfBlueGreen::Routing.new(api_url, username, password, org, space, login = false)
-        @pcf_blue_green.stub(:cf_routes_output).and_return('cat spec/mocks/simple_routes.txt')
-        @pcf_blue_green.stub(:map_route_command).and_return('echo')
-        expect(expected_routes).to eq(@pcf_blue_green.remap_routes)
-      end
-
-      it "it doesn't re-map routes with a path. Also doesn't re-map routes for other applications. Even with the same hostname" do
-
-        expected_routes = %{customapp-app-space-green apps.prod.domain.com -n customapp,
-customapp-app-space-green apps.prod.domain.com -n otherapp}
+        @pcf_blue_green.stub(:entity_for).and_return(JSON.parse(File.read('spec/mocks/simple_entity.json')))
+        @pcf_blue_green.stub(:routes_stdout).and_return(JSON.parse(File.read('spec/mocks/routes_stdout.json')))
+        @pcf_blue_green.stub(:domain_for).and_return("app.domain.com")
+        @pcf_blue_green.stub(:delete_route_command).and_return('echo')
 
-
-        ENV['APP_SPACE'] = 'app-space'
-        ENV['APP_NAME'] = 'customapp'
-        ENV['cf_app'] = 'customapp'
-        ENV['cf_api'] = 'https://api.sys.sandbox.test.com'
-        ENV['cf_user'] = 'testuser'
-        ENV['cf_password'] = 'password'
-        ENV['cf_org'] = 'ds'
-        ENV['green'] = 'customapp-app-space-green'
-
-        space                          = ENV['APP_SPACE']
-        app                            = ENV['APP_NAME']
-        api_url                        = ENV['cf_api']
-        username                       = ENV['cf_user']
-        password                       = ENV['cf_password']
-        org                            = ENV['cf_org']
-
-
-        @pcf_blue_green = PcfBlueGreen::Routing.new(api_url, username, password, org, space, login = false)
-        @pcf_blue_green.stub(:cf_routes_output).and_return('cat spec/mocks/custom_routes.txt')
-        @pcf_blue_green.stub(:map_route_command).and_return('echo')
-        expect(expected_routes).to eq(@pcf_blue_green.remap_routes)
+        expect(expected_routes).to eq(@pcf_blue_green.remove_routes)
       end
     end
-
-    context 'handle_all_paths' do
-       it "re-maps the application routes including paths and custom domains" do
-
-        expected_routes = %{customapp-app-space-green apps.prod.domain.com -n customapp --path somepath1,
-customapp-app-space-green apps.prod.domain.com -n otherapp --path somepath2,
-customapp-app-space-green apps.prod.domain.com -n otherapp --path somepath3,
-customapp-app-space-green apps.prod.domain.com -n customapp,
-customapp-app-space-green apps.prod.domain.com -n otherapp}
-
-
-        ENV['APP_SPACE'] = 'app-space'
-        ENV['APP_NAME'] = 'customapp'
-        ENV['cf_app'] = 'customapp'
-        ENV['cf_api'] = 'https://api.sys.sandbox.test.com'
-        ENV['cf_user'] = 'testuser'
-        ENV['cf_password'] = 'password'
-        ENV['cf_org'] = 'ds'
-        ENV['green'] = 'customapp-app-space-green'
-        ENV['handle_all_paths'] = 'true'
-
-        space                          = ENV['APP_SPACE']
-        app                            = ENV['APP_NAME']
-        api_url                        = ENV['cf_api']
-        username                       = ENV['cf_user']
-        password                       = ENV['cf_password']
-        org                            = ENV['cf_org']
-
-
-        @pcf_blue_green = PcfBlueGreen::Routing.new(api_url, username, password, org, space, login = false)
-        @pcf_blue_green.stub(:cf_routes_output).and_return('cat spec/mocks/custom_routes.txt')
-        @pcf_blue_green.stub(:map_route_command).and_return('echo')
-        expect(expected_routes).to eq(@pcf_blue_green.remap_routes)
-      end
-      it "re-maps application routes including paths" do
-
-       expected_routes = %{second-app-app-space-green apps.prod.domain.com.com -n third-app --path firstapp-path1,
-second-app-app-space-green apps.prod.domain.com.com -n third-app --path firstapp-path2,
-second-app-app-space-green apps.prod.domain.com.com -n third-app --path firstapp-path3,
-second-app-app-space-green apps.prod.domain.com.com -n third-app --path firstapp-path4,
-second-app-app-space-green apps.prod.domain.com.com -n third-app --path firstapp-path5,
-second-app-app-space-green apps.prod.domain.com.com -n third-app --path secondapp-path,
-second-app-app-space-green apps.prod.domain.com.com -n second-app}
-
-
-       ENV['APP_SPACE'] = 'app-space'
-       ENV['APP_NAME'] = 'second-app'
-       ENV['cf_app'] = 'second-app'
-       ENV['cf_api'] = 'https://api.sys.sandbox.test.com'
-       ENV['cf_user'] = 'testuser'
-       ENV['cf_password'] = 'password'
-       ENV['cf_org'] = 'ds'
-       ENV['green'] = 'second-app-app-space-green'
-       ENV['handle_all_paths'] = 'true'
-
-       space                          = ENV['APP_SPACE']
-       app                            = ENV['APP_NAME']
-       api_url                        = ENV['cf_api']
-       username                       = ENV['cf_user']
-       password                       = ENV['cf_password']
-       org                            = ENV['cf_org']
-
-
-       @pcf_blue_green = PcfBlueGreen::Routing.new(api_url, username, password, org, space, login = false)
-       @pcf_blue_green.stub(:cf_routes_output).and_return('cat spec/mocks/custom_routes_domain_host.txt')
-       @pcf_blue_green.stub(:map_route_command).and_return('echo')
-       expect(expected_routes).to eq(@pcf_blue_green.remap_routes)
-     end
-
-     it "re-maps application routes including paths. Also true for custom domain and host" do
-
-      expected_routes = %{third-app-app-space-green apps.prod.domain.com.com -n third-app,
-third-app-app-space-green apps.prod.otherdomain.com -n third-app,
-third-app-app-space-green apps.prod.otherdomain.com -n third-app-other-host}
-
-
-      ENV['APP_SPACE'] = 'app-space'
-      ENV['APP_NAME'] = 'third-app'
-      ENV['cf_app'] = 'third-app'
-      ENV['cf_api'] = 'https://api.sys.sandbox.test.com'
-      ENV['cf_user'] = 'testuser'
-      ENV['cf_password'] = 'password'
-      ENV['cf_org'] = 'ds'
-      ENV['green'] = 'third-app-app-space-green'
-      ENV['handle_all_paths'] = 'true'
-
-      space                          = ENV['APP_SPACE']
-      app                            = ENV['APP_NAME']
-      api_url                        = ENV['cf_api']
-      username                       = ENV['cf_user']
-      password                       = ENV['cf_password']
-      org                            = ENV['cf_org']
-
-
-      @pcf_blue_green = PcfBlueGreen::Routing.new(api_url, username, password, org, space, login = false)
-      @pcf_blue_green.stub(:cf_routes_output).and_return('cat spec/mocks/custom_routes_domain_host.txt')
-      @pcf_blue_green.stub(:map_route_command).and_return('echo')
-      expect(expected_routes).to eq(@pcf_blue_green.remap_routes)
-    end
-   end
-  end
-end
+ end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pcf_blue_green
 version: !ruby/object:Gem::Version
-  version: '0.38'
+  version: '0.41'
 platform: ruby
 authors:
 - Pawel Bardzinski
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-shellout
@@ -108,7 +108,8 @@ files:
 - pcf_blue_green.gemspec
 - spec/mocks/custom_routes.txt
 - spec/mocks/custom_routes_domain_host.txt
-- spec/mocks/simple_routes.txt
+- spec/mocks/routes_stdout.json
+- spec/mocks/simple_entity.json
 - spec/pcf_blue_green_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/aaa-ncnu-ie/pcf_blue_green

data/spec/mocks/simple_routes.txt

@@ -1,6 +0,0 @@
-
-
-space              host                                 domain                                         port   path                              type   apps          service
-app-space          simpleapp                            apps.prod.domain.com                                                                           simpleapp
-app-space          otherapp                             apps.prod.domain.com                                                                           otherapp
-app-space          otherapp                             apps.prod.domain.com                                  /validate                                otherapp