conan_deploy 0.0.15 → 0.0.16

data/bin/conan

@@ -95,6 +95,10 @@ optparse = OptionParser.new do |o|
     options[:'dry-run'] = true
   end
 
+  o.on('-S','--stfu', 'Supress errors when compairing active and inactive domains' ) do
+    options[:stfu] = true
+  end
+
   o.on('-V','--verbose', 'Verbose console output' ) do
     options[:verbose] = true
   end

data/lib/conan/application.rb

@@ -2,7 +2,7 @@
 class Application
 
   attr_accessor :id, :platform_type, :group_id, :artifact_id, :version, :extension, :sha1, :artifact_meta_data, :url_segment,
-  :unique_name, :additional_mappings, :org, :infra, :smoke_test_path
+  :unique_name, :additional_mappings, :org, :infra, :smoke_test_path, :existing_mappings
 
   def initialize(id, project_name, platform_type, options, url_segment=nil)
     @id = id
@@ -33,7 +33,7 @@ class Application
   end
 
   def inactive_healthcheck_url
-    "http://inactive.#{full_backchannel_domain}/#{@smoke_test_path}"
+    "http://x.#{full_backchannel_domain}/#{@smoke_test_path}"
   end
 
   def active_healthcheck_url
@@ -145,11 +145,11 @@ class Application
 
 
   def active_domains
-    [full_backchannel_domain, infra_agnostic_backchannel_domain] + Array(@additional_mappings)
+    @existing_mappings || [full_backchannel_domain, infra_agnostic_backchannel_domain] + Array(@additional_mappings)
   end
 
   def inactive_domains
-    active_domains.map{|domain| "inactive.#{domain}"}
+    active_domains.map{|domain| "x.#{domain}"}
   end
 
   private

data/lib/conan/deployment.rb

@@ -64,7 +64,7 @@ class Deployment < HasOptions
   end
 
   def inactive_urls(app)
-    active_urls(app).map{ |url| "inactive.#{url}" }
+    active_urls(app).map{ |url| "x.#{url}" }
   end
 
   def manifest_url(app)
@@ -76,7 +76,7 @@ class Deployment < HasOptions
   end
 
   def inactive_smoke_test_url(app)
-    "http://inactive.#{dns_name(app)}/#{@custom_smoke_test_path || 'status/healthcheck'}"
+    "http://x.#{dns_name(app)}/#{@custom_smoke_test_path || 'status/healthcheck'}"
   end
 
   def paas_target

data/lib/conan/stackato.rb

@@ -28,6 +28,7 @@ class Stackato
   def self.static_login(options)
     org = options[:'deploy-shipcloud'].split('-')[0]
     infra = options[:'deploy-shipcloud'].split('-')[1]
+    @@options = options
 
     puts "logging in at https://api.paas.#{infra}.#{org}.mtnsatcloud.com"
     @@stackato_command = "stackato --target https://api.paas.#{infra}.#{org}.mtnsatcloud.com --token-file #{@@paas_token_file}"
@@ -72,6 +73,7 @@ class Stackato
       if /#{Regexp.escape(newly_deployed_app.stackato_base_name)}/ =~ app["name"] and app["name"] != newly_deployed_app.unique_name
         old_app = newly_deployed_app.clone
         old_app.unique_name = app["name"]
+        old_app.existing_mappings = app["uris"]
         old_apps << old_app
       end
     end
@@ -201,18 +203,18 @@ class Stackato
     active_urls = deployment.active_urls(app)
     inactive_urls = deployment.inactive_urls(app)
 
-    StackatoApplicationInfo.new(list_json, base_name, active_urls, inactive_urls)
+    StackatoApplicationInfo.new(list_json, base_name, active_urls, inactive_urls, @@options)
   end
 end
 
 class StackatoApplicationInfo
-  def initialize(list_json, base_name, active_urls, inactive_urls)
+  def initialize(list_json, base_name, active_urls, inactive_urls, options)
     app_list = JSON.parse(list_json)
 
     active_app_names = []
     inactive_app_names = []
 
-    app_list.each { |app_hash|
+    app_list.each do |app_hash|
       if !(app_hash.has_key? 'name' and app_hash.has_key? 'uris')
         raise "Stackato list json is malformed: " + list_json
       end
@@ -226,11 +228,12 @@ class StackatoApplicationInfo
         elsif app_uris.sort == inactive_urls.sort
           inactive_app_names << app_name
         else
-          raise 'Stackato app "' + app_name +
-            '" needs to be mapped exclusively to either the active or inactive set of URLs. Please reconcile before continuing.'
+          unless options[:stfu]
+            raise "Stackato app '#{app_name}' needs to be mapped exclusively to either the active or inactive set of URLs. Please reconcile before continuing."
+          end
         end
       end
-    }
+    end
 
     if active_app_names.length > 1
       raise "More than one app is mapped to the active URL(s). Please reconcile before continuing."

data/lib/conan/version.rb

@@ -1,3 +1,3 @@
 module Conan
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conan_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-11 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: daphne_util