vidar 1.0.0 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d51ae63b22aa48574d762a5b79d0f94459b35a9a0ab4f55c893d8b92e9eb9d1
-  data.tar.gz: c9ef2b907bc9434bb31205ba050e6d30d1834bff7400f313611fb735939caea3
+  metadata.gz: b8cc826680e276230381b1cb5158840c827e48d56ebb3598861ebb3aaa6baa2c
+  data.tar.gz: df2cbc9d2c82dddaf4219835905342f370e517a344c2bf2f46c8ebf5e27e18dd
 SHA512:
-  metadata.gz: 8d26d183f212baccd95730bb2c47a6512b20c15b0c7ef6819184a667baae2b5c0aace6bcffcf937a287331017adb3efa3ebbf4e5843507077367b199ffde2a49
-  data.tar.gz: b64587f88c7cb524bf1b433e57ed47f37bb064b1ea8c1e9beb7747230bdfc4f6f02681296201c2ed361b71460ccddec187fee8960f710f9928126225da194637
+  metadata.gz: 9c7dc902f40eb18d022bf95c4874886ad828aab6a7c6ff06f2507aa8cb9b2dc3680a78d4d651d85d7af69ca29810c1afc562794dd395eb2044ca3ffad3652603
+  data.tar.gz: b67b002b67712e37811d17dd2836e0a8b0bfe5de97f23c96c310cd8ae33cf57fd76b70ddc7e45e776503cb6f55576ac90fca6bfbee34468b35095c49d5ccb654

data/.dependabot/config.yml

@@ -0,0 +1,18 @@
+version: 1
+
+update_configs:
+  - package_manager: "ruby:bundler"
+    directory: "/"
+    update_schedule: "monthly"
+    commit_message:
+      prefix: "[dependabot]"
+    allowed_updates:
+      - match:
+          update_type: "all"
+    automerged_updates:
+      - match:
+          dependency_type: "development"
+          update_type: "all"
+      - match:
+          dependency_type: "production"
+          update_type: "all"

data/.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Create a report to track an issue that has been identified
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Mutation/Query**
+
+**URL and HTTP method (for non-GQL):**
+
+**Sentry or Logs URL:**
+
+**User/authentication details**
+Impacted user name or service account
+
+**Additional context**
+Add any other context about the problem here.

data/.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

data/.github/ISSUE_TEMPLATE/story.md

@@ -0,0 +1,22 @@
+---
+name: New story
+about: Add a new story for implementation
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the solution**
+A clear and concise description of what you want to happen.
+When will this feature be done?
+
+**Describe the users**
+Who are we building this feature for?
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
+Link to any applicable documents describing the feature.
+
+**Designs**
+Link to any applicable designs on Invision.

data/.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,18 @@
+## Description
+<!--- Describe your changes in detail -->
+
+## Related issue(s)
+<!--- GH issue number -->
+
+## Motivation and Context
+<!--- Why is this change required? What problem does it solve? -->
+<!--- If it fixes an open issue, please link to the issue here. -->
+
+## How Has This Been Tested?
+<!--- Please describe in detail how you tested your changes. -->
+
+## Screenshots (if appropriate):
+<!--- Please add any screenshots of the feature. -->
+
+## Related PRs
+<!--- Please add links to any related PRs (backend, component packages, etc). -->

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

@@ -0,0 +1,16 @@
+# automatically approve PRs submitted by Dependabot
+# this will allow Dependabot to automatically merge dependency update PRs where CI passes
+# from: https://github.com/hmarr/auto-approve-action
+name: Auto approve Dependabot PRs
+
+on:
+  pull_request
+
+jobs:
+  auto-approve:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: hmarr/auto-approve-action@v2.0.0
+      if: github.actor == 'dependabot[bot]' || github.actor == 'dependabot-preview[bot]'
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"

data/.travis.yml

@@ -3,8 +3,9 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.6.5
-before_install: gem install bundler -v 2.0.2
+  - 2.6
+  - 2.7
+before_install: gem install bundler
 script:
-  - bundle exec rspec
-  - bundle exec rubocop
+  - bundle exec rake spec
+  - bundle exec rake rubocop

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vidar (1.0.0)
+    vidar (1.1.4)
       colorize
       faraday
       thor (~> 1.0)
@@ -9,49 +9,56 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    ast (2.4.1)
     awesome_print (1.8.0)
-    coderay (1.1.2)
+    coderay (1.1.3)
     colorize (0.8.1)
-    diff-lcs (1.3)
-    faraday (0.17.1)
+    diff-lcs (1.4.4)
+    faraday (1.0.1)
       multipart-post (>= 1.2, < 3)
-    jaro_winkler (1.5.4)
-    method_source (0.9.2)
+    method_source (1.0.0)
     multipart-post (2.1.1)
-    parallel (1.19.1)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
+    parallel (1.19.2)
+    parser (2.7.1.4)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     rainbow (3.0.0)
     rake (13.0.1)
+    regexp_parser (1.7.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.78.0)
-      jaro_winkler (~> 1.5.1)
+    rspec-support (3.9.3)
+    rubocop (0.88.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.1.1)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.7)
+      rexml
+      rubocop-ast (>= 0.1.0, < 1.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.1)
-      rubocop (>= 0.71.0)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (0.2.0)
+      parser (>= 2.7.0.1)
+    rubocop-performance (1.7.1)
+      rubocop (>= 0.82.0)
+    rubocop-rspec (1.42.0)
+      rubocop (>= 0.87.0)
     ruby-progressbar (1.10.1)
     thor (1.0.1)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby
@@ -64,7 +71,8 @@ DEPENDENCIES
   rspec
   rubocop
   rubocop-performance
+  rubocop-rspec
   vidar!
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.md

@@ -1,9 +1,9 @@
 [![Gem Version](https://badge.fury.io/rb/vidar.svg)](https://rubygems.org/gems/vidar)
 [![Build Status](https://travis-ci.org/RenoFi/vidar.svg?branch=master)](https://travis-ci.org/RenoFi/vidar)
 
-# Vidar
+# vidar
 
-Vidar is a set of docker & k8s deployment tools based on thor gem
+`vidar` is a set of docker & k8s deployment tools based on thor gem
 
 ## Installation
 
@@ -25,12 +25,48 @@ Or install it yourself as:
 #### Requirements :
 
 * multistage `Dockerfile`, with at least 2 stages defined: `base`, `release`.
-* `docker-compose.ci.yml` file with defined services for all mentioned stages
+* `docker-compose.ci.yml` file with defined services for all mentioned stages, e.g.
+
+```yml
+version: '3.7'
+
+services:
+  base:
+    image: gcr.io/[GCP-PROJECT-ID]/[APP-NAME]:base-${CURRENT_BRANCH:?err}
+    build:
+      dockerfile: Dockerfile
+      context: .
+      target: base
+      cache_from:
+        - gcr.io/[GCP-PROJECT-ID]/[APP-NAME]:base-master
+        - gcr.io/[GCP-PROJECT-ID]/[APP-NAME]:base
+        - gcr.io/[GCP-PROJECT-ID]/[APP-NAME]:release
+        - gcr.io/[GCP-PROJECT-ID]/[APP-NAME]:$REVISION
+    env_file:
+      - .env
+    environment:
+      - RACK_ENV=test
+
+  release:
+    image: gcr.io/[GCP-PROJECT-ID]/[APP-NAME]:release
+    build:
+      dockerfile: Dockerfile
+      context: .
+      target: release
+      args:
+        - REVISION=${REVISION:?err}
+      cache_from:
+        - gcr.io/[GCP-PROJECT-ID]/[APP-NAME]:base-${CURRENT_BRANCH:?err}
+        - gcr.io/[GCP-PROJECT-ID]/[APP-NAME]:base-master
+        - gcr.io/[GCP-PROJECT-ID]/[APP-NAME]:base
+        - gcr.io/[GCP-PROJECT-ID]/[APP-NAME]:$REVISION
+```
+
 * `vidar.yml` file to the project root directory, which following content:
 
 ```yml
 # docker image name, required
-image: gcr.io/renofiinfrastructure/vidar
+image: gcr.io/[GCP-PROJECT-ID]/[APP-NAME]
 # k8s namespace, required
 namespace: borrower
 # github name used to build deployment notification content

data/Rakefile

@@ -5,4 +5,4 @@ require 'rubocop/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 RuboCop::RakeTask.new
 
-task default: %i[rubocop spec]
+task default: %i[rubocop:auto_correct spec]

data/lib/vidar.rb

@@ -1,6 +1,7 @@
 require 'json'
 require 'open3'
 require 'ostruct'
+require 'uri'
 require 'yaml'
 
 require 'colorized_string'

data/lib/vidar/cli.rb

@@ -42,10 +42,10 @@ module Vidar
 
     desc "publish", "Publish docker images on docker registry"
     def publish
-      base_image_tag     = "#{Config.get!(:image)}:#{Config.get!(:base_stage_name)}"
+      base_image_tag = "#{Config.get!(:image)}:#{Config.get!(:base_stage_name)}"
       revision_image_tag = "#{Config.get!(:image)}:#{Config.get!(:revision)}"
-      release_image_tag  = "#{Config.get!(:image)}:#{Config.get!(:release_stage_name)}"
-      latest_image_tag   = "#{Config.get!(:image)}:latest"
+      release_image_tag = "#{Config.get!(:image)}:#{Config.get!(:release_stage_name)}"
+      latest_image_tag = "#{Config.get!(:image)}:latest"
 
       Log.info "Publishing #{revision_image_tag}"
       Run.docker "tag #{release_image_tag} #{revision_image_tag}"
@@ -117,6 +117,7 @@ module Vidar
         github:        Config.get!(:github),
         revision:      Config.get!(:revision),
         revision_name: Config.get!(:revision_name),
+        build_url:     Config.build_url,
         deploy_config: Config.deploy_config
       )
 
@@ -194,6 +195,7 @@ module Vidar
         github:        Config.get!(:github),
         revision:      Config.get!(:revision),
         revision_name: Config.get!(:revision_name),
+        build_url:     Config.build_url,
         deploy_config: Config.deploy_config
       )
 

data/lib/vidar/config.rb

@@ -52,10 +52,15 @@ module Vidar
         get(key) || fail(MissingConfigError, key)
       end
 
+      def build_url
+        value = ENV[get(:build_env).to_s]
+        value&.empty? ? nil : value
+      end
+
       def deploy_config
         deployments = get(:deployments)
         deployments = {} unless deployments.is_a?(Hash)
-        deployment  = deployments[get!(:kubectl_context)]
+        deployment = deployments[get!(:kubectl_context)]
 
         if deployment.nil?
           Log.error "ERROR: could not find deployment config for #{get!(:kubectl_context)} context"

data/lib/vidar/k8s/container.rb

@@ -3,18 +3,22 @@ module Vidar
     class Container
       JOB_KIND = "Job".freeze
 
-      attr_reader :data, :state, :namespace, :kind, :pod_name
+      attr_reader :data, :state, :namespace,
+        :kind, :pod_name,
+        :reason, :message
 
       def initialize(data)
-        @data      = data
-        @state     = data["state"]
+        @data = data
+        @state = data["state"] || {}
         @namespace = data["namespace"]
-        @kind      = data["kind"]
-        @pod_name  = data["pod_name"]
+        @kind = data["kind"]
+        @pod_name = data["pod_name"]
+        @reason = data["reason"]
+        @message = data["message"]
       end
 
       def name
-        data["name"]
+        data["name"] || pod_name
       end
 
       def deployed?
@@ -40,13 +44,15 @@ module Vidar
       def to_text
         parts = []
         parts << namespace.to_s.ljust(20, " ")
-        parts << name.to_s.ljust(25, " ")
-        parts += text_statuses.map { |s| s.ljust(40, " ") }
+        parts << name.to_s.ljust(35, " ")
+        parts += text_statuses.map { |s| s.ljust(45, " ") }
         "| #{parts.join(' | ')} |"
       end
 
       def text_statuses
-        if running?
+        if unschedulable?
+          [ColorizedString["Unschedulable"].light_red, ColorizedString[message].light_red]
+        elsif running?
           if job?
             [ColorizedString["Running"].light_yellow, "Started at: #{running_started_at}"]
           elsif ready?
@@ -97,6 +103,10 @@ module Vidar
         state.dig("terminated", "reason") == "Error" || state.dig("terminated", "exitCode")
       end
 
+      def unschedulable?
+        reason == "Unschedulable"
+      end
+
       def job?
         kind == JOB_KIND
       end

data/lib/vidar/k8s/pod_set.rb

@@ -63,13 +63,13 @@ module Vidar
       def containers_data
         items.map do |i|
           owner_references = i.dig("metadata", "ownerReferences") || []
-          kind             = (owner_references[0] || {})["kind"]
-          namespace        = i.dig("metadata", "namespace")
-          statuses         = i.dig("status", "containerStatuses") || []
+          kind = (owner_references[0] || {})["kind"]
+          namespace = i.dig("metadata", "namespace")
+          statuses = i.dig("status", "containerStatuses") || i.dig("status", "conditions") || []
           statuses.each do |s|
             s["namespace"] = namespace
-            s["kind"]      = kind
-            s["pod_name"]  = i.dig("metadata", "name")
+            s["kind"] = kind
+            s["pod_name"] = i.dig("metadata", "name")
           end
           statuses
         end.flatten

data/lib/vidar/log.rb

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

data/lib/vidar/slack_notification.rb

@@ -1,16 +1,18 @@
 module Vidar
   class SlackNotification
-    def initialize(github:, revision:, revision_name:, deploy_config:)
-      @github          = github
-      @revision        = revision
-      @revision_name   = revision_name
-      @deploy_name     = deploy_config.name
-      @deploy_url      = deploy_config.url
-      @default_color   = deploy_config.default_color
-      @success_color   = deploy_config.success_color
-      @failure_color   = deploy_config.failure_color
-      @webhook_url     = deploy_config.slack_webhook_url
-      @connection      = Faraday.new
+    def initialize(github:, revision:, revision_name:, deploy_config:, build_url: nil)
+      @github = github
+      @revision = revision
+      @revision_name = revision_name
+      @build_url = build_url
+      @build_hostname = ::URI.parse(build_url || '').hostname
+      @deploy_name = deploy_config.name
+      @deploy_url = deploy_config.url
+      @default_color = deploy_config.default_color
+      @success_color = deploy_config.success_color
+      @failure_color = deploy_config.failure_color
+      @webhook_url = deploy_config.slack_webhook_url
+      @connection = Faraday.new
     end
 
     def configured?
@@ -18,12 +20,12 @@ module Vidar
     end
 
     def failure
-      message = "Failed deploy of #{github_link} to #{deploy_link} :fire: <!channel>"
+      message = "Failed deploy of #{github_link} to #{deploy_link} :fire: <!channel> #{build_link}"
       perform_with data(message: message, color: failure_color)
     end
 
     def success
-      message = "Successful deploy of #{github_link} to #{deploy_link}"
+      message = "Successful deploy of #{github_link} to #{deploy_link}. #{build_link}"
       perform_with data(message: message, color: success_color)
     end
 
@@ -44,7 +46,7 @@ module Vidar
     attr_reader :github, :revision, :revision_name,
       :deploy_name, :deploy_url, :webhook_url,
       :default_color, :success_color, :failure_color,
-      :connection
+      :connection, :build_url, :build_hostname
 
     def data(message:, color:)
       {
@@ -71,5 +73,9 @@ module Vidar
     def deploy_link
       "<#{deploy_url}|#{deploy_name}>"
     end
+
+    def build_link
+      build_url && "<#{build_url}|View the build on #{build_hostname}>"
+    end
   end
 end

data/lib/vidar/version.rb

@@ -1,3 +1,3 @@
 module Vidar
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.4'.freeze
 end

data/vidar.gemspec

@@ -3,14 +3,14 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'vidar/version'
 
 Gem::Specification.new do |spec|
-  spec.name     = 'vidar'
-  spec.version  = Vidar::VERSION
-  spec.authors  = ['Krzysztof Knapik', 'RenoFi Engineering Team']
-  spec.email    = ['knapo@knapo.net', 'engineering@renofi.com']
+  spec.name = 'vidar'
+  spec.version = Vidar::VERSION
+  spec.authors = ['Krzysztof Knapik', 'RenoFi Engineering Team']
+  spec.email = ['knapo@knapo.net', 'engineering@renofi.com']
 
-  spec.summary  = 'K8s deployment tools based on thor'
+  spec.summary = 'K8s deployment tools based on thor'
   spec.homepage = 'https://github.com/RenoFi/vidar'
-  spec.license  = 'MIT'
+  spec.license = 'MIT'
 
   spec.metadata['homepage_uri'] = 'https://github.com/RenoFi/vidar'
   spec.metadata['source_code_uri'] = 'https://github.com/RenoFi/vidar'
@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   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.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 2.6'
@@ -35,4 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-performance'
+  spec.add_development_dependency 'rubocop-rspec'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vidar
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.4
 platform: ruby
 authors:
 - Krzysztof Knapik
 - RenoFi Engineering Team
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-20 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -151,7 +151,21 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+- !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'
+description:
 email:
 - knapo@knapo.net
 - engineering@renofi.com
@@ -160,6 +174,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dependabot/config.yml"
+- ".github/ISSUE_TEMPLATE/bug_report.md"
+- ".github/ISSUE_TEMPLATE/config.yml"
+- ".github/ISSUE_TEMPLATE/story.md"
+- ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/workflows/auto-approve.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -189,7 +209,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/RenoFi/vidar
   source_code_uri: https://github.com/RenoFi/vidar
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -204,8 +224,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: K8s deployment tools based on thor
 test_files: []