shards 2.1.6 → 2.2.1.pre.test

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84a189cde1dd20ee0c703592580ddccbca10bdc5
-  data.tar.gz: bc439f40ae05dcdc97111c061933aa01da8e257a
+  metadata.gz: 11aaa88e5e9af9729d5b5554f54842bde6a885c0
+  data.tar.gz: 7373e2a508097075659ef1a1a644ed0947dc711a
 SHA512:
-  metadata.gz: d7dcbd6cfdb02e578542507c18187aeb76f16292e48bae745311960fb79be9124d427ff4ce1943590bafb68ea67141064c746efbe96b37ba05973a744afb38cf
-  data.tar.gz: 34676aa6982b0d2b532e7087815ab74d141f60d6ccab91f5b41aef3a158fe8a336ff1c228b022267e894bee95dbb18c6bfec424cbef11bdf11ca3392885665c5
+  metadata.gz: 035ae7f6ae76900c45e8c88d3e52b777d2a4021425cf88504c989af152c4496edd34a3a3fc5a0b8bc26d5470aee1fae5f26e74a0510f6ab205d54162509bcdd3
+  data.tar.gz: ed2206cf2f5fa7e56e00f7d23c55df784295b50280175685915c95805cdf6dde72596066f1c5b79401b0a0ec1a6833020ed135b609e6f64c27d92bfa80764841

data/Gemfile.lock

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

data/lib/settings/workflows/base.yaml

@@ -74,7 +74,7 @@ shared_steps:
   dns_upsert:
     message: The dns record with the host %s has been succesfully created.
     wrong_message: Error. Could not register the host %s as a dns record.
-    correct: finish
+    correct: finish_successfully
     wrong: finish
 
   clean_repo_and_exit:
@@ -84,6 +84,10 @@ shared_steps:
   finish:
     correct: final_step
 
+  finish_successfully:
+    message: The workflow finish successfully.
+    correct: finish
+
   ask_blank_db:
     # this step could be called or not after the write_yaml_files
     # to change the workflow dinamically call the methods

data/lib/settings/workflows/create_by_api.yaml

@@ -6,23 +6,21 @@ create_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: finish
+    correct: finish_successfully
     wrong: finish
 
-
-  correct_steps_summary:
-    - validate_client
-    - validate_domain
-    - validate_location
-    - validate_stage
-    - check_shard_presence_in_shards
-    - check_database_presence_in_server
-    - check_domain_dns_presence
-    - check_domain_presence_in_sites
-    - write_yaml_files
-    - create_database
-    - commit_changes
-    - finish
+correct_steps_summary:
+  - validate_client
+  - validate_domain
+  - validate_location
+  - validate_stage
+  - check_shard_presence_in_shards
+  - check_database_presence_in_server
+  - check_domain_dns_presence
+  - check_domain_presence_in_sites
+  - write_yaml_files
+  - create_database
+  - commit_changes
 
 
 start: validate_client

data/lib/settings/workflows/delete_by_terminal.yaml

@@ -47,7 +47,7 @@ delete_by_terminal:
   delete_database:
     wrong_message: The database %s could not be deleted.
     message: Database %s has been deleted.
-    correct: finish
+    correct: finish_successfully
     wrong: finish
 
 start: validate_location

data/lib/settings/workflows/fast_terminal.yaml

@@ -2,23 +2,28 @@
 # see shared_steps in base.yaml to find the steps not defined in a workflow
 
 fast_terminal:
+  all_steps_in_base:
+    - all steps are in base yaml
 
-  correct_steps_summary:
-    - validate_client
-    - validate_domain
-    - validate_location
-    - validate_stage
-    - check_shard_presence_in_shards
-    - check_database_presence_in_server
-    - check_domain_dns_presence
-    - check_domain_presence_in_sites
-    - write_yaml_files
-    - create_database
-    - commit_changes
-    - check_fingerprints
-      # It runs a puppet agent -t 3 times when the above check fails.
-    - application_reload_shards_task
-    - dns_upsert
-    - finish
+correct_steps_summary:
+  - validate_client
+  - validate_domain
+  - validate_location
+  - validate_stage
+  - check_shard_presence_in_shards
+  - check_database_presence_in_server
+  - check_domain_dns_presence
+  - check_domain_presence_in_sites
+  - write_yaml_files
+  - create_database
+  - commit_changes
+  - check_fingerprints
+    # Run a 3 times loop when the above check fails.
+  - loop_step
+  - puppet_agent_udate
+  - check_fingerprints
+    # finish loop
+  - application_reload_shards_task
+  - dns_upsert
 
 start: validate_client

data/lib/settings/workflows/fingerprints_by_api.yaml

@@ -0,0 +1,48 @@
+---
+# see shared_steps in base.yaml to find the steps not defined in a workflow
+
+fingerprints_by_api:
+
+  # import validate client domain location and stage from fingerprints terminal
+
+  check_fingerprints:
+    message: The yaml files have been updated correctly in server(s).
+    wrong_message: Fingerprints are not matching %s
+    correct: application_reload_shards_task
+    wrong: loop_step
+
+  application_reload_shards_task:
+    message: Reload task have been executed successfully.
+    wrong_message: Errors found in the reload task %s.
+    correct: dns_upsert
+    wrong: finish
+
+  puppet_agent_update:
+    message: Puppet has been executed successfully.
+    correct: check_fingerprints
+    wrong_message: Errors executing the puppet update % s
+    wrong: check_fingerprints
+
+  loop_step:
+    correct: puppet_agent_update
+    message: The step %s will be executed after wait %d seconds.
+    wrong: finish
+    wrong_message: This is the %dth loop. The maximun is (%d).
+    total_loops: 1
+    seconds_between_loop: 1
+
+correct_steps_summary:
+  - validate_client
+  - validate_domain
+  - validate_location
+  - validate_stage
+  - check_fingerprints
+    # Run a 1 time loop when the above check fails.
+  - loop_step
+  - puppet_agent_udate
+  - check_fingerprints
+    # finish loop
+  - application_reload_shards_task
+  - dns_upsert
+
+start: validate_client

data/lib/settings/workflows/fingerprints_terminal.yaml

@@ -0,0 +1,42 @@
+---
+# see shared_steps in base.yaml to find the steps not defined in a workflow
+
+fingerprints_terminal:
+
+  validate_client:
+    correct: validate_domain
+    wrong: finish
+    wrong_message: The client name %s.
+    min_size: 2
+
+  validate_domain:
+    correct: validate_location
+    wrong: finish
+    wrong_message: The domain %s.
+    min_size: 3
+    regex: ^[a-z0-9_]*$
+
+  validate_stage:
+    correct: check_fingerprints
+    wrong_message: Stage %s does not exist.
+    wrong: finish
+
+  validate_location:
+    correct: validate_stage
+    wrong_message: Location %s does not exist.
+    wrong: finish
+
+correct_steps_summary:
+  - validate_client
+  - validate_domain
+  - validate_location
+  - validate_stage
+  - check_fingerprints
+    # Run a 3 times loop when the above check fails.
+  - loop_step # start the loop here
+  - puppet_agent_udate
+  - check_fingerprints # finish loop
+  - application_reload_shards_task
+  - dns_upsert
+
+start: validate_client

data/lib/shards/client.rb

@@ -20,9 +20,9 @@ module Shards
 
     def loop_fingerprint_check location, stage, client, domain
 
-      fast_terminal=Shards::Workflow::FingerprintTerminal.new config
-      fast_terminal.params= { client: client, domain: domain, location: location.downcase, stage: stage }
-      fast_terminal.start
+      terminal=Shards::Workflow::FingerprintsTerminal.new config
+      terminal.params= { client: client, domain: domain, location: location.downcase, stage: stage }
+      terminal.start
 
     end
 

data/lib/shards/version.rb

@@ -1,3 +1,3 @@
 module Shards
-  VERSION = "2.1.6"
+  VERSION = "2.2.1-test"
 end

data/lib/shards/workflow/base.rb

@@ -9,12 +9,13 @@ module Shards
       attr_accessor :config, :flow, :pointer, :step, :answer, :pointer_history, :client, :location, :stage, :domain, :site, :params, :blank_db
 
       attr_writer :wf
-      attr_reader :current_loop
+      attr_reader :current_loop, :success
 
       def initialize config
         @config=config
         config.repo.clean
         @pointer_history = []
+        @success=false
       end
 
       def yaml
@@ -101,6 +102,27 @@ module Shards
         puts message
       end
 
+      def validate_client
+
+        cli=params[:client]
+
+        validate_min_size cli, step['min_size']
+
+        @client=cli
+
+      end
+
+      def validate_domain
+
+        domain_name=params[:domain]
+
+        validate_min_size domain_name, step['min_size']
+
+        validate_regex domain_name, step['regex']
+
+        @domain=domain_name
+
+      end
 
       def ask_question
         puts step['question']
@@ -188,7 +210,7 @@ module Shards
       def write_yaml_files
         stage.add_domain domain
         site.add_site
-        puts config.repo.diff
+        output_message config.repo.diff
         ask_question
         raise step['wrong_message'] if answer.strip.downcase!='y'
       end
@@ -196,8 +218,8 @@ module Shards
       def commit_changes
         config.repo.message = "Added shard in #{location.name} for #{client}"
         config.repo.autocommit
-        puts step['message']
-        puts config.repo.message
+        output_message step['message']
+        output_message config.repo.message
       end
 
       def create_database
@@ -205,17 +227,17 @@ module Shards
         stage.shard.db.create dryrun: false
         message_params= [stage.shard.db.name, stage.shard.db.server]
         raise_wrong_text message_params unless stage.shard.db.exist?
-        puts step['message'] % message_params
+        output_message step['message'] % message_params
       end
 
       def clean_repo_and_exit
-        puts config.repo.clean
+        output_message config.repo.clean
       end
 
       def dns_upsert
         stage.shard.dns.set dryrun: false
         raise_wrong_text host unless stage.shard.dns.exist?
-        puts step['message'] % host
+        output_message step['message'] % host
       end
 
       def host
@@ -253,7 +275,7 @@ module Shards
         resp=stage.check_remote_process remote_check: :fingerprints
         errors=filter_errors resp
         raise_wrong_text errors if errors.count>0
-        puts step['message']
+        output_message step['message']
       end
 
       def loop_step
@@ -261,7 +283,7 @@ module Shards
         @total_loops||=step['total_loops']
         @current_loop+=1
         raise_wrong_text [current_loop,@total_loops] if current_loop>@total_loops
-        puts step['message'] % [step['correct'], step['seconds_between_loop']]
+        output_message step['message'] % [step['correct'], step['seconds_between_loop']]
         sleep step['seconds_between_loop']
       end
 
@@ -270,14 +292,19 @@ module Shards
         resp=stage.check_remote_process remote_check: :reload_shards!
         errors=filter_status_errors resp
         raise_wrong_text errors if errors.count>0
-        puts step['message']
+        output_message step['message']
       end
 
       def puppet_agent_update
         resp=stage.check_remote_process remote_check: :puppet_agent!
         errors=filter_status_errors resp
         raise_wrong_text errors if errors.count>0
-        puts step['message']
+        output_message step['message']
+      end
+
+      def finish_successfully
+        output_message step['message']
+        @success=true
       end
 
       private

data/lib/shards/workflow/by_api.rb

@@ -0,0 +1,25 @@
+
+module Shards
+
+  module Workflow
+
+    class ByApi < Shards::Workflow::Base
+
+      attr_accessor :log
+
+      def write_yaml_files
+        stage.add_domain domain
+        site.add_site
+        output_message config.repo.diff
+      end
+
+      def output_message message
+        @log||="Create By API\n"
+        @log << "#{pointer} -> #{message} #{Time.now.to_s}\n"
+      end
+
+    end
+
+  end
+
+end

data/lib/shards/workflow/create_by_api.rb

@@ -1,19 +1,10 @@
-require_relative './base.rb'
 
 module Shards
 
   module Workflow
 
-    class CreateByApi < Shards::Workflow::Base
+    class CreateByApi < Shards::Workflow::ByApi
 
-      def write_yaml_files
-        stage.add_domain domain
-        site.add_site
-      end
-
-      def output_message message
-        message
-      end
 
     end
 

data/lib/shards/workflow/delete_by_terminal.rb

@@ -1,4 +1,3 @@
-require_relative './base.rb'
 
 module Shards
 

data/lib/shards/workflow/fast_terminal.rb

@@ -1,4 +1,3 @@
-require_relative './base.rb'
 
 module Shards
 
@@ -6,27 +5,6 @@ module Shards
 
     class FastTerminal < Shards::Workflow::Base
 
-      def validate_client
-
-        cli=params[:client]
-
-        validate_min_size cli, step['min_size']
-
-        @client=cli
-
-      end
-
-      def validate_domain
-
-        domain_name=params[:domain]
-
-        validate_min_size domain_name, step['min_size']
-
-        validate_regex domain_name, step['regex']
-
-        @domain=domain_name
-
-      end
 
     end
 

data/lib/shards/workflow/fast_terminal_all.rb

@@ -1,4 +1,3 @@
-require_relative './fast_terminal.rb'
 
 module Shards
 

data/lib/shards/workflow/fingerprints_by_api.rb

@@ -0,0 +1,31 @@
+
+module Shards
+
+  module Workflow
+
+    class FingerprintsByApi < Shards::Workflow::ByApi
+
+      def shared_workflow
+        'fingerprints_terminal'
+      end
+
+      def shared_wf_file
+        get_file "#{shared_workflow}.yaml"
+      end
+
+      def shared_steps_with_workflow
+        YAML.load_file(shared_wf_file)[shared_workflow]
+      end
+
+      def start
+        @flow=shared_steps.merge yaml[wf]
+        @flow.merge! shared_steps_with_workflow
+        @pointer=yaml['start']
+        run_step
+      end
+
+    end
+
+  end
+
+end

data/lib/shards/workflow/{fingerprint_terminal.rb → fingerprints_terminal.rb}

@@ -1,10 +1,9 @@
-require_relative './base.rb'
 
 module Shards
 
   module Workflow
 
-    class FingerprintTerminal < Shards::Workflow::Base
+    class FingerprintsTerminal < Shards::Workflow::Base
 
       def validate_client
 

data/lib/shards/workflow/terminal.rb

@@ -1,4 +1,3 @@
-require_relative './base.rb'
 
 module Shards
 

data/lib/shards/workflow/workflow.rb

@@ -1,9 +1,11 @@
 require "shards/workflow/base"
 require "shards/workflow/terminal"
 require "shards/workflow/fast_terminal"
-require "shards/workflow/fingerprint_terminal"
+require "shards/workflow/fingerprints_terminal"
 require "shards/workflow/delete_by_terminal"
+require "shards/workflow/by_api"
 require "shards/workflow/create_by_api"
+require "shards/workflow/fingerprints_by_api"
 
 module Shards
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shards
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.2.1.pre.test
 platform: ruby
 authors:
 - Diego PL
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -248,7 +248,8 @@ files:
 - lib/settings/workflows/delete_by_terminal.yaml
 - lib/settings/workflows/fast_terminal.yaml
 - lib/settings/workflows/fast_terminal_all.yaml
-- lib/settings/workflows/fingerprint_terminal.yaml
+- lib/settings/workflows/fingerprints_by_api.yaml
+- lib/settings/workflows/fingerprints_terminal.yaml
 - lib/settings/workflows/terminal.yaml
 - lib/shards.rb
 - lib/shards/base.rb
@@ -267,11 +268,13 @@ files:
 - lib/shards/stage.rb
 - lib/shards/version.rb
 - lib/shards/workflow/base.rb
+- lib/shards/workflow/by_api.rb
 - lib/shards/workflow/create_by_api.rb
 - lib/shards/workflow/delete_by_terminal.rb
 - lib/shards/workflow/fast_terminal.rb
 - lib/shards/workflow/fast_terminal_all.rb
-- lib/shards/workflow/fingerprint_terminal.rb
+- lib/shards/workflow/fingerprints_by_api.rb
+- lib/shards/workflow/fingerprints_terminal.rb
 - lib/shards/workflow/terminal.rb
 - lib/shards/workflow/workflow.rb
 - shards.gemspec
@@ -292,9 +295,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.14

data/lib/settings/workflows/fingerprint_terminal.yaml

@@ -1,23 +0,0 @@
----
-# see shared_steps in base.yaml to find the steps not defined in a workflow
-
-fingerprint_terminal:
-
-  validate_stage:
-    correct: check_fingerprints
-    wrong_message: Stage %s does not exist.
-    wrong: clean_repo_and_exit
-
-  correct_steps_summary:
-    - validate_client
-    - validate_domain
-    - validate_location
-    - validate_stage
-    - check_fingerprints
-    - loop_step
-      # It runs a puppet agent -t 3 times when the above check fails.
-    - application_reload_shards_task
-    - dns_upsert
-    - finish
-
-start: validate_client