add optional repo credentials

Author: tycooon

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ["2.7", "3.0", "3.1", "3.2"]
+        ruby: ["3.0", "3.1", "3.2", "3.3"]
 
     name: ${{ matrix.ruby }}
 
@@ -24,7 +24,3 @@ jobs:
         bundler-cache: true
 
     - run: bundle exec rake
-
-    # - uses: coverallsapp/github-action@v1.1.2
-    #   with:
-    #     github-token: ${{ secrets.GITHUB_TOKEN }}

.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   Include:
     - bin/console
     - Gemfile

Dockerfile

@@ -4,7 +4,7 @@ RUN apk add --update --no-cache ruby git colordiff
 
 WORKDIR /wd
 
-COPY --from=ghcr.io/helmfile/helmfile:v0.149.0  /usr/local/bin/helmfile /usr/local/bin/helmfile
+COPY --from=ghcr.io/helmfile/helmfile  /usr/local/bin/helmfile /usr/local/bin/helmfile
 COPY . .
 
 RUN gem install colorize && gem build && gem install helmsnap --local

Gemfile

@@ -8,3 +8,4 @@ gem "pry"
 gem "rake"
 gem "rspec"
 gem "rubocop"
+gem "rubocop-config-umbrellio"

Gemfile.lock

@@ -1,87 +1,105 @@
 PATH
   remote: .
   specs:
-    helmsnap (1.0.2)
+    helmsnap (1.1.0)
       colorize
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+    activesupport (7.2.1)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
-      tzinfo (~> 2.0)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
     coderay (1.1.3)
-    colorize (0.8.1)
-    concurrent-ruby (1.1.10)
-    diff-lcs (1.5.0)
-    i18n (1.12.0)
+    colorize (1.1.0)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
-    method_source (1.0.0)
-    minitest (5.17.0)
-    parallel (1.22.1)
-    parser (3.2.0.0)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    logger (1.6.1)
+    method_source (1.1.0)
+    minitest (5.25.1)
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
+      racc
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    rack (3.0.3)
+    racc (1.8.1)
+    rack (3.1.8)
     rainbow (3.1.1)
-    rake (13.0.6)
-    regexp_parser (2.6.1)
-    rexml (3.2.5)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.0)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.1)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.2)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
-    rubocop (1.43.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.66.1)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.24.1, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.24.1)
-      parser (>= 3.1.1.0)
-    rubocop-config-umbrellio (1.43.0.81)
-      rubocop (~> 1.43.0)
-      rubocop-performance (~> 1.15.0)
-      rubocop-rails (~> 2.17.0)
+    rubocop-ast (1.32.3)
+      parser (>= 3.3.1.0)
+    rubocop-config-umbrellio (1.66.0.99)
+      rubocop (~> 1.66.0)
+      rubocop-factory_bot (~> 2.26.0)
+      rubocop-performance (~> 1.22.0)
+      rubocop-rails (~> 2.26.0)
       rubocop-rake (~> 0.6.0)
-      rubocop-rspec (~> 2.16.0)
+      rubocop-rspec (~> 3.0.0)
       rubocop-sequel (~> 0.3.3)
-    rubocop-performance (1.15.2)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.17.4)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-performance (1.22.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rails (2.26.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 1.33.0, < 2.0)
+      rubocop (>= 1.52.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.16.0)
-      rubocop (~> 1.33)
+    rubocop-rspec (3.0.5)
+      rubocop (~> 1.61)
     rubocop-sequel (0.3.4)
       rubocop (~> 1.0)
-    ruby-progressbar (1.11.0)
-    tzinfo (2.0.5)
+    ruby-progressbar (1.13.0)
+    securerandom (0.3.1)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.6.0)
 
 PLATFORMS
   arm64-darwin-21
@@ -98,4 +116,4 @@ DEPENDENCIES
   rubocop-config-umbrellio
 
 BUNDLED WITH
-   2.4.3
+   2.5.21

README.md

@@ -49,7 +49,7 @@ You can also override configuration file location using `--config` option.
 
 ## Dependencies
 
