kuber_kit 0.5.10 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 790b99f8456fde1e3c0f8f81308e6bcd7d6c8d6b4e274da4f667f0297f703b2a
-  data.tar.gz: 6102f785babd0ba638f46b9edc0d2d2740d60bcc7d3a4dd81a8a9e210aa2dc5a
+  metadata.gz: 32c19efd73a0f79e6dd009a9e6700c184b78eacde4be6c7eb3e9571a6aa5977d
+  data.tar.gz: 6c66868a7a280ecaccc6dcb44ee75a929ecbb057545f412dab2f57e4e8c45bc9
 SHA512:
-  metadata.gz: c61ead9e24a6f88c1ae0e8a517eb030b035d8ce68c1babefcb0de9b4a36a8638f41f57a47000f75cd2f681c4e3086477a2afd9113d5e9850bce7ad3242c2c0aa
-  data.tar.gz: 96436dd5394baff8c2a8a2fe285909b4474df72f8548bfbecd0a2a9c28f2e6e763b0beec8b9d0ecaa6f12e69ca5c8c40974e16d1bf060911f6cf400f36a6eabc
+  metadata.gz: 8b1316dd6e65c9f81db7450c4e86c398357cd429054965ddff80634744f1ab5b1acedb638cd51c9c65040edd0c09c67429d5f884eef6c443ddb0e6bf558bd878
+  data.tar.gz: dac99cdc86d70f8f9424f6cb9aee0e7f5630e5407f878266c6373740015a5664c3ea6c27a29c9f39985b738bc7665281f9f9ced846436f251598da16bc6517f8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+**0.6.0**
+- Cleanup old image build dirs
+- Add rotation to deployment log file
+
 **0.5.10**
 - Fix a regression when deployment result would not be properly returned as json.
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kuber_kit (0.5.10)
+    kuber_kit (0.6.0)
       cli-ui
       contracts-lite
       dry-auto_inject (~> 0.7.0)

data/TODO.md

@@ -1,5 +1,3 @@
-- cleanup image builds older than some date
-- add some rotation for deploy log
 - env files should use a separate deployment method (with change detection)
 - add automatical confirmation support for service deployer
 - template should be able to set default attributes

data/lib/kuber_kit.rb

@@ -79,6 +79,7 @@ module KuberKit
   end
 
   module Tools
+    autoload :BuildDirCleaner, 'tools/build_dir_cleaner'
     autoload :FilePresenceChecker, 'tools/file_presence_checker'
     autoload :LoggerFactory, 'tools/logger_factory'
     autoload :ProcessCleaner, 'tools/process_cleaner'
@@ -153,6 +154,7 @@ module KuberKit
     autoload :ActionHandler, 'service_deployer/action_handler'
     autoload :StrategyDetector, 'service_deployer/strategy_detector'
     autoload :Deployer, 'service_deployer/deployer'
+    autoload :DeploymentOptionsSelector, 'service_deployer/deployment_options_selector'
     autoload :ServiceListResolver, 'service_deployer/service_list_resolver'
     autoload :ServiceDependencyResolver, 'service_deployer/service_dependency_resolver'
 

data/lib/kuber_kit/actions/image_compiler.rb

@@ -30,7 +30,7 @@ class KuberKit::Actions::ImageCompiler
     ui.print_error("Error", e.message)
 
     compilation_result.failed!(e.message)
-
+    
     false
   end
 

data/lib/kuber_kit/actions/service_deployer.rb

@@ -3,6 +3,7 @@ class KuberKit::Actions::ServiceDeployer
     "actions.image_compiler",
     "service_deployer.service_list_resolver",
     "service_deployer.service_dependency_resolver",
+    "service_deployer.deployment_options_selector",
     "core.service_store",
     "shell.local_shell",
     "tools.process_cleaner",
@@ -23,10 +24,9 @@ class KuberKit::Actions::ServiceDeployer
     current_configuration = KuberKit.current_configuration
 
     if services.empty? && tags.empty?
-      services, tags = show_tags_selection
+      services, tags = deployment_options_selector.call()
     end
 
-
     disabled_services = current_configuration.disabled_services.map(&:to_s)
     disabled_services += skip_services if skip_services
 
@@ -45,20 +45,12 @@ class KuberKit::Actions::ServiceDeployer
       return false
     end
 
-    services_list = all_service_names.map(&:to_s).map(&:yellow).join(", ")
-    ui.print_info "ServiceDeployer", "The following services will be deployed: #{services_list}"
-
-    if require_confirmation
-      result = ui.prompt("Please confirm to continue deployment", ["confirm".green, "cancel".red])
-      return false unless ["confirm".green, "confirm", "yes"].include?(result)
-    end
-
-    services = all_service_names.map do |service_name|
-      service_store.get_service(service_name.to_sym)
+    unless allow_deployment?(require_confirmation: require_confirmation, service_names: all_service_names)
+      return false
     end
 
-    images_names = services.map(&:images).flatten.uniq
-
+    # Compile images for all services and dependencies
+    images_names = get_image_names(service_names: all_service_names)
     unless skip_compile
       compilation_result = compile_images(images_names)
 
@@ -77,11 +69,13 @@ class KuberKit::Actions::ServiceDeployer
   rescue KuberKit::Error => e
     ui.print_error("Error", e.message)
 
-    compilation_result.failed!(e.message)
-
+    deployment_result.failed!(e.message)
+    
     false
   rescue Interrupt => e
     process_cleaner.clean
+
+    false
   end
 
   private
@@ -109,46 +103,23 @@ class KuberKit::Actions::ServiceDeployer
       image_compiler.call(images_names, {})
     end
 
-    def show_tags_selection()
-      specific_service_option = "deploy specific service"
-      all_services_option     = "deploy all services"
-
-      tags = [specific_service_option, all_services_option]
-      tags += service_store
-        .all_definitions
-        .values
-        .map(&:to_service_attrs)
-        .map(&:tags)
-        .flatten
-        .uniq
-        .sort
-        .map(&:to_s)
-
-      selected_tag = ui.prompt("Please select which tag to deploy", tags)
-
-      if selected_tag == specific_service_option
-        show_service_selection
-      elsif selected_tag == all_services_option
-        [["*"], []]
-      else
-        [[], [selected_tag]]
+    def get_image_names(service_names:)
+      services = service_names.map do |service_name|
+        service_store.get_service(service_name.to_sym)
       end
+  
+      services.map(&:images).flatten.uniq
     end
 
-    def show_service_selection()
-      services = service_store
-        .all_definitions
-        .values
-        .map(&:service_name)
-        .uniq
-        .sort
-        .map(&:to_s)
-
-      if services.empty?
-        return [[], []]
+    def allow_deployment?(require_confirmation:, service_names:)
+      services_list = service_names.map(&:to_s).map(&:yellow).join(", ")
+      ui.print_info "ServiceDeployer", "The following services will be deployed: #{services_list}"
+
+      unless require_confirmation
+        return true
       end
 
-      selected_service = ui.prompt("Please select which service to deploy", services)
-      [[selected_service], []]
+      result = ui.prompt("Please confirm to continue deployment", ["confirm".green, "cancel".red])
+      return ["confirm".green, "confirm", "yes"].include?(result)
     end
 end

data/lib/kuber_kit/container.rb

@@ -121,6 +121,10 @@ class KuberKit::Container
     KuberKit::Core::ContextHelper::ContextHelperFactory.new
   end
 
+  register "tools.build_dir_cleaner" do
+    KuberKit::Tools::BuildDirCleaner.new
+  end
+
   register "tools.file_presence_checker" do
     KuberKit::Tools::FilePresenceChecker.new
   end
@@ -273,6 +277,10 @@ class KuberKit::Container
     KuberKit::ServiceDeployer::Deployer.new
   end
 
+  register "service_deployer.deployment_options_selector" do
+    KuberKit::ServiceDeployer::DeploymentOptionsSelector.new
+  end
+
   register "service_deployer.service_list_resolver" do
     KuberKit::ServiceDeployer::ServiceListResolver.new
   end

data/lib/kuber_kit/image_compiler/action_handler.rb

@@ -2,12 +2,15 @@ class KuberKit::ImageCompiler::ActionHandler
   include KuberKit::Import[
     "image_compiler.compiler",
     "core.image_store",
+    "tools.build_dir_cleaner",
     "configs",
   ]
 
   Contract KuberKit::Shell::AbstractShell, Symbol, String => Any
   def call(shell, image_name, build_id)
     image = image_store.get_image(image_name)
+
+    build_dir_cleaner.call(parent_dir: configs.image_compile_dir)
     
     compile_dir = generate_compile_dir(build_id: build_id)
 

data/lib/kuber_kit/service_deployer/deployment_options_selector.rb

@@ -0,0 +1,49 @@
+class KuberKit::ServiceDeployer::DeploymentOptionsSelector
+  include KuberKit::Import[
+    "core.service_store",
+    "ui"
+  ]
+
+  OPTION_SPECIFIC_SERVICE = "deploy specific service".freeze
+  OPTION_ALL_SERVICES     = "deploy all services"
+
+  def call()
+    tags = [OPTION_SPECIFIC_SERVICE, OPTION_ALL_SERVICES]
+    tags += service_store
+      .all_definitions
+      .values
+      .map(&:to_service_attrs)
+      .map(&:tags)
+      .flatten
+      .uniq
+      .sort
+      .map(&:to_s)
+
+    selected_tag = ui.prompt("Please select which tag to deploy", tags)
+
+    if selected_tag == OPTION_SPECIFIC_SERVICE
+      show_service_selection
+    elsif selected_tag == OPTION_ALL_SERVICES
+      [["*"], []]
+    else
+      [[], [selected_tag]]
+    end
+  end
+
+  def show_service_selection()
+    services = service_store
+      .all_definitions
+      .values
+      .map(&:service_name)
+      .uniq
+      .sort
+      .map(&:to_s)
+
+    if services.empty?
+      return [[], []]
+    end
+
+    selected_service = ui.prompt("Please select which service to deploy", services)
+    [[selected_service], []]
+  end
+end

data/lib/kuber_kit/shell/local_shell.rb

@@ -100,6 +100,18 @@ class KuberKit::Shell::LocalShell < KuberKit::Shell::AbstractShell
     end
   end
 
+  def list_dirs(path)
+    command = %Q{find -L #{path}  -type f}
+    command += " -name '#{name}'" if name
+    exec!(command).split(/[\r\n]+/)
+  rescue => e
+    if e.message.include?("No such file or directory")
+      raise DirNotFoundError.new("Dir not found: #{path}")
+    else
+      raise e
+    end
+  end
+
   def wrap_command_with_pid(command)
     "KIT=#{Process.pid} #{command}"
   end

data/lib/kuber_kit/tools/build_dir_cleaner.rb

@@ -0,0 +1,26 @@
+class KuberKit::Tools::BuildDirCleaner
+  include KuberKit::Import[
+    "shell.bash_commands",
+    "shell.local_shell",
+  ]
+
+  KEEP_DIRS_COUNT = 10
+
+  def call(parent_dir:)
+    dirs_to_delete = get_ancient_builds_dirs(parent_dir: parent_dir)
+
+    dirs_to_delete.each do |dir|
+      bash_commands.rm_rf(local_shell, dir)
+    end
+  end
+
+  private
+    def get_ancient_builds_dirs(parent_dir:)
+      all_dirs  = Dir.glob("#{parent_dir}/*")
+      skip_dirs = all_dirs
+        .sort_by{ |f| File.ctime(f) }
+        .reverse[0...KEEP_DIRS_COUNT]
+
+      all_dirs - skip_dirs
+    end
+end

data/lib/kuber_kit/tools/logger_factory.rb

@@ -10,16 +10,17 @@ class KuberKit::Tools::LoggerFactory
     Logger::FATAL  => String::Colors::PURPLE,
   }
 
+  MAX_LOGS_TO_KEEP  = 3
+  MAX_LOG_FILE_SIZE = 512000
+
   include KuberKit::Import[
     "configs",
   ]
 
-  def create(stdout = nil, level = nil)
-    if !stdout
-      prepare_log_file(configs.log_file_path)
-    end
+  def create(level: nil)
+    prepare_log_file(configs.log_file_path)
     
-    logger = Logger.new(stdout || configs.log_file_path)
+    logger = Logger.new(configs.log_file_path, MAX_LOGS_TO_KEEP, MAX_LOG_FILE_SIZE)
 
     logger.level = level || Logger::DEBUG
 

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "0.5.10"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.6.0
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-21 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts-lite
@@ -306,6 +306,7 @@ files:
 - lib/kuber_kit/preprocessing/text_preprocessor.rb
 - lib/kuber_kit/service_deployer/action_handler.rb
 - lib/kuber_kit/service_deployer/deployer.rb
+- lib/kuber_kit/service_deployer/deployment_options_selector.rb
 - lib/kuber_kit/service_deployer/service_dependency_resolver.rb
 - lib/kuber_kit/service_deployer/service_list_resolver.rb
 - lib/kuber_kit/service_deployer/strategies/abstract.rb
@@ -331,6 +332,7 @@ files:
 - lib/kuber_kit/template_reader/reader.rb
 - lib/kuber_kit/template_reader/strategies/abstract.rb
 - lib/kuber_kit/template_reader/strategies/artifact_file.rb
+- lib/kuber_kit/tools/build_dir_cleaner.rb
 - lib/kuber_kit/tools/file_presence_checker.rb
 - lib/kuber_kit/tools/logger_factory.rb
 - lib/kuber_kit/tools/process_cleaner.rb