helm-wrapper 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c095374280df3b7dba01263e1122dd7d14903a18fb861219627685384f60aef
-  data.tar.gz: a758c37877f7e813676603ab4db1fbb43207f60d64ddce7e488bec8b85b719ab
+  metadata.gz: 76acfe4805299ed72c029326ed693127fe8518078eea2d5c81880be17d1823d4
+  data.tar.gz: 6355e496234578a2f414cf8873b2ecfff6d0aa710a4045a3741e940e1996ada8
 SHA512:
-  metadata.gz: 0b92b882982cd95087c102d88313350278feccca52a0b2ccdafa883f7cf7b639419ef773272192ceabbf95358c37ca19ca6e7e25fcba9e49882effe40599cf70
-  data.tar.gz: 2c79ed943dd0059f39a779b6f99459f84da16db76442e7a4f9b3ecedfac93f5cd44d658c663c0c62446f9b5975ab96ff9be2d0d14e5da46dfe17c007da4e05aa
+  metadata.gz: 3ec82adad9abe9ad074f6f60fc4ed5711e9f08a7c92258b1b6e71fcf6da491c3a9a0f211796d7ccab3d2f30c027ad0cfdad06955233547bb788faef0e81172f5
+  data.tar.gz: 0b1299e87f67e83c2a7289049a9222b7a269739fd50b8fc9e18e94f818076dd9c857607507911b690feebae91e6a7fe0c7a5a3408883361705ec6f61201c4d83

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

@@ -77,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/runner.rb

@@ -64,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
@@ -269,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
@@ -287,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: helm-wrapper
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Richard Lees