swarm_cluster_cli_ope 0.5.0.pre.3 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 137adc8bf19db9527fc5fdf3ec3eb5c71f0efd8b553d540eac1007a5ed31999a
-  data.tar.gz: '09d17f52234efab31318398e9bf4a2d992af47fee5c9870373dba1a7de20c13c'
+  metadata.gz: 0c8d4d620c7c8929ca7606a553347601906ebdf99c13ac77c103ee94e4d46c74
+  data.tar.gz: cb045c6a4f21ba1482e79b1d810476677c509ac737cc3ef000bd68afb34ea5eb
 SHA512:
-  metadata.gz: 257e7b406f1242637fb93b96da32a1ea7b08c189554d5442803b29dc8c182f13d9036d294ec62a2b65b0a25cad896e9203f5d9eb18fb0cea0d37245365250214
-  data.tar.gz: e84a120a6953ea3a08a8a1bd4a2c684923547f6fc83f357a1419d2832ad8c25e4fdbcd39cf4008fb88976db74020a1d007088f396391015ff20eeae2a23d72e2
+  metadata.gz: 34772d9e2eb49263ec059a78bcbaa75629043f3d58b2c47c15c8061c430f995d6c5af6100b66c63781b17d450e012574f32a3c48228b24e2c51fc587904204e6
+  data.tar.gz: 1f59ee9abaf08937a09f26e6f0d7c77d88b595154aac0a0b9399299a4dc2bb7ffb59c7c5906d4fbcdf9d69967ccbc8765fee58e64334544f19a48267fb93d75e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swarm_cluster_cli_ope (0.5.0.pre.3)
+    swarm_cluster_cli_ope (0.5.2)
       activesupport
       open4
       thor (~> 1.0)

data/README.md

@@ -211,7 +211,11 @@ docker-compose -f test_folder/test_1/docker-compose-local.yml up -d
 Per Kubernetes dobbiamo avere minikube installato.
 lanciare quindi l'ambiente di test:
 
+```shell script
 kubectl apply -f test_folder/test_k8s/test.yaml
+docker-compose -f test_folder/test_k8s/docker-compose-local.yml up -d
+```
+
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version 
 number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git 

data/lib/swarm_cluster_cli_ope.rb

@@ -2,7 +2,15 @@ require "zeitwerk"
 loader = Zeitwerk::Loader.for_gem
 loader.setup # ready!
 
+require "active_support/core_ext/module/attribute_accessors"
 module SwarmClusterCliOpe
   class Error < StandardError; end
-  # Your code goes here...
+
+
+  ##
+  # La configurazione che viene resa disponibile a tutte le funzioni sucessivamente all'interazione con il concern
+  # della configurazione o con il  blocco di configurazione di un determinato enviroment
+  mattr_accessor :current_configuration
+  @@current_configuration = nil
+
 end

data/lib/swarm_cluster_cli_ope/base_configuration.rb

@@ -137,6 +137,8 @@ module SwarmClusterCliOpe
         exit
       end
 
+      evaluate_correct_command_usage(@_merged_configurations[@environment])
+
       @_merged_configurations[@environment]
 
     end
@@ -170,9 +172,22 @@ module SwarmClusterCliOpe
       end
     end
 
-
+    ##
+    # Indica il nome del progetto locale compose, quella parte di nome che viene attaccata in fronte
+    # ad ogni nome di servizio locale, e che come default è il nome della cartella in cui risiede
+    # il docker-compose.yml file
+    # @return [String]
+    def local_compose_project_name
+      File.basename(FileUtils.pwd).downcase
+    end
 
     private
+
+    ##
+    # Funzione che serve per identificare se siamo nella corretta classe di configurazione e di conseguenza nel corretto
+    # set di comandi di configurazione. Serve per non eseguire k8s con le vecchie impostazioni o viceversa
+    def evaluate_correct_command_usage(configuration) end
+
     ##
     # nome del file in cui salvare le configurazioni di progetto
     # @return [String]

data/lib/swarm_cluster_cli_ope/configuration.rb

@@ -79,17 +79,20 @@ module SwarmClusterCliOpe
       nodes.find { |c| c.id == node_id }
     end
 
-    ##
-    # Indica il nome del progetto locale compose, quella parte di nome che viene attaccata in fronte
-    # ad ogni nome di servizio locale, e che come default è il nome della cartella in cui risiede
-    # il docker-compose.yml file
-    # @return [String]
-    def local_compose_project_name
-      File.basename(FileUtils.pwd).downcase
-    end
 
     private
 
+
+    def evaluate_correct_command_usage(configuration)
+
+      if configuration[:connections_maps].keys.include?(:context)
+        puts "ATTENZIONE, I COMANDI DEVONO ESSERE LANCIATI DAL SUB COMANDO K8S"
+        exit
+      end
+
+    end
+
+
     ##
     # Path al file dove salviamo la cache dei managers, ha un TTL legato all'orario (anno-mese-giorno-ora)
     # quindi ogni ora si autoripulisce e con un md5 delle configurazioni di base

data/lib/swarm_cluster_cli_ope/configuration_concern.rb

@@ -8,7 +8,7 @@ module SwarmClusterCliOpe
 
       # @return [SwarmClusterCliOpe::Configuration]
       def cfgs
-        self.class.cfgs
+        SwarmClusterCliOpe.current_configuration ||= self.class.cfgs
       end
 
     end

data/lib/swarm_cluster_cli_ope/kubernetes/configuration.rb

@@ -2,14 +2,29 @@ module SwarmClusterCliOpe
   module Kubernetes
     class Configuration < BaseConfiguration
 
+      def shell
+        @_shell = Thor::Shell::Basic.new
+      end
+
+      delegate :yes?,to: :shell
 
       ##
       # In kubernetes abbiamo il context, il context può essere ricevuto o dalla configurazione oppure dal current_context
       # di kubelet
       # @return [String]
       def context
-        cmd = ShellCommandExecution.new(['kubectl config current-context'])
-        cmd.execute.raw_result[:stdout]
+
+        context = merged_configurations.dig(:connections_maps,:context) || nil
+
+        if context.nil?
+          cmd = ShellCommandExecution.new(['kubectl config current-context'])
+          context = cmd.execute.raw_result[:stdout]
+          unless yes? "Attenzione, non era presente il contesto nelle configurazioni, usiamo quello attualmente in uso: #{context}, proseguiamo lo stesso?[y,yes]"
+            exit
+          end
+
+        end
+        context
       end
 
       ##
@@ -33,16 +48,27 @@ module SwarmClusterCliOpe
           SyncConfigs::Sqlite3
         when 'rsync'
           SyncConfigs::Rsync
-        # when 'mysql'
-        #   SyncConfigs::Mysql
-        # when 'pg'
-        #   SyncConfigs::PostGres
+        when 'mysql'
+          SyncConfigs::Mysql
+        when 'pg'
+          SyncConfigs::PostGres
         else
           logger.error { "CONFIGURAIONE NON PREVISTA: #{name}" }
           nil
         end
       end
 
+      private
+
+      def evaluate_correct_command_usage(configuration)
+
+        unless configuration[:connections_maps].keys.include?(:context)
+          puts "ATTENZIONE, I COMANDI NON DEVONO ESSERE LANCIATI DAL SUB COMANDO K8S"
+          exit
+        end
+
+      end
+
 
     end
   end

data/lib/swarm_cluster_cli_ope/kubernetes/pod.rb

@@ -30,9 +30,9 @@ module SwarmClusterCliOpe
       end
 
       # @param [String,Array<String>] cmd -> comando da passare a kubectl exec -- CMD
-      # @return [SwarmClusterCliOpe::ShellCommandExecution]
+      # @return [SwarmClusterCliOpe::ShellCommandResponse]
       def exec(cmd)
-        base_cmd(["exec", name, "--", cmd].flatten)
+        base_cmd(["exec", name, "--", cmd].flatten).execute
       end
 
       ##
@@ -98,10 +98,11 @@ module SwarmClusterCliOpe
           puts "Problemi nella ricerca del pod"
           exit
         else
-          if ris.result[:items].empty?
-            logger.warn { "non abbiamo trovato il pod" }
+          if ris.single_obj[:items].empty?
+            puts  "non abbiamo trovato il pod"
+            exit
           else
-            self.new(ris.result[:items].first, context: context)
+            self.new(ris.single_obj[:items].first, context: context)
           end
         end
       end
@@ -119,7 +120,7 @@ module SwarmClusterCliOpe
           puts "Problemi nella ricerca del pod"
           exit
         else
-          self.new(ris.result, context: context)
+          self.new(ris.single_obj, context: context)
         end
       end
 

data/lib/swarm_cluster_cli_ope/kubernetes/sync_configs/mysql.rb

@@ -0,0 +1,10 @@
+module SwarmClusterCliOpe
+  module Kubernetes
+    module SyncConfigs
+      class Mysql < SwarmClusterCliOpe::SyncConfigs::Mysql
+
+        include BaseDecorator
+      end
+    end
+  end
+end

data/lib/swarm_cluster_cli_ope/kubernetes/sync_configs/post_gres.rb

@@ -0,0 +1,11 @@
+module SwarmClusterCliOpe
+  module Kubernetes
+    module SyncConfigs
+      class PostGres < SwarmClusterCliOpe::SyncConfigs::PostGres
+
+        include BaseDecorator
+
+      end
+    end
+  end
+end

data/lib/swarm_cluster_cli_ope/kubernetes/sync_configs/rsync.rb

@@ -47,7 +47,7 @@ module SwarmClusterCliOpe
             end
 
             cmd = container.exec(['bash -c "apt update && apt install -yq rsync psmisc"'])
-            if cmd.execute.failed?
+            if cmd.failed?
               puts "Problemi nell'installazione di rsync nel pod"
             else
               cmd = container.cp_in(File.expand_path("../../rsync_cfgs/rsyncd.conf", __FILE__), "/tmp/.")
@@ -55,54 +55,60 @@ module SwarmClusterCliOpe
               cmd = container.cp_in(File.expand_path("../../rsync_cfgs/rsyncd.secrets", __FILE__), "/tmp/.")
               copy_2 = cmd.execute.failed?
               cmd = container.exec(['bash -c "chmod 600 /tmp/rsyncd.secrets  && chown root /tmp/*"'])
-              chmod = cmd.execute.failed?
+              chmod = cmd.failed?
               if copy_1 or copy_2 or chmod
                 puts "problema nella copia dei file di configurazione nel pod"
               else
 
-
-                cmd = container.exec('bash -c "rsync --daemon --config=/tmp/rsyncd.conf  --verbose --log-file=/tmp/rsync.log"')
-                if cmd.execute.failed?
-                  say "Rsync non Inizializzato"
-                else
-                  local_port = rand(30000..40000)
-
-                  p = IO.popen(container.base_cmd("port-forward #{podname} #{local_port}:873").string_command)
-                  pid = p.pid
-                  say "PID in execuzione port forward:#{pid}"
-
-                  sleep 1
-
-                  # lanciamo il comando quindi per far rsync
-                  rsync_command = [
-                    "rsync -az --no-o --no-g",
-                    "--delete",
-                    "--password-file=#{ File.expand_path("../../rsync_cfgs/password", __FILE__)}"
-                  ]
-
-                  if direction == :up
-                    rsync_command << "#{local_folder}/."
-                    rsync_command << "rsync://root@0.0.0.0:#{local_port}/archives#{remote_folder}"
+                begin
+                  cmd = container.exec('bash -c "rsync --daemon --config=/tmp/rsyncd.conf  --verbose --log-file=/tmp/rsync.log"')
+                  if cmd.failed?
+                    say "Rsync non Inizializzato"
                   else
-                    rsync_command << "rsync://root@0.0.0.0:#{local_port}/archives#{remote_folder}/."
-                    rsync_command << local_folder
+                    begin
+                      local_port = rand(30000..40000)
+
+                      p = IO.popen(container.base_cmd("port-forward #{podname} #{local_port}:873").string_command)
+                      pid = p.pid
+                      say "PID in execuzione port forward:#{pid}"
+
+                      begin
+
+                        sleep 1
+
+                        # lanciamo il comando quindi per far rsync
+                        rsync_command = [
+                          "rsync -az --no-o --no-g",
+                          "--delete",
+                          "--password-file=#{ File.expand_path("../../rsync_cfgs/password", __FILE__)}"
+                        ]
+
+                        if direction == :up
+                          rsync_command << "#{local_folder}/."
+                          rsync_command << "rsync://root@0.0.0.0:#{local_port}/archives#{remote_folder}"
+                        else
+                          rsync_command << "rsync://root@0.0.0.0:#{local_port}/archives#{remote_folder}/."
+                          rsync_command << local_folder
+                        end
+                        say "Eseguo rsync #{rsync_command.join(" ")}"
+
+                        cmd = ShellCommandExecution.new(rsync_command)
+                        cmd.execute
+
+                      ensure
+                        sleep 1
+                        say "Stoppo porta forwarded"
+                        Process.kill("INT", pid)
+                      end
+                    ensure
+                      say "Tolgo il servizio di rsyn"
+                      container.exec('bash -c "killall rsync"')
+                    end
                   end
-                  say "Eseguo rsync #{rsync_command.join(" ")}"
-
-
-                  cmd = ShellCommandExecution.new(rsync_command)
-                  cmd.execute
-
-                  sleep 1
-                  Process.kill("INT", pid)
-
-
-                  say "Eseguo pulizia"
-                  cmd = container.exec('bash -c "killall rsync"')
-                  cmd.execute
-                  cmd = container.exec('bash -c "rm -fr /tmp/rsyncd*"')
-                  cmd.execute
 
+                ensure
+                  say "Eseguo pulizia configurazioni caricate"
+                  container.exec('bash -c "rm -fr /tmp/rsyncd*"')
                 end
 
               end

data/lib/swarm_cluster_cli_ope/logger_concern.rb

@@ -6,7 +6,7 @@ module SwarmClusterCliOpe
       return LoggerConcern.const_get("LOGGER") if LoggerConcern.const_defined?("LOGGER")
       logger = Logger.new(STDOUT)
       LoggerConcern.const_set("LOGGER", logger)
-      logger.level = case Configuration.instance.logger_level
+      logger.level = case BaseConfiguration.instance.logger_level
                      when "0"
                        Logger::ERROR
                      when "1"

data/lib/swarm_cluster_cli_ope/shell_command_response.rb

@@ -1,8 +1,8 @@
 require 'forwardable'
 
 module SwarmClusterCliOpe
-##
-# Identifica una risposta dalla shell
+  ##
+  # Identifica una risposta dalla shell
   class ShellCommandResponse
     extend Forwardable
     include LoggerConcern
@@ -28,18 +28,24 @@ module SwarmClusterCliOpe
     ##
     # Risultato, essendo sempre composto da una lista di righe in formato json, ritorniamo un array di json
     # @param [Object] object_class
-    # @return [Array<object_class>]
-    def result(object_class: OpenStruct)
+    # @return [Array<object_class>,Object]
+    def result(object_class: OpenStruct, single: false)
       #tento prima di estrapolare direttamente da json e sucessivamente come array
-      begin
+      if single
         # questo per k8s, dato che abbiamo come risposta un json vero
-        object_class.new(JSON.parse( raw_result[:stdout]))
-      rescue
+        object_class.new(JSON.parse(raw_result[:stdout]))
+      else
         # questo nel caso siamo in swarm che ci ritorna un array di json
         raw_result[:stdout].split("\n").collect { |s| object_class.new(JSON.parse(s)) }
       end
     end
 
+    # @param [Class<OpenStruct>] object_class
+    # @return [Object]
+    def single_obj(object_class: OpenStruct)
+      result(object_class: object_class, single: true)
+    end
+
     #
     # def to_a
     #   raw_result[:stdout].split("\n")

data/lib/swarm_cluster_cli_ope/stack_sync_concern.rb

@@ -102,6 +102,13 @@ module SwarmClusterCliOpe
                     else
                       raise "ONLY [push|pull] action accepted"
                     end
+
+        if direction == :push
+          unless yes? "ATTENZIONE STAI FACENDO PUSH, proseguire????[y,yes]"
+            exit "OK, CIAO"
+          end
+        end
+
         cfgs.env(options[:environment]) do |cfgs|
           sync_cfgs = cfgs.sync_configurations
           if sync_cfgs.empty?

data/lib/swarm_cluster_cli_ope/sync_configs/mysql.rb

@@ -7,9 +7,24 @@ module SwarmClusterCliOpe
         resume('pull')
         if yes?("Confermare il comando?[y,yes]")
           tmp_file = "/tmp/#{Time.now.to_i}.sql.gz"
-          container.exec("bash -c 'mysqldump  -u #{remote.username} --password=#{remote.password} #{remote.database_name} | gzip -c -f' > #{tmp_file}")
+          container.exec("bash -c 'mysqldump -u #{remote.username} --password=#{remote.password} #{remote.database_name} | gzip -c -f' > #{tmp_file}")
           local_container.copy_in(tmp_file, tmp_file)
-          local_container.exec("bash -c 'zcat #{tmp_file} | mysql  -u #{local.username} --password=#{local.password} #{local.database_name}'")
+          local_authentication = "-u #{local.username} --password=#{local.password}"
+
+          command = []
+          command << "bash -c '"
+
+          command << "mysql #{local_authentication} -e \"DROP DATABASE IF EXISTS #{local.database_name};CREATE DATABASE  #{local.database_name}\""
+
+          command << "&&"
+
+          command << "zcat #{tmp_file}"
+          command << "|"
+          command << "mysql #{local_authentication} #{local.database_name}"
+
+          command << "'"
+
+          local_container.exec(command.join" ")
         end
         true
       end

data/lib/swarm_cluster_cli_ope/sync_configs/post_gres.rb

@@ -2,7 +2,6 @@ module SwarmClusterCliOpe
   module SyncConfigs
     class PostGres < BaseDatabase
 
-
       def pull
         resume('pull')
 
@@ -13,11 +12,11 @@ module SwarmClusterCliOpe
           local.container.copy_in(tmp_file, tmp_file)
 
           # drop old db and recreate
-          if Gem::Version.new(local.database_version) <= Gem::Version.new("12")
-            close_connections_and_drop_cmd(local)
-          else
-            raise "DA ANALIZZARE QUANDO LA 13 disponibile....dropdb ha un force come parametro"
-          end
+          # if Gem::Version.new(local.database_version) <= Gem::Version.new("12")
+          close_connections_and_drop_cmd(local)
+          # else
+          #   raise "DA ANALIZZARE QUANDO LA 13 disponibile....dropdb ha un force come parametro"
+          # end
 
           create_cmd(local)
 
@@ -37,12 +36,8 @@ module SwarmClusterCliOpe
           dump_cmd(local, tmp_file)
           remote.container.copy_in(tmp_file, tmp_file)
 
-          # drop old db and recreate
-          if Gem::Version.new(local.database_version) <= Gem::Version.new("12")
-            close_connections_and_drop_cmd(remote)
-          else
-            raise "DA ANALIZZARE QUANDO LA 13 disponibile....dropdb ha un force come parametro"
-          end
+          close_connections_and_drop_cmd(remote)
+
           create_cmd(remote)
 
           restore_cmd(remote, tmp_file)
@@ -125,23 +120,31 @@ module SwarmClusterCliOpe
 
       end
 
-
       # @param [EnvConfigs] config
       def close_connections_and_drop_cmd(config)
+
         cmd = []
-        cmd << "PGPASSWORD=\"#{config.password}\""
 
-        sql = []
-        sql << "SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname =  '\"'\"'#{config.database_name}'\"'\"' AND pid <> pg_backend_pid();;"
-        sql << "DROP DATABASE IF EXISTS #{config.database_name};"
+        if Gem::Version.new(config.database_version) >= Gem::Version.new("13")
+          cmd << "export PGPASSWORD=\"#{config.password}\" &&"
+          cmd << 'dropdb --force --if-exists'
+          cmd << "-U #{config.username}"
+          cmd << config.database_name
 
-        cmd << "echo \"#{sql.join(" ")}\" "
-        cmd << '|'
-        cmd << 'psql'
-        cmd << "-U #{config.username}"
-        cmd << "postgres"
-        cmd
+        else
+          cmd << "export PGPASSWORD=\"#{config.password}\" &&"
 
+          sql = []
+          sql << "SELECT pg_terminate_backend(pg_stat_activity.pid) FROM pg_stat_activity WHERE pg_stat_activity.datname =  '\"'\"'#{config.database_name}'\"'\"' AND pid <> pg_backend_pid();;"
+          sql << "DROP DATABASE IF EXISTS #{config.database_name};"
+
+          cmd << "echo \"#{sql.join(" ")}\" "
+          cmd << '|'
+          cmd << 'psql'
+          cmd << "-U #{config.username}"
+          cmd << "postgres"
+
+        end
         logger.info { "CLOSE CONNECTIONS COMMAND: #{cmd.join(' ')}" }
         config.container.exec("bash -c '#{cmd.join(' ')}'")
       end
@@ -153,7 +156,6 @@ module SwarmClusterCliOpe
       # PGPASSWORD='root' createdb  -U root  -h 0.0.0.0  -p 32790  development;
       # PGPASSWORD='root' psql  -U root  -h 0.0.0.0  -p 32790  -d development < ./cortobio_production_new_2020-09-10-171742.sql
 
-
     end
   end
 end

data/lib/swarm_cluster_cli_ope/version.rb

@@ -1,3 +1,3 @@
 module SwarmClusterCliOpe
-  VERSION = "0.5.0.pre.3"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swarm_cluster_cli_ope
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre.3
+  version: 0.5.2
 platform: ruby
 authors:
 - Marino Bonetti
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2021-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -105,6 +105,8 @@ files:
 - lib/swarm_cluster_cli_ope/kubernetes/rsync_cfgs/rsyncd.conf
 - lib/swarm_cluster_cli_ope/kubernetes/rsync_cfgs/rsyncd.secrets
 - lib/swarm_cluster_cli_ope/kubernetes/sync_configs/base_decorator.rb
+- lib/swarm_cluster_cli_ope/kubernetes/sync_configs/mysql.rb
+- lib/swarm_cluster_cli_ope/kubernetes/sync_configs/post_gres.rb
 - lib/swarm_cluster_cli_ope/kubernetes/sync_configs/rsync.rb
 - lib/swarm_cluster_cli_ope/kubernetes/sync_configs/sqlite3.rb
 - lib/swarm_cluster_cli_ope/logger_concern.rb
@@ -151,9 +153,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.8
 signing_key: