vidar 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39bab664337e5a4ff3a1a94ab654a9aa1243c21684896cd09f38b9c8bf012a64
-  data.tar.gz: 550b5a6b1102c328d94b40cfcbaef9e5d400713e560e08f9899256ddc8d0172a
+  metadata.gz: cb4f731d2ecb43dbab6e252579b755bc1098a307abf207016b030250fe7a521c
+  data.tar.gz: 0f33ac809ea03301a9fba6d6d8aada53e45c06b7c31e8a0d45e50770d39efa80
 SHA512:
-  metadata.gz: e20c5780fdd46521e51d37fe2c08ab1d1d8d034a0241142b518f1164dbeef37145b14a08ea55ee5bac44f9e1f43fbdc46702cf0c1cfbb60c1060d970cd44c41b
-  data.tar.gz: 1a53963ffcbfde5f641a96da266d9a469cf35ae8b47f504411c4696e51f471ce8128204e12b60f39c7807fe8eff5ed64ba67577bc91439904c3084dc2ff687ad
+  metadata.gz: 62042e2e8463466d35ad3fe7ab0bc983802d0068b3de11f9defa8c2c9d3014d063ea62e8699f6915a7d97a0eeac7f8280d5f7c5d75d404e0b605686fcbe3a809
+  data.tar.gz: a4584dd019975cd299a2addbc0e01e417fa623ce1cfd7b5693cdbcb119f7883715edca4523cb774721b7c4acd7a0b8ecc735d38f185b04c394fc75cb8c403f9e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vidar (0.1.5)
+    vidar (0.1.6)
       colorize
       thor (~> 0.20)
 

data/lib/vidar.rb

@@ -9,6 +9,7 @@ require 'colorized_string'
 
 require 'vidar/version'
 require 'vidar/config'
+require 'vidar/interpolation'
 require 'vidar/log'
 require 'vidar/run'
 require 'vidar/slack_notification'

data/lib/vidar/cli.rb

@@ -14,61 +14,61 @@ module Vidar
 
     desc "pull", "Pulls existing docker images to leverage docker caching"
     def pull
-      Log.info "Pulling #{Config.get(:image)} tags"
-      Run.docker "pull #{Config.get(:image)}:builder-#{Config.get(:current_branch)} 2> /dev/null || true"
-      Run.docker "pull #{Config.get(:image)}:builder 2> /dev/null || true"
-      Run.docker "pull #{Config.get(:image)}:release 2> /dev/null || true"
+      Log.info "Pulling #{Config.get!(:image)} tags"
+      Run.docker "pull #{Config.get!(:image)}:builder-#{Config.get!(:current_branch)} 2> /dev/null || true"
+      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"
     end
 
     desc "build", "Builds docker stages"
     def build
-      Log.info "Building #{Config.get(:image)}:builder-#{Config.get(:current_branch)}"
+      Log.info "Building #{Config.get!(:image)}:builder-#{Config.get!(:current_branch)}"
       Run.docker_compose "build builder"
 
-      Log.info "Building #{Config.get(:image)}:runner-#{Config.get(:current_branch)}"
+      Log.info "Building #{Config.get!(:image)}:runner-#{Config.get!(:current_branch)}"
       Run.docker_compose "build runner"
 
-      Log.info "Building #{Config.get(:image)}:release"
+      Log.info "Building #{Config.get!(:image)}:release"
       Run.docker_compose "build release"
     end
 
     desc "cache", "Caches intermediate docker stages"
     def cache
-      Log.info "Publish #{Config.get(:image)}:builder-#{Config.get(:current_branch)}"
-      Run.docker "push #{Config.get(:image)}:builder-#{Config.get(:current_branch)}"
+      Log.info "Publish #{Config.get!(:image)}:builder-#{Config.get!(:current_branch)}"
+      Run.docker "push #{Config.get!(:image)}:builder-#{Config.get!(:current_branch)}"
     end
 
     desc "publish", "Publishes docker images on docker registry"
     def publish
-      Log.info "Publish #{Config.get(:image)}:#{Config.get(:revision)}"
-      Run.docker "tag #{Config.get(:image)}:release #{Config.get(:image)}:#{Config.get(:revision)}"
-      Run.docker "push #{Config.get(:image)}:#{Config.get(:revision)}"
+      Log.info "Publish #{Config.get!(:image)}:#{Config.get!(:revision)}"
+      Run.docker "tag #{Config.get!(:image)}:release #{Config.get!(:image)}:#{Config.get!(:revision)}"
+      Run.docker "push #{Config.get!(:image)}:#{Config.get!(:revision)}"
 
-      return unless Config.get(:current_branch) == Config.get(:default_branch)
+      return unless Config.get!(:current_branch) == Config.get!(:default_branch)
 
-      Log.info "Publish #{Config.get(:image)}:builder"
-      Run.docker "tag #{Config.get(:image)}:builder-#{Config.get(:current_branch)} #{Config.get(:image)}:builder"
-      Run.docker "push #{Config.get(:image)}:builder"
+      Log.info "Publish #{Config.get!(:image)}:builder"
+      Run.docker "tag #{Config.get!(:image)}:builder-#{Config.get!(:current_branch)} #{Config.get!(:image)}:builder"
+      Run.docker "push #{Config.get!(:image)}:builder"
 
-      Log.info "Publish #{Config.get(:image)}:latest"
-      Run.docker "tag #{Config.get(:image)}:release #{Config.get(:image)}:latest"
-      Run.docker "push #{Config.get(:image)}:release"
-      Run.docker "push #{Config.get(:image)}:latest"
+      Log.info "Publish #{Config.get!(:image)}:latest"
+      Run.docker "tag #{Config.get!(:image)}:release #{Config.get!(:image)}:latest"
+      Run.docker "push #{Config.get!(:image)}:release"
+      Run.docker "push #{Config.get!(:image)}:latest"
     end
 
     desc "deploy", "Performs k8s deployment with deploy hook"
     method_option :revision, default: nil
     def deploy
-      revision = options[:revision] || Config.get(:revision)
-      Log.info "Current cluster: #{Config.get(:cluster)} ###"
+      revision = options[:revision] || Config.get!(:revision)
+      Log.info "Current cluster: #{Config.get!(:cluster)} ###"
 
       Log.info "Set kubectl image..."
-      Run.kubectl "set image deployments,cronjobs *=#{Config.get(:image)}:#{revision} --all"
+      Run.kubectl "set image deployments,cronjobs *=#{Config.get!(:image)}:#{revision} --all"
 
       Log.info "Looking for deploy hook..."
-      template_name, error, status = Open3.capture3 "kubectl get cronjob deploy-hook-template -n #{Config.get(:namespace)} -o name --ignore-not-found=true"
+      template_name, error, status = Open3.capture3 "kubectl get cronjob deploy-hook-template -n #{Config.get!(:namespace)} -o name --ignore-not-found=true"
 
       if status.success?
         if template_name.to_s.empty?
@@ -86,7 +86,7 @@ module Vidar
 
     desc "release", "Builds and publishes docker images"
     def release
-      Log.info  "Release #{options[:image]}:#{options[:revision]}"
+      Log.info "Release #{options[:image]}:#{options[:revision]}"
       pull
       build
       cache
@@ -95,14 +95,14 @@ 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: #{Config.get!(:cluster)} ###"
+      Log.info "Checking is all containers on #{Config.get!(:cluster)} in #{Config.get!(:namespace)} are ready..."
 
       sleep(2)
       error = false
       tries = 0
       max_tries = 30
-      until K8s::Pods.new(Config.get(:namespace)).all_ready?
+      until K8s::Pods.new(Config.get!(:namespace)).all_ready?
         tries += 1
         sleep(10)
         if tries > max_tries
@@ -111,13 +111,15 @@ 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_url:   Config.get(:cluster_url)
+        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_url:   Config.get!(:cluster_url)
       )
 
       if error

data/lib/vidar/config.rb

@@ -30,7 +30,13 @@ module Vidar
 
       def get(key)
         load unless loaded?
-        @data[key.to_s] || DEFAULT_OPTIONS[key.to_sym]&.call || fail(MissingConfigError, key)
+        value = @data[key.to_s] || DEFAULT_OPTIONS[key.to_sym]&.call
+        Vidar::Interpolation.call(value, self)
+      end
+
+      def get!(key)
+        load unless loaded?
+        get(key) || fail(MissingConfigError, key)
       end
     end
   end

data/lib/vidar/interpolation.rb

@@ -0,0 +1,16 @@
+module Vidar
+  class Interpolation
+    INTERPOLATION_PATTERN = /\{\{(\w+)\}\}/.freeze
+
+    class << self
+      def call(string, getter)
+        return unless string
+        fail ArgumentError, "getter must respond_to get." unless getter.respond_to?(:get)
+
+        string.gsub(INTERPOLATION_PATTERN) do |match|
+          getter.get($1) || match
+        end
+      end
+    end
+  end
+end

data/lib/vidar/k8s/pods.rb

@@ -26,7 +26,7 @@ module Vidar
 
       def items
         @items ||= begin
-          output = `kubectl get pods -n #{Config.get(:namespace)} -o json`
+          output = `kubectl get pods -n #{Config.get!(:namespace)} -o json`
           json = JSON.parse(output.strip)
           json["items"] || []
         end

data/lib/vidar/run.rb

@@ -6,12 +6,12 @@ module Vidar
       end
 
       def docker_compose(command)
-        args = %w[revision current_branch].map { |arg| "#{arg.upcase}=#{Config.get(arg.to_sym)}" }
-        system("#{args.join(' ')} docker-compose -f #{Config.get(:compose_file)} #{command}") || exit(1)
+        args = %w[revision current_branch].map { |arg| "#{arg.upcase}=#{Config.get!(arg.to_sym)}" }
+        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)
+        system("kubectl --namespace=#{Config.get!(:namespace)} #{command}") || exit(1)
       end
     end
   end

data/lib/vidar/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vidar
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Krzysztof Knapik
@@ -148,6 +148,7 @@ files:
 - lib/vidar.rb
 - lib/vidar/cli.rb
 - lib/vidar/config.rb
+- lib/vidar/interpolation.rb
 - lib/vidar/k8s/container_status.rb
 - lib/vidar/k8s/pods.rb
 - lib/vidar/log.rb