Change default line limit back to a constant

CHANGELOG.md

@@ -7,7 +7,7 @@
 - Remove resources that are targeted by side-effect-inducing mutating admission webhooks from the serverside dry run batch [#798](https://github.com/Shopify/krane/pull/798)
 
 *Enhancements*
-- ENV["LOG_LINE_LIMIT"] allows the number of container logs printed for failures to be configurable from the 25 line default [#803](https://github.com/Shopify/krane/pull/803).
+- ENV["KRANE_LOG_LINE_LIMIT"] allows the number of container logs printed for failures to be configurable from the 25 line default [#803](https://github.com/Shopify/krane/pull/803).
 
 ## 2.1.5
 

lib/krane/container_logs.rb

@@ -3,9 +3,7 @@ module Krane
   class ContainerLogs
     attr_reader :lines, :container_name
 
-    def self.default_line_limit
-      Integer(ENV["LOG_LINE_LIMIT"], exception: false) || 25
-    end
+    DEFAULT_LINE_LIMIT = Integer(ENV.fetch('KRANE_LOG_LINE_LIMIT', 25))
 
     def initialize(parent_id:, container_name:, namespace:, context:, logger:)
       @parent_id = parent_id
@@ -54,7 +52,7 @@ def fetch_latest
       cmd << if @last_timestamp.present?
         "--since-time=#{rfc3339_timestamp(@last_timestamp)}"
       else
-        "--tail=#{self.class.default_line_limit}"
+        "--tail=#{DEFAULT_LINE_LIMIT}"
       end
       out, _err, _st = kubectl.run(*cmd, log_failure: false)
       out.split("\n")

lib/krane/kubernetes_resource.rb

@@ -306,8 +306,8 @@ def debug_message(cause = nil, info_hash = {})
               next
             end
 
-            if logs.lines.length == ContainerLogs.default_line_limit
-              truncated = " (last #{ContainerLogs.default_line_limit} lines shown)"
+            if logs.lines.length == ContainerLogs::DEFAULT_LINE_LIMIT
+              truncated = " (last #{ContainerLogs::DEFAULT_LINE_LIMIT} lines shown)"
             end
             helpful_info << "  - Logs from container '#{logs.container_name}'#{truncated}:"
             logs.lines.each do |line|

test/unit/container_logs_test.rb

@@ -37,17 +37,6 @@ def test_sync_handles_cycles_where_no_new_logs_available
     assert_equal(generate_log_messages(1..10), @logs.lines)
   end
 
-  def test_can_configure_default_line_limit
-    original_env = ENV["LOG_LINE_LIMIT"]
-    assert_equal(25, Krane::ContainerLogs.default_line_limit)
-
-    line_limit = 2
-    ENV["LOG_LINE_LIMIT"] = line_limit.to_s
-    assert_equal(line_limit, Krane::ContainerLogs.default_line_limit)
-  ensure
-    ENV["LOG_LINE_LIMIT"] = original_env
-  end
-
   def test_empty_delegated_to_lines
     Krane::Kubectl.any_instance.stubs(:run).returns([logs_response_1, "", ""])
     assert_predicate(@logs, :empty?)