kubes 0.4.3 → 0.5.0

data/lib/kubes/compiler/shared/helpers/deprecated.rb

@@ -0,0 +1,37 @@
+module Kubes::Compiler::Shared::Helpers
+  class Deprecated
+    def built_image
+      puts "DEPRECATED: built_image is deprecated, use docker_image helper instead.".color(:yellow)
+      print_source
+    end
+
+    def error_info
+      error_info = caller.find { |l| l.include?('.kubes/resources') }
+      path, line_number, _ = error_info.split(':')
+      {path: path, line_number: line_number}
+    end
+
+    def print_source
+      info = error_info
+      path = info[:path]
+      line_number = info[:line_number].to_i
+
+      pretty_path = path.sub("#{Kubes.root}/",'')
+      puts "Here's the line in #{pretty_path} that calls built_image:\n\n"
+
+      contents = IO.read(path)
+      content_lines = contents.split("\n")
+      context = 5 # lines of context
+      top, bottom = [line_number-context-1, 0].max, line_number+context-1
+      lpad = content_lines.size.to_s.size
+      content_lines[top..bottom].each_with_index do |line_content, index|
+        current_line = top+index+1
+        if current_line == line_number
+          printf("%#{lpad}d %s\n".color(:red), current_line, line_content)
+        else
+          printf("%#{lpad}d %s\n", current_line, line_content)
+        end
+      end
+    end
+  end
+end

data/lib/kubes/compiler/strategy/base.rb

@@ -1,13 +1,13 @@
 class Kubes::Compiler::Strategy
   class Base
     include Kubes::Logging
+    include Kubes::Compiler::Util::SaveFile
+    include Kubes::Compiler::Shared::CustomHelpers
 
     def initialize(options={})
       @options = options
       @path = options[:path]
-
-      @filename = @path.sub(%r{.*\.kubes/resources/},'') # IE: web/deployment.rb or web/deployment.yaml
-      @save_file = @filename.sub('.yml','.yaml').sub('.rb','.yaml')
+      @save_file = save_file(@path)
     end
   end
 end

data/lib/kubes/compiler/strategy/dsl.rb

@@ -3,6 +3,7 @@ class Kubes::Compiler::Strategy
     include Kubes::Compiler::Util::Normalize
 
     def run
+      load_custom_helpers
       dsl = dsl_class.new(@options) # Deployment, Service, etc
       data = dsl.run
       Result.new(@save_file, data)
@@ -17,7 +18,7 @@ class Kubes::Compiler::Strategy
     end
 
     def syntax_class
-      klass_name = normalize_kind(@filename)
+      klass_name = normalize_kind(@save_file)
       "Kubes::Compiler::Dsl::Syntax::#{klass_name}".constantize
     rescue NameError
       logger.debug "Using default resource for: #{klass_name}"
@@ -25,7 +26,7 @@ class Kubes::Compiler::Strategy
     end
 
     def block_form?
-      type = extract_type(@filename)
+      type = extract_type(@save_file)
       type.pluralize == type
     end
   end

data/lib/kubes/compiler/strategy/erb.rb

@@ -4,10 +4,12 @@ class Kubes::Compiler::Strategy
   class Erb < Base
     extend Kubes::Compiler::Dsl::Core::Fields
     include Kubes::Compiler::Dsl::Core::Helpers
+    include Kubes::Compiler::Shared::CustomHelpers
     include Kubes::Compiler::Shared::Helpers
     include Kubes::Compiler::Layering
 
     def run
+      load_custom_helpers
       @data = {}
 
       render_files(pre_layers)
@@ -32,11 +34,18 @@ class Kubes::Compiler::Strategy
     def render_result(path)
       if File.exist?(path)
         yaml = RenderMePretty.result(path, context: self)
-        result = YAML.load(yaml)
+        result = yaml_load(path, yaml)
         result.is_a?(Hash) ? result : {} # in case of blank yaml doc a Boolean false is returned
       else
         {}
       end
     end
+
+    def yaml_load(path, yaml)
+      YAML.load(yaml)
+    rescue Psych::SyntaxError
+      YamlError.new(path, yaml).show
+      exit 1
+    end
   end
 end

data/lib/kubes/compiler/strategy/erb/yaml_error.rb

@@ -0,0 +1,60 @@
+class Kubes::Compiler::Strategy::Erb
+  class YamlError
+    include Kubes::Compiler::Util::SaveFile
+
+    def initialize(path, rendered_yaml)
+      @path, @rendered_yaml = path, rendered_yaml
+    end
+
+    def show
+      FileUtils.mkdir_p(File.dirname(dest))
+      IO.write(dest, @rendered_yaml)
+      show_error(dest)
+    end
+
+    def dest
+      save_file = save_file(@path)
+      "#{Kubes.root}/.kubes/output/#{save_file}"
+    end
+
+    def show_error(path)
+      text = IO.read(path)
+      begin
+        YAML.load(text)
+      rescue Psych::SyntaxError => e
+        handle_yaml_syntax_error(e, path)
+      end
+    end
+
+    def handle_yaml_syntax_error(e, path)
+      io = StringIO.new
+      io.puts "Invalid yaml. Output written for debugging: #{path}".color(:red)
+      io.puts "ERROR: #{e.message}".color(:red)
+
+      # Grab line info.  Example error:
+      #   ERROR: (<unknown>): could not find expected ':' while scanning a simple key at line 2 column 1
+      md = e.message.match(/at line (\d+) column (\d+)/)
+      line = md[1].to_i
+
+      lines = IO.read(path).split("\n")
+      context = 5 # lines of context
+      top, bottom = [line-context-1, 0].max, line+context-1
+      spacing = lines.size.to_s.size
+      lines[top..bottom].each_with_index do |line_content, index|
+        line_number = top+index+1
+        if line_number == line
+          io.printf("%#{spacing}d %s\n".color(:red), line_number, line_content)
+        else
+          io.printf("%#{spacing}d %s\n", line_number, line_content)
+        end
+      end
+
+      if ENV['KUBES_TEST']
+        io.string
+      else
+        puts io.string
+        exit 1
+      end
+    end
+  end
+end

data/lib/kubes/compiler/util/normalize.rb

@@ -5,7 +5,7 @@ module Kubes::Compiler::Util
     end
 
     def extract_type(path)
-      File.basename(path).sub('.rb','').sub(/-.*/,'')
+      File.basename(path).sub('.yaml','').sub('.yml','').sub('.rb','').sub(/-.*/,'')
     end
   end
 end

data/lib/kubes/compiler/util/save_file.rb

@@ -0,0 +1,8 @@
+module Kubes::Compiler::Util
+  module SaveFile
+    def save_file(path)
+      filename = path.sub(%r{.*\.kubes/resources/},'') # IE: web/deployment.rb or web/deployment.yaml
+      filename.sub('.yml','.yaml').sub('.rb','.yaml')
+    end
+  end
+end

data/lib/kubes/config.rb

@@ -32,7 +32,7 @@ module Kubes
 
       config.repo = nil # expected to be set by .kubes/config.rb
 
-      config.logger = Logger.new($stdout)
+      config.logger = Logger.new($stderr)
       config.logger.level = ENV['KUBES_LOG_LEVEL'] || :info
 
       config.skip = []

data/lib/kubes/core.rb

@@ -28,5 +28,11 @@ module Kubes
     def kustomize?
       Kubectl::Kustomize.detect?
     end
+
+    def check_project!
+      return if File.exist?("#{Kubes.root}/.kubes/config.rb")
+      logger.error "ERROR: It doesnt look like this is a kubes project. Are you sure you are in a kubes project?".color(:red)
+      ENV['TS_TEST'] ? raise : exit(1)
+    end
   end
 end

data/lib/kubes/docker/strategy/image_name.rb

@@ -30,7 +30,7 @@ module Kubes::Docker::Strategy
       return "tongueroo/demo-kubes:kubes-12345678" if ENV['TEST']
 
       unless File.exist?(image_state_path)
-        puts "Unable to find #{image_state_path} which contains the last docker image name built with kubes build.  Please run `kubes docker build` first."
+        logger.error "ERROR: Unable to find #{image_state_path} which contains the last docker image name built with kubes build.  Please run `kubes docker build` first."
         exit 1
       end
       IO.read(image_state_path).strip

data/lib/kubes/kubectl.rb

@@ -17,13 +17,11 @@ module Kubes
       params = args.flatten.join(' ')
       args = "#{@name} #{params}" # @name: apply or delete
 
-      switch_context do
-        run_hooks("kubectl.rb", name: @name, file: @options[:file]) do
-          if options[:capture]
-            self.class.capture(args, options) # already includes kubectl
-          else
-            self.class.execute(args, options)
-          end
+      run_hooks("kubectl.rb", name: @name, file: @options[:file]) do
+        if options[:capture]
+          self.class.capture(args, options) # already includes kubectl
+        else
+          self.class.execute(args, options)
         end
       end
     end
@@ -44,22 +42,6 @@ module Kubes
       Kubes.config.kubectl.exit_on_fail[@name]
     end
 
-    def switch_context(&block)
-      kubectl = Kubes.config.kubectl
-      context = kubectl.context
-      if context
-        previous_context = capture("kubectl config current-context")
-        sh("kubectl config use-context #{context}", mute: true)
-        result = block.call
-        if !previous_context.blank? && !kubectl.context_keep
-          sh("kubectl config use-context #{previous_context}", mute: true)
-        end
-        result
-      else
-        block.call
-      end
-    end
-
     def args
       # base at end in case of redirection. IE: command > /path
       custom.args + default.args

data/lib/kubes/kubectl/batch.rb

@@ -3,6 +3,7 @@ class Kubes::Kubectl
     include Kubes::Hooks::Concern
     include Kubes::Logging
     include Kubes::Util::Consider
+    include Kubes::Util::Sh
     include Ordering
 
     def initialize(name, options={})
@@ -12,48 +13,41 @@ class Kubes::Kubectl
     def run
       # @options[:preview] is really only used for kubectl delete
       logger.info "Will run:" if @options[:preview]
-      run_hooks("kubes.rb", name: @name) do
-        sorted_files.each do |file|
-          if @options[:preview]
-            logger.info "    kubectl #{@name} -f #{file}"
-          else
-            Kubes::Kubectl.run(@name, @options.merge(file: file))
+      switch_context do
+        run_hooks("kubes.rb", name: @name) do
+          sorted_files.each do |file|
+            if @options[:preview]
+              logger.info "    kubectl #{@name} -f #{file}"
+            else
+              Kubes::Kubectl.run(@name, @options.merge(file: file))
+            end
           end
         end
       end
     end
 
-    # kubes apply                   # {role: nil, resource: nil}
-    # kubes apply clock             # {role: "clock", resource: nil}
-    # kubes apply clock deployment  # {role: "clock", resource: "deployment"}
-    def search_expr
-      role, resource = @options[:role], @options[:resource]
-      if role && resource
-        "#{Kubes.root}/.kubes/output/#{role}/#{resource}.yaml"
-      elsif role
-        "#{Kubes.root}/.kubes/output/#{role}/*.yaml"
-      else
-        "#{Kubes.root}/.kubes/output/**/*.yaml"
-      end
-    end
+    def switch_context(&block)
+      kubectl = Kubes.config.kubectl
+      context = kubectl.context
 
-    def files
-      files = []
-      Dir.glob(search_expr).each do |path|
-        next unless process?(path)
-        file = path.sub("#{Kubes.root}/", '')
-        files << file
+      unless context
+        block.call
+        return
       end
-      files
-    end
 
-    def process?(path)
-      consider?(path) && two_levels_deep?(path)
-    end
+      previous_context = sh_capture("kubectl config current-context")
+      if previous_context == context
+        block.call
+        return
+      end
 
-    def two_levels_deep?(path)
-      rel_path = path.sub(%r{.*\.kubes/output/},'')
-      rel_path.split('/').size == 2
+      logger.debug "Switching kubectl context to: #{context}"
+      sh("kubectl config use-context #{context}", mute: true)
+      result = block.call
+      if !previous_context.blank? && !kubectl.context_keep
+        sh("kubectl config use-context #{previous_context}", mute: true)
+      end
+      result
     end
   end
 end

data/lib/kubes/kubectl/ordering.rb

@@ -35,5 +35,47 @@ class Kubes::Kubectl
       i = index.to_s.rjust(3, "0") # pad with 0
       "#{i}-#{value}" # append name so that terms with same index get order alphabetically
     end
+
+    # kubes apply                   # {role: nil, resource: nil}
+    # kubes apply clock             # {role: "clock", resource: nil}
+    # kubes apply clock deployment  # {role: "clock", resource: "deployment"}
+    def search_expr
+      role, resource = @options[:role], @options[:resource]
+      if role && resource
+        "#{Kubes.root}/.kubes/output/#{role}/#{resource}.yaml"
+      elsif role
+        "#{Kubes.root}/.kubes/output/#{role}/*.yaml"
+      else
+        "#{Kubes.root}/.kubes/output/**/*.yaml"
+      end
+    end
+
+    def files
+      files = []
+      Dir.glob(search_expr).each do |path|
+        next unless process?(path)
+        file = path.sub("#{Kubes.root}/", '')
+        files << file
+      end
+      files
+    end
+
+    # Only considering files 2 layers deep. So:
+    #
+    #    Yes = web/deployment.yaml
+    #    No = web/deployment/dev.yaml
+    #
+    def process?(path)
+      if Kubes.kustomize?
+        File.file?(path)
+      else
+        consider?(path) && two_levels_deep?(path)
+      end
+    end
+
+    def two_levels_deep?(path)
+      rel_path = path.sub(%r{.*\.kubes/(resources|output)/},'')
+      rel_path.split('/').size == 2
+    end
   end
 end

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.4.3"
+  VERSION = "0.5.0"
 end

data/lib/templates/base/.kubes/config.rb.tt

@@ -2,7 +2,7 @@ Kubes.configure do |config|
   config.repo = "<%= @options[:repo] %>"
   config.logger.level = "info"
   # auto-switching
-  # config.kubectl.context = "dev-services"
+  # config.kubectl.context = "dev-cluster"
   # config.kubectl.context_keep = true # keep context after switching
   # config.kubectl.exit_on_fail_for_apply  = true # whether or not continue if the kubectl command fails
   # config.kubectl.exit_on_fail_for_delete = false # whether or not continue if the kubectl command fails

data/lib/templates/base/.kubes/config/env/dev.rb

@@ -2,5 +2,5 @@
 #
 # Example:
 # Kubes.configure do |config|
-#   config.kubectl.context = "dev-services"
+#   config.kubectl.context = "dev-cluster"
 # end

data/lib/templates/base/.kubes/config/env/prod.rb

@@ -2,5 +2,5 @@
 #
 # Example:
 # Kubes.configure do |config|
-#   config.kubectl.context = "prod-services"
+#   config.kubectl.context = "prod-cluster"
 # end

data/lib/templates/dsl/.kubes/resources/web/deployment.rb

@@ -2,7 +2,7 @@ name "web"
 labels(role: "web")
 
 replicas 1 # overridden on a env basis
-image built_image # IE: user/<%= app %>:kubes-2020-06-13T19-55-16-43afc6e
+image docker_image # IE: user/<%= app %>:kubes-2020-06-13T19-55-16-43afc6e
 
 # revisionHistoryLimit 1 # uncomment to reduce old ReplicaSets, default is 10 https://bit.ly/3hqrzyP
 # maxUnavailable 25

data/lib/templates/new/dsl/backend_config.rb

@@ -0,0 +1,10 @@
+name "<%= app %>"
+spec(
+  timeoutSec: 40,
+  connectionDraining: {
+    drainingTimeoutSec: 60,
+  },
+  sessionAffinity: {
+    affinityType: "CLIENT_IP",
+  }
+)