helm-wrapper 1.6.2 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0c6825235f55e18927bc81c56ee25b1a2da087cb13abc76c331b262a21e4948
-  data.tar.gz: c884c4abc0009521dfdc11d5a8a4c71e8839a45012a0165d6dcdeceb31314601
+  metadata.gz: 141b2ae006039883e281b95616f3ee6f44da3623e4bccf38c50a616f896ef25b
+  data.tar.gz: ac1155aaa3afce63dd46b3502fb6f412e0da6a4b2809c3dc04d22c4766d38b7c
 SHA512:
-  metadata.gz: 20da545ab1511ef1220b31d21aeca1b35f0f0967dbd96dfb8086d023f372960b6f135c6203c2e500a92989e2e802110864be49dc4643684f36cab278583b1b02
-  data.tar.gz: ce9bd34edf9c901d5e711e67ce6002acd0d70f03d3dbcb6b94b30f971721bf3592cede7595df3eefb6f0b6c235bae707e5a7b72bc6460bb9cf7aab84c4eb2204
+  metadata.gz: f19b2c92e6685320a8d335729402377c28a2a80ae9d4d6f5a1a61943bfaee94fec8f0d4531e1c712fad1cde8431b4d93427b75463cf41ef30dc336b7232e7f9c
+  data.tar.gz: ef40889f9d01ae740ad1e367c7fd37a38d99eea9a2700937d0534c7597afbcd0b901209b1d80791a429bc39485af50534ea1577c8601d352dc2cba2631f8650f

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

@@ -14,6 +14,10 @@ module HelmWrapper
 
       include HelmWrapper::Shared::Logging
 
+###############################################################################
+
+      @@chart_metadata_file = "Chart.yaml"
+
 ###############################################################################
 
       attr_reader :artefact
@@ -25,22 +29,24 @@ module HelmWrapper
 ###############################################################################
 
       def initialize(options:)
-        logger.fatal("Chart name must be a string!") unless options["name"].kind_of?(String)
-        logger.fatal("Chart name must not be blank!") if options["name"].strip.empty?
+        if options["path"].nil? then
+          @path = options["path"]
 
-        @name = options["name"]
+          logger.fatal("Chart name must be a string!") unless options["name"].kind_of?(String)
+          logger.fatal("Chart name must not be blank!") if options["name"].strip.empty?
+          @name = options["name"]
 
-        unless options["path"].nil? then
+          logger.fatal("Chart version must be a string!") unless options["version"].kind_of?(String)
+          @version = options["version"]
+        else
           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 version must be a string!") unless options["version"].kind_of?(String)
+          @path = options["path"]
 
-        @version = options["version"]
+          load_metadata
+        end
 
         logger.fatal("Chart repos must be a list of hashes!") unless options["repos"].kind_of?(Array)
 
@@ -49,11 +55,7 @@ module HelmWrapper
         @oci      = Array.new
         @artefact = Array.new
 
-        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"]
-
+        repos.each do |repo|
           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")
@@ -113,6 +115,39 @@ module HelmWrapper
         oci[index]["active"] = active
       end
 
+###############################################################################
+
+      private
+
+###############################################################################
+
+      def load_metadata
+        file = File.join(@path, @@chart_metadata_file)
+
+        if File.file?(file)
+          logger.info("Loading chart metadata from: #{file}...")
+        else
+          logger.fatal("Chart metadata file: #{file} not found!")
+        end
+
+        yaml = YAML.load(File.read(file))
+        logger.fatal("Invalid YAML in chart metadata file: #{file}") unless yaml.kind_of?(Hash)
+
+        logger.fatal("Chart name is missing from chart metadata file!") unless yaml.key?("name")
+        logger.fatal("Chart name is not a string in chart metadata file!") unless yaml["name"].kind_of?(String)
+        logger.fatal("Chart name is blank in chart metadata file!") if yaml["name"].strip.empty?
+
+        @name = yaml["name"]
+
+        logger.fatal("Chart version is missing from chart metadata file!") unless yaml.key?("version")
+        logger.fatal("Chart version is not a string in chart metadata file!") unless yaml["version"].kind_of?(String)
+        logger.fatal("Chart version is blank in chart metadata file!") if yaml["version"].strip.empty?
+
+        @version = yaml["version"]
+
+        logger.info("Metadata loaded: #{@name} version: #{@version}")
+      end
+
 ###############################################################################
 
     end

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

@@ -175,25 +175,29 @@ module HelmWrapper
 
 ###############################################################################
 
-      def push(tag:)
-        logger.fatal("Cannot Helm push before initialising repositories!") unless repos
-
+      def package(destination: ".")
         parameters = Array.new
-        parameters.append("push")
-        parameters.append("\"#{@chart.name}:#{tag}\"")
+        parameters.append("--destination=\"#{destination}\"")
+        parameters.append("\"#{@chart.path}\"")
 
-        logger.fatal("Helm push failed!") unless run(action: "chart", parameters: parameters)
+        logger.fatal("Helm package failed!") unless run(action: "package", parameters: parameters)
       end
 
 ###############################################################################
 
-      def save(tag:)
+      def push(source: ".", destination:)
+        logger.fatal("Cannot Helm push before initialising repositories!") unless repos
+
+        package_name = "#{@chart.name}-#{@chart.version}.tgz"
+        package_path = File.join(source, package_name)
+
+        logger.fatal("Must package before pushing! Package: #{package_path} not found!") unless File.file?(package_path)
+
         parameters = Array.new
-        parameters.append("save")
-        parameters.append("\"#{@chart.path}\"")
-        parameters.append("\"#{@chart.name}:#{tag}\"")
+        parameters.append("\"#{package_path}\"")
+        parameters.append("\"#{destination}\"")
 
-        logger.fatal("Helm save failed!") unless run(action: "chart", parameters: parameters)
+        logger.fatal("Helm push failed!") unless run(action: "push", parameters: parameters)
       end
 
 ###############################################################################

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

@@ -18,12 +18,14 @@ module HelmWrapper
 
       @binary
       @chart
+      @destination
 
 ###############################################################################
 
-      def initialize(binary:, chart:)
-        @binary = binary
-        @chart  = chart
+      def initialize(binary:, chart:, destination:)
+        @binary      = binary
+        @chart       = chart
+        @destination = destination
 
         yield self if block_given?
 
@@ -34,8 +36,7 @@ module HelmWrapper
 
       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"
+        task :push, [:clean] => :binary do |t, args|
           clean = args[:clean].kind_of?(String) ? args[:clean].downcase == "true" : true
 
           runner = HelmWrapper::Shared::Runner.new(binary: @binary, chart: @chart)
@@ -44,8 +45,8 @@ module HelmWrapper
 
           begin
             runner.init_repos
-            runner.save(tag: tag)
-            runner.push(tag: tag)
+            runner.package
+            runner.push(destination: @destination)
           ensure
             runner.clean(repos: clean)
           end

data/lib/helm-wrapper/version.rb

@@ -4,7 +4,7 @@ module HelmWrapper
 
 ###############################################################################
 
-  VERSION = "1.6.2"
+  VERSION = "1.7.0"
 
 ###############################################################################
 

data/lib/helm-wrapper.rb

@@ -25,6 +25,7 @@ module HelmWrapper
   def self.deployment_tasks(chart:, namespace:, release:, options: Hash.new)
     @logger.info("Building deployment tasks for release: #{release}...")
 
+    @logger.fatal("Chart must be specified as a string!") unless chart.kind_of?(String)
     @logger.fatal("Options must be specified as a hash!") unless options.kind_of?(Hash)
 
     binary_options = Hash.new
@@ -60,9 +61,11 @@ module HelmWrapper
 
 ###############################################################################
 
-  def self.development_tasks(chart:, path:, oci: false, options: Hash.new)
+  def self.development_tasks(path:, destination: String.new, options: Hash.new)
     @logger.info("Building development tasks for path: #{path}...")
 
+    @logger.fatal("Path must be specified as a string!") unless path.kind_of?(String)
+    @logger.fatal("Destination must be specified as a string!") unless destination.kind_of?(String)
     @logger.fatal("Options must be specified as a hash!") unless options.kind_of?(Hash)
 
     binary_options = Hash.new
@@ -70,17 +73,16 @@ 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["path"]    = path
-    chart_options["repos"]   = options.key?("chart-repos")   ? options["chart-repos"]   : Array.new
-    chart_options["version"] = String.new
+    chart_options["name"]  = nil
+    chart_options["path"]  = path
+    chart_options["repos"] = options.key?("chart-repos")   ? options["chart-repos"]   : Array.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) if oci
+    tasks << HelmWrapper::Tasks::Push.new(binary: binary, chart: chart, destination: destination) unless destination.strip.empty?
     tasks << HelmWrapper::Tasks::Validate.new(binary: binary, chart: chart)
     return tasks
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helm-wrapper
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
 platform: ruby
 authors:
 - Richard Lees
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-24 00:00:00.000000000 Z
+date: 2021-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake