kuber_kit 0.1.4 → 0.1.9

data/lib/kuber_kit/core/configuration_factory.rb

@@ -6,6 +6,7 @@ class KuberKit::Core::ConfigurationFactory
     "core.artifact_store",
     "core.env_file_store",
     "core.template_store",
+    "core.build_server_store",
     "configs"
   ]
 
@@ -16,6 +17,7 @@ class KuberKit::Core::ConfigurationFactory
     registries = fetch_registries(configuration_attrs.registries)
     env_files  = fetch_env_files(configuration_attrs.env_files)
     templates  = fetch_templates(configuration_attrs.templates)
+    build_servers = fetch_build_servers(configuration_attrs.build_servers)
 
     KuberKit::Core::Configuration.new(
       name:             configuration_attrs.name,
@@ -24,7 +26,9 @@ class KuberKit::Core::ConfigurationFactory
       env_files:        env_files,
       templates:        templates,
       kubeconfig_path:  configuration_attrs.kubeconfig_path,
-      deploy_strategy:  configuration_attrs.deploy_strategy || configs.deploy_strategy
+      deploy_strategy:  configuration_attrs.deploy_strategy || configs.deploy_strategy,
+      services_attributes: configuration_attrs.services_attributes,
+      build_servers:    build_servers
     )
   end
 
@@ -60,4 +64,10 @@ class KuberKit::Core::ConfigurationFactory
       end
       result
     end
+
+    def fetch_build_servers(build_servers)
+      build_servers.map do |build_server_name|
+        build_server_store.get(build_server_name)
+      end
+    end
 end

data/lib/kuber_kit/core/configuration_store.rb

@@ -1,7 +1,4 @@
 class KuberKit::Core::ConfigurationStore
-  NotFoundError = Class.new(KuberKit::NotFoundError)
-  AlreadyAddedError = Class.new(KuberKit::Error)
-
   include KuberKit::Import[
     "core.configuration_factory",
     "core.configuration_definition_factory",
@@ -16,24 +13,12 @@ class KuberKit::Core::ConfigurationStore
   end
 
   def add_definition(configuration_definition)
-    @@configuration_definitions ||= {}
-
-    unless @@configuration_definitions[configuration_definition.configuration_name].nil?
-      raise AlreadyAddedError, "image #{configuration_definition.configuration_name} was already added"
-    end
-
-    @@configuration_definitions[configuration_definition.configuration_name] = configuration_definition
+    definitions_store.add(configuration_definition.configuration_name, configuration_definition)
   end
 
   Contract Symbol => Any
   def get_definition(configuration_name)
-    @@configuration_definitions ||= {}
-
-    if @@configuration_definitions[configuration_name].nil?
-      raise NotFoundError, "configuration #{configuration_name} not found"
-    end
-
-    @@configuration_definitions[configuration_name]
+    definitions_store.get(configuration_name)
   end
 
   Contract Symbol => Any
@@ -57,18 +42,23 @@ class KuberKit::Core::ConfigurationStore
   end
 
   def reset!
-    @@configuration_definitions = {}
-  end
-
-  def all_definitions
-    @@configuration_definitions ||= {}
+    definitions_store.reset!
   end
 
   def count
-    all_definitions.count
+    definitions_store.size
   end
 
   def exists?(configuration_name)
-    !all_definitions[configuration_name].nil?
+    definitions_store.exists?(configuration_name)
   end
+
+  def all_definitions
+    definitions_store.items
+  end
+
+  private
+    def definitions_store
+      @@definitions_store ||= KuberKit::Core::Store.new(KuberKit::Core::ConfigurationDefinition)
+    end
 end

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

@@ -1,25 +1,30 @@
 class KuberKit::Core::ContextHelper::BaseHelper
   CONTRACT = RespondTo[:get_binding]
 
-  attr_reader :shell, :artifact_store, :image_store
+  attr_reader :shell, :artifact_store, :image_store, :env_file_reader
 
-  def initialize(image_store:, artifact_store:, shell:)
-    @image_store    = image_store
-    @artifact_store = artifact_store
-    @shell          = shell
+  def initialize(image_store:, artifact_store:, shell:, env_file_reader:)
+    @image_store      = image_store
+    @artifact_store   = artifact_store
+    @shell            = shell
+    @env_file_reader  = env_file_reader
   end
 
   def image_url(image_name)
-    image = @image_store.get_image(image_name)
+    image = @image_store.get_image(image_name.to_sym)
 
     image.remote_registry_url
   end
 
   def artifact_path(name, file_name = nil)
-    artifact = @artifact_store.get(name)
+    artifact = @artifact_store.get(name.to_sym)
     [artifact.cloned_path, file_name].compact.join("/")
   end
 
+  def env_file(env_file_name)
+    @env_file_reader.call(@shell, env_file_name)
+  end
+
   def configuration_name
     KuberKit.current_configuration.name
   end

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

@@ -1,23 +1,26 @@
 class KuberKit::Core::ContextHelper::ContextHelperFactory
   include KuberKit::Import[
     "core.image_store",
-    "core.artifact_store"
+    "core.artifact_store",
+    env_file_reader: "env_file_reader.action_handler"
   ]
 
   def build_image_context(shell)
     KuberKit::Core::ContextHelper::ImageHelper.new(
-      image_store:    image_store,
-      artifact_store: artifact_store,
-      shell:          shell
+      image_store:      image_store,
+      artifact_store:   artifact_store,
+      shell:            shell,
+      env_file_reader:  env_file_reader
     )
   end
 
   def build_service_context(shell, service)
     KuberKit::Core::ContextHelper::ServiceHelper.new(
-      image_store:    image_store,
-      artifact_store: artifact_store,
-      shell:          shell,
-      service:        service
+      image_store:      image_store,
+      artifact_store:   artifact_store,
+      shell:            shell,
+      env_file_reader:  env_file_reader,
+      service:          service,
     )
   end
 end

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

@@ -1,9 +1,10 @@
 class KuberKit::Core::ContextHelper::ServiceHelper < KuberKit::Core::ContextHelper::BaseHelper
-  def initialize(image_store:, artifact_store:, shell:, service:)
+  def initialize(image_store:, artifact_store:, shell:, env_file_reader:, service:)
     super(
-      image_store:    image_store, 
-      artifact_store: artifact_store, 
-      shell:          shell
+      image_store:      image_store, 
+      artifact_store:   artifact_store, 
+      shell:            shell,
+      env_file_reader:  env_file_reader
     )
     @service = service
   end
@@ -15,4 +16,8 @@ class KuberKit::Core::ContextHelper::ServiceHelper < KuberKit::Core::ContextHelp
   def service_uri
     @service.uri
   end
+
+  def attribute(attribute_name, default: nil)
+    @service.attribute(attribute_name, default: default)
+  end
 end

data/lib/kuber_kit/core/env_files/env_file_store.rb

@@ -1,19 +1,6 @@
 class KuberKit::Core::EnvFiles::EnvFileStore
-  NotFoundError = Class.new(KuberKit::NotFoundError)
-  AlreadyAddedError = Class.new(KuberKit::Error)
-
   def add(env_file)
-    @@env_files ||= {}
-
-    if !env_file.is_a?(KuberKit::Core::EnvFiles::AbstractEnvFile)
-      raise ArgumentError.new("should be an instance of KuberKit::Core::EnvFiles::AbstractEnvFile, got: #{env_file.inspect}")
-    end
-
-    unless @@env_files[env_file.name].nil?
-      raise AlreadyAddedError, "env_file #{env_file.name} was already added"
-    end
-
-    @@env_files[env_file.name] = env_file
+    store.add(env_file.name, env_file)
   end
 
   def get(env_file_name)
@@ -24,14 +11,7 @@ class KuberKit::Core::EnvFiles::EnvFileStore
   end
 
   def get_global(env_file_name)
-    @@env_files ||= {}
-    env_file = @@env_files[env_file_name]
-
-    if env_file.nil?
-      raise NotFoundError, "env_file '#{env_file_name}' not found"
-    end
-    
-    env_file
+    store.get(env_file_name)
   end
 
   def get_from_configuration(env_file_name)
@@ -40,6 +20,11 @@ class KuberKit::Core::EnvFiles::EnvFileStore
   end
 
   def reset!
-    @@env_files = {}
+    store.reset!
   end
+
+  private
+    def store
+      @@store ||= KuberKit::Core::Store.new(KuberKit::Core::EnvFiles::AbstractEnvFile)
+    end
 end

data/lib/kuber_kit/core/image_store.rb

@@ -1,7 +1,4 @@
 class KuberKit::Core::ImageStore
-  NotFoundError = Class.new(KuberKit::Error)
-  AlreadyAddedError = Class.new(KuberKit::Error)
-
   include KuberKit::Import[
     "core.image_factory",
     "core.image_definition_factory",
@@ -16,24 +13,12 @@ class KuberKit::Core::ImageStore
   end
 
   def add_definition(image_definition)
-    @@image_definitions ||= {}
-
-    unless @@image_definitions[image_definition.image_name].nil?
-      raise AlreadyAddedError, "image #{image_definition.image_name} was already added"
-    end
-
-    @@image_definitions[image_definition.image_name] = image_definition
+    definitions_store.add(image_definition.image_name, image_definition)
   end
 
   Contract Symbol => Any
   def get_definition(image_name)
-    @@image_definitions ||= {}
-
-    if @@image_definitions[image_name].nil?
-      raise NotFoundError, "image #{image_name} not found"
-    end
-
-    @@image_definitions[image_name]
+    definitions_store.get(image_name)
   end
 
   Contract Symbol => Any
@@ -57,6 +42,11 @@ class KuberKit::Core::ImageStore
   end
 
   def reset!
-    @@image_definitions = {}
+    definitions_store.reset!
   end
+
+  private
+    def definitions_store
+      @@definitions_store ||= KuberKit::Core::Store.new(KuberKit::Core::ImageDefinition)
+    end
 end

data/lib/kuber_kit/core/registries/registry_store.rb

@@ -1,19 +1,6 @@
 class KuberKit::Core::Registries::RegistryStore
-  NotFoundError = Class.new(KuberKit::NotFoundError)
-  AlreadyAddedError = Class.new(KuberKit::Error)
-
   def add(registry)
-    @@registries ||= {}
-
-    if !registry.is_a?(KuberKit::Core::Registries::AbstractRegistry)
-      raise ArgumentError.new("should be an instance of KuberKit::Core::Registries::AbstractRegistry, got: #{registry.inspect}")
-    end
-
-    unless @@registries[registry.name].nil?
-      raise AlreadyAddedError, "registry #{registry.name} was already added"
-    end
-
-    @@registries[registry.name] = registry
+    store.add(registry.name, registry)
   end
 
   def get(registry_name)
@@ -24,14 +11,7 @@ class KuberKit::Core::Registries::RegistryStore
   end
 
   def get_global(registry_name)
-    @@registries ||= {}
-    registry = @@registries[registry_name]
-
-    if registry.nil?
-      raise NotFoundError, "registry '#{registry_name}' not found"
-    end
-    
-    registry
+    store.get(registry_name)
   end
 
   def get_from_configuration(registry_name)
@@ -44,6 +24,11 @@ class KuberKit::Core::Registries::RegistryStore
   end
 
   def reset!
-    @@registries = {}
+    store.reset!
   end
+
+  private
+    def store
+      @@store ||= KuberKit::Core::Store.new(KuberKit::Core::Registries::AbstractRegistry)
+    end
 end

data/lib/kuber_kit/core/service.rb

@@ -1,20 +1,36 @@
 class KuberKit::Core::Service
-  attr_reader :name, :template_name, :tags, :images
+  AttributeNotSet = Class.new(Indocker::Error)
+
+  attr_reader :name, :template_name, :tags, :images, :attributes
 
   Contract KeywordArgs[
     name:           Symbol,
     template_name:  Symbol,
     tags:           ArrayOf[Symbol],
     images:         ArrayOf[Symbol],
+    attributes:     HashOf[Symbol => Any],
   ] => Any
-  def initialize(name:, template_name:, tags:, images:)
+  def initialize(name:, template_name:, tags:, images:, attributes:)
     @name = name
     @template_name = template_name
     @tags = tags
     @images = images
+    @attributes = attributes
   end
 
   def uri
-    name.to_s.sub("_", "-")
+    name.to_s.gsub("_", "-")
+  end
+
+  def attribute(attribute_name, default: nil)
+    if !attributes.has_key?(attribute_name.to_sym) && default.nil?
+      raise AttributeNotSet, "attribute #{attribute_name} was not set"
+    end
+
+    if !attributes.has_key?(attribute_name.to_sym) && !default.nil?
+      return default
+    end
+
+    attributes[attribute_name.to_sym]
   end
 end

data/lib/kuber_kit/core/service_definition.rb

@@ -12,6 +12,7 @@ class KuberKit::Core::ServiceDefinition
       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),
     )
   end
 
@@ -33,6 +34,12 @@ class KuberKit::Core::ServiceDefinition
     self
   end
 
+  def attributes(value = nil, &block)
+    @attributes = 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

@@ -8,11 +8,15 @@ class KuberKit::Core::ServiceFactory
       raise AttributeNotSetError, "Please set template for service using #template method"
     end
 
+    configuration_attributes = KuberKit.current_configuration.service_attributes(service_attrs.name)
+    attributes = (service_attrs.attributes || {}).merge(configuration_attributes)
+
     KuberKit::Core::Service.new(
       name:           service_attrs.name,
       template_name:  service_attrs.template_name,
       tags:           service_attrs.tags,
-      images:         service_attrs.images
+      images:         service_attrs.images,
+      attributes:     attributes
     )
   end
 end

data/lib/kuber_kit/core/service_store.rb

@@ -1,7 +1,4 @@
 class KuberKit::Core::ServiceStore
-  NotFoundError = Class.new(KuberKit::Error)
-  AlreadyAddedError = Class.new(KuberKit::Error)
-
   include KuberKit::Import[
     "core.service_factory",
     "core.service_definition_factory",
@@ -16,24 +13,12 @@ class KuberKit::Core::ServiceStore
   end
 
   def add_definition(service_definition)
-    @@service_definitions ||= {}
-
-    unless @@service_definitions[service_definition.service_name].nil?
-      raise AlreadyAddedError, "service #{service_definition.service_name} was already added"
-    end
-
-    @@service_definitions[service_definition.service_name] = service_definition
+    definitions_store.add(service_definition.service_name, service_definition)
   end
 
   Contract Symbol => Any
   def get_definition(service_name)
-    @@service_definitions ||= {}
-
-    if @@service_definitions[service_name].nil?
-      raise NotFoundError, "service '#{service_name}' not found"
-    end
-
-    @@service_definitions[service_name]
+    definitions_store.get(service_name)
   end
 
   Contract Symbol => Any
@@ -57,18 +42,23 @@ class KuberKit::Core::ServiceStore
   end
 
   def reset!
-    @@service_definitions = {}
+    definitions_store.reset!
   end
 
-  def all_definitions
-    @@service_definitions ||= {}
+  def count
+    definitions_store.size
   end
 
-  def count
-    all_definitions.count
+  def all_definitions
+    definitions_store.items
   end
 
   def exists?(service_name)
-    !all_definitions[service_name].nil?
+    definitions_store.exists?(service_name)
   end
+
+  private
+    def definitions_store
+      @@definitions_store ||= KuberKit::Core::Store.new(KuberKit::Core::ServiceDefinition)
+    end
 end