vidar 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb4f731d2ecb43dbab6e252579b755bc1098a307abf207016b030250fe7a521c
-  data.tar.gz: 0f33ac809ea03301a9fba6d6d8aada53e45c06b7c31e8a0d45e50770d39efa80
+  metadata.gz: 1cd6a83c0201682b8366247dca55e395e3bdd7012c58c59555258e91a199300b
+  data.tar.gz: 52ba79dd94564548fae2690c21672ee6c4d56c7034692af2b247541b9e8e22ba
 SHA512:
-  metadata.gz: 62042e2e8463466d35ad3fe7ab0bc983802d0068b3de11f9defa8c2c9d3014d063ea62e8699f6915a7d97a0eeac7f8280d5f7c5d75d404e0b605686fcbe3a809
-  data.tar.gz: a4584dd019975cd299a2addbc0e01e417fa623ce1cfd7b5693cdbcb119f7883715edca4523cb774721b7c4acd7a0b8ecc735d38f185b04c394fc75cb8c403f9e
+  metadata.gz: 86c304b21aaa052552ea618cf01aa5d8bf9790342912b6354f79e40053ca572520fca3104986919763e3c230874d318691b1d6e28d6e455eea690a99e49e6bf5
+  data.tar.gz: 7333853d537aacf960accd63f7c6e8b97f53a40dbca2a9ff0041677be743860a14eee1549bada27ddfe22c78787beeb4bdc442cb27573399e0e4b345e3c60297

data/.ruby-version

@@ -0,0 +1 @@
+ruby-2.6.4

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    vidar (0.1.6)
+    vidar (0.2.0)
       colorize
+      faraday
       thor (~> 0.20)
 
 GEM
@@ -12,8 +13,11 @@ GEM
     coderay (1.1.2)
     colorize (0.8.1)
     diff-lcs (1.3)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
     jaro_winkler (1.5.3)
     method_source (0.9.2)
+    multipart-post (2.1.1)
     parallel (1.17.0)
     parser (2.6.4.0)
       ast (~> 2.4.0)
@@ -61,4 +65,4 @@ DEPENDENCIES
   vidar!
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/lib/vidar.rb

@@ -1,11 +1,11 @@
-require 'yaml'
 require 'json'
 require 'open3'
 require 'ostruct'
 require 'yaml'
 
-require 'thor'
 require 'colorized_string'
+require 'faraday'
+require 'thor'
 
 require 'vidar/version'
 require 'vidar/config'

data/lib/vidar/cli.rb

@@ -19,7 +19,7 @@ module Vidar
       Run.docker "pull #{Config.get!(:image)}:builder 2> /dev/null || true"
       Run.docker "pull #{Config.get!(:image)}:release 2> /dev/null || true"
       Log.info "Docker images:"
-      puts Run.docker "images"
+      Log.info Run.docker("images")
     end
 
     desc "build", "Builds docker stages"
@@ -62,7 +62,7 @@ module Vidar
     method_option :revision, default: nil
     def deploy
       revision = options[:revision] || Config.get!(:revision)
-      Log.info "Current cluster: #{Config.get!(:cluster)} ###"
+      Log.info "Current cluster_name: #{Config.get!(:cluster_name)} ###"
 
       Log.info "Set kubectl image..."
       Run.kubectl "set image deployments,cronjobs *=#{Config.get!(:image)}:#{revision} --all"
@@ -95,8 +95,8 @@ module Vidar
 
     desc "monitor_deploy_status", "Checks is deployment has finished and sends post-deploy notification"
     def monitor_deploy_status
-      Log.info "Current cluster: #{Config.get!(:cluster)} ###"
-      Log.info "Checking is all containers on #{Config.get!(:cluster)} in #{Config.get!(:namespace)} are ready..."
+      Log.info "Current cluster_name: #{Config.get!(:cluster_name)} ###"
+      Log.info "Checking is all containers on #{Config.get!(:cluster_name)} in #{Config.get!(:namespace)} are ready..."
 
       sleep(2)
       error = false
@@ -111,24 +111,22 @@ module Vidar
         end
       end
 
-      return unless Config.get(:slack_webhook_url)
-
       slack_notification = SlackNotification.new(
         webhook_url:   Config.get!(:slack_webhook_url),
         github:        Config.get!(:github),
         revision:      Config.get!(:revision),
         revision_name: Config.get!(:revision_name),
-        cluster:       Config.get!(:cluster),
+        cluster_name:  Config.get!(:cluster_name),
         cluster_url:   Config.get!(:cluster_url)
       )
 
       if error
         Log.error "ERROR: Some of containers are not ready."
-        slack_notification.error
+        slack_notification.error if slack_notification.configured?
         exit(1)
       else
         Log.info "OK: All containers are ready."
-        slack_notification.success
+        slack_notification.success if slack_notification.configured?
       end
     end
   end

data/lib/vidar/config.rb

@@ -8,7 +8,17 @@ module Vidar
       current_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 },
-      cluster:        -> { `kubectl config current-context`.strip.split("_", 4)[-1] } # TODO: improve context cleanup
+      cluster_name:   -> {
+        cluster_names = get(:cluster_names).to_s
+        current_context = `kubectl config current-context`.strip
+
+        if cluster_names.empty?
+          current_context
+        else
+          names_in_context = current_context.scan(Regexp.new(cluster_names))
+          names_in_context.flatten.first || current_context
+        end
+      }
     }.freeze
 
     class << self
@@ -28,6 +38,16 @@ module Vidar
         @loaded
       end
 
+      def cluster_name
+        cluster_names = get(:cluster_names).to_s
+        current_context = `kubectl config current-context`.strip
+
+        return current_context if cluster_names.empty?
+
+        names_in_context = current_context.scan(Regexp.new(cluster_names))
+        names_in_context.flatten.first || current_context
+      end
+
       def get(key)
         load unless loaded?
         value = @data[key.to_s] || DEFAULT_OPTIONS[key.to_sym]&.call

data/lib/vidar/interpolation.rb

@@ -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) || match
+          getter.get($1) || match # rubocop:disable Style/PerlBackrefs
         end
       end
     end

data/lib/vidar/slack_notification.rb

@@ -3,32 +3,42 @@ module Vidar
     SUCCESS_COLOR = "good".freeze
     ERROR_COLOR = "danger".freeze
 
-    def initialize(webhook_url:, github:, revision:, revision_name:, cluster:, cluster_url:)
-      @webhook_url = webhook_url
-      @github = github
-      @revision = revision
+    def initialize(webhook_url:, github:, revision:, revision_name:, cluster_name:, cluster_url:)
+      @webhook_url   = webhook_url
+      @github        = github
+      @revision      = revision
       @revision_name = revision_name
-      @cluster = cluster
-      @cluster_url = cluster_url
+      @cluster_name  = cluster_name
+      @cluster_url   = cluster_url
+      @connection    = Faraday.new
+    end
+
+    def configured?
+      !webhook_url.to_s.empty?
     end
 
     def error
       message = "Failed deploy of #{github_link} to #{cluster_link} :fire: <!channel>"
-      perform data(message: message, color: ERROR_COLOR)
+      perform_with data(message: message, color: ERROR_COLOR)
     end
 
     def success
       message = "Successful deploy of #{github_link} to #{cluster_link}"
-      perform data(message: message, color: SUCCESS_COLOR)
+      perform_with data(message: message, color: SUCCESS_COLOR)
     end
 
-    def perform(data)
-      `curl -X POST -H "Content-type: application/json" --data '#{data}' '#{webhook_url}' 2>&1 /dev/null`
+    def perform_with(data)
+      p data
+      connection.post do |req|
+        req.url webhook_url
+        req.headers['Content-Type'] = 'application/json'
+        req.body = data.to_json
+      end
     end
 
     private
 
-    attr_reader :webhook_url, :github, :revision, :revision_name, :cluster, :cluster_url
+    attr_reader :webhook_url, :github, :revision, :revision_name, :cluster_name, :cluster_url, :connection
 
     def data(message:, color:)
       {
@@ -41,7 +51,7 @@ module Vidar
             "fallback": message
           }
         ]
-      }.to_json
+      }
     end
 
     def github_url
@@ -53,7 +63,7 @@ module Vidar
     end
 
     def cluster_link
-      "<#{cluster_url}|#{cluster}>"
+      "<#{cluster_url}|#{cluster_name}>"
     end
   end
 end

data/lib/vidar/version.rb

@@ -1,3 +1,3 @@
 module Vidar
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/vidar.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.6'
 
   spec.add_dependency 'colorize'
+  spec.add_dependency 'faraday'
   spec.add_dependency 'thor', '~> 0.20'
 
   spec.add_development_dependency 'bundler'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidar
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-05 00:00:00.000000000 Z
+date: 2019-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +149,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -177,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: K8s deployment tools based on thor