RubyGems - vidar - Versions diffs - 1.16.0 → 1.17.1 - Mend

vidar 1.16.0 → 1.17.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (28) hide show

checksums.yaml +4 -4
data/.bundler-version +1 -1
data/.github/dependabot.yml +40 -1
data/.github/workflows/auto-approve.yml +8 -6
data/.github/workflows/auto-merge.yml +62 -15
data/.github/workflows/ci.yml +2 -2
data/.gitignore +2 -2
data/.standard.yml +2 -0
data/CHANGELOG.md +18 -0
data/Gemfile +10 -12
data/Gemfile.lock +39 -30
data/Rakefile +5 -6
data/exe/vidar +1 -1
data/lib/vidar/cli.rb +15 -13
data/lib/vidar/config.rb +57 -12
data/lib/vidar/deploy_status.rb +22 -21
data/lib/vidar/honeycomb_notification.rb +16 -10
data/lib/vidar/interpolation.rb +1 -1
data/lib/vidar/k8s/container.rb +30 -3
data/lib/vidar/k8s/pod_set.rb +27 -8
data/lib/vidar/log.rb +1 -1
data/lib/vidar/run.rb +2 -2
data/lib/vidar/sentry_notification.rb +4 -1
data/lib/vidar/slack_notification.rb +10 -7
data/lib/vidar/version.rb +1 -1
data/lib/vidar.rb +20 -20
data/vidar.gemspec +18 -18
metadata +11 -4

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34f83978f5cf02b12e3b24ba387c8f2816b05d268b7099695ce585d1abbef7a4
-  data.tar.gz: 9cdb5fbecf48f7a93d143e1e51f61a0d1cdda6c85cca582f5353262ceec8ec94
+  metadata.gz: c9f70e2aea16ca7648801c10d594785cf71cc4059e723075a7e0a5ac2df28e7a
+  data.tar.gz: e02d0cfe17b044eb62d11fee018e15956c02835ab7bb947a224b5a3fcfdf48bc
 SHA512:
-  metadata.gz: 50255dfe156d09b96665f3b5d8476d0ea7e36ea6c8b0792bc5082c68156cbfdcba58465409e3b6f69adebde78f4a6dbc37fe34dc936cfc5b66dff7d5128ded19
-  data.tar.gz: 9de76e0a980e1db77200f48731c01f2ef62f0c940808f416b744224a39d9828194e5dedb626e19359878d7648266ffff639862f5e682d1e9c4d895d6c94bbf69
+  metadata.gz: 88bb3c398a191d7b02a6d2591653b5ddc8ed88a1d2432dd84e2d0188fdcbb3873ea5f20eb7ca00c3b2f3bc49b03f030f3c12dcb4799d306741fa4d0f668489f4
+  data.tar.gz: afe4490c85deca103d2b07f720b36710fae66fc7acc60ffb91fbf4c235ac4fa027ecb01067a56710a3bafb9e0d357eeeafb3aa41d729b0c0a43b607ca4c3f3b1

data/.bundler-version CHANGED Viewed

	@@ -1 +1 @@
1	- 4.0.4
1	+ 4.0.10

data/.github/dependabot.yml CHANGED Viewed

@@ -6,10 +6,49 @@ updates:
     schedule:
       interval: "weekly"
       day: "monday"
-      time: "08:00"
+      time: "11:00"
       timezone: "UTC"
+    cooldown:
+      default-days: 2
+      include:
+        - "*"
     commit-message:
       prefix: "[dependabot]"
+    groups:
+      ruby-minor-and-patch:
+        applies-to: version-updates
+        update-types:
+          - "minor"
+          - "patch"
     labels:
+      - "dependencies"
       - "automerge"
+    ignore:
+      - dependency-name: "*"
+        update-types:
+          - "version-update:semver-major"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "monday"
+      time: "11:00"
+      timezone: "UTC"
+    cooldown:
+      default-days: 2
+    commit-message:
+      prefix: "[dependabot]"
+    groups:
+      actions-minor-and-patch:
+        applies-to: version-updates
+        update-types:
+          - "minor"
+          - "patch"
+    labels:
       - "dependencies"
+      - "automerge"
+    ignore:
+      - dependency-name: "*"
+        update-types:
+          - "version-update:semver-major"

data/.github/workflows/auto-approve.yml CHANGED Viewed

@@ -1,14 +1,16 @@
-name: Auto approve dependency upgrades and hot-fix PRs
+name: Auto approve hot-fix PRs
 on:
   pull_request_target:
-    types:
-      - labeled
-      - ready_for_review
+    types: [opened, labeled, ready_for_review]
 jobs:
   auto-approve:
+    if: >
+      github.actor == 'renofidev' ||
+      contains(github.event.pull_request.labels.*.name, 'HOTFIX-AUTO-APPROVE') ||
+      contains(github.event.pull_request.labels.*.name, 'self-approve')
     runs-on: ubuntu-latest
     steps:
-      - uses: hmarr/auto-approve-action@v3
-        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(github.event.pull_request.labels.*.name, 'HOTFIX-AUTO-APPROVE') || contains(github.event.pull_request.labels.*.name, 'self-approve') || contains(github.event.pull_request.labels.*.name, 'dependencies')
+      - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"

data/.github/workflows/auto-merge.yml CHANGED Viewed

@@ -2,6 +2,9 @@ name: automerge
 on:
   pull_request_target:
     types:
+      - opened
+      - synchronize
+      - reopened
       - labeled
   pull_request_review:
     types:
@@ -9,23 +12,67 @@ on:
   check_suite:
     types:
       - completed
-  status: {}
+permissions:
+  contents: write
+  pull-requests: write
 jobs:
-  automerge:
+  automerge-labeled:
+    if: >
+      github.event.pull_request.user.login != 'dependabot[bot]' &&
+      contains(github.event.pull_request.labels.*.name, 'automerge') &&
+      !contains(github.event.pull_request.labels.*.name, 'automerge blocked')
     runs-on: ubuntu-latest
     steps:
-      - name: automerge
-        uses: pascalgn/automerge-action@v0.16.4
+      - name: Enable auto-merge
+        run: gh pr merge --auto --squash --delete-branch "$PR_URL"
         env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          MERGE_METHOD: squash
-          MERGE_DELETE_BRANCH: true
-          MERGE_LABELS: "automerge,!automerge blocked"
-      - name: automerge-dependencies
-        uses: pascalgn/automerge-action@v0.16.4
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  automerge-dependabot:
+    if: >
+      github.event.pull_request.user.login == 'dependabot[bot]' &&
+      !contains(github.event.pull_request.labels.*.name, 'automerge blocked')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@25dd0e34f4fe68f24cc83900b1fe3fe149efef98 # v3.1.0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Approve minor and patch
+        if: >
+          steps.metadata.outputs.update-type == 'version-update:semver-patch' ||
+          steps.metadata.outputs.update-type == 'version-update:semver-minor'
+        uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+      - name: Enable auto-merge for minor and patch
+        if: >
+          steps.metadata.outputs.update-type == 'version-update:semver-patch' ||
+          steps.metadata.outputs.update-type == 'version-update:semver-minor'
+        run: gh pr merge --auto --squash --delete-branch "$PR_URL"
+        env:
+          PR_URL: ${{ github.event.pull_request.html_url }}
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  automerge-update-branch:
+    if: github.event_name == 'check_suite'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Update branches behind base
         env:
-          GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-          MERGE_METHOD: squash
-          MERGE_DELETE_BRANCH: true
-          MERGE_LABELS: "dependencies,!automerge blocked"
-          MERGE_REMOVE_LABELS: ""
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh pr list --repo "$GITHUB_REPOSITORY" \
+            --label automerge \
+            --limit 100 \
+            --json number,labels \
+            --jq '.[] | select(.labels | map(.name) | contains(["automerge blocked"]) | not) | .number' \
+            | while read pr_number; do
+            gh pr update-branch "$pr_number" --repo "$GITHUB_REPOSITORY" 2>/dev/null || true
+          done

data/.github/workflows/ci.yml CHANGED Viewed

@@ -14,9 +14,9 @@ jobs:
         ruby-version: [3.4, 4.0]
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
     - name: Set up Ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@c4e5b1316158f92e3d49443a9d58b31d25ac0f8f # v1.306.0
       with:
         ruby-version: ${{ matrix.ruby-version }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically

data/.gitignore CHANGED Viewed

@@ -11,6 +11,6 @@
 .rspec_status
 # Cached rubocop config files
-.rubocop-remote*
-.rubocop-http*
+.rubocop-*
 vidar.yml
+.claude

data/.standard.yml ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ format: progress
2	+ parallel: true

data/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,23 @@
 # CHANGELOG
+## 1.17.1 - 2026-05-19
+- Fix `monitor_deploy_status` failing the deploy promotion when `--max_tries` is passed: Thor's `invoke :notify_sentry` was forwarding the parent task's ARGV as positional args. Pass explicit empty args/options to scope the sub-invocation.
+## 1.17.0 - 2026-03-24
+- Replace backtick shell calls with `Open3.capture3` for safer command execution
+- Add `rescue JSON::ParserError` in `K8s::PodSet` to handle malformed kubectl output gracefully
+- Fix `terminated_error?` returning truthy for exit code 0
+- Add `Unknown` state label for containers with unrecognized state
+- Add `sidecar?` method and `sidecar_container_names` config key for configurable sidecar filtering (replaces hardcoded istio-proxy)
+- Add `rescue Faraday::Error` to all notification classes to prevent network errors from crashing deploys
+- Simplify `DeployStatus` polling loops and remove off-by-one in max_tries
+- Add `vidar.yml` schema validation on load (requires `image`, `namespace`, `github`)
+- Pin faraday dependency to `>= 2.0, < 3`
+- Add YARD documentation to all public classes and methods
+- Expand test coverage from 18 to 148 examples
 ## 1.16.0 - 2026-01-27
 Ruby 4.0 support. Drop ruby 3.3 support.

data/Gemfile CHANGED Viewed

@@ -1,16 +1,14 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 gemspec
-gem 'awesome_print'
-gem 'bundler'
-gem 'irb'
-gem 'pry'
-gem 'rake'
-gem 'rspec'
-gem 'rubocop'
-gem 'rubocop-rake'
-gem 'rubocop-rspec'
-gem 'webmock'
+gem "awesome_print"
+gem "bundler"
+gem "irb"
+gem "pry"
+gem "rake"
+gem "rspec"
+gem "standard"
+gem "webmock"
-gem 'openssl'
+gem "openssl"

data/Gemfile.lock CHANGED Viewed

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    vidar (1.16.0)
+    vidar (1.17.1)
       colorize
-      faraday
+      faraday (>= 2.0, < 3)
       thor (~> 1.0)
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.8)
+    addressable (2.9.0)
       public_suffix (>= 2.0.2, < 8.0)
     ast (2.4.3)
     awesome_print (1.9.2)
-    bigdecimal (4.0.1)
+    bigdecimal (4.1.1)
     coderay (1.1.3)
     colorize (1.1.0)
     crack (1.0.1)
@@ -21,8 +21,8 @@ GEM
       rexml
     date (3.5.1)
     diff-lcs (1.6.2)
-    erb (6.0.1)
-    faraday (2.14.0)
+    erb (6.0.4)
+    faraday (2.14.2)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -30,26 +30,27 @@ GEM
       net-http (~> 0.5)
     hashdiff (1.2.1)
     io-console (0.8.2)
-    irb (1.16.0)
+    irb (1.18.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    json (2.18.0)
+    json (2.19.5)
     language_server-protocol (3.17.0.5)
     lint_roller (1.1.0)
     logger (1.7.0)
     method_source (1.1.0)
     net-http (0.9.1)
       uri (>= 0.11.1)
-    openssl (4.0.0)
-    parallel (1.27.0)
-    parser (3.3.10.1)
+    openssl (4.0.2)
+    parallel (1.28.0)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.8.0)
+    prism (1.9.0)
     pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -57,15 +58,15 @@ GEM
     psych (5.3.1)
       date
       stringio
-    public_suffix (7.0.2)
+    public_suffix (7.0.5)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.3.1)
-    rdoc (7.1.0)
+    rake (13.4.2)
+    rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
       tsort
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
     reline (0.6.3)
       io-console (~> 0.5)
     rexml (3.4.4)
@@ -78,11 +79,11 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.7)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-support (3.13.6)
-    rubocop (1.82.1)
+    rspec-support (3.13.7)
+    rubocop (1.84.2)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
@@ -90,19 +91,29 @@ GEM
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.48.0, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
       prism (~> 1.7)
-    rubocop-rake (0.7.1)
+    rubocop-performance (1.26.1)
       lint_roller (~> 1.1)
-      rubocop (>= 1.72.1)
-    rubocop-rspec (3.9.0)
-      lint_roller (~> 1.1)
-      rubocop (~> 1.81)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
     ruby-progressbar (1.13.0)
+    standard (1.54.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.84.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.8)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.9.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.26.0)
     stringio (3.2.0)
     thor (1.5.0)
     tsort (0.2.0)
@@ -110,7 +121,7 @@ GEM
       unicode-emoji (~> 4.1)
     unicode-emoji (4.2.0)
     uri (1.1.1)
-    webmock (3.26.1)
+    webmock (3.26.2)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -126,9 +137,7 @@ DEPENDENCIES
   pry
   rake
   rspec
-  rubocop
-  rubocop-rake
-  rubocop-rspec
+  standard
   vidar!
   webmock

data/Rakefile CHANGED Viewed

@@ -1,9 +1,8 @@
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-require 'rubocop/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+require "standard/rake"
 RSpec::Core::RakeTask.new(:spec)
-RuboCop::RakeTask.new
-task ci: %i[spec rubocop]
-task default: %i[spec rubocop:autocorrect]
+task ci: %i[spec standard]
+task default: %i[spec standard:fix]

data/exe/vidar CHANGED Viewed

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'vidar'
+require "vidar"
 Vidar::CLI.start

data/lib/vidar/cli.rb CHANGED Viewed

@@ -24,7 +24,8 @@ module Vidar
       Log.info "Pulling #{Config.get!(:image)} tags"
       Run.docker "pull #{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:current_branch)} 2> /dev/null || true"
-      image_names = `docker images --format "{{.Repository}}:{{.Tag}}"`.split("\n")
+      image_names_stdout, _stderr, _status = Open3.capture3('docker images --format "{{.Repository}}:{{.Tag}}"')
+      image_names = image_names_stdout.split("\n")
       base_image = "#{Config.get!(:image)}:#{Config.get!(:base_stage_name)}-#{Config.get!(:default_branch)}"
       Run.docker "pull #{base_image} 2> /dev/null || true" unless image_names.include?(base_image)
@@ -128,8 +129,8 @@ module Vidar
       destination = options[:destination]
       container = options[:container]
       all = options[:all]
-      Log.info "Set kubectl image for #{'all ' if all}#{destination} container=#{container}..."
-      Run.kubectl "set image #{destination} #{container}=#{Config.get!(:image)}:#{revision} #{'--all' if all}"
+      Log.info "Set kubectl image for #{"all " if all}#{destination} container=#{container}..."
+      Run.kubectl "set image #{destination} #{container}=#{Config.get!(:image)}:#{revision} #{"--all" if all}"
     end
     desc "set_image", "Set image for k8s deployment"
@@ -146,8 +147,8 @@ module Vidar
       destination = options[:destination]
       container = options[:container]
       all = options[:all]
-      Log.info "Set kubectl image for #{'all ' if all}#{destination} container=#{container}..."
-      Run.kubectl "set image #{destination} #{container}=#{Config.get!(:image)}:#{revision} #{'--all' if all}"
+      Log.info "Set kubectl image for #{"all " if all}#{destination} container=#{container}..."
+      Run.kubectl "set image #{destination} #{container}=#{Config.get!(:image)}:#{revision} #{"--all" if all}"
     end
     desc "release", "Build and publish docker images"
@@ -178,7 +179,7 @@ module Vidar
         Log.info "OK: All containers are ready"
         slack_notification.success if slack_notification.configured?
         honeycomb_notification.success
-        invoke :notify_sentry
+        invoke :notify_sentry, [], {}
       else
         Log.error "ERROR: Some of containers are errored or not ready"
         slack_notification.failure if slack_notification.configured?
@@ -198,16 +199,17 @@ module Vidar
       Log.error "ERROR: could not find deployment config for #{Config.get!(:kubectl_context)} context" unless deploy_config
       pod_set = K8s::PodSet.new(namespace: Config.get!(:namespace), filter: options[:name])
-      containers = pod_set.containers.select(&:ready_and_running?).reject(&:istio?)
+      sidecar_names = Array(Config.get(:sidecar_container_names))
+      containers = pod_set.containers.select(&:ready_and_running?).reject { |c| c.sidecar?(sidecar_names) }
       if containers.empty?
-        name = options[:name] || 'any'
+        name = options[:name] || "any"
         Log.error "No running containers found with *#{name}* name"
         exit(1)
       else
         Log.info "Available containers:"
         containers.each(&:print)
-        container = containers.detect { |c| c.name == 'console' } || containers.last
+        container = containers.detect { |c| c.name == "console" } || containers.last
         Log.info "Running #{options[:command]} in #{container.pod_name}"
         Run.kubectl("exec -it #{container.pod_name} -- #{options[:command]}")
@@ -232,7 +234,7 @@ module Vidar
     desc "notify_sentry", "Notify sentry about current release"
     def notify_sentry
       sentry_notification = SentryNotification.new(
-        revision:      Config.get!(:revision),
+        revision: Config.get!(:revision),
         deploy_config: Config.deploy_config
       )
@@ -248,10 +250,10 @@ module Vidar
     desc "notify_slack", "Send custom slack notification"
     def notify_slack
       slack_notification = SlackNotification.new(
-        github:        Config.get!(:github),
-        revision:      Config.get!(:revision),
+        github: Config.get!(:github),
+        revision: Config.get!(:revision),
         revision_name: Config.get!(:revision_name),
-        build_url:     Config.build_url,
+        build_url: Config.build_url,
         deploy_config: Config.deploy_config
       )

data/lib/vidar/config.rb CHANGED Viewed

@@ -1,34 +1,44 @@
 module Vidar
+  # Loads and provides access to the vidar.yml manifest configuration.
+  # Values fall back to DEFAULT_OPTIONS when not defined in the manifest.
   class Config
     DEFAULT_MANIFEST_FILE = "vidar.yml".freeze
     DEFAULT_BRANCHES = %w[main master].freeze
+    REQUIRED_KEYS = %w[image namespace github].freeze
     DEFAULT_OPTIONS = {
-      compose_file:       -> { "docker-compose.ci.yml" },
-      compose_cmd:        -> { "docker compose" },
-      default_branch:     -> { (DEFAULT_BRANCHES & branches).first || DEFAULT_BRANCHES.first },
-      current_branch:     -> { (ENV['SEMAPHORE_GIT_WORKING_BRANCH'] || `git rev-parse --abbrev-ref HEAD`.strip).tr("/", "-") },
-      revision:           -> { `git rev-parse HEAD`.strip },
-      revision_name:      -> { `git show --pretty=format:"%s (%h)" -s HEAD`.strip },
-      kubectl_context:    -> { `kubectl config current-context`.strip },
-      shell_command:      -> { "/bin/sh" },
-      console_command:    -> { "bin/console" },
-      base_stage_name:    -> { "base" },
+      compose_file: -> { "docker-compose.ci.yml" },
+      compose_cmd: -> { "docker compose" },
+      default_branch: -> { (DEFAULT_BRANCHES & branches).first || DEFAULT_BRANCHES.first },
+      current_branch: -> { (ENV["SEMAPHORE_GIT_WORKING_BRANCH"] || shell_capture("git rev-parse --abbrev-ref HEAD")).tr("/", "-") },
+      revision: -> { shell_capture("git rev-parse HEAD") },
+      revision_name: -> { shell_capture('git show --pretty=format:"%s (%h)" -s HEAD') },
+      kubectl_context: -> { shell_capture("kubectl config current-context") },
+      shell_command: -> { "/bin/sh" },
+      console_command: -> { "bin/console" },
+      base_stage_name: -> { "base" },
       release_stage_name: -> { "release" },
-      honeycomb_api_key:  -> { ENV['HONEYCOMB_API_KEY'] },
+      honeycomb_api_key: -> { ENV["HONEYCOMB_API_KEY"] },
+      sidecar_container_names: -> { ["istio-proxy"] }
     }.freeze
     class << self
       attr_reader :data
       attr_writer :manifest_file
+      # Loads the manifest file and validates required keys.
+      # @param file_path [String] path to vidar.yml
+      # @raise [MissingManifestFileError] if the file does not exist
+      # @raise [Error] if required keys are missing or schema is invalid
       def load(file_path = manifest_file)
         ensure_file_exist!(file_path)
         @data = YAML.load_file(file_path)
+        validate_schema!
         @loaded = true
       end
+      # @return [String] path to the manifest file
       def manifest_file
         @manifest_file || DEFAULT_MANIFEST_FILE
       end
@@ -37,10 +47,13 @@ module Vidar
         fail(MissingManifestFileError, file_path) unless File.exist?(file_path)
       end
+      # @return [Boolean] true if the manifest has been loaded
       def loaded?
         @loaded
       end
+      # @param key [Symbol, String] config key
+      # @return [Object, nil] value from manifest or default
       def get(key)
         load unless loaded?
@@ -51,19 +64,26 @@ module Vidar
         Vidar::Interpolation.call(value, self)
       end
+      # @param key [Symbol, String] config key
+      # @return [Object] value from manifest or default
+      # @raise [MissingConfigError] if the key is not found
       def get!(key)
         get(key) || fail(MissingConfigError, key)
       end
+      # @return [String, nil] CI build URL resolved from env or manifest
       def build_url
         value = ENV[get(:build_env).to_s] || get(:build_url)
         value&.empty? ? nil : value
       end
+      # @param env [String] environment name (maps to HONEYCOMB_API_KEY_<ENV>)
+      # @return [String, nil] Honeycomb API key for the given environment
       def honeycomb_env_api_key(env)
         ENV["HONEYCOMB_API_KEY_#{env.upcase}"]
       end
+      # @return [DeployConfig] deployment config for the current kubectl context
       def deploy_config
         deploy_configs[get!(:kubectl_context)] ||= build_deploy_config(get!(:kubectl_context))
       end
@@ -88,13 +108,38 @@ module Vidar
         @deploy_configs ||= {}
       end
+      # @return [Array<String>] local git branch names
       def branches
-        `git for-each-ref --format='%(refname:short)' refs/heads/*`.split("\n")
+        stdout, _stderr, _status = Open3.capture3("git for-each-ref --format='%(refname:short)' refs/heads/*")
+        stdout.split("\n")
       end
+      # @return [Boolean] true if current branch is the default branch
       def default_branch?
         get!(:current_branch) == get!(:default_branch)
       end
+      private
+      def validate_schema!
+        missing = REQUIRED_KEYS.reject { |k| @data.key?(k) }
+        fail(Error, "vidar.yml is missing required keys: #{missing.join(", ")}") if missing.any?
+        deployments = @data["deployments"]
+        fail(Error, "vidar.yml: 'deployments' must be a Hash, got #{deployments.class}") if deployments && !deployments.is_a?(Hash)
+        return unless deployments
+        deployments.each do |context, config|
+          fail(Error, "vidar.yml: deployment '#{context}' must be a Hash") unless config.is_a?(Hash)
+          fail(Error, "vidar.yml: deployment '#{context}' is missing required key 'name'") unless config.key?("name")
+        end
+      end
+      def shell_capture(command)
+        stdout, _stderr, _status = Open3.capture3(command)
+        stdout.strip
+      end
     end
   end
 end

data/lib/vidar/deploy_status.rb CHANGED Viewed

@@ -1,4 +1,5 @@
 module Vidar
+  # Polls Kubernetes pod status until deployment completes or times out.
   class DeployStatus
     INITIAL_SLEEP = 2
     SLEEP = 10
@@ -6,52 +7,52 @@ module Vidar
     attr_reader :namespace, :filter, :max_tries
+    # @param namespace [String] Kubernetes namespace, or "all"
+    # @param filter [String, nil] optional substring filter on container names
+    # @param max_tries [Integer] maximum poll iterations before giving up
     def initialize(namespace:, filter: nil, max_tries: MAX_TRIES)
       @namespace = namespace
       @filter = filter
       @max_tries = max_tries
     end
+    # Waits until at least one pod exists in the namespace.
+    # @return [void]
     def wait_until_up
-      tries = 0
       sleep(INITIAL_SLEEP)
-      until pod_set.any?
-        tries += 1
+      max_tries.times do
+        ps = current_pod_set
+        break if ps.any?
         sleep(SLEEP)
-        if tries > max_tries
-          break
-        end
       end
     end
+    # Waits until all pods are deployed and none are still initializing.
+    # @return [void]
     def wait_until_completed
-      tries = 0
       sleep(INITIAL_SLEEP)
-      until pod_set.deployed?
-        tries += 1
+      max_tries.times do
+        ps = current_pod_set
+        break if ps.deployed?
         sleep(SLEEP)
-        if tries > max_tries && !pod_set.waiting?
-          break
-        end
       end
     end
+    # @return [Boolean] true if the last observed pod set reported success
     def success?
-      return false unless last_pod_set
+      return false unless @last_pod_set
-      last_pod_set.success?
+      @last_pod_set.success?
     end
-    def last_pod_set
-      @pod_set
-    end
+    private
-    def pod_set
-      @pod_set = K8s::PodSet.new(namespace:, filter:)
+    def current_pod_set
+      @last_pod_set = K8s::PodSet.new(namespace:, filter:)
     end
   end
 end

data/lib/vidar/honeycomb_notification.rb CHANGED Viewed

@@ -2,12 +2,12 @@ module Vidar
   class HoneycombNotification
     def self.get
       new(
-        github:        Config.get!(:github),
-        revision:      Config.get!(:revision),
+        github: Config.get!(:github),
+        revision: Config.get!(:revision),
         revision_name: Config.get!(:revision_name),
-        build_url:     Config.build_url,
+        build_url: Config.build_url,
         deploy_config: Config.deploy_config,
-        api_key: Config.get(:honeycomb_api_key),
+        api_key: Config.get(:honeycomb_api_key)
       )
     end
@@ -68,8 +68,8 @@ module Vidar
       response = connection.post do |req|
         req.url "https://api.honeycomb.io/1/markers/#{dataset}"
-        req.headers['Content-Type'] = 'application/json'
-        req.headers['X-Honeycomb-Team'] = api_key.to_s
+        req.headers["Content-Type"] = "application/json"
+        req.headers["X-Honeycomb-Team"] = api_key.to_s
         req.body = data.to_json
       end
@@ -77,6 +77,9 @@ module Vidar
       warn "Honeycomb marker not created: status: #{response.status} response: #{response.body}"
       false
+    rescue Faraday::Error => e
+      warn "Honeycomb legacy marker request failed: #{e.message}"
+      false
     end
     def create_marker
@@ -84,8 +87,8 @@ module Vidar
       response = connection.post do |req|
         req.url "https://api.honeycomb.io/1/markers/__all__"
-        req.headers['Content-Type'] = 'application/json'
-        req.headers['X-Honeycomb-Team'] = Config.honeycomb_env_api_key(dataset).to_s
+        req.headers["Content-Type"] = "application/json"
+        req.headers["X-Honeycomb-Team"] = Config.honeycomb_env_api_key(dataset).to_s
         req.body = data.to_json
       end
@@ -93,15 +96,18 @@ module Vidar
       warn "Honeycomb marker not created: status: #{response.status} response: #{response.body}"
       false
+    rescue Faraday::Error => e
+      warn "Honeycomb env marker request failed: #{e.message}"
+      false
     end
     def data
       {
-        message: "#{success? ? 'Successful' : 'Failed'} deploy of #{github} revision #{revision} - #{revision_name}",
+        message: "#{success? ? "Successful" : "Failed"} deploy of #{github} revision #{revision} - #{revision_name}",
         type: success? ? "deploy" : "failed_deploy",
         start_time: start_time.to_i,
         end_time: end_time.to_i,
-        url: build_url,
+        url: build_url
       }
     end
   end

data/lib/vidar/interpolation.rb CHANGED Viewed

@@ -8,7 +8,7 @@ module Vidar
         fail ArgumentError, "getter must respond_to get." unless getter.respond_to?(:get)
         string.gsub(INTERPOLATION_PATTERN) do |match|
-          getter.get($1) || ENV[$1] || match # rubocop:disable Style/PerlBackrefs
+          getter.get($1) || ENV[$1] || match
         end
       end
     end

data/lib/vidar/k8s/container.rb CHANGED Viewed

@@ -1,5 +1,6 @@
 module Vidar
   module K8s
+    # Represents a single Kubernetes container and its current state.
     class Container
       JOB_KIND = "Job".freeze
@@ -17,22 +18,26 @@ module Vidar
         @message = data["message"]
       end
+      # @return [String] container name, falling back to pod name
       def name
         data["name"] || pod_name
       end
+      # @return [Boolean] true if the container is considered successfully deployed
       def deployed?
         return terminated? if job?
         ready? && running?
       end
+      # @return [Boolean] true if the container completed successfully
       def success?
         return terminated_completed? if job?
         ready_and_running?
       end
+      # @return [Boolean] true if the container is ready and running
       def ready_and_running?
         ready? && running?
       end
@@ -46,9 +51,10 @@ module Vidar
         parts << namespace.to_s.ljust(20, " ")
         parts << name.to_s.ljust(35, " ")
         parts += text_statuses.map { |s| s.ljust(45, " ") }
-        "| #{parts.join(' | ')} |"
+        "| #{parts.join(" | ")} |"
       end
+      # @return [Array<String>] two-element array with status label and detail
       def text_statuses
         if unschedulable?
           [ColorizedString["Unschedulable"].light_red, ColorizedString[message].light_red]
@@ -67,18 +73,21 @@ module Vidar
         elsif waiting?
           [ColorizedString["Waiting"].light_yellow, ""]
         else
-          [ColorizedString[state.inspect].light_red, ""]
+          [ColorizedString["Unknown"].light_yellow, state.empty? ? "" : state.inspect]
         end
       end
+      # @return [Boolean] true if container state is "waiting"
       def waiting?
         state["waiting"]
       end
+      # @return [Boolean] true if container is ready
       def ready?
         data["ready"]
       end
+      # @return [Boolean] true if container is running
       def running?
         !running_started_at.nil?
       end
@@ -87,10 +96,12 @@ module Vidar
         state.dig("running", "startedAt")
       end
+      # @return [Boolean] true if container has terminated (any reason)
       def terminated?
         !state["terminated"].nil?
       end
+      # @return [Boolean] true if container terminated successfully
       def terminated_completed?
         state.dig("terminated", "reason") == "Completed" || state.dig("terminated", "exitCode") == 0
       end
@@ -99,18 +110,34 @@ module Vidar
         state.dig("terminated", "finishedAt")
       end
+      # @return [Boolean] true if container terminated with an error exit code
       def terminated_error?
-        state.dig("terminated", "reason") == "Error" || state.dig("terminated", "exitCode")
+        exit_code = state.dig("terminated", "exitCode")
+        state.dig("terminated", "reason") == "Error" || (!exit_code.nil? && exit_code != 0)
       end
+      # @return [Boolean] true if container state is unknown
+      def unknown?
+        !unschedulable? && !running? && !terminated? && !waiting?
+      end
+      # @return [Boolean] true if container reason is Unschedulable
       def unschedulable?
         reason == "Unschedulable"
       end
+      # @return [Boolean] true if this container belongs to a Job
       def job?
         kind == JOB_KIND
       end
+      # @param sidecar_names [Array<String>] list of sidecar container names to match
+      # @return [Boolean] true if this container is a known sidecar
+      def sidecar?(sidecar_names = ["istio-proxy"])
+        sidecar_names.include?(name.to_s)
+      end
+      # @return [Boolean] true if this is an istio-proxy sidecar container
       def istio?
         name == "istio-proxy"
       end

data/lib/vidar/k8s/pod_set.rb CHANGED Viewed

@@ -1,19 +1,27 @@
 module Vidar
   module K8s
+    # Represents a collection of Kubernetes pods and their containers
+    # fetched via `kubectl get pods` for a given namespace.
     class PodSet
+      # @param namespace [String] Kubernetes namespace, or "all" for all namespaces
+      # @param filter [String, nil] optional substring filter on container names
       def initialize(namespace:, filter: nil)
         @namespace = namespace
         @filter = filter
       end
+      # @return [Boolean] true if any containers exist in the pod set
       def any?
         containers.any?
       end
+      # @return [Boolean] true if any containers are in waiting state
       def waiting?
         containers.any?(&:waiting?)
       end
+      # Logs current container states and returns whether all are deployed.
+      # @return [Boolean]
       def deployed?
         if items.empty?
           Log.error "Could not fetch pod list"
@@ -29,12 +37,14 @@ module Vidar
         containers.all?(&:deployed?)
       end
+      # @return [Boolean] true if all containers report success
       def success?
         return false if containers.empty?
         containers.all?(&:success?)
       end
+      # @return [Array<Container>] filtered container list
       def containers
         if filter
           all_containers.select { |cs| cs.name.to_s.include?(filter) }
@@ -49,21 +59,30 @@ module Vidar
       def items
         @items ||= begin
-          json = JSON.parse(kubectl_get.strip)
-          json["items"] || []
+          output = kubectl_get.strip
+          return [] if output.empty?
+          JSON.parse(output)["items"] || []
+        rescue JSON::ParserError => e
+          Log.error "Failed to parse kubectl JSON output: #{e.message}"
+          []
         end
       end
       def kubectl_get
-        if namespace == "all"
-          `#{Run.kubectl_envs_string}kubectl get pods --all-namespaces -o json`
+        envs = Run.kubectl_envs_hash
+        stdout, stderr, status = if namespace == "all"
+          Open3.capture3(envs, "kubectl", "get", "pods", "--all-namespaces", "-o", "json")
         else
-          `#{Run.kubectl_envs_string}kubectl get pods -n #{namespace} -o json`
+          Open3.capture3(envs, "kubectl", "get", "pods", "-n", namespace, "-o", "json")
+        end
+        unless status.success?
+          Log.error "kubectl get pods failed: #{stderr.strip}"
+          return ""
         end
-      end
-      def ready_and_running_containers
-        containers.select(&:ready_and_running?)
+        stdout
       end
       def all_containers

data/lib/vidar/log.rb CHANGED Viewed

@@ -2,7 +2,7 @@ module Vidar
   class Log
     class << self
       def line
-        puts "|#{'-' * 142}|"
+        puts "|#{"-" * 142}|"
       end
       def info(text, fill_with = "#")

data/lib/vidar/run.rb CHANGED Viewed

@@ -7,7 +7,7 @@ module Vidar
       def docker_compose(command)
         args = %w[revision current_branch].map { |arg| "#{arg.upcase}=#{Config.get!(arg.to_sym)}" }
-        system("#{args.join(' ')} #{Config.get!(:compose_cmd)} -f #{Config.get!(:compose_file)} #{command}") || exit(1)
+        system("#{args.join(" ")} #{Config.get!(:compose_cmd)} -f #{Config.get!(:compose_file)} #{command}") || exit(1)
       end
       def kubectl(command, namespace: Config.get!(:namespace))
@@ -24,7 +24,7 @@ module Vidar
       end
       def kubectl_envs_hash
-        { "HTTPS_PROXY" => Config.deploy_config.https_proxy }.compact
+        {"HTTPS_PROXY" => Config.deploy_config.https_proxy}.compact
       end
     end
   end

data/lib/vidar/sentry_notification.rb CHANGED Viewed

@@ -13,9 +13,12 @@ module Vidar
     def call
       connection.post do |req|
         req.url webhook_url
-        req.headers['Content-Type'] = 'application/json'
+        req.headers["Content-Type"] = "application/json"
         req.body = data.to_json
       end
+    rescue Faraday::Error => e
+      warn "Sentry notification request failed: #{e.message}"
+      nil
     end
     private

data/lib/vidar/slack_notification.rb CHANGED Viewed

@@ -2,10 +2,10 @@ module Vidar
   class SlackNotification
     def self.get
       new(
-        github:        Config.get!(:github),
-        revision:      Config.get!(:revision),
+        github: Config.get!(:github),
+        revision: Config.get!(:revision),
         revision_name: Config.get!(:revision_name),
-        build_url:     Config.build_url,
+        build_url: Config.build_url,
         deploy_config: Config.deploy_config
       )
     end
@@ -31,7 +31,7 @@ module Vidar
     def failure
       message = [
         "<!channel> Failed deploy of #{github_link} to #{deploy_link}.",
-        build_link,
+        build_link
       ]
       perform_with data(message:, color: failure_color)
     end
@@ -39,7 +39,7 @@ module Vidar
     def success
       message = [
         "Successful deploy of #{github_link} to #{deploy_link}.",
-        build_link,
+        build_link
       ]
       perform_with data(message:, color: success_color)
     end
@@ -51,9 +51,12 @@ module Vidar
     def perform_with(data)
       connection.post do |req|
         req.url webhook_url
-        req.headers['Content-Type'] = 'application/json'
+        req.headers["Content-Type"] = "application/json"
         req.body = data.to_json
       end
+    rescue Faraday::Error => e
+      warn "Slack notification request failed: #{e.message}"
+      nil
     end
     private
@@ -72,7 +75,7 @@ module Vidar
             title_link: github_url,
             color:,
             text:,
-            fallback: text,
+            fallback: text
           }
         ]
       }

data/lib/vidar/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Vidar
-  VERSION = '1.16.0'.freeze
+  VERSION = "1.17.1".freeze
 end

data/lib/vidar.rb CHANGED Viewed

@@ -1,25 +1,25 @@
-require 'json'
-require 'open3'
-require 'uri'
-require 'yaml'
+require "json"
+require "open3"
+require "uri"
+require "yaml"
-require 'colorized_string'
-require 'faraday'
-require 'thor'
+require "colorized_string"
+require "faraday"
+require "thor"
-require 'vidar/version'
-require 'vidar/config'
-require 'vidar/honeycomb_notification'
-require 'vidar/interpolation'
-require 'vidar/log'
-require 'vidar/run'
-require 'vidar/sentry_notification'
-require 'vidar/slack_notification'
-require 'vidar/k8s/container'
-require 'vidar/k8s/pod_set'
-require 'vidar/deploy_config'
-require 'vidar/deploy_status'
-require 'vidar/cli'
+require "vidar/version"
+require "vidar/config"
+require "vidar/honeycomb_notification"
+require "vidar/interpolation"
+require "vidar/log"
+require "vidar/run"
+require "vidar/sentry_notification"
+require "vidar/slack_notification"
+require "vidar/k8s/container"
+require "vidar/k8s/pod_set"
+require "vidar/deploy_config"
+require "vidar/deploy_status"
+require "vidar/cli"
 module Vidar
   Error = Class.new(StandardError)

data/vidar.gemspec CHANGED Viewed

@@ -1,32 +1,32 @@
-lib = File.expand_path('lib', __dir__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'vidar/version'
+require "vidar/version"
 Gem::Specification.new do |spec|
-  spec.name = 'vidar'
+  spec.name = "vidar"
   spec.version = Vidar::VERSION
-  spec.authors = ['Krzysztof Knapik', 'RenoFi Engineering Team']
-  spec.email = ['knapo@knapo.net', 'engineering@renofi.com']
+  spec.authors = ["Krzysztof Knapik", "RenoFi Engineering Team"]
+  spec.email = ["knapo@knapo.net", "engineering@renofi.com"]
-  spec.summary = 'K8s deployment tools based on thor'
-  spec.homepage = 'https://github.com/RenoFi/vidar'
-  spec.license = 'MIT'
+  spec.summary = "K8s deployment tools based on thor"
+  spec.homepage = "https://github.com/RenoFi/vidar"
+  spec.license = "MIT"
-  spec.metadata['homepage_uri'] = 'https://github.com/RenoFi/vidar'
-  spec.metadata['source_code_uri'] = 'https://github.com/RenoFi/vidar'
-  spec.metadata['changelog_uri'] = 'https://github.com/RenoFi/vidar/blob/master/CHANGELOG.md'
-  spec.metadata['rubygems_mfa_required'] = 'true'
+  spec.metadata["homepage_uri"] = "https://github.com/RenoFi/vidar"
+  spec.metadata["source_code_uri"] = "https://github.com/RenoFi/vidar"
+  spec.metadata["changelog_uri"] = "https://github.com/RenoFi/vidar/blob/master/CHANGELOG.md"
+  spec.metadata["rubygems_mfa_required"] = "true"
-  spec.required_ruby_version = Gem::Requirement.new('>= 3.4.0')
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.4.0")
   spec.files = Dir.chdir(__dir__) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin/|spec/|\.rub)}) }
   end
-  spec.bindir = 'exe'
+  spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
-  spec.add_dependency 'colorize'
-  spec.add_dependency 'faraday'
-  spec.add_dependency 'thor', '~> 1.0'
+  spec.add_dependency "colorize"
+  spec.add_dependency "faraday", ">= 2.0", "< 3"
+  spec.add_dependency "thor", "~> 1.0"
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidar
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.17.1
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -30,14 +30,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +78,7 @@ files:
 - ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
+- ".standard.yml"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -116,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.4
+rubygems_version: 4.0.10
 specification_version: 4
 summary: K8s deployment tools based on thor
 test_files: []