helmsnap 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c18d2415fcbf1aaaaa122e41ba823563c39e9074778c44fb9b504788f3a6fad2
-  data.tar.gz: 8c2ca2cccdf76d316f6cfa3228fbe982dd8262b957a5f4c13378bd6db7d9595e
+  metadata.gz: 6736a60925c46a19ac7d349ea1e0fff67d7d3e6499a74f9f620a00d17eda0f50
+  data.tar.gz: 2441260a8c95cd7ae6c3b91616dce927cf7972652f8dc4431b0fc78379a93522
 SHA512:
-  metadata.gz: 251efbe07d35daed3b788f30bf8fb42609b58b1677b58d4b1916799519d546d3f4aaa2b2986da7feb304de3a6f4db9fe049130ce1f060053a1377832fabe27d5
-  data.tar.gz: 656c7f6656f84b677c343d04878891c7c91e1f43aa1e1950be7a02895b401b7f29aa05ba527df5b47551dcfd903dcaca1869d6afcb309ae93503e40a35b750a9
+  metadata.gz: cf1cdbdba197e96cb1ba2403bd69ee7d6cad705bcb2d6378f112852ba92477be6fb7dad954cafbca54fa88a4f93113a83b56d9c9aa33952d07710a128c5cca24
+  data.tar.gz: 666bad3f4be9e21af24649a59508f88fc5f0a72bee4f26b32f10ed3f635224631d0cab4744e2c4260bb9c3fefa552f03f32f90eeb33c7c26f2324e4e84be9c7a

data/.rubocop.yml

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

data/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

data/Gemfile

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

data/Gemfile.lock

@@ -1,87 +1,103 @@
 PATH
   remote: .
   specs:
-    helmsnap (1.0.2)
+    helmsnap (1.1.0)
       colorize
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.0.4)
+    activesupport (7.1.4)
+      base64
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
+      mutex_m
       tzinfo (~> 2.0)
     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)
+    method_source (1.1.0)
+    minitest (5.25.1)
+    mutex_m (0.2.0)
+    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)
+    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 +114,4 @@ DEPENDENCIES
   rubocop-config-umbrellio
 
 BUNDLED WITH
-   2.4.3
+   2.5.21

data/README.md

@@ -38,18 +38,22 @@ This tool can also be useful when you are developing a new chart or updating an
 
 ## Configuration
 
-By default, helmsnap will render your helmfile using `default` environment and will place snapshots in `helm/snapshots` directory. If you want to configure that, create a `.helmsnap.yaml` file and put there configuration that looks like this:
+By default, helmsnap will render your helmfile using `default` environment and will place snapshots in `helm/snapshots` directory. If you want to configure that, or you need to provide credentials for access to private helm repos, you can create a `.helmsnap.yaml` file and put there configuration that looks like this:
 
 ```yaml
 envs: [staging, production] # `[default]` by default
 snapshotsPath: somedir/snapshots # `helm/snapshots` by default
+credentials: # [] by default
+- repo: https://example.com/some/path/to/repo
+  username: someuser
+  password: somepassword
 ```
 
 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.
 

data/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

data/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)

data/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 @@ class Helmsnap::Config
 
     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 @@ class Helmsnap::Config
   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

data/lib/helmsnap/setup_dependencies.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 class Helmsnap::SetupDependencies < Helmsnap::Service
+  REPO_NAME_PREFIX = "helmsnap-"
+
   def initialize(config)
     super()
     self.config = config
@@ -8,6 +10,8 @@ class Helmsnap::SetupDependencies < Helmsnap::Service
   end
 
   def call
+    clear_existing_repos!
+
     config.envs.flat_map(&:release_paths).each do |chart_path|
       setup!(chart_path)
     end
@@ -17,6 +21,14 @@ class Helmsnap::SetupDependencies < Helmsnap::Service
 
   attr_accessor :config, :processed_paths
 
+  def clear_existing_repos!
+    result = run_cmd("helm", "repo", "ls", allow_failure: true).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 @@ class Helmsnap::SetupDependencies < Helmsnap::Service
     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)

data/lib/helmsnap/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: helmsnap
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Yuri Smirnov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-16 00:00:00.000000000 Z
+date: 2024-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-config-umbrellio
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description:
 email:
 - tycooon@yandex.ru
@@ -85,14 +71,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: A tool for creating and checking helm chart snapshots.