vidar 1.7.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb2df292256761c82b4c0faab70db10cb3fcf9f6b28a3777ba5843cb9949deea
-  data.tar.gz: eed9221ba5e8418ecc518b7c2168a469235bc383949c32d09e23f0ff3086a5b1
+  metadata.gz: 377ce0e0c614b14f20c1675d24f843c76bcce4a1631a49cbfaa4403ae0866a06
+  data.tar.gz: d7e15d2fcebde93e16a917667bcb722f6796c8e1a6f7ddd8ddca6628db4b0ec3
 SHA512:
-  metadata.gz: 6d949b5d18bafd71eed2722831c68b5bae941cf1e7fb62f8f5cb8c7b3a2e8c99ed54893a2982eecaf61857b984f772f5b40a1682504d538f1d97dafa9ac06b47
-  data.tar.gz: 1ed526fadb5d7780c1fdeaf6847793a7265329d1a29944a7a430245a0adcbd32efc33e15ef24f6f336fa8eec7cb1106bdea9d5e2e827a756788a3a7e2c518981
+  metadata.gz: ff6e0fd051afb356d8b5d84c3fb6e90b6402aa1bcc7a9ce01cfbcb1c97c86a4c90fdf440ec767ccd52aa9a7e8ea4e7866a1cd070915662e4dcefb971754218bb
+  data.tar.gz: 9117d313c5ffcefb791fcbde326621a154e6999f396c651def96c02ef70b4a296caa983a25ea8ceba1127e7ae6e2034767744509003ccd56267625a876d1d6ab

data/.bundler-version

@@ -1 +1 @@
-2.4.4
+2.4.13

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

@@ -1,14 +1,13 @@
-# automatically approve PRs submitted by Dependabot or Renofidev
-# this will allow Dependabot to automatically merge dependency update PRs where CI passes
-# from: https://github.com/hmarr/auto-approve-action
-name: Auto approve dependency upgrades PRs
-on: pull_request_target
+name: Auto approve dependency upgrades and hot-fix PRs
+on:
+  pull_request_target:
+    types: [labeled, unlabeled, edited, ready_for_review, review_requested, auto_merge_enabled]
 
 jobs:
   auto-approve:
     runs-on: ubuntu-latest
     steps:
-    - uses: hmarr/auto-approve-action@v2
-      if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev'
-      with:
-        github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - uses: hmarr/auto-approve-action@v3
+        if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]' || github.actor == 'renofidev' || contains(toJson(github), 'HOTFIX-AUTO-APPROVE')
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"

data/.github/workflows/auto-merge-dependencies.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge-dependencies
-        uses: pascalgn/automerge-action@v0.14.3
+        uses: pascalgn/automerge-action@v0.15.6
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_METHOD: squash

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

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: automerge
-        uses: pascalgn/automerge-action@v0.14.3
+        uses: pascalgn/automerge-action@v0.15.6
         env:
           GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           MERGE_METHOD: squash

data/.github/workflows/ci.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['3.0', 3.1]
+        ruby-version: [3.1, 3.2]
 
     steps:
     - uses: actions/checkout@v3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 1.8.0 - 2023-06-02
+
+Add support for HTTPS_PROXY automatically set for each kubectl command
+
 ## 1.7.0 - 2023-01-23
 
 Add support for publishing Honeycomb markers on deployment.

data/Gemfile

@@ -1,3 +1,13 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'awesome_print'
+gem 'bundler'
+gem 'pry'
+gem 'rake'
+gem 'rspec'
+gem 'rubocop'
+gem 'rubocop-rake'
+gem 'rubocop-rspec'
+gem 'webmock'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vidar (1.7.0)
+    vidar (1.8.0)
       colorize
       faraday
       thor (~> 1.0)
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.1)
+    addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     awesome_print (1.9.2)
@@ -18,15 +18,15 @@ GEM
     crack (0.4.5)
       rexml
     diff-lcs (1.5.0)
-    faraday (2.7.4)
+    faraday (2.7.5)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
     hashdiff (1.0.1)
     json (2.6.3)
     method_source (1.0.0)
-    parallel (1.22.1)
-    parser (3.2.0.0)
+    parallel (1.23.0)
+    parser (3.2.2.1)
       ast (~> 2.4.1)
     pry (0.14.2)
       coderay (~> 1.1)
@@ -34,43 +34,46 @@ GEM
     public_suffix (5.0.1)
     rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.6.1)
+    regexp_parser (2.8.0)
     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-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.3)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-support (3.12.0)
-    rubocop (1.43.0)
+    rubocop (1.51.0)
       json (~> 2.3)
       parallel (~> 1.10)
       parser (>= 3.2.0.0)
       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)
+      rubocop-ast (>= 1.28.0, < 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-capybara (2.17.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.18.0)
       rubocop (~> 1.41)
+    rubocop-factory_bot (2.23.1)
+      rubocop (~> 1.33)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.18.0)
+    rubocop-rspec (2.22.0)
       rubocop (~> 1.33)
-      rubocop-capybara
-    ruby-progressbar (1.11.0)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
     ruby2_keywords (0.0.5)
-    thor (1.2.1)
+    thor (1.2.2)
     unicode-display_width (2.4.2)
     webmock (3.18.1)
       addressable (>= 2.8.0)
@@ -93,4 +96,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.3.26
+   2.4.12

data/README.md

@@ -92,6 +92,8 @@ deployments:
     slack_webhook_url: https://hooks.slack.com/services/ASCKNZ0vug2R3Ydo/ASCKNZ0vug2R3Ydo/ASCKNZ0vug2R3Ydo
     # Name of the Honeycomb dataset to create a deployment marker in
     honeycomb_dataset: staging
+    # https_proxy address used to connect private k8s control plane endpoint
+    https_proxy: localhost:8888
 # docker-compose file, optional, default value: docker-compose.ci.yml
 compose_file: docker-compose.ci.yml
 # default_branch, optional, default value: main or master (auto-detected from local branches)

data/lib/vidar/cli.rb

@@ -14,6 +14,11 @@ module Vidar
       Run.docker_compose("run #{target} #{options[:command]}") || exit(1)
     end
 
+    desc "version", "Prints current version"
+    def version
+      puts Vidar::VERSION
+    end
+
     desc "pull", "Pull existing docker images to leverage docker caching"
     def pull
       Log.info "Pulling #{Config.get!(:image)} tags"

data/lib/vidar/config.rb

@@ -14,7 +14,7 @@ module Vidar
       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'] },
     }.freeze
 
     class << self
@@ -59,10 +59,18 @@ module Vidar
         value&.empty? ? nil : value
       end
 
+      def honeycomb_env_api_key(env)
+        ENV["HONEYCOMB_API_KEY_#{env.upcase}"]
+      end
+
       def deploy_config
+        deploy_configs[get!(:kubectl_context)] ||= build_deploy_config(get!(:kubectl_context))
+      end
+
+      def build_deploy_config(kubectl_context)
         deployments = get(:deployments)
         deployments = {} unless deployments.is_a?(Hash)
-        deployment = deployments[get!(:kubectl_context)]
+        deployment = deployments[kubectl_context]
 
         if deployment.nil?
           Log.error "ERROR: could not find deployment config for #{get!(:kubectl_context)} context"
@@ -75,6 +83,10 @@ module Vidar
         DeployConfig.new(deployment)
       end
 
+      def deploy_configs
+        @deploy_configs ||= {}
+      end
+
       def branches
         `git for-each-ref --format='%(refname:short)' refs/heads/*`.split("\n")
       end

data/lib/vidar/deploy_config.rb

@@ -6,7 +6,8 @@ module Vidar
 
     attr_reader :name, :url,
       :default_color, :success_color, :failure_color,
-      :slack_webhook_url, :sentry_webhook_url, :honeycomb_dataset
+      :slack_webhook_url, :sentry_webhook_url, :honeycomb_dataset,
+      :https_proxy
 
     def initialize(options)
       @name = options.fetch(:name)
@@ -19,6 +20,8 @@ module Vidar
       @slack_webhook_url = options[:slack_webhook_url]
       @sentry_webhook_url = options[:sentry_webhook_url]
       @honeycomb_dataset = options[:honeycomb_dataset]
+
+      @https_proxy = options[:https_proxy]
     end
   end
 end

data/lib/vidar/honeycomb_notification.rb

@@ -59,6 +59,11 @@ module Vidar
     end
 
     def call
+      create_legacy_marker
+      create_marker
+    end
+
+    def create_legacy_marker
       return false unless configured?
 
       response = connection.post do |req|
@@ -74,6 +79,22 @@ module Vidar
       false
     end
 
+    def create_marker
+      return false unless dataset && Config.honeycomb_env_api_key(dataset)
+
+      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.body = data.to_json
+      end
+
+      return true if response.status == 201
+
+      warn "Honeycomb marker not created: status: #{response.status} response: #{response.body}"
+      false
+    end
+
     def data
       {
         message: "#{success? ? 'Successful' : 'Failed'} deploy of #{github} revision #{revision} - #{revision_name}",

data/lib/vidar/k8s/pod_set.rb

@@ -52,9 +52,9 @@ module Vidar
 
       def kubectl_get
         if namespace == "all"
-          `kubectl get pods --all-namespaces -o json`
+          `#{Run.kubectl_envs_string}kubectl get pods --all-namespaces -o json`
         else
-          `kubectl get pods -n #{namespace} -o json`
+          `#{Run.kubectl_envs_string}kubectl get pods -n #{namespace} -o json`
         end
       end
 

data/lib/vidar/run.rb

@@ -10,8 +10,13 @@ module Vidar
         system("#{args.join(' ')} docker-compose -f #{Config.get!(:compose_file)} #{command}") || exit(1)
       end
 
-      def kubectl(command)
-        system("kubectl --namespace=#{Config.get!(:namespace)} #{command}") || exit(1)
+      def kubectl(command, namespace: Config.get!(:namespace))
+        system("#{kubectl_envs_string}kubectl --namespace=#{namespace} #{command}") || exit(1)
+      end
+
+      def kubectl_envs_string
+        https_proxy = Config.deploy_config.https_proxy
+        "HTTPS_PROXY=#{https_proxy} " if https_proxy
       end
     end
   end

data/lib/vidar/version.rb

@@ -1,3 +1,3 @@
 module Vidar
-  VERSION = '1.7.0'.freeze
+  VERSION = '1.8.0'.freeze
 end

data/vidar.gemspec

@@ -29,14 +29,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'colorize'
   spec.add_dependency 'faraday'
   spec.add_dependency 'thor', '~> 1.0'
-
-  spec.add_development_dependency 'awesome_print'
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec'
-  spec.add_development_dependency 'webmock'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidar
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -53,132 +53,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: awesome_print
-  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'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  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'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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'
-- !ruby/object:Gem::Dependency
-  name: rake
-  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'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  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'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  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'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  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'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  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'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  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:
 - knapo@knapo.net
@@ -245,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.4
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: K8s deployment tools based on thor