Don't over complicate things with needless abstraction methods

Author: northrup

lib/entitlements/service/github.rb

@@ -362,22 +362,6 @@ def graphql_result_retryable?(result)
         result[:code] >= 500
       end
 
-      # Helper: log `message` to `Entitlements.logger` at the given severity. Restricts
-      # the dispatch to a known set of severities so callers can pick a level computed
-      # at runtime without going through `send`/`public_send`.
-      #
-      # severity - Symbol, one of :warn or :error.
-      # message  - String message to log.
-      #
-      # Returns nothing.
-      Contract C::Or[:warn, :error], String => C::Any
-      def log_at_severity(severity, message)
-        case severity
-        when :warn then Entitlements.logger.warn(message)
-        when :error then Entitlements.logger.error(message)
-        end
-      end
-
       # Helper method: Do the HTTP POST to the GitHub API for GraphQL.
       #
       # query - String with the data to be posted.
@@ -401,9 +385,8 @@ def graphql_http_post_real(query)
             # The retry wrapper retries on 5xx, so log those at WARN to avoid misleading
             # the operator with an ERROR for a transient failure that we recover from.
             # Terminal non-2xx responses (4xx) stay at ERROR.
-            severity = response.code.start_with?("5") ? :warn : :error
-            log_at_severity(severity, "Got HTTP #{response.code} POSTing to #{uri}")
-            log_at_severity(severity, response.body)
+            msg = "POST to #{uri} returned HTTP Code #{response.code} and Body: #{response.body}"
+            response.code.start_with?("5") ? Entitlements.logger.warn(msg) : Entitlements.logger.error(msg)
             return { code: response.code.to_i, data: { "body" => response.body } }
           end
 

spec/unit/entitlements/service/github_spec.rb

@@ -379,17 +379,15 @@
     it "logs at error and returns code and body for a non-200 4xx response" do
       answer = { "errors" => ["message" => "Something busted"] }
       stub_request(:post, "https://github.fake/api/v3/graphql").to_return(status: 429, body: JSON.generate(answer))
-      expect(logger).to receive(:error).with("Got HTTP 429 POSTing to https://github.fake/api/v3/graphql")
-      expect(logger).to receive(:error).with("{\"errors\":[{\"message\":\"Something busted\"}]}")
+      expect(logger).to receive(:error).with("POST to https://github.fake/api/v3/graphql returned HTTP Code 429 and Body: #{JSON.generate(answer)}")
       response = subject.send(:graphql_http_post_real, "nonsense")
       expect(response).to eq(code: 429, data: { "body" => JSON.generate(answer) })
     end
 
     it "logs at warn and returns code and body for a 5xx response (retryable)" do
       body = '{"message": "We couldn\'t respond to your request in time. Sorry about that."}'
       stub_request(:post, "https://github.fake/api/v3/graphql").to_return(status: 504, body:)
-      expect(logger).to receive(:warn).with("Got HTTP 504 POSTing to https://github.fake/api/v3/graphql")
-      expect(logger).to receive(:warn).with(body)
+      expect(logger).to receive(:warn).with("POST to https://github.fake/api/v3/graphql returned HTTP Code 504 and Body: #{body}")
       response = subject.send(:graphql_http_post_real, "nonsense")
       expect(response).to eq(code: 504, data: { "body" => body })
     end