helm-wrapper 0.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3da406ae1f3c001d4b51c4f649f63f303c36b974190a94da96eac15a9fcb4aa
-  data.tar.gz: 22d5e3f7ba99bcdbc33b547630d8b7e48a347ebdf5e99773e9335277374c7eea
+  metadata.gz: 76acfe4805299ed72c029326ed693127fe8518078eea2d5c81880be17d1823d4
+  data.tar.gz: 6355e496234578a2f414cf8873b2ecfff6d0aa710a4045a3741e940e1996ada8
 SHA512:
-  metadata.gz: ec9bf88db860c8e788f4c00a2216acd695b6de238f23c1e98ea90bb969523f8a60a721cdebce64d5c7629f61b2179d2194eadd446c6faeae8f261c976f0e09fd
-  data.tar.gz: 2e04c841ef35f60edcf7a2fa934b0f1f92af7b73970d431e501bccdf89a8a92fcfbf7d9a97cd57dc53ea62cde23351fe0f74ac1317d8e02dba842273a7b7edb5
+  metadata.gz: 3ec82adad9abe9ad074f6f60fc4ed5711e9f08a7c92258b1b6e71fcf6da491c3a9a0f211796d7ccab3d2f30c027ad0cfdad06955233547bb788faef0e81172f5
+  data.tar.gz: 0b1299e87f67e83c2a7289049a9222b7a269739fd50b8fc9e18e94f818076dd9c857607507911b690feebae91e6a7fe0c7a5a3408883361705ec6f61201c4d83

data/lib/helm-wrapper.rb

@@ -22,8 +22,8 @@ module HelmWrapper
 
 ###############################################################################
 
-  def self.define_tasks(chart:, namespace:, release:, options: Hash.new)
-    @logger.info("Building tasks for chart: #{chart}...")
+  def self.deployment_tasks(chart:, namespace:, release:, options: Hash.new)
+    @logger.info("Building deployment tasks for chart: #{chart}...")
 
     @logger.fatal("Options must be specified as a hash!") unless options.kind_of?(Hash)
 
@@ -32,8 +32,10 @@ module HelmWrapper
     binary_options["version"] = options.key?("binary-version") ? options["binary-version"] : Shared::Latest.instance.version
 
     chart_options = Hash.new
-    chart_options["name"]  = chart
-    chart_options["repos"] = options.key?("chart-repos") ? options["chart-repos"] : Array.new
+    chart_options["name"]    = chart
+    chart_options["path"]    = nil
+    chart_options["repos"]   = options.key?("chart-repos")   ? options["chart-repos"]   : Array.new
+    chart_options["version"] = options.key?("chart-version") ? options["chart-version"] : String.new
 
     config_options = Hash.new
     config_options["auth-azure"]         = options.key?("config-auth-azure")         ? options["config-auth-azure"]         : false
@@ -49,6 +51,34 @@ module HelmWrapper
     tasks << HelmWrapper::Tasks::Apply.new(binary: binary, chart: chart, options: config_options)
     tasks << HelmWrapper::Tasks::Binary.new(binary: binary)
     tasks << HelmWrapper::Tasks::Destroy.new(binary: binary, chart: chart, options: config_options)
+    tasks << HelmWrapper::Tasks::Template.new(binary: binary, chart: chart, options: config_options)
+    return tasks
+  end
+
+###############################################################################
+
+  def self.development_tasks(chart:, path:, options: Hash.new)
+    @logger.info("Building development tasks for path: #{path}...")
+
+    @logger.fatal("Options must be specified as a hash!") unless options.kind_of?(Hash)
+
+    binary_options = Hash.new
+    binary_options["base"]    = options.key?("binary-base")    ? options["binary-base"]    : File.join(Dir.pwd, "vendor", "helm")
+    binary_options["version"] = options.key?("binary-version") ? options["binary-version"] : Shared::Latest.instance.version
+
+    chart_options = Hash.new
+    chart_options["name"]    = chart
+    chart_options["path"]    = path
+    chart_options["repos"]   = options.key?("chart-repos")   ? options["chart-repos"]   : Array.new
+    chart_options["version"] = String.new
+
+    binary = HelmWrapper::Shared::Binary.new(options: binary_options)
+    chart  = HelmWrapper::Shared::Chart.new(options: chart_options)
+
+    tasks = Array.new
+    tasks << HelmWrapper::Tasks::Binary.new(binary: binary)
+    tasks << HelmWrapper::Tasks::Push.new(binary: binary, chart: chart)
+    tasks << HelmWrapper::Tasks::Validate.new(binary: binary, chart: chart)
     return tasks
   end
 

data/lib/helm-wrapper/common.rb

@@ -4,7 +4,7 @@ module HelmWrapper
 
 ###############################################################################
 
-  def self.create_directory(directory:, purpose: nil, exists: true)
+  def self.create_directory(directory:, exists: true, purpose: nil)
     return exists if File.directory?(directory)
 
     result = false
@@ -20,6 +20,17 @@ module HelmWrapper
     result = File.directory?(directory)
   end
 
+###############################################################################
+
+  def self.find(base:, name:, exts:, description: "File")
+    exts.each do |ext|
+      path = File.join(base, name + ext)
+      return path if File.file?(path)
+    end
+
+    @logger.fatal("#{description} name: #{name} not found in location: #{base}!")
+  end
+
 ###############################################################################
 
 end

data/lib/helm-wrapper/shared/auths/azure.rb

@@ -29,13 +29,14 @@ module HelmWrapper
 
 ###############################################################################
 
-        @ca_tempfile = nil
-        @token       = nil
+        @keyvault
+        @secret_ca
+        @secret_endpoint
+        @secret_token
 
 ###############################################################################
 
-        attr_reader :ca
-        attr_reader :endpoint
+        @ca_tempfile = nil
 
 ###############################################################################
 
@@ -46,6 +47,10 @@ module HelmWrapper
 ###############################################################################
 
         def auth()
+          ca       = secret(vault: @keyvault, name: @secret_ca)
+          endpoint = secret(vault: @keyvault, name: @secret_endpoint)
+          token    = secret(vault: @keyvault, name: @secret_token)
+
           @ca_tempfile = Tempfile.new('helm-wrapper-auths-azure-ca')
 
           begin
@@ -57,8 +62,8 @@ module HelmWrapper
           logger.success("Azure authenticator successfully written Kubernetes CA to file!")
 
           ENV["HELM_KUBECAFILE"]    = @ca_tempfile.path
-          ENV["HELM_KUBEAPISERVER"] = @endpoint
-          ENV["HELM_KUBETOKEN"]     = @token
+          ENV["HELM_KUBEAPISERVER"] = endpoint
+          ENV["HELM_KUBETOKEN"]     = token
 
           logger.success("Azure authenticator environment variables set!")
         end
@@ -109,18 +114,18 @@ module HelmWrapper
 ###############################################################################
 
         def specific()
-          logger.fatal("Azure CLI must bpassworde installed and accessible to use the Azure authenticator.") unless cli
+          logger.fatal("Azure CLI must be installed and accessible to use the Azure authenticator.") unless cli
 
           logger.fatal("Azure authenticator mandatory option 'keyvault' has not been set!") unless @options.key?("keyvault")
           logger.fatal("Azure authenticator keyvault must be a string!") unless @options["keyvault"].kind_of?(String)
           logger.fatal("Azure authenticator keyvault must not be blank!") if @options["keyvault"].strip.empty?
 
           keyvault = @options["keyvault"]
-          if @options.key?("ca-certificate") then
-            logger.fatal("Azure authenticator keyvault certificate for Kubernetes CA must be a string!") unless @options["ca-certificate"].kind_of?(String)
-            logger.fatal("Azure authenticator keyvault certificate for Kubernetes CA must not be blank!") if @options["ca-certificate"].strip.empty?
+          if @options.key?("ca-secret") then
+            logger.fatal("Azure authenticator keyvault secret for Kubernetes CA must be a string!") unless @options["ca-secret"].kind_of?(String)
+            logger.fatal("Azure authenticator keyvault secret for Kubernetes CA must not be blank!") if @options["ca-secret"].strip.empty?
 
-            ca = @options["ca-certificate"]
+            ca = @options["ca-secret"]
           else
             ca = "kubernetes-ca"
           end
@@ -144,17 +149,13 @@ module HelmWrapper
           end
 
           begin
-            keyvault = keyvault % @variables.values
-            ca       = ca       % @variables.values
-            endpoint = endpoint % @variables.values
-            token    = token    % @variables.values
+            @keyvault        = keyvault % @variables.identifiers
+            @secret_ca       = ca       % @variables.identifiers
+            @secret_endpoint = endpoint % @variables.identifiers
+            @secret_token    = token    % @variables.identifiers
           rescue
-            logger.fatal("Azure authenticator options contain variables that are not included in the configuration file!")
+            logger.fatal("Azure authenticator options contain identifiers that are not included in the configuration file!")
           end
-
-          @ca       = secret(vault: keyvault, name: ca)
-          @endpoint = secret(vault: keyvault, name: endpoint)
-          @token    = secret(vault: keyvault, name: token)
         end
 
 ###############################################################################

data/lib/helm-wrapper/shared/auths/common.rb

@@ -29,7 +29,7 @@ module HelmWrapper
 
 ###############################################################################
 
-        def initialize(code:, config:, options:, service:, variables:)
+        def initialize(options:, variables:)
           logger.fatal("This class should not be used directly! Please create an authenticator-specific class instead!")
         end
 

data/lib/helm-wrapper/shared/chart.rb

@@ -16,9 +16,11 @@ module HelmWrapper
 
 ###############################################################################
 
-      attr_reader :oci
-      attr_reader :name
       attr_reader :artefact
+      attr_reader :name
+      attr_reader :path
+      attr_reader :oci
+      attr_reader :version
 
 ###############################################################################
 
@@ -28,6 +30,18 @@ module HelmWrapper
 
         @name = options["name"]
 
+        logger.fatal("Chart version must be a string!") unless options["version"].kind_of?(String)
+
+        @version = options["version"]
+
+        unless options["path"].nil? then
+          logger.fatal("Chart path must be a string!") unless options["path"].kind_of?(String)
+          logger.fatal("Chart path must not be blank!") if options["path"].strip.empty?
+          logger.fatal("Chart path must exist!") unless File.directory?(options["path"])
+        end
+
+        @path = options["path"]
+
         logger.fatal("Chart repos must be a list of hashes!") unless options["repos"].kind_of?(Array)
 
         repos = options["repos"]
@@ -63,23 +77,13 @@ module HelmWrapper
             logger.fatal("Chart repo: #{hash["name"]} username must be a string!") unless repo["username"].kind_of?(String)
             logger.fatal("Chart repo: #{hash["name"]} username must not be blank!") if repo["username"].strip.empty?
 
-            repo_username = repo["username"].strip
-
-            logger.fatal("Chart repo: #{hash["name"]} username attribute must refer to a valid environment variable that holds the actual repository username!") unless ENV.key?(repo_username)
-            logger.fatal("Environment variable holding the username for chart repo: #{hash["name"]} is blank!") if ENV[repo_username].strip.empty?
-
-            hash["username"] = ENV[repo_username].strip
+            hash["username"] = repo["username"].strip
 
             logger.fatal("Chart repo: #{hash["name"]} must have a password attribute if 'username' is set!") unless repo.key?("password")
             logger.fatal("Chart repo: #{hash["name"]} password must be a string!") unless repo["password"].kind_of?(String)
             logger.fatal("Chart repo: #{hash["name"]} password must not be blank!") if repo["password"].strip.empty?
 
-            repo_password = repo["password"].strip
-
-            logger.fatal("Chart repo: #{hash["name"]} password attribute must refer to a valid environment variable that holds the actual repository password!") unless ENV.key?(repo_password)
-            logger.fatal("Environment variable holding the password for chart repo: #{hash["name"]} is blank!") if ENV[repo_password].strip.empty?
-
-            hash["password"] = ENV[repo_password].strip
+            hash["password"] = repo["password"].strip
           else
             fatal("Chart repo: #{hash["name"]} is an OCI repository therefore must have a username attribute! Public OCI repositories do not need to be declared.") if is_oci
             hash["username"] = nil

data/lib/helm-wrapper/shared/config.rb

@@ -22,11 +22,6 @@ module HelmWrapper
 
       @@config_exts = [ "", ".yaml", ".yml" ]
 
-###############################################################################
-
-      @@variable_files_name =   "helmvars"
-      @@variable_files_exts = [ ".yaml", ".yml" ]
-
 ###############################################################################
 
       attr_reader :auths
@@ -36,7 +31,6 @@ module HelmWrapper
       attr_reader :namespace
       attr_reader :path
       attr_reader :release
-      attr_reader :variable_files
       attr_reader :variables
 
 ###############################################################################
@@ -71,65 +65,30 @@ module HelmWrapper
         auth_azure_options = options["auth-azure-options"]
 
         @chart = chart
-        @path  = find(base: @base, name: @name, exts: @@config_exts, description: "Configuration")
+        @path  = ::HelmWrapper.find(base: @base, name: @name, exts: @@config_exts, description: "Configuration")
 
         yaml = YAML.load(File.read(@path))
         logger.fatal("Invalid YAML in configuration file: #{@path}") unless yaml.kind_of?(Hash)
 
-        if yaml.key?("variables") then
-          logger.fatal("Key 'variables' is not a hash in configuration file: #{@path}") unless yaml["variables"].kind_of?(Hash)
-          @variables = HelmWrapper::Shared::Variables.new(values: yaml["variables"])
-        else
-          @variables = HelmWrapper::Shared::Variables.new()
-        end
+        identifers = yaml.key?("identifiers") ? yaml["identifiers"] : Hash.new
+        @variables = HelmWrapper::Shared::Variables.new(chart: @chart.name, config: @name, namespace: namespace, release: release, identifiers: identifers)
+        @variables.add_variables(variables: yaml["globals"]) if yaml.key?("globals")
 
-        @variable_files = yaml.key?("helm") ? validate(variable_files: yaml["helm"]) : Array.new
+        if yaml.key?("helm") then
+          logger.fatal("Key 'helm' is not a hash in configuration file: #{@path}") unless yaml["helm"].kind_of?(Hash)
+          helm = yaml["helm"]
 
-        begin
-          namespace = namespace % @variables.values
-          release   = release   % @variables.values
-        rescue
-          logger.fatal("Provided configuration options contain variables that are not included in the configuration file!")
+          @variables.add_variables(variables: helm["variables"]) if helm.key?("variables")
+          @variables.add_files(base: @base, files: helm["files"]) if helm.key?("files")
         end
 
-        @namespace = namespace
-        @release   = release
+        @namespace = @variables.core[:namespace]
+        @release   = @variables.core[:release]
 
         @auths = Array.new
         @auths.append(HelmWrapper::Shared::Auths::Azure.new(options: auth_azure_options, variables: @variables)) if auth_azure
       end
 
-###############################################################################
-
-      private
-
-###############################################################################
-
-      def find(base:, name:, exts:, description: "File")
-        @@config_exts.each do |config_ext|
-          path = File.join(base, name + config_ext)
-          return path if File.file?(path)
-        end
-
-        logger.fatal("#{description} name: #{@name} not found in location: #{@base}!")
-      end
-
-###############################################################################
-
-      def validate(variable_files:)
-        logger.fatal("Optional key 'variable_files' must be a list of strings!") unless variable_files.kind_of?(Array)
-
-        result = Array.new
-
-        variable_files.each do |variable_file|
-          logger.fatal("All elements of 'helm' must be strings!") unless variable_file.kind_of?(String)
-          logger.fatal("All elements of 'helm' must not be blank!") if variable_file.strip.empty?
-          result.append(find(base: File.join(@base, @@variable_files_name), name: variable_file.strip, exts: @@variable_files_exts, description: "Helm values file"))
-        end
-
-        return result
-      end
-
 ###############################################################################
 
     end

data/lib/helm-wrapper/shared/runner.rb

@@ -36,7 +36,7 @@ module HelmWrapper
 
 ###############################################################################
 
-      def initialize(binary:, chart:, config:)
+      def initialize(binary:, chart:, config: nil)
         @binary = binary
         @chart  = chart
         @config = config
@@ -48,6 +48,8 @@ module HelmWrapper
 ###############################################################################
 
       def init_auths()
+        logger.fatal("Cannot initialise authenticators without a valid configuration!") if @config.nil?
+
         @auths_attempted = true
 
         config.auths.map(&:auth)
@@ -62,28 +64,36 @@ module HelmWrapper
 
         @chart.oci.each_with_index do |oci_repo, oci_index|
           logger.info("Logging into OCI repository: #{oci_repo["name"]}")
+
+          username = from_environment(variable: oci_repo["username"])
+          password = from_environment(variable: oci_repo["password"])
+
           @chart.oci_active(active: true, index: oci_index)
 
           parameters = Array.new
           parameters.append("login")
           parameters.append("\"#{oci_repo["url"]}\"")
-          parameters.append("--username=\"#{oci_repo["username"]}\"")
+          parameters.append("--username=\"#{username}\"")
           parameters.append("--password-stdin")
-          logger.fatal("Failed to login to Helm OCI repository: #{oci_repo["name"]}, url: #{oci_repo["url"]}") unless run(action: "registry", parameters: parameters, stdin: oci_repo["password"])
+          logger.fatal("Failed to login to Helm OCI repository: #{oci_repo["name"]}, url: #{oci_repo["url"]}") unless run(action: "registry", parameters: parameters, stdin: password)
         end
 
         if @chart.artefact.length > 0 then
 
           @chart.artefact.each_with_index do |artefact_repo, artefact_index|
             logger.info("Adding artefact repository: #{artefact_repo["name"]}")
+
+            username = artefact_repo["username"].nil? ? nil : from_environment(variable: artefact_repo["username"])
+            password = artefact_repo["password"].nil? ? nil : from_environment(variable: artefact_repo["password"])
+
             @chart.artefact_active(active: true, index: artefact_index)
 
             parameters = Array.new
             parameters.append("add")
             parameters.append("\"#{artefact_repo["name"]}\"")
             parameters.append("\"#{artefact_repo["url"]}\"")
-            parameters.append("--username=\"#{artefact_repo["username"]}\"") unless artefact_repo["username"].nil?
-            parameters.append("--password=\"#{artefact_repo["password"]}\"") unless artefact_repo["password"].nil?
+            parameters.append("--username=\"#{username}\"") unless username.nil?
+            parameters.append("--password=\"#{password}\"") unless password.nil?
             parameters.append("--force-update") if force
             logger.fatal("Failed to add Helm repository: #{artefact_repo["name"]}, url: #{artefact_repo["url"]}") unless run(action: "repo", parameters: parameters)
           end
@@ -105,32 +115,84 @@ module HelmWrapper
 ###############################################################################
 
       def delete()
+        logger.fatal("Cannot Helm delete without a valid configuration!") if @config.nil?
         logger.fatal("Cannot Helm delete before initialising authenticators!") unless auths
 
         parameters = Array.new
-        parameters.append("--namespace \"#{@config.namespace}\"")
-        parameters.append(@config.release)
+        parameters.append("--namespace=\"#{@config.namespace}\"")
+        parameters.append("\"#{@config.release}\"")
 
         logger.fatal("Helm delete failed!") unless run(action: "delete", parameters: parameters)
       end
 
+###############################################################################
+
+      def template()
+        logger.fatal("Cannot Helm template without a valid configuration!") if @config.nil?
+        logger.fatal("Cannot Helm template before initialising repositories!") unless repos
+
+        parameters = Array.new
+        parameters.append("--namespace=\"#{@config.namespace}\"")
+        parameters.append("\"#{@config.release}\"")
+        parameters.append("\"#{@chart.name}\"")
+        parameters.append("--version=\"#{@chart.version}\"") unless @chart.version.strip.empty?
+        parameters.concat(variable_files)
+        parameters.concat(variable_strings)
+
+        logger.fatal("Helm template failed!") unless run(action: "template", parameters: parameters)
+      end
+
 ###############################################################################
 
       def upgrade(install: true)
+        logger.fatal("Cannot Helm upgrade without a valid configuration!") if @config.nil?
         logger.fatal("Cannot Helm upgrade before initialising authenticators!") unless auths
         logger.fatal("Cannot Helm upgrade before initialising repositories!") unless repos
 
         parameters = Array.new
-        parameters.append("--namespace \"#{@config.namespace}\"")
+        parameters.append("--namespace=\"#{@config.namespace}\"")
         parameters.append("--install") if install
-        parameters.append(@config.release)
-        parameters.append(@chart.name)
+        parameters.append("\"#{@config.release}\"")
+        parameters.append("\"#{@chart.name}\"")
+        parameters.append("--version=\"#{@chart.version}\"") unless @chart.version.strip.empty?
         parameters.concat(variable_files)
         parameters.concat(variable_strings)
 
         logger.fatal("Helm upgrade failed!") unless run(action: "upgrade", parameters: parameters)
       end
 
+###############################################################################
+
+      def lint()
+        parameters = Array.new
+        parameters.append("\"#{@chart.path}\"")
+
+        logger.fatal("Helm validate failed!") unless run(action: "lint", parameters: parameters)
+      end
+
+###############################################################################
+
+      def push(tag:)
+        logger.fatal("Cannot Helm push before initialising repositories!") unless repos
+
+        parameters = Array.new
+        parameters.append("push")
+        parameters.append("\"#{@chart.name}:#{tag}\"")
+
+        logger.fatal("Helm push failed!") unless run(action: "chart", parameters: parameters)
+      end
+
+###############################################################################
+
+      def save(tag:)
+        parameters = Array.new
+        parameters.append("save")
+        parameters.append("\"#{@chart.path}\"")
+        parameters.append("\"#{@chart.name}:#{tag}\"")
+
+        logger.fatal("Helm save failed!") unless run(action: "chart", parameters: parameters)
+      end
+
 ###############################################################################
 
     private
@@ -182,8 +244,8 @@ module HelmWrapper
       def variable_files
         result = Array.new
 
-        @config.variable_files.each do |variable_file|
-          result.append("--values=\"#{variable_file}\"")
+        @config.variables.files.each do |file|
+          result.append("--values=\"#{file}\"")
         end
 
         return result
@@ -194,8 +256,6 @@ module HelmWrapper
       def variable_strings
         result = Array.new
 
-        result.append("--set=\"config=#{@config.name}\"")
-
         @config.variables.values.each do |key, value|
           result.append("--set=\"#{key.to_s}=#{value}\"")
         end
@@ -217,7 +277,7 @@ module HelmWrapper
             out, status = Open3.capture2e(cmdline, :stdin_data=>stdin)
             logger.debug("Helm output:")
             logger.debug(out)
-            result = status.success?
+            result = statrepo_usernameus.success?
           rescue
             result = false
           end
@@ -235,6 +295,15 @@ module HelmWrapper
         return result
       end
 
+###############################################################################
+
+      def from_environment(variable:)
+        logger.fatal("Environment variable: #{variable} does not exist") unless ENV.key?(variable)
+        logger.fatal("Environment variable: #{variable} is blank!") if ENV[variable].strip.empty?
+
+        return ENV[variable].strip
+      end
+
 ###############################################################################
 
     end

data/lib/helm-wrapper/shared/variables.rb

@@ -16,36 +16,109 @@ module HelmWrapper
 
 ###############################################################################
 
-      @@reserved = [ "chart" ]
+      @@variable_files_name =   "helmvars"
+      @@variable_files_exts = [ ".yaml", ".yml" ]
 
 ###############################################################################
 
+      attr_reader :core
+      attr_reader :files
+      attr_reader :identifiers
       attr_reader :values
 
 ###############################################################################
 
-      def initialize(values: Hash.new, sort: true)
-        cleansed = cleanse(values: values)
-        @values = sort ? cleansed.sort.to_h : cleansed
+      def initialize(chart:, config:, namespace:, release:, identifiers: Hash.new, sort: false)
+        logger.fatal("Identifiers provided must be a hash!") unless identifiers.kind_of?(Hash)
+
+        core             = Hash.new()
+        core[:chart]     = chart
+        core[:config]    = config
+        core[:namespace] = nil
+        core[:release]   = nil
+
+        user = cleanse(variables: identifiers, reserved: core.keys)
+
+        begin
+          core[:namespace] = namespace % user
+          core[:release]   = release   % user
+        rescue
+          logger.fatal("Provided configuration options include identifiers that are not included in the configuration file!")
+        end
+
+        merged = core.merge(user)
+
+        @core        = core
+        @identifiers = sort ? merged.sort.to_h : merged
+        @values      = @identifiers
+        @files       = Array.new
+      end
+
+###############################################################################
+
+      def add_files(base:, files:)
+        logger.fatal("Variable files provided must be an array!") unless files.kind_of?(Array)
+
+        files.each do |file|
+          logger.fatal("All provided variable file names must be strings!") unless file.kind_of?(String)
+          logger.fatal("All provided variable file names must not be blank!") if file.strip.empty?
+
+          path = ::HelmWrapper.find(base: File.join(base, @@variable_files_name), name: file.strip, exts: @@variable_files_exts, description: "Helm values file")
+
+          if @files.include?(path) then
+            logger.warn("Helm variables file is included more than once: #{file.strip}")
+          else
+            @files.append(path)
+          end
+        end
       end
 
 ###############################################################################
 
+      def add_variables(variables:, sort: false)
+        logger.fatal("Variables provided must be a hash!") unless variables.kind_of?(Hash)
+
+        cleansed = cleanse(variables: variables, reserved: @values.keys)
+
+        begin
+          cleansed = cleansed.map{ |key, value| [ key, value % @identifiers ] }.to_h
+        rescue
+          logger.fatal("Variables contain identifiers that are not included in the configuration file!")
+        end
+
+        merged  = @values.merge(cleansed)
+        @values = sort ? merged.sort.to_h : merged
+      end
+
+###############################################################################
+
+      def clear_files()
+        @files = Array.new
+      end
+
+###############################################################################
+
+      def clear_variables()
+        @values = @identifers
+       end
+
+ ###############################################################################
+
       private
 
 ###############################################################################
 
-      def cleanse(values:)
+      def cleanse(variables:, reserved:)
         result = Hash.new
 
-        values.keys.each do |key|
+        variables.keys.each do |key|
           logger.fatal("Could not clean variables hash. All keys MUST be strings!") unless key.kind_of?(String)
-          logger.fatal("Could not clean variables hash, key: #{key.downcase} is reserved and cannot be used!") if @@reserved.include?(key.downcase)
+          logger.fatal("Could not clean variables hash, key: #{key.downcase} is reserved or already in use and cannot be used!") if reserved.include?(key.downcase.to_sym)
           logger.fatal("Could not clean variables hash, duplicate key found: #{key.downcase}!") if result.key?(key.downcase.to_sym)
-          logger.fatal("Could not clean variables hash, value for: #{key.downcase} is not a string!") unless values[key].kind_of?(String)
-          logger.fatal("Could not clean variables hash, value for: #{key.downcase} is empty!") if values[key].strip.empty?
+          logger.fatal("Could not clean variables hash, value for: #{key.downcase} is not a string!") unless variables[key].kind_of?(String)
+          logger.fatal("Could not clean variables hash, value for: #{key.downcase} is empty!") if variables[key].strip.empty?
 
-          result[key.downcase.to_sym] = values[key].strip
+          result[key.downcase.to_sym] = variables[key].strip
         end
 
         return result

data/lib/helm-wrapper/tasks.rb

@@ -7,5 +7,8 @@ require 'rake/tasklib'
 require_relative 'tasks/apply'
 require_relative 'tasks/binary'
 require_relative 'tasks/destroy'
+require_relative 'tasks/push'
+require_relative 'tasks/template'
+require_relative 'tasks/validate'
 
 ###############################################################################

data/lib/helm-wrapper/tasks/apply.rb

@@ -45,7 +45,7 @@ module HelmWrapper
           config = HelmWrapper::Shared::Config.new(chart: @chart, options: options)
           runner = HelmWrapper::Shared::Runner.new(binary: @binary, chart: @chart, config: config)
 
-          logger.info("Running Helm upgrade for chart: #{@chart.name}...")
+          logger.info("Running Helm upgrade for release: #{config.release}, namespace: #{config.namespace}...")
 
           begin
             runner.init_repos

data/lib/helm-wrapper/tasks/destroy.rb

@@ -44,7 +44,7 @@ module HelmWrapper
           config = HelmWrapper::Shared::Config.new(chart: @chart, options: options)
           runner = HelmWrapper::Shared::Runner.new(binary: @binary, chart: @chart, config: config)
 
-          logger.info("Running Helm delete for chart: #{@chart.name}...")
+          logger.info("Running Helm delete for release: #{config.release}, namespace: #{config.namespace}...")
 
           begin
             runner.init_auths

data/lib/helm-wrapper/tasks/push.rb

@@ -0,0 +1,67 @@
+###############################################################################
+
+module HelmWrapper
+
+###############################################################################
+
+  module Tasks
+
+###############################################################################
+
+    class Push < ::Rake::TaskLib
+
+###############################################################################
+
+      include HelmWrapper::Shared::Logging
+
+###############################################################################
+
+      @binary
+      @chart
+
+###############################################################################
+
+      def initialize(binary:, chart:)
+        @binary = binary
+        @chart  = chart
+
+        yield self if block_given?
+
+        push_task
+      end
+
+###############################################################################
+
+      def push_task
+        desc "Pushes a Helm chart to an OCI Helm repository."
+        task :push, [:tag, :clean] => :binary do |t, args|
+          tag = (args[:tag].kind_of?(String) and (not args[:tag].strip.empty?)) ? args[:tag].strip : "latest"
+          clean = args[:clean].kind_of?(String) ? args[:clean].downcase == "true" : true
+
+          runner = HelmWrapper::Shared::Runner.new(binary: @binary, chart: @chart)
+
+          logger.info("Running Helm push for path: #{@chart.path}...")
+
+          begin
+            runner.init_repos
+            runner.save(tag: tag)
+            runner.push(tag: tag)
+          ensure
+            runner.clean(repos: clean)
+          end
+        end
+      end
+
+###############################################################################
+
+    end
+
+###############################################################################
+
+  end
+
+###############################################################################
+
+end
+
+###############################################################################

data/lib/helm-wrapper/tasks/template.rb

@@ -0,0 +1,71 @@
+###############################################################################
+
+module HelmWrapper
+
+###############################################################################
+
+  module Tasks
+
+###############################################################################
+
+    class Template < ::Rake::TaskLib
+
+###############################################################################
+
+      include HelmWrapper::Shared::Logging
+
+###############################################################################
+
+      @binary
+      @chart
+      @options
+
+###############################################################################
+
+      def initialize(binary:, chart:, options:)
+        @binary  = binary
+        @chart   = chart
+        @options = options
+
+        yield self if block_given?
+
+        template_task
+      end
+
+###############################################################################
+
+      def template_task
+        desc "Templates a chart with Helm for a given configuration."
+        task :template, [:config, :clean] => :binary do |t, args|
+          options = @options.merge({"name" => args[:config]})
+          clean   = args[:clean].kind_of?(String) ? args[:clean].downcase == "true" : true
+
+          logger.info("Processing configuration for Helm template...")
+
+          config = HelmWrapper::Shared::Config.new(chart: @chart, options: options)
+          runner = HelmWrapper::Shared::Runner.new(binary: @binary, chart: @chart, config: config)
+
+          logger.info("Running Helm template for release: #{config.release}, namespace: #{config.namespace}...")
+
+          begin
+            runner.init_repos
+            runner.template
+          ensure
+            runner.clean(repos: clean)
+          end
+        end
+      end
+
+###############################################################################
+
+    end
+
+###############################################################################
+
+  end
+
+###############################################################################
+
+end
+
+###############################################################################

data/lib/helm-wrapper/tasks/validate.rb

@@ -0,0 +1,58 @@
+###############################################################################
+
+module HelmWrapper
+
+###############################################################################
+
+  module Tasks
+
+###############################################################################
+
+    class Validate < ::Rake::TaskLib
+
+###############################################################################
+
+      include HelmWrapper::Shared::Logging
+
+###############################################################################
+
+      @binary
+      @chart
+
+###############################################################################
+
+      def initialize(binary:, chart:)
+        @binary = binary
+        @chart  = chart
+
+        yield self if block_given?
+
+        validate_task
+      end
+
+###############################################################################
+
+      def validate_task
+        desc "Validates a Helm chart stored locally."
+        task :validate => :binary do |t, args|
+          runner = HelmWrapper::Shared::Runner.new(binary: @binary, chart: @chart)
+
+          logger.info("Running Helm validate for path: #{@chart.path}...")
+
+          runner.lint
+        end
+      end
+
+###############################################################################
+
+    end
+
+###############################################################################
+
+  end
+
+###############################################################################
+
+end
+
+###############################################################################

data/lib/helm-wrapper/version.rb

@@ -4,7 +4,7 @@ module HelmWrapper
 
 ###############################################################################
 
-  VERSION = "0.1.0"
+  VERSION = "1.1.1"
 
 ###############################################################################
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helm-wrapper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Richard Lees
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -58,6 +58,9 @@ files:
 - lib/helm-wrapper/tasks/apply.rb
 - lib/helm-wrapper/tasks/binary.rb
 - lib/helm-wrapper/tasks/destroy.rb
+- lib/helm-wrapper/tasks/push.rb
+- lib/helm-wrapper/tasks/template.rb
+- lib/helm-wrapper/tasks/validate.rb
 - lib/helm-wrapper/version.rb
 homepage: https://gitlab.com/rlees85-ruby/helm-wrapper/
 licenses: