helm-wrapper 1.1.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76acfe4805299ed72c029326ed693127fe8518078eea2d5c81880be17d1823d4
-  data.tar.gz: 6355e496234578a2f414cf8873b2ecfff6d0aa710a4045a3741e940e1996ada8
+  metadata.gz: b1d3f972839e1f9e7abd290193f07d57517d5ce589056e880c06d464bdd7bf37
+  data.tar.gz: 9bad65a1005854b57ccdfb14cea4f7e2c1305eb4669fb4d65c17b72e5004c27c
 SHA512:
-  metadata.gz: 3ec82adad9abe9ad074f6f60fc4ed5711e9f08a7c92258b1b6e71fcf6da491c3a9a0f211796d7ccab3d2f30c027ad0cfdad06955233547bb788faef0e81172f5
-  data.tar.gz: 0b1299e87f67e83c2a7289049a9222b7a269739fd50b8fc9e18e94f818076dd9c857607507911b690feebae91e6a7fe0c7a5a3408883361705ec6f61201c4d83
+  metadata.gz: ecf5901a01a7dccbb485db2d25467fec5759f243a8bd96d9ff3f0e22f7862f0e388d710190c95ab580cbdde27176923d3eeaf3573ebfc5571d779956a58fbf14
+  data.tar.gz: 81c011c1774a3649ecf4a5a68b3bca0f5769760a73455ac656aa624639cea78a1b99f7282cf64cd3a1f4a7dabd41ff50d8fcc7555fc5fe821f7416036008709f

data/lib/helm-wrapper.rb

@@ -23,7 +23,7 @@ module HelmWrapper
 ###############################################################################
 
   def self.deployment_tasks(chart:, namespace:, release:, options: Hash.new)
-    @logger.info("Building deployment tasks for chart: #{chart}...")
+    @logger.info("Building deployment tasks for release: #{release}...")
 
     @logger.fatal("Options must be specified as a hash!") unless options.kind_of?(Hash)
 
@@ -38,11 +38,14 @@ module HelmWrapper
     chart_options["version"] = options.key?("chart-version") ? options["chart-version"] : String.new
 
     config_options = Hash.new
+    config_options["atomic"]             = options.key?("config-atomic")             ? options["config-atomic"]             : false
     config_options["auth-azure"]         = options.key?("config-auth-azure")         ? options["config-auth-azure"]         : false
     config_options["auth-azure-options"] = options.key?("config-auth-azure-options") ? options["config-auth-azure-options"] : Hash.new
     config_options["base"]               = options.key?("config-base")               ? options["config-base"]               : File.join(Dir.pwd, "config")
     config_options["namespace"]          = namespace
     config_options["release"]            = release
+    config_options["timeout"]            = options.key?("config-timeout")            ? options["config-timeout"]            : "5m0s"
+    config_options["wait"]               = options.key?("config-wait")               ? options["config-wait"]               : true
 
     binary = HelmWrapper::Shared::Binary.new(options: binary_options)
     chart  = HelmWrapper::Shared::Chart.new(options: chart_options)

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

@@ -30,10 +30,6 @@ 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?
@@ -42,6 +38,10 @@ module HelmWrapper
 
         @path = options["path"]
 
+        logger.fatal("Chart version must be a string!") unless options["version"].kind_of?(String)
+
+        @version = options["version"]
+
         logger.fatal("Chart repos must be a list of hashes!") unless options["repos"].kind_of?(Array)
 
         repos = options["repos"]
@@ -49,7 +49,11 @@ module HelmWrapper
         @oci      = Array.new
         @artefact = Array.new
 
-        repos.each do |repo|
+        repos.each do |repo|        logger.fatal("Configuration name must be a string!") unless options["name"].kind_of?(String)
+        logger.fatal("Configuration name must not be blank!") if options["name"].strip.empty?
+
+        @name = options["name"]
+
           logger.fatal("All elements of chart repos must be hashes!") unless repo.kind_of?(Hash)
 
           logger.fatal("Chart repo: #{hash["name"]} must have a type attribute!") unless repo.key?("type")

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

@@ -24,18 +24,25 @@ module HelmWrapper
 
 ###############################################################################
 
+      attr_reader :atomic
       attr_reader :auths
       attr_reader :base
       attr_reader :chart
       attr_reader :name
       attr_reader :namespace
-      attr_reader :path
       attr_reader :release
+      attr_reader :path
+      attr_reader :timeout
       attr_reader :variables
+      attr_reader :wait
 
 ###############################################################################
 
       def initialize(chart:, options:)
+        logger.fatal("Configuration atomic mode must be a boolean!") unless [ true, false ].include?(options["atomic"])
+
+        @atomic = options["atomic"]
+
         logger.fatal("Configuration base path must be a string!") unless options["base"].kind_of?(String)
         logger.fatal("Configuration base path must not be blank!") if options["base"].strip.empty?
 
@@ -46,44 +53,65 @@ module HelmWrapper
 
         @name = options["name"]
 
-        logger.fatal("Configuration destination namespace must be a string!") unless options["namespace"].kind_of?(String)
-        logger.fatal("Configuration destination namespace must not be blank!") if options["namespace"].strip.empty?
-
-        namespace = options["namespace"]
-
         logger.fatal("Configuration release name must be a string!") unless options["release"].kind_of?(String)
         logger.fatal("Configuration release name must not be blank!") if options["release"].strip.empty?
 
-        release = options["release"]
+        @release = options["release"]
+
+        logger.fatal("Configuration wait timeout must be a string!") unless options["timeout"].kind_of?(String)
+        logger.fatal("Configuration wait timeout must not be blank!") if options["timeout"].strip.empty?
 
-        logger.fatal("Configuration authenticator for Azure enabled must be a Boolean!") unless [ true, false ].include?(options["auth-azure"])
+        @timeout = options["timeout"]
+
+        logger.fatal("Configuration authenticator for Azure enabled must be a boolean!") unless [ true, false ].include?(options["auth-azure"])
 
         auth_azure = options["auth-azure"]
 
-        logger.fatal("Configuration authenticator for Azure options must be a Hash!") unless options["auth-azure-options"].kind_of?(Hash)
+        logger.fatal("Configuration authenticator for Azure options must be a hash!") unless options["auth-azure-options"].kind_of?(Hash)
 
         auth_azure_options = options["auth-azure-options"]
 
+        logger.fatal("Configuration destination namespace must be a string!") unless options["namespace"].kind_of?(String)
+        logger.fatal("Configuration destination namespace must not be blank!") if options["namespace"].strip.empty?
+
+        namespace = options["namespace"]
+
+        logger.fatal("Configuration wait mode must be a boolean!") unless [ true, false ].include?(options["wait"])
+
+        wait = options["wait"]
+
         @chart = chart
         @path  = ::HelmWrapper.find(base: @base, name: @name, exts: @@config_exts, description: "Configuration")
+        @wait  = (not @atomic) and wait
 
         yaml = YAML.load(File.read(@path))
         logger.fatal("Invalid YAML in configuration file: #{@path}") unless yaml.kind_of?(Hash)
 
         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")
+        @variables = HelmWrapper::Shared::Variables.new(chart: @chart.name, config: @name, namespace: namespace, release: @release, identifiers: identifers)
+        @namespace = @variables.core[:namespace]
+
+        if yaml.key?("globals") then
+          logger.fatal("Key 'globals' is not a hash in configuration file: #{@path}") unless yaml["globals"].kind_of?(Hash)
+          globals = yaml["globals"]
+
+          @variables.add_variables(variables: globals["variables"]) if globals.key?("variables")
+        end
 
         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"]
 
-          @variables.add_variables(variables: helm["variables"]) if helm.key?("variables")
-          @variables.add_files(base: @base, files: helm["files"]) if helm.key?("files")
-        end
+          [ "globals", @release ].each do |extra|
+            if helm.key?(extra) then
+              logger.fatal("Key '#{extra}' under 'helm' is not a hash in configuration file: #{@path}") unless helm[extra].kind_of?(Hash)
+              section = helm[extra]
 
-        @namespace = @variables.core[:namespace]
-        @release   = @variables.core[:release]
+              @variables.add_variables(variables: section["variables"]) if section.key?("variables")
+              @variables.add_files(base: @base, files: section["files"]) if section.key?("files")
+            end
+          end
+        end
 
         @auths = Array.new
         @auths.append(HelmWrapper::Shared::Auths::Azure.new(options: auth_azure_options, variables: @variables)) if auth_azure

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

@@ -154,6 +154,9 @@ module HelmWrapper
         parameters.append("--install") if install
         parameters.append("\"#{@config.release}\"")
         parameters.append("\"#{@chart.name}\"")
+        parameters.append("--atomic") if @config.atomic
+        parameters.append("--wait") if @config.wait
+        parameters.append("--timeout=\"#{@config.timeout}\"") if (@config.atomic or @config.wait)
         parameters.append("--version=\"#{@chart.version}\"") unless @chart.version.strip.empty?
         parameters.concat(variable_files)
         parameters.concat(variable_strings)
@@ -277,7 +280,7 @@ module HelmWrapper
             out, status = Open3.capture2e(cmdline, :stdin_data=>stdin)
             logger.debug("Helm output:")
             logger.debug(out)
-            result = statrepo_usernameus.success?
+            result = status.success?
           rescue
             result = false
           end

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

@@ -35,15 +35,14 @@ module HelmWrapper
         core[:chart]     = chart
         core[:config]    = config
         core[:namespace] = nil
-        core[:release]   = nil
+        core[:release]   = release
 
-        user = cleanse(variables: identifiers, reserved: core.keys)
+        user = cleanse(variables: identifiers, reserved: core.keys, downcase: true)
 
         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!")
+          logger.fatal("Provided namespace includes identifiers that are not included in the configuration file!")
         end
 
         merged = core.merge(user)
@@ -108,17 +107,20 @@ module HelmWrapper
 
 ###############################################################################
 
-      def cleanse(variables:, reserved:)
+      def cleanse(variables:, reserved:, downcase: false)
         result = Hash.new
 
         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 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 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] = variables[key].strip
+          sym = downcase ? key.downcase.to_sym : key.to_sym
+
+          logger.fatal("Could not clean variables hash, key: #{sym.to_s} is reserved or already in use and cannot be used!") if reserved.include?(sym)
+          logger.fatal("Could not clean variables hash, duplicate key found: #{sym.to_s}!") if result.key?(sym)
+          logger.fatal("Could not clean variables hash, value for: #{sym.to_s} is not a string!") unless variables[key].kind_of?(String)
+          logger.fatal("Could not clean variables hash, value for: #{sym.to_s} is empty!") if variables[key].strip.empty?
+
+          result[sym] = variables[key].strip
         end
 
         return result

data/lib/helm-wrapper/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helm-wrapper
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Richard Lees
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake