shards 3.1 → 3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa4d8238d564cb0b4fd0515cf38fba0012aad65ea85c82dec099801c5b414af9
-  data.tar.gz: 7be2c2147e768a69bb511d5d0eda49f11e3aa3232863272ccc5d29b74b9c5473
+  metadata.gz: c6f3e5c3b27a1260b50f1a00cf86ae62e8b7c1593fc2feb1e68bd7cd7194d438
+  data.tar.gz: 6ba8aaf2b3d0025d8750d552ea50d9061f2bae402f951770813f0dbaef8285ee
 SHA512:
-  metadata.gz: 9d91b4250d21945dca44bed36e4a36c6843552dcd504aeecd851806bf8ce1223ea6b52c956c197e1fb7a53ed9d7e65c0ad23e669293b9d85ae3aaa64f3a1e187
-  data.tar.gz: 6850d171bc875352d197334dd023ecd5b8d8e4234c0634dd1a32868d2034ba6a045cfda31d7e3ae3b1a1cc437a4c284d669cc0ceb00ba52ecde041ea7ad2b185
+  metadata.gz: 8064c86c8daab178f602e47052b2d56977c744214b169524e3b8cf5d16c704456dd1e1657030b6dc040ff72b1f646877155d8ceabfedf7182c7fcef64e0abd66
+  data.tar.gz: d4a076e06a2af9e83d8efc2bc01c2234d46062fca82e41c97420cdbd4c354d67aa305109498e09b2bdb77415162038f8270aaf570258e8b8dbae34b2cde1a31f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shards (3.1)
+    shards (3.2)
       aws-sdk-ec2 (~> 1.48)
       aws-sdk-elasticloadbalancing (~> 1.5)
       aws-sdk-elasticloadbalancingv2 (~> 1.14)

data/lib/settings/workflows/delete_by_api.yaml

@@ -27,16 +27,11 @@ delete_by_api:
   commit_changes:
     message: The changes has been committed and pushed to the remote repository.
     wrong_message: We had an issue to commit and push the changes.
-    correct: delete_database
+    correct: finish_successfully
     wrong: finish
 
   #TODO restart sidekiq before the database deletion.
 
-  delete_database:
-    wrong_message: The database %s could not be deleted.
-    message: Database %s has been deleted.
-    correct: finish_successfully
-    wrong: finish
 
 start: validate_location
 
@@ -48,6 +43,5 @@ correct_steps_summary:
   - delete_site_and_shard
   - write_yaml_files
   - commit_changes
-  - delete_database
 
 start: validate_location

data/lib/settings/workflows/reload_by_api.yaml

@@ -19,7 +19,7 @@ reload_by_api:
   application_reload_shards_task:
     message: Reload task have been executed successfully.
     wrong_message: Errors found in the reload task %s.
-    correct: finish_successfully
+    correct: delete_database
     wrong: finish
 
   puppet_agent_update:
@@ -34,6 +34,12 @@ reload_by_api:
     correct: application_reload_shards_task
     wrong: finish
 
+  delete_database:
+    wrong_message: The database %s could not be deleted.
+    message: Database %s has been deleted.
+    correct: finish_successfully
+    wrong: finish
+
 correct_steps_summary:
   - validate_client
   - validate_domain
@@ -43,5 +49,6 @@ correct_steps_summary:
   - puppet_agent_update
   - check_fingerprints2
   - application_reload_shards_task
+  - delete_database
 
 start: validate_client

data/lib/shards/stage.rb

@@ -14,6 +14,7 @@ module Shards
     end
 
     attr_accessor :name, :location_name, :shard, :chosen_blank_db
+    attr_writer :host_list
 
     def initialize name, data, location_name
 
@@ -78,7 +79,7 @@ module Shards
     end
 
     def web_server_hosts
-      name=='prod' ? get_production_ips : [ internal_host ]
+      name=='prod' ? get_production_hosts : [ internal_host ]
     end
 
     def hosts_to_check
@@ -93,6 +94,10 @@ module Shards
       []
     end
 
+    def get_production_hosts
+      @host_list || @ips || get_production_ips
+    end
+
     def get_production_ips
       ip_search=Shards::IpSearch.new self
       @ips||=ip_search.ips
@@ -106,8 +111,12 @@ module Shards
       get('route53').split('.').first
     end
 
+    def host_list
+      @host_list || hosts_to_check
+    end
+
     def check_remote_process remote_check: :internal_host
-      hosts_to_check.map do |h|
+      host_list.map do |h|
         @internal_host=h
         [ h , send(remote_check) ]
       end.to_h

data/lib/shards/version.rb

@@ -1,3 +1,3 @@
 module Shards
-  VERSION = "3.1"
+  VERSION = "3.2"
 end

data/lib/shards/workflow/base.rb

@@ -278,7 +278,9 @@ module Shards
 
       def check_fingerprints
         resp=stage.check_remote_process remote_check: :fingerprints
-        errors=filter_errors resp
+
+        errors=filter_errors multitenant(resp)
+        stage.host_list = multitenant(resp).keys
         raise_wrong_text errors if errors.count>0
         output_message step['message']
       end
@@ -326,6 +328,11 @@ module Shards
       def filter_status_errors resp
         resp.select { |k,x| x[:status]==1 }
       end
+
+      def multitenant resp
+        resp.select { |k,x| x.values.count { |v| v[:remote]=='md5sum:' } < 1 }
+      end
+
     end
 
   end

data/lib/shards/workflow/delete_by_api.rb

@@ -53,34 +53,6 @@ module Shards
         output_message config.repo.message
       end
 
-      def delete_database
-
-        if database_to_drop
-
-          @db=Shards::Db.new stage: stage
-
-          db.database_to_drop=database_to_drop
-
-          raise "Database %s does is not in present db servers" % database_to_drop  unless db.exist?(database_to_drop)
-
-          db.servers_to_drop.each do |host|
-
-            output_message "Database:\t #{database_to_drop}"
-            output_message "Host:    \t #{host}"
-            output_message "DELETING database #{database_to_drop} in #{host}"
-            db.server=host
-            db.drop
-
-          end
-
-          raise_wrong_text database_to_drop if db.exist? database_to_drop
-          output_message step['message'] % database_to_drop
-
-        else
-          output_message "The shard is in use by other site, will not be deleted"
-        end
-      end
-
       private
 
       def target_message_error

data/lib/shards/workflow/reload_by_api.rb

@@ -1,6 +1,34 @@
 module Shards
   module Workflow
     class ReloadByApi < Shards::Workflow::FingerprintsByApi
+      def delete_database
+
+        if database_to_drop
+
+          @db=Shards::Db.new stage: stage
+
+          db.database_to_drop=database_to_drop
+
+          raise "Database %s does is not in present db servers" % database_to_drop  unless db.exist?(database_to_drop)
+
+          db.servers_to_drop.each do |host|
+
+            output_message "Database:\t #{database_to_drop}"
+            output_message "Host:    \t #{host}"
+            output_message "DELETING database #{database_to_drop} in #{host}"
+            db.server=host
+            db.drop
+
+          end
+
+          raise_wrong_text database_to_drop if db.exist? database_to_drop
+          output_message step['message'] % database_to_drop
+
+        else
+          output_message "The shard is in use by other site, will not be deleted"
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shards
 version: !ruby/object:Gem::Version
-  version: '3.1'
+  version: '3.2'
 platform: ruby
 authors:
 - Diego PL
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2019-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler