kuber_kit 1.1.5 → 1.1.6

data/lib/kuber_kit/core/context_helper/service_helper.rb

@@ -1,5 +1,5 @@
 class KuberKit::Core::ContextHelper::ServiceHelper < KuberKit::Core::ContextHelper::BaseHelper
-  def initialize(image_store:, artifact_store:, shell:, env_file_reader:, service:)
+  def initialize(image_store:, artifact_store:, shell:, env_file_reader:, service:, template_renderer:)
     super(
       image_store:      image_store, 
       artifact_store:   artifact_store, 
@@ -7,6 +7,7 @@ class KuberKit::Core::ContextHelper::ServiceHelper < KuberKit::Core::ContextHelp
       env_file_reader:  env_file_reader
     )
     @service = service
+    @template_renderer = template_renderer
   end
 
   def service_name
@@ -20,4 +21,17 @@ class KuberKit::Core::ContextHelper::ServiceHelper < KuberKit::Core::ContextHelp
   def attribute(attribute_name, default: nil)
     @service.attribute(attribute_name, default: default)
   end
+
+  Contract Maybe[String, Symbol], Hash => String
+  def render(template_name, variables = {})
+    context_helper = KuberKit::Core::ContextHelper::LocalContextHelper.new(
+      parent_context_helper: self,
+      variables: variables
+    )
+    @template_renderer.call(shell, template_name.to_sym, context_helper: context_helper)
+  end
+
+  def method_missing(m, *args, &block)
+    raise("Unknown variable: #{m} while rendering '#{service_name}' with '#{@service.template_name}' template.")
+  end
 end

data/lib/kuber_kit/core/dependencies/abstract_dependency_resolver.rb

@@ -50,6 +50,13 @@ class KuberKit::Core::Dependencies::AbstractDependencyResolver
     (deps + item_names).uniq
   end
 
+  # Get all dependencies for items (excluding the items themself), without any limitations
+  Contract Or[Symbol, ArrayOf[Symbol]] => Any
+  def get_all_deps(item_names)
+    deps = Array(item_names).map { |i| get_recursive_deps(i) }.flatten
+    deps.uniq - item_names
+  end
+
   def get_recursive_deps(item_name, dependency_tree: [])
     deps = get_deps(item_name)
 

data/lib/kuber_kit/core/service.rb

@@ -1,25 +1,28 @@
 class KuberKit::Core::Service
   AttributeNotSet = Class.new(KuberKit::Error)
 
-  attr_reader :name, :dependencies, :template_name, :tags, :images, :attributes, :deployer_strategy
+  attr_reader :name, :initializers, :template_name, :tags, :images, :attributes, 
+              :deployer_strategy, :generator_strategy
 
   Contract KeywordArgs[
     name:               Symbol,
-    dependencies:       ArrayOf[Symbol],
+    initializers:       ArrayOf[Symbol],
     template_name:      Maybe[Symbol],
     tags:               ArrayOf[Symbol],
     images:             ArrayOf[Symbol],
     attributes:         HashOf[Symbol => Any],
-    deployer_strategy:  Maybe[Symbol]
+    deployer_strategy:  Maybe[Symbol],
+    generator_strategy: Maybe[Symbol]
   ] => Any
-  def initialize(name:, dependencies:, template_name:, tags:, images:, attributes:, deployer_strategy:)
+  def initialize(name:, initializers:, template_name:, tags:, images:, attributes:, deployer_strategy:, generator_strategy:)
     @name = name
-    @dependencies = dependencies
+    @initializers = initializers
     @template_name = template_name
     @tags = tags
     @images = images
     @attributes = attributes
     @deployer_strategy = deployer_strategy
+    @generator_strategy = generator_strategy
   end
 
   def uri

data/lib/kuber_kit/core/service_definition.rb

@@ -1,26 +1,32 @@
 class KuberKit::Core::ServiceDefinition
-  attr_reader :service_name, :template_name, :dependencies
+  attr_reader :service_name, :template_name, :dependencies, :initializers
   
   Contract Or[Symbol, String] => Any
   def initialize(service_name)
     @service_name = service_name.to_sym
-    @dependencies = []
+    @initializers = []
   end
 
   def to_service_attrs
     OpenStruct.new(
       name:               @service_name,
-      dependencies:       @dependencies,
+      initializers:       @initializers,
       template_name:      get_value(@template_name),
       tags:               Array(get_value(@tags)).map(&:to_sym),
       images:             Array(get_value(@images)).map(&:to_sym),
       attributes:         get_value(@attributes),
       deployer_strategy:  get_value(@deployer_strategy),
+      generator_strategy: get_value(@generator_strategy),
     )
   end
 
   def depends_on(*value, &block)
-    @dependencies = Array(value).flatten
+    initialize_with(value)
+    self
+  end
+
+  def initialize_with(*value, &block)
+    @initializers = Array(value).flatten
     self
   end
 
@@ -54,6 +60,12 @@ class KuberKit::Core::ServiceDefinition
     self
   end
 
+  def generator_strategy(value = nil, &block)
+    @generator_strategy = block_given? ? block : value
+
+    self
+  end
+
   private
     def get_value(variable)
       variable.is_a?(Proc) ? variable.call : variable

data/lib/kuber_kit/core/service_factory.rb

@@ -7,12 +7,13 @@ class KuberKit::Core::ServiceFactory
 
     KuberKit::Core::Service.new(
       name:               service_attrs.name,
-      dependencies:       service_attrs.dependencies,
+      initializers:       service_attrs.initializers,
       template_name:      service_attrs.template_name,
       tags:               service_attrs.tags,
       images:             service_attrs.images,
       attributes:         attributes,
       deployer_strategy:  service_attrs.deployer_strategy,
+      generator_strategy: service_attrs.generator_strategy,
     )
   end
 end

data/lib/kuber_kit/defaults.rb

@@ -7,12 +7,12 @@ class KuberKit::Defaults
     end
 
     def init!
-      container["artifacts_sync.artifact_updater"].use_resolver(
-        container["artifacts_sync.git_artifact_resolver"], 
+      container["artifacts_sync.artifact_updater"].use_strategy(
+        container["artifacts_sync.strategies.git_updater"], 
         artifact_class: KuberKit::Core::Artifacts::Git
       )
-      container["artifacts_sync.artifact_updater"].use_resolver(
-        container["artifacts_sync.null_artifact_resolver"], 
+      container["artifacts_sync.artifact_updater"].use_strategy(
+        container["artifacts_sync.strategies.null_updater"], 
         artifact_class: KuberKit::Core::Artifacts::Local
       )
       container["env_file_reader.reader"].use_reader(
@@ -44,6 +44,11 @@ class KuberKit::Defaults
         KuberKit::ServiceDeployer::Strategies::Helm.new
       )
 
+      container["service_generator.generator"].register_strategy(
+        :helm,
+        KuberKit::ServiceGenerator::Strategies::Helm.new
+      )
+
       container["shell_launcher.launcher"].register_strategy(
         :kubernetes,
         KuberKit::ShellLauncher::Strategies::Kubernetes.new

data/lib/kuber_kit/image_compiler/image_builder.rb

@@ -5,7 +5,7 @@ class KuberKit::ImageCompiler::ImageBuilder
   ]
 
   Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Image, String, KeywordArgs[
-    context_helper: Maybe[KuberKit::Core::ContextHelper::BaseHelper::CONTRACT]
+    context_helper: Maybe[KuberKit::Core::ContextHelper::AbstractHelper]
   ] => Any
   def build(shell, image, build_dir, context_helper: nil)
     image.before_build_callback.call(context_helper, build_dir) if image.before_build_callback

data/lib/kuber_kit/service_deployer/service_dependency_resolver.rb

@@ -5,7 +5,7 @@ class KuberKit::ServiceDeployer::ServiceDependencyResolver < KuberKit::Core::Dep
   ]
   
   def get_deps(service_name)
-    service_store.get_definition(service_name).dependencies
+    service_store.get_definition(service_name).initializers
   end
 
   def dependency_batch_size

data/lib/kuber_kit/service_deployer/strategies/helm.rb

@@ -14,8 +14,8 @@ class KuberKit::ServiceDeployer::Strategies::Helm < KuberKit::ServiceDeployer::S
     chart_config_path = File.join(chart_root_path, "Chart.yaml")
     release_path      = File.join(chart_templates_path, "release.yaml")
 
-    bash_commands.mkdir_p(shell, File.dirname(chart_root_path))
-    bash_commands.mkdir_p(shell, File.dirname(chart_templates_path))
+    bash_commands.mkdir_p(shell, chart_root_path)
+    bash_commands.mkdir_p(shell, chart_templates_path)
 
     shell.write(release_path, service_config)
     shell.write(chart_config_path, chart_config_content(service.uri))

data/lib/kuber_kit/service_generator/action_handler.rb

@@ -0,0 +1,16 @@
+class KuberKit::ServiceGenerator::ActionHandler
+  include KuberKit::Import[
+    "service_generator.generator",
+    "service_generator.strategy_detector",
+    "core.service_store",
+  ]
+
+  Contract KuberKit::Shell::AbstractShell, Symbol, String => Any
+  def call(shell, service_name, export_path)
+    service = service_store.get_service(service_name)
+
+    strategy_name = strategy_detector.call(service)
+
+    generator.generate(shell, service, export_path, strategy_name)
+  end
+end

data/lib/kuber_kit/service_generator/generator.rb

@@ -0,0 +1,26 @@
+class KuberKit::ServiceGenerator::Generator
+  StrategyNotFoundError = Class.new(KuberKit::NotFoundError)
+
+  include KuberKit::Import[
+    "core.service_store",
+  ]
+
+  def register_strategy(strategy_name, strategy)
+    @@strategies ||= {}
+
+    if !strategy.is_a?(KuberKit::ServiceGenerator::Strategies::Abstract)
+      raise ArgumentError.new("should be an instance of KuberKit::ServiceGenerator::Strategies::Abstract, got: #{strategy.inspect}")
+    end
+
+    @@strategies[strategy_name] = strategy
+  end
+
+  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service, String, Symbol => Any
+  def generate(shell, service, export_path, strategy_name)
+    generator = @@strategies[strategy_name]
+
+    raise StrategyNotFoundError, "Can't find strategy with name #{strategy_name}" if generator.nil?
+
+    generator.generate(shell, service, export_path)
+  end
+end

data/lib/kuber_kit/service_generator/strategies/abstract.rb

@@ -0,0 +1,5 @@
+class KuberKit::ServiceGenerator::Strategies::Abstract
+  def generate(shell, service, export_path)
+    raise KuberKit::NotImplementedError, "must be implemented"
+  end
+end

data/lib/kuber_kit/service_generator/strategies/helm.rb

@@ -0,0 +1,33 @@
+class KuberKit::ServiceGenerator::Strategies::Helm < KuberKit::ServiceGenerator::Strategies::Abstract
+  include KuberKit::Import[
+    "service_reader.reader",
+    "shell.bash_commands",
+    "configs",
+  ]
+
+  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Service, String => Any
+  def generate(shell, service, export_path)
+    service_config        = reader.read(shell, service)
+    chart_root_path       = File.join(export_path, "#{service.name}_chart")
+    chart_templates_path  = File.join(chart_root_path, "templates")
+    chart_config_path     = File.join(chart_root_path, "Chart.yaml")
+    release_path          = File.join(chart_templates_path, "release.yaml")
+
+    bash_commands.mkdir_p(shell, chart_root_path)
+    bash_commands.mkdir_p(shell, chart_templates_path)
+
+    shell.write(release_path, service_config)
+    shell.write(chart_config_path, chart_config_content(service.uri))
+  end
+
+  def chart_config_content(release_name)
+    query = <<-CHART
+apiVersion: v2
+name: #{release_name}
+description: #{release_name}
+type: application
+version: 1.0.0
+appVersion: "1.0.0"
+    CHART
+  end
+end

data/lib/kuber_kit/service_generator/strategy_detector.rb

@@ -0,0 +1,6 @@
+class KuberKit::ServiceGenerator::StrategyDetector
+  Contract KuberKit::Core::Service => Symbol
+  def call(service)
+    service.generator_strategy || KuberKit.current_configuration.generator_strategy
+  end
+end

data/lib/kuber_kit/service_reader/reader.rb

@@ -1,9 +1,7 @@
 class KuberKit::ServiceReader::Reader
   include KuberKit::Import[
-    "core.template_store",
     "core.context_helper_factory",
-    "template_reader.reader",
-    "preprocessing.text_preprocessor"
+    "template_reader.renderer"
   ]
 
   AttributeNotSetError = Class.new(KuberKit::Error)
@@ -14,14 +12,8 @@ class KuberKit::ServiceReader::Reader
       raise AttributeNotSetError, "Please set template for service using #template method"
     end
 
-    template = template_store.get(service.template_name)
-
     context_helper = context_helper_factory.build_service_context(shell, service)
 
-    template = reader.read(shell, template)
-
-    result = text_preprocessor.compile(template, context_helper: context_helper)
-
-    result
+    renderer.call(shell, service.template_name, context_helper: context_helper)
   end
 end

data/lib/kuber_kit/shell/commands/git_commands.rb

@@ -8,6 +8,15 @@ class KuberKit::Shell::Commands::GitCommands
     return nil
   end
 
+  def get_branch_name(shell, git_repo_path, remote_name: "origin")
+    shell.exec!([
+      "cd #{git_repo_path}",
+      "git rev-parse --abbrev-ref HEAD",
+    ].join(" && "), merge_stderr: true)
+  rescue KuberKit::Shell::AbstractShell::ShellError
+    return nil
+  end
+
   def get_version_hash(shell, git_repo_path)
     shell.exec!([
       "cd #{git_repo_path}",
@@ -28,6 +37,7 @@ class KuberKit::Shell::Commands::GitCommands
       "cd #{path}",
       "git add .",
       "git reset HEAD --hard",
+      "git fetch origin #{branch}",
       "git checkout #{branch}",
       "git reset --hard '@{u}'",
       "git pull --force",

data/lib/kuber_kit/template_reader/reader.rb

@@ -11,6 +11,7 @@ class KuberKit::TemplateReader::Reader
     @@readers[template_class] = template_reader
   end
 
+  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Templates::AbstractTemplate => String
   def read(shell, template)
     reader = @@readers[template.class]
 

data/lib/kuber_kit/template_reader/renderer.rb

@@ -0,0 +1,17 @@
+class KuberKit::TemplateReader::Renderer
+  include KuberKit::Import[
+    "core.template_store",
+    "preprocessing.text_preprocessor",
+    template_reader: "template_reader.reader"
+  ]
+
+
+  Contract KuberKit::Shell::AbstractShell, Symbol, KeywordArgs[
+    context_helper: KuberKit::Core::ContextHelper::AbstractHelper
+  ] => String
+  def call(shell, template_name, context_helper:)
+    template = template_store.get(template_name)
+    template_text = template_reader.read(shell, template)
+    text_preprocessor.compile(template_text, context_helper: context_helper)
+  end
+end

data/lib/kuber_kit/template_reader/strategies/artifact_file.rb

@@ -3,6 +3,7 @@ class KuberKit::TemplateReader::Strategies::ArtifactFile < KuberKit::TemplateRea
     "core.artifact_store"
   ]
 
+  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Templates::AbstractTemplate => String
   def read(shell, template)
     artifact = artifact_store.get(template.artifact_name)
 

data/lib/kuber_kit/version.rb

@@ -1,3 +1,3 @@
 module KuberKit
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

data/lib/kuber_kit.rb

@@ -61,11 +61,13 @@ module KuberKit
     end
 
     module ContextHelper
+      autoload :AbstractHelper, 'core/context_helper/abstract_helper'
       autoload :BaseHelper, 'core/context_helper/base_helper'
       autoload :ImageHelper, 'core/context_helper/image_helper'
       autoload :ServiceHelper, 'core/context_helper/service_helper'
       autoload :ContextHelperFactory, 'core/context_helper/context_helper_factory'
       autoload :ContextVars, 'core/context_helper/context_vars'
+      autoload :LocalContextHelper, 'core/context_helper/local_context_helper'
     end
 
     module Registries
@@ -125,10 +127,13 @@ module KuberKit
   end
 
   module ArtifactsSync
-    autoload :AbstractArtifactResolver, 'artifacts_sync/abstract_artifact_resolver'
     autoload :ArtifactUpdater, 'artifacts_sync/artifact_updater'
-    autoload :GitArtifactResolver, 'artifacts_sync/git_artifact_resolver'
-    autoload :NullArtifactResolver, 'artifacts_sync/null_artifact_resolver'
+
+    module Strategies
+      autoload :Abstract, 'artifacts_sync/strategies/abstract'
+      autoload :GitUpdater, 'artifacts_sync/strategies/git_updater'
+      autoload :NullUpdater, 'artifacts_sync/strategies/null_updater'
+    end
   end
 
   module EnvFileReader
@@ -147,6 +152,7 @@ module KuberKit
   module TemplateReader
     autoload :ActionHandler, 'template_reader/action_handler'
     autoload :Reader, 'template_reader/reader'
+    autoload :Renderer, 'template_reader/renderer'
 
     module Strategies
       autoload :Abstract, 'template_reader/strategies/abstract'
@@ -171,6 +177,17 @@ module KuberKit
     end
   end
 
+  module ServiceGenerator
+    autoload :ActionHandler, 'service_generator/action_handler'
+    autoload :StrategyDetector, 'service_generator/strategy_detector'
+    autoload :Generator, 'service_generator/generator'
+
+    module Strategies
+      autoload :Abstract, 'service_generator/strategies/abstract'
+      autoload :Helm, 'service_generator/strategies/helm'
+    end
+  end
+
   module ServiceReader
     autoload :ActionHandler, 'service_reader/action_handler'
     autoload :Reader, 'service_reader/reader'
@@ -194,6 +211,7 @@ module KuberKit
     autoload :ServiceReader, 'actions/service_reader'
     autoload :ServiceDeployer, 'actions/service_deployer'
     autoload :ServiceChecker, 'actions/service_checker'
+    autoload :ServiceGenerator, 'actions/service_generator'
     autoload :ConfigurationLoader, 'actions/configuration_loader'
     autoload :KubectlApplier, 'actions/kubectl_applier'
     autoload :KubectlAttacher, 'actions/kubectl_attacher'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kuber_kit
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Iskander Khaziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: contracts
@@ -136,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -259,13 +273,14 @@ files:
 - lib/kuber_kit/actions/kubectl_logs.rb
 - lib/kuber_kit/actions/service_checker.rb
 - lib/kuber_kit/actions/service_deployer.rb
+- lib/kuber_kit/actions/service_generator.rb
 - lib/kuber_kit/actions/service_reader.rb
 - lib/kuber_kit/actions/shell_launcher.rb
 - lib/kuber_kit/actions/template_reader.rb
-- lib/kuber_kit/artifacts_sync/abstract_artifact_resolver.rb
 - lib/kuber_kit/artifacts_sync/artifact_updater.rb
-- lib/kuber_kit/artifacts_sync/git_artifact_resolver.rb
-- lib/kuber_kit/artifacts_sync/null_artifact_resolver.rb
+- lib/kuber_kit/artifacts_sync/strategies/abstract.rb
+- lib/kuber_kit/artifacts_sync/strategies/git_updater.rb
+- lib/kuber_kit/artifacts_sync/strategies/null_updater.rb
 - lib/kuber_kit/cli.rb
 - lib/kuber_kit/configs.rb
 - lib/kuber_kit/container.rb
@@ -283,10 +298,12 @@ files:
 - lib/kuber_kit/core/configuration_definition_factory.rb
 - lib/kuber_kit/core/configuration_factory.rb
 - lib/kuber_kit/core/configuration_store.rb
+- lib/kuber_kit/core/context_helper/abstract_helper.rb
 - lib/kuber_kit/core/context_helper/base_helper.rb
 - lib/kuber_kit/core/context_helper/context_helper_factory.rb
 - lib/kuber_kit/core/context_helper/context_vars.rb
 - lib/kuber_kit/core/context_helper/image_helper.rb
+- lib/kuber_kit/core/context_helper/local_context_helper.rb
 - lib/kuber_kit/core/context_helper/service_helper.rb
 - lib/kuber_kit/core/dependencies/abstract_dependency_resolver.rb
 - lib/kuber_kit/core/env_files/abstract_env_file.rb
@@ -346,6 +363,11 @@ files:
 - lib/kuber_kit/service_deployer/strategies/helm.rb
 - lib/kuber_kit/service_deployer/strategies/kubernetes.rb
 - lib/kuber_kit/service_deployer/strategy_detector.rb
+- lib/kuber_kit/service_generator/action_handler.rb
+- lib/kuber_kit/service_generator/generator.rb
+- lib/kuber_kit/service_generator/strategies/abstract.rb
+- lib/kuber_kit/service_generator/strategies/helm.rb
+- lib/kuber_kit/service_generator/strategy_detector.rb
 - lib/kuber_kit/service_reader/action_handler.rb
 - lib/kuber_kit/service_reader/reader.rb
 - lib/kuber_kit/shell/abstract_shell.rb
@@ -367,6 +389,7 @@ files:
 - lib/kuber_kit/shell_launcher/strategies/kubernetes.rb
 - lib/kuber_kit/template_reader/action_handler.rb
 - lib/kuber_kit/template_reader/reader.rb
+- lib/kuber_kit/template_reader/renderer.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

data/lib/kuber_kit/artifacts_sync/abstract_artifact_resolver.rb

@@ -1,5 +0,0 @@
-class KuberKit::ArtifactsSync::AbstractArtifactResolver
-  def resolve(shell, artifact)
-    raise KuberKit::NotImplementedError, "must be implemented"
-  end
-end

data/lib/kuber_kit/artifacts_sync/git_artifact_resolver.rb

@@ -1,31 +0,0 @@
-class KuberKit::ArtifactsSync::GitArtifactResolver < KuberKit::ArtifactsSync::AbstractArtifactResolver
-
-  include KuberKit::Import[
-    "shell.git_commands",
-  ]
-
-  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Artifacts::Git => Any
-  def resolve(shell, artifact)
-    already_cloned = artifact_already_cloned?(
-      shell:       shell,
-      target_path: artifact.cloned_path,
-      remote_url:  artifact.remote_url,
-    )
-
-    if already_cloned
-      git_commands.force_pull_repo(shell, 
-        path: artifact.cloned_path, branch: artifact.branch
-      )
-    else
-      git_commands.download_repo(shell, 
-        remote_url: artifact.remote_url, path: artifact.cloned_path, branch: artifact.branch
-      )
-    end
-  end
-
-  private
-    def artifact_already_cloned?(shell:, target_path:, remote_url:)
-      target_remote_url = git_commands.get_remote_url(shell, target_path)
-      target_remote_url == remote_url
-    end
-end

data/lib/kuber_kit/artifacts_sync/null_artifact_resolver.rb

@@ -1,7 +0,0 @@
-class KuberKit::ArtifactsSync::NullArtifactResolver < KuberKit::ArtifactsSync::AbstractArtifactResolver
-
-  Contract KuberKit::Shell::AbstractShell, Any => Any
-  def resolve(shell, artifact)
-    return true
-  end
-end