swarm_cluster_cli_ope 0.5.0.pre.5 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3ef506ff18497d7a1e4d7e8641d439f006d5a4efd6065436e4f9ab3ff9a251c
-  data.tar.gz: bbce35bf210097b7e2bb2d8a973ec345f2dd9cea786536947ddb88bd9baf0aef
+  metadata.gz: ec7a0b3dd9f3253a1e18bcb091b4e31a5de19b6304a91fe77ed4d704c9a9f109
+  data.tar.gz: b552969314967d155c2ddba35de7f4f809b5905830c1fb2edc20a0542879005f
 SHA512:
-  metadata.gz: aa6b8661174a5b5c4961baf2c973c202b15b29ef25e5e796548c902339626d53aea85f6a70c83302127a4864ff868588d0c9b36431d9db71dd1c4626baa8482d
-  data.tar.gz: 6d81962999b8b01337c03c299db875264dde14bdf2b093448ed47e7f0f0dc51bc53fcdc70086975f0e66c6efee2ccfd5545a669e29d03a499fc1a88ab2ed9460
+  metadata.gz: 64f80000c7b36cd5ef521f41939fb93060b3e94520081b33522d44ecf52cba7754022881089a981a206b230287289e19735efd9b6fdcb1acdb60e26563c2f14a
+  data.tar.gz: e7943eaad259b10bc0e3c6879aca2910d6a864e843d0235844eca2ef90c10c8ba7fa671b1fa2bbcbdec5041a0946abae4d96b6a49d311636f8a52dd5717a7a7a

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 ## Changelog
 
+# 0.5.4
+- bug permessi sul file password dell'rsync
+
+# 0.5.3
+- bug selezione pod, ora filtra solamente per i containers che sono attivi 
+
 # 0.4
 - implementazione push pull con il comando **stacksync** di pg
 - controllo di versione sul file caricato rispeto a gemma, con conseguente warning 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    swarm_cluster_cli_ope (0.5.0.pre.5)
+    swarm_cluster_cli_ope (0.5.4)
       activesupport
       open4
       thor (~> 1.0)
@@ -10,23 +10,22 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.4)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    concurrent-ruby (1.1.7)
-    i18n (1.8.5)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    concurrent-ruby (1.1.8)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.2)
+    minitest (5.14.3)
     open4 (1.3.4)
     rake (12.3.3)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.8)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.1)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

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

@@ -48,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
 
       ##
@@ -90,6 +90,7 @@ module SwarmClusterCliOpe
         base_cmd << "--context=#{context}" unless context.blank?
         base_cmd << "get pod"
         base_cmd << "--selector=#{selector}"
+        base_cmd << "--field-selector=status.phase=Running" #solo pod che stanno girando teniamo sotto controllo
         base_cmd << "--output=json"
 
         cmd = ShellCommandExecution.new(base_cmd)

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,22 +47,22 @@ 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/.")
+              cmd = container.cp_in(configs_path("rsyncd.conf"), "/tmp/.")
               copy_1 = cmd.execute.failed?
-              cmd = container.cp_in(File.expand_path("../../rsync_cfgs/rsyncd.secrets", __FILE__), "/tmp/.")
+              cmd = container.cp_in(configs_path("rsyncd.secrets"), "/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
 
                 begin
                   cmd = container.exec('bash -c "rsync --daemon --config=/tmp/rsyncd.conf  --verbose --log-file=/tmp/rsync.log"')
-                  if cmd.execute.failed?
+                  if cmd.failed?
                     say "Rsync non Inizializzato"
                   else
                     begin
@@ -76,11 +76,15 @@ module SwarmClusterCliOpe
 
                         sleep 1
 
+                        # forzo i permessi sul file della password
+                        cmd = ShellCommandExecution.new(["chmod 600 #{ configs_path("password")}"])
+                        cmd.execute
+
                         # 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__)}"
+                          "--password-file=#{ configs_path("password")}"
                         ]
 
                         if direction == :up
@@ -102,15 +106,13 @@ module SwarmClusterCliOpe
                       end
                     ensure
                       say "Tolgo il servizio di rsyn"
-                      cmd = container.exec('bash -c "killall rsync"')
-                      cmd.execute
+                      container.exec('bash -c "killall rsync"')
                     end
                   end
 
                 ensure
                   say "Eseguo pulizia configurazioni caricate"
-                  cmd = container.exec('bash -c "rm -fr /tmp/rsyncd*"')
-                  cmd.execute
+                  container.exec('bash -c "rm -fr /tmp/rsyncd*"')
                 end
 
               end
@@ -121,6 +123,14 @@ module SwarmClusterCliOpe
 
         end
 
+        ##
+        # Estrapola la path al file di configurazione
+        # @param [String] file
+        # @return [String]
+        def configs_path(file)
+          File.expand_path("../../rsync_cfgs/#{file}", __FILE__)
+        end
+
       end
     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/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.5"
+  VERSION = "0.5.4"
 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.5
+  version: 0.5.4
 platform: ruby
 authors:
 - Marino Bonetti
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2021-01-29 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: