chopshop-logreader 0.2.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c53ec0d00981d6a750be43cfa24862d8fd70d1279c059d48dc3b82373039b361
-  data.tar.gz: abb8eef308f179833c6d79a5ff96381467ebebcfeee5781fc7345eafd9abd355
+  metadata.gz: ed7a741e3549b4d7b48cc7a30bb099a9debda0378c2d9873cea0ba07fafcad2d
+  data.tar.gz: 9b8f94a7360e0319370c5391a547f2ad874833a27ff00e4325a7731e30fb908d
 SHA512:
-  metadata.gz: b45c9045b2f02568c1399dd1108cfd73105309e904210533ff820d0dcfaf3da2b2a099dd8332974ff8d871ebac86265db9d5c7d6775427035638b8ccd9e759d8
-  data.tar.gz: 2334c245b37282fdaf7117b4d4e9ad45724f805eb72fd87497013cf928f49c71eb720553c84cfc50d915ac74f32f3664e7f2e0e1d76140ed0ecf8e23081a5735
+  metadata.gz: e2a513f331481b74f60a122b318552826d08d8fca8dcb651e212ca4fbad37257378efe8f286490aae16d02428814b918ba0ee3f5f262503a2bdc6ca3462e52b7
+  data.tar.gz: 3fc6ad5d1c1fbe8810132e45258672728079e1ebcb5871755b7ae8432025224d75e85bc12e142fd0c015836152788bf7122e1fa4fdb64076d54e81ab8266b2a6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    chopshop-logreader (0.2.1)
+    chopshop-logreader (0.2.4)
 
 GEM
   remote: https://rubygems.org/

data/lib/chopshop/logreader/executor.rb

@@ -3,8 +3,12 @@ require "chopshop/logreader/parser"
 module Chopshop
   module Logreader
     class Executor
-      attr_reader :parser
+      attr_reader :parser, :options, :profile, :tenant,
+        :region, :namespace, :container, :service_name
 
+      # The regex + time calculator takes the human readable output from the kubernetes CLI
+      # and calculates how long any given pod has been running. It then selects the most
+      # recently pod/shortest living pod
       REGEX = /(?<t1>\d+)(?<v1>[a-z]+)(?<t2>\d*)(?<v2>[a-z]*)/i
       TIME_CALCULATOR = {
         "s" => 1,
@@ -22,26 +26,43 @@ module Chopshop
         @parser = Chopshop::Logreader::Parser.new
       end
 
+      def parse_options
+        @options = @parser.parse
+        @profile = options.profile || ENV["AWS_PROFILE"] || ENV["PROFILE"]
+        @tenant = options.tenant || ENV["DEFAULT_TENANT"]
+        @region = options.region || ENV["AWS_REGION"] || "us-east-1"
+        @namespace = options.namespace || ENV["K8_NAMESPACE"] || "connect"
+        @container = options.container
+        @service_name = ARGV[0]
+      end
+
       def execute!
-        options = @parser.parse 
-        profile = options.profile || ENV["AWS_PROFILE"] || ENV["PROFILE"]
-        tenant = options.tenant || ENV["DEFAULT_TENANT"]
-
-        container = nil
-        service = ARGV[0]
-        `rally-kubectl -e #{profile} -t #{tenant}`
-        puts "looking for valid container"
-        while !container
-          containers = `kubectl get pods --namespace #{options.namespace} | grep #{service}`
-          container = containers.split("\n").map {|line| line.split(" ") }.each do |line|
+        parse_options
+        service = nil
+
+        # log into the EKS cluster, may require 2FA authing here.
+        `rally-kubectl -a #{region} -e #{profile} -t #{tenant}`
+        puts "looking for valid service container"
+        while !service
+          services = `kubectl get pods --namespace #{namespace} | grep #{service_name}`
+          service = services.split("\n").map {|line| line.split(" ") }.each do |line|
+            # get the length of time the pod has been running from the kubernetes CLI output
             match_data = REGEX.match(line[4])
+            # calculate the human readable version of time into a single integer for comparison
             line[5] = TIME_CALCULATOR[match_data.captures[1].downcase] * match_data.captures[0].to_i + TIME_CALCULATOR[match_data.captures[3].downcase] * match_data.captures[2].to_i
+            # select the most recent/shortest living pod
           end.select{|line| line[2] == options.status }.sort_by {|line| line[5] }.first
 
-          if container
-            exec "kubectl logs --follow=#{options.follow} --tail=#{options.lines} --namespace connect #{container[0]}"
+          # if we have a pod we want logs from, then get logs and be done
+          if service
+            if container
+              exec "kubectl logs --follow=#{options.follow} --tail=#{options.lines} --namespace #{namespace} --container=#{container} #{service[0]}"
+            else
+              exec "kubectl logs --follow=#{options.follow} --tail=#{options.lines} --namespace #{namespace} #{service[0]}"
+            end
           end
 
+          # no pod with logs, wait 1 second and try again.
           print "."
           sleep 1
         end

data/lib/chopshop/logreader/parser.rb

@@ -8,15 +8,17 @@ module Chopshop
         options = OpenStruct.new(
           follow: true, # follow output from log file
           lines: -1, # whole file always,
-          status: "Running", # look for a currently running container
-          namespace: "connect",
+          status: "Running", # look for a currently running service
+          namespace: nil,
           tenant: nil,
-          profile: nil
+          profile: nil,
+          region: nil,
+          container: nil
         )
 
 
         OptionParser.new do |opts|
-          opts.banner = "Usage: ruby log-reader.rb SERVICE [options]"
+          opts.banner = "Usage: chopshop-logreader SERVICE [options]"
 
           opts.on("-f [FOLLOW]", "--follow [FOLLOW]", "boolean true/false on whether to follow output from the file. default: true", TrueClass) do |follow|
             options[:follow] = follow
@@ -26,19 +28,27 @@ module Chopshop
             options[:lines] = lines
           end
 
-          opts.on("-s [STATUS]", "--status [STATUS]", "valid values: Completed|Running|Error. will only look for containers with the given status. default: Running", String) do |status|
+          opts.on("-s [STATUS]", "--status [STATUS]", "valid values: Completed|Running|Error. will only look for services/jobs with the given status. default: Running", String) do |status|
             options[:status] = status
           end
 
-          opts.on("-n [NAMESPACE]", "--namespace [NAMESPACE]", "sets the kubernetes namespace to look for containers in. default: connect", String) do |status|
-            options[:status] = status
+          opts.on("-n [NAMESPACE]", "--namespace [NAMESPACE]", "sets the kubernetes namespace to look for service/job in. default: connect", String) do |namespace|
+            options[:namespace] = namespace
           end
 
           opts.on("-p [PROFILE]", "--profile [PROFILE]", "chooses the cloud profile to use for permissions. default: nil.  You must provide this value or set the ENV VAR AWS_PROFILE' or the ENV VAR 'PROFILE'", String) do |profile|
             options[:profile] = profile
           end
 
-          opts.on("-t [TENANT]", "--tenant [TENANT]", "sets the kubernetes tenant to look for containers in. default: nil.  You must provide this value or set the ENV VAR DEFAULT_TENANT'", String) do |tenant|
+          opts.on("-r [REGION]", "--region [REGION]", "sets the cloud region to look for a tenant within. default: us-east-1.  You may also provide this value via the ENV VAR 'AWS_REGION'", String) do |region|
+            options[:region] = region
+          end
+
+          opts.on("-c [CONTAINER]", "--container [CONTAINER]", "sets the kubernetes tenant to look for containers in. default: nil. Often not needed", String) do |container|
+            options[:container] = container
+          end
+
+          opts.on("-t [TENANT]", "--tenant [TENANT]", "sets the kubernetes tenant to look for the service/job in. default: nil.  You must provide this value or set the ENV VAR DEFAULT_TENANT'", String) do |tenant|
             options[:tenant] = tenant
           end
 
@@ -54,4 +64,4 @@ module Chopshop
       end
     end
   end
-end
+end

data/lib/chopshop/logreader/version.rb

@@ -1,5 +1,5 @@
 module Chopshop
   module Logreader
-    VERSION = "0.2.1"
+    VERSION = "0.2.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chopshop-logreader
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Travis Perdue
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-10 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler