conan_deploy 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmVlYmE0YzJmYjFhZjUyNWIxNDM0MWM5MWJhMzgzMWZiNGUzNDQzZg==
+    YzA2ZWQ3N2MwYzc3YTE1N2NlNzczNzhjYzE1MjUwYjFlMjNjZGRhNA==
   data.tar.gz: !binary |-
-    ZmFmNWIzNDA0NDM5NTQ3NDE3OWM1ZmQ3MWZkOWQzZjA5Yzk5MDg3Mg==
+    Mjg1OWQxODM4ZTdiN2IxMjgyNDljMWFjY2QzYmMwZDM5MGMxMzIxMQ==
 SHA512:
   metadata.gz: !binary |-
-    NGU2OWU4OWI0MDIxOGUwZTdhY2U3YzE1MGUyZTNjM2EyZjAwMWNiNjc5ODY3
-    ZGFiYzA2MjAwZTE5YTFlYTIxODFhMmU3YjA3MGVjNzE1ZmY3NWUwNTkwYzY2
-    ZGNlYTlhZmYzM2Y5MTdmMGRiMTRmNGU0YTc3ZmM1NWViY2RhMTA=
+    NWFhYmFmZDdlOTdjNmJlNDlhMzdlODk4NTA0MjYyNTMxOTc1ZTdlYzQzZDIy
+    NGFhN2VlMjQwZTJhODEwMjI3ZDJkYmQxMjkxZGJhMWZhYjM5MTQyMGQ3NTZh
+    NjExM2ZlNWZlNjEyZTM3ODk5ODQxMDI0NjI5MzNmN2JkN2EzZWI=
   data.tar.gz: !binary |-
-    NjBiMDBkZWYwMDc1NDJlMTI1YTI0ZTM1Y2UzNmE0YjliN2UzOThjNWVlMGE2
-    MTQ4YjcxYTNlNzRlY2RhNTliZDgxMjgwNWY2ZjZhODQ0YTcyZWI1YTcyOWI2
-    YjA3OTUxMzk4NzgwNDQ5ZWFiOWE5MmFjODY1MzExNGYwNzA0ZGM=
+    ZTM3Y2IwMzVhNGRhNWJiOGRlZTkxYWQ1MmZjMTc4MDJmMDI2Yzk0Nzg1ZTBm
+    MGUyNDI0NGNlNGEwNzU5YTNhMjY2ZWJmY2JhMDYwZWIzNzNhMzE5YTQxZGNh
+    NmFkYjMxMzI3ZDUxZTc3NmUzY2Q2YWZhZDgyZWM5YTJkMzQ4MjY=

data/lib/conan/application_helper.rb

@@ -70,7 +70,7 @@ module ApiHelper
     return default_headers
   end
 
-  def self.healthcheck(url, timeout)
+  def self.smoke_test(url, timeout)
     RestClientExt.get(
         url,
         defaultHeaders(

data/lib/conan/deploy.rb

@@ -36,11 +36,11 @@ module Conan
         manifest.provision
         manifest.bg_configure
         manifest.bg_deploy
-        if(manifest.is_inactive_node_healthy?)
+        if(manifest.is_inactive_node_operational?)
           manifest.bg_switch
           manifest.bg_clean
         else
-          raise RuntimeError.new "Blue node is not healthy. Skipping switch and cleaning to facilitate troubleshooting."
+          raise RuntimeError.new "Blue node is not operational. Skipping switch and cleaning to facilitate troubleshooting."
         end
 
       else

data/lib/conan/manifest_builder.rb

@@ -119,10 +119,10 @@ class Manifest
     @current_pipeline.bg_deploy(@current_environment, paas, force)
   end
 
-  def is_inactive_node_healthy?
+  def is_inactive_node_operational?
     validateThatEnvironmentIsSelected
-    puts "Blue/green health check #{@current_environment.id} for #{@current_pipeline.id} pipeline"
-    @current_pipeline.is_inactive_node_healthy?(@current_environment, paas)
+    puts "Blue/green smoke test #{@current_environment.id} for #{@current_pipeline.id} pipeline"
+    @current_pipeline.is_inactive_node_operational?(@current_environment, paas)
   end
 
   def bg_switch
@@ -236,12 +236,12 @@ class Pipeline
     }  
   end
 
-  def is_inactive_node_healthy?(environment, paas)
+  def is_inactive_node_operational?(environment, paas)
     eachAppDeployment(environment) { |app, deploy|
-      response = ApiHelper.healthcheck(deploy.inactive_healthcheck_url(app), 60)
+      response = ApiHelper.smoke_test(deploy.inactive_smoke_test_url(app), 60)
 
       if(response.code != 200)
-        puts "Healthcheck failed for inactive (Blue) node. Here is the entire response: #{response.inspect}"
+        puts "Smoke test failed for inactive (Blue) node. Here is the entire response: #{response.inspect}"
         return false
       else
         return true
@@ -450,7 +450,7 @@ class Deployment < HasOptions
 
   @@paas_domain = 'mtnsatcloud.com'
 
-  attr_accessor :environment, :org, :ship, :shipcloud, :app_ids, :facility_id, :additional_mappings
+  attr_accessor :environment, :org, :ship, :shipcloud, :app_ids, :facility_id, :additional_mappings, :custom_smoke_test_path
 
   def initialize(environment, org, ship)
     # inherit options from the environment
@@ -465,6 +465,7 @@ class Deployment < HasOptions
     @facility_id = nil
     @enabled = true
     @randomid = SecureRandom.hex(3)
+    @custom_smoke_test_path = nil
   end  
 
   def apps(*app_ids)
@@ -517,12 +518,12 @@ class Deployment < HasOptions
     "http://#{dns_name(app)}/status/manifest"
   end
 
-  def active_healthcheck_url(app)
-    "http://#{dns_name(app)}/status/healthcheck"
+  def active_smoke_test_url(app)
+    "http://#{dns_name(app)}/#{@custom_smoke_test_path || 'status/healthcheck'}"
   end
 
-  def inactive_healthcheck_url(app)
-    "http://inactive.#{dns_name(app)}/status/healthcheck"
+  def inactive_smoke_test_url(app)
+    "http://inactive.#{dns_name(app)}/#{@custom_smoke_test_path || 'status/healthcheck'}"
   end
 
   def paas_target
@@ -531,6 +532,10 @@ class Deployment < HasOptions
 
   def to_s
     "#{org}-#{ship}"
-  end   
+  end
+
+  def smoke_test_path(path=nil)
+    @custom_smoke_test_path = path
+  end
 end
 

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conan_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Mike Reardon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daphne_util