-- Ruby 2.7+.
+- Ruby 3.0+.
 - [Helmfile](https://github.com/roboll/helmfile), which in turn relies on [Helm](https://github.com/helm/helm).
 - Colordiff or diff utility.
 

helmsnap.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = "A tool for creating and checking helm chart snapshots."
   spec.homepage = "https://github.com/tycooon/helmsnap"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.0.0"
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to your gem server 'https://example.com'"
   spec.metadata["homepage_uri"] = spec.homepage
@@ -31,6 +31,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "colorize"
-
-  spec.add_development_dependency "rubocop-config-umbrellio"
 end

lib/helmsnap/args_parser.rb

@@ -6,7 +6,7 @@ class Helmsnap::ArgsParser
   Args = Struct.new(:config_path)
 
   DEFAULT_CONFIG_PATH = Pathname.new(".helmsnap.yaml")
-  CONFIG_PATH_HELP = %{Path to config (default: "#{DEFAULT_CONFIG_PATH}")}
+  CONFIG_PATH_HELP = %{Path to config (default: "#{DEFAULT_CONFIG_PATH}")}.freeze
   BANNER = "Usage: helmsnap CMD [options]"
 
   def initialize(options)

lib/helmsnap/config.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 class Helmsnap::Config
-  attr_reader :envs, :snapshots_path
+  Credentials = Struct.new(:username, :password)
+
+  attr_reader :envs, :snapshots_path, :credentials
 
   DEFAULT_ENV = "default"
   DEFAULT_SNAPSHOTS_PATH = "helm/snapshots"
@@ -15,11 +17,12 @@ def initialize(config_path)
 
     self.envs = parse_envs(yaml)
     self.snapshots_path = parse_snaphots_path(yaml)
+    self.credentials = parse_credentials(yaml)
   end
 
   private
 
-  attr_writer :envs, :snapshots_path
+  attr_writer :envs, :snapshots_path, :credentials
 
   def parse_envs(yaml)
     value = yaml.fetch("envs", [DEFAULT_ENV])
@@ -29,4 +32,10 @@ def parse_envs(yaml)
   def parse_snaphots_path(yaml)
     Pathname.new(yaml.fetch("snapshotsPath", DEFAULT_SNAPSHOTS_PATH))
   end
+
+  def parse_credentials(yaml)
+    yaml.fetch("credentials", []).each_with_object({}) do |obj, credentials|
+      credentials[obj["repo"]] = Credentials.new(obj["username"], obj["password"])
+    end
+  end
 end

lib/helmsnap/setup_dependencies.rb

@@ -1,13 +1,17 @@
 # frozen_string_literal: true
 
 class Helmsnap::SetupDependencies < Helmsnap::Service
+  REPO_NAME_PREFIX = "helmsnap-"
+
   def initialize(config)
     super()
     self.config = config
     self.processed_paths = Set.new
   end
 
   def call
+    clear_existing_repos!
+
     config.envs.flat_map(&:release_paths).each do |chart_path|
       setup!(chart_path)
     end
@@ -17,6 +21,14 @@ def call
 
   attr_accessor :config, :processed_paths
 
+  def clear_existing_repos!
+    result = run_cmd("helm", "repo", "ls").output
+
+    result.scan(/#{REPO_NAME_PREFIX}\S+/o) do |repo_name|
+      run_cmd("helm", "repo", "remove", repo_name)
+    end
+  end
+
   def setup!(chart_path)
     normalized_path = chart_path.expand_path
     return if processed_paths.include?(normalized_path)
@@ -30,7 +42,14 @@ def setup!(chart_path)
     end
 
     dep_list.scan(%r{(https?://.+?)\s}) do |dep_path|
-      run_cmd("helm", "repo", "add", Digest::MD5.hexdigest(dep_path.first), dep_path.first)
+      url = dep_path.first
+
+      if (credentials = config.credentials[url])
+        extra_args = ["--username", credentials.username, "--password", credentials.password]
+      end
+
+      repo_name = "#{REPO_NAME_PREFIX}#{Digest::MD5.hexdigest(url)}"
+      run_cmd("helm", "repo", "add", repo_name, url, *extra_args)
     end
 
     update_deps!(chart_path)

lib/helmsnap/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Helmsnap
-  VERSION = "1.0.2"
+  VERSION = "1.1.0"
 end