forest_admin_datasource_rpc 1.25.0 → 1.25.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 866dca4f9c33cb47664bb8a5fe388cb739fe9196a2a36388f4fe7f592a6eb5a9
-  data.tar.gz: f842badea7ade32c5762263e7ff43cfc454b34abafc09d5303e8f8b11e38171d
+  metadata.gz: 6473d3b105d21ba059701998a1179cb820551ffd9efc471a6850d23add3bbdad
+  data.tar.gz: bf4c243fe556572d5b634f9cef370ee3b09d6800ae3d8cf5a1d45806e3ed9481
 SHA512:
-  metadata.gz: c0bc9f9405a81905bf196c35a07c8a47efb1aed2459a1c9fbc62ede96daa9fc5466b63ce7f24f1cb4e575e8e6e5a81a8c10d57ea636ad4d6118d60d11a87e158
-  data.tar.gz: 23743618cc264434cc9adb7c938a6336cc363a0662e7170ec6e5240d52cd312389b560e0518f3f31ba84a6c3d96e10ca833833f8ac6674d053543b00c8625caf
+  metadata.gz: a443bb560f80a2f96d2b70c32ddb32abf53fd3fe9881dacb49caa021c0c8894a15c25d21f9c2eb83683c3d82557d503538461b75c112c368c404becb745eccd3
+  data.tar.gz: 55da1ddd18d8eea56472cba795e1622e88d3ede2ead212b0e4b3c3e4cf15ed3ea27635d89ae0058efdf20f8c0e245e22cb23013e902a27571bcdc67a4051b200

data/lib/forest_admin_datasource_rpc/Utils/rpc_client.rb

@@ -5,16 +5,6 @@ require 'time'
 
 module ForestAdminDatasourceRpc
   module Utils
-    # Response wrapper for schema requests that need ETag
-    class SchemaResponse
-      attr_reader :body, :etag
-
-      def initialize(body, etag = nil)
-        @body = body
-        @etag = etag
-      end
-    end
-
     class RpcClient
       ERROR_STATUS_MAP = {
         400 => ForestAdminAgent::Http::Exceptions::ValidationError,
@@ -51,14 +41,14 @@ module ForestAdminDatasourceRpc
 
       def fetch_schema(endpoint, if_none_match: nil)
         response = make_request(endpoint, method: :get, symbolize_keys: true, if_none_match: if_none_match)
-        handle_response_with_etag(response)
+        handle_response(response)
       end
 
       private
 
       # rubocop:disable Metrics/ParameterLists
       def make_request(endpoint, caller: nil, method: :get, payload: nil, symbolize_keys: false, if_none_match: nil)
-        log_request_start(method, endpoint, if_none_match)
+        log_request_start(method, endpoint)
 
         client = build_faraday_client(symbolize_keys)
         headers = build_request_headers(caller, if_none_match)
@@ -128,25 +118,6 @@ module ForestAdminDatasourceRpc
         raise_appropriate_error(response)
       end
 
-      def handle_response_with_etag(response)
-        if response.success?
-          etag = extract_etag(response)
-          ForestAdminAgent::Facades::Container.logger&.log(
-            'Debug',
-            "[RPC Client] Schema response received (status: #{response.status}, ETag: #{etag || "none"})"
-          )
-          return SchemaResponse.new(response.body, etag)
-        end
-        return NotModified if response.status == HTTP_NOT_MODIFIED
-
-        raise_appropriate_error(response)
-      end
-
-      def extract_etag(response)
-        etag = response.headers['ETag'] || response.headers['etag']
-        etag&.gsub(/\A"?|"?\z/, '')
-      end
-
       def raise_appropriate_error(response)
         error_body = parse_error_body(response)
         status = response.status
@@ -194,11 +165,10 @@ module ForestAdminDatasourceRpc
         }.compact
       end
 
-      def log_request_start(method, endpoint, if_none_match)
-        etag_info = if_none_match ? " (If-None-Match: #{if_none_match})" : ''
+      def log_request_start(method, endpoint)
         ForestAdminAgent::Facades::Container.logger&.log(
           'Debug',
-          "[RPC Client] Sending #{method.to_s.upcase} request to #{@api_url}#{endpoint}#{etag_info}"
+          "[RPC Client] Sending #{method.to_s.upcase} request to #{@api_url}#{endpoint}"
         )
       end
 

data/lib/forest_admin_datasource_rpc/Utils/schema_polling_client.rb

@@ -12,17 +12,15 @@ module ForestAdminDatasourceRpc
       MIN_POLLING_INTERVAL = 1
       MAX_POLLING_INTERVAL = 3600
 
-      def initialize(uri, auth_secret, polling_interval: DEFAULT_POLLING_INTERVAL, introspection_schema: nil,
-                     introspection_etag: nil, &on_schema_change)
+      def initialize(uri, auth_secret, polling_interval: DEFAULT_POLLING_INTERVAL, introspection: nil,
+                     &on_schema_change)
         @uri = uri
         @auth_secret = auth_secret
         @polling_interval = polling_interval
         @on_schema_change = on_schema_change
         @closed = false
-        @introspection_schema = introspection_schema
-        @introspection_etag = introspection_etag
+        @introspection_schema = introspection
         @current_schema = nil
-        @cached_etag = nil
         @connection_attempts = 0
         @initial_sync_completed = false
         @client_id = uri
@@ -63,7 +61,7 @@ module ForestAdminDatasourceRpc
         @connection_attempts += 1
         log_checking_schema
 
-        result = @rpc_client.fetch_schema('/forest/rpc-schema', if_none_match: @cached_etag)
+        result = @rpc_client.fetch_schema('/forest/rpc-schema', if_none_match: @current_schema&.dig(:etag))
         handle_schema_result(result)
       rescue Faraday::ConnectionFailed, Faraday::TimeoutError => e
         log_connection_error(e)
@@ -77,34 +75,25 @@ module ForestAdminDatasourceRpc
 
       private
 
-      def compute_etag(schema)
-        return nil if schema.nil?
-
-        schema[:etag] || schema['etag'] || Digest::SHA1.hexdigest(JSON.generate(schema))
-      end
-
       def fetch_initial_schema_sync
         # If we have an introspection schema, send its ETag to avoid re-downloading unchanged schema
-        introspection_etag = @introspection_etag || (@introspection_schema && compute_etag(@introspection_schema))
-        result = @rpc_client.fetch_schema('/forest/rpc-schema', if_none_match: introspection_etag)
+        result = @rpc_client.fetch_schema('/forest/rpc-schema', if_none_match: @introspection_schema&.dig(:etag))
 
         if result == RpcClient::NotModified
           # Schema unchanged from introspection - use introspection
           @current_schema = @introspection_schema
-          @cached_etag = introspection_etag
           @initial_sync_completed = true
           ForestAdminAgent::Facades::Container.logger&.log(
             'Info',
-            "[Schema Polling] RPC schema unchanged (HTTP 304), using introspection (ETag: #{@cached_etag})"
+            "[Schema Polling] RPC schema unchanged (HTTP 304), using introspection (ETag: #{@current_schema[:etag]})"
           )
         else
           # New schema from RPC
-          @current_schema = result.body
-          @cached_etag = result.etag || compute_etag(@current_schema)
+          @current_schema = result
           @initial_sync_completed = true
           ForestAdminAgent::Facades::Container.logger&.log(
             'Debug',
-            "[Schema Polling] Initial schema fetched successfully (ETag: #{@cached_etag})"
+            "[Schema Polling] Initial schema fetched successfully (ETag: #{@current_schema[:etag]})"
           )
         end
 
@@ -119,14 +108,12 @@ module ForestAdminDatasourceRpc
         if @introspection_schema
           # Fallback to introspection schema - don't crash
           @current_schema = @introspection_schema
-          @cached_etag = @introspection_etag || compute_etag(@current_schema)
           @introspection_schema = nil
-          @introspection_etag = nil
           @initial_sync_completed = true
           ForestAdminAgent::Facades::Container.logger&.log(
             'Warn',
             "RPC agent at #{@uri} is unreachable (#{error.class}: #{error.message}), " \
-            "using provided introspection schema (ETag: #{@cached_etag})"
+            "using provided introspection schema (ETag: #{@current_schema[:etag]})"
           )
         else
           # No introspection - re-raise to crash
@@ -159,7 +146,8 @@ module ForestAdminDatasourceRpc
       end
 
       def log_checking_schema
-        etag_info = @cached_etag ? "with ETag: #{@cached_etag}" : 'without ETag (initial fetch)'
+        etag = @current_schema&.dig(:etag)
+        etag_info = etag ? "with ETag: #{etag}" : 'without ETag (initial fetch)'
         msg = "[Schema Polling] Checking schema from #{@uri}/forest/rpc-schema " \
               "(attempt ##{@connection_attempts}, #{etag_info})"
         ForestAdminAgent::Facades::Container.logger&.log('Debug', msg)
@@ -176,34 +164,31 @@ module ForestAdminDatasourceRpc
       def handle_schema_unchanged
         ForestAdminAgent::Facades::Container.logger&.log(
           'Debug',
-          "[Schema Polling] Schema unchanged (HTTP 304 Not Modified), ETag still valid: #{@cached_etag}"
+          "[Schema Polling] Schema unchanged (HTTP 304 Not Modified), ETag still valid: #{@current_schema[:etag]}"
         )
         @connection_attempts = 0
       end
 
       def handle_schema_changed(result)
-        new_schema = result.body
-        new_etag = result.etag || compute_etag(new_schema)
+        new_schema = result
 
         if @initial_sync_completed
-          handle_schema_update(new_schema, new_etag)
+          handle_schema_update(new_schema)
         else
-          @cached_etag = new_etag
           @current_schema = new_schema
           @initial_sync_completed = true
           ForestAdminAgent::Facades::Container.logger&.log(
             'Info',
-            "[Schema Polling] Initial sync completed successfully (ETag: #{new_etag})"
+            "[Schema Polling] Initial sync completed successfully (ETag: #{@current_schema[:etag]})"
           )
         end
         @connection_attempts = 0
       end
 
-      def handle_schema_update(schema, etag)
-        old_etag = @cached_etag
-        @cached_etag = etag
+      def handle_schema_update(schema)
+        old_etag = @current_schema[:etag]
         @current_schema = schema
-        msg = "[Schema Polling] Schema changed detected (old ETag: #{old_etag}, new ETag: #{etag}), " \
+        msg = "[Schema Polling] Schema changed detected (old ETag: #{old_etag}, new ETag: #{schema[:etag]}), " \
               'triggering reload callback'
         ForestAdminAgent::Facades::Container.logger&.log('Info', msg)
         trigger_schema_change_callback(schema)

data/lib/forest_admin_datasource_rpc/version.rb

@@ -1,3 +1,3 @@
 module ForestAdminDatasourceRpc
-  VERSION = "1.25.0"
+  VERSION = "1.25.1"
 end

data/lib/forest_admin_datasource_rpc.rb

@@ -12,7 +12,7 @@ module ForestAdminDatasourceRpc
     Utils::SchemaPollingPool.instance.configure(max_threads: max_threads)
   end
 
-  KNOWN_BUILD_OPTIONS = %i[uri auth_secret introspection introspection_etag schema_polling_interval_sec].freeze
+  KNOWN_BUILD_OPTIONS = %i[uri auth_secret introspection schema_polling_interval_sec].freeze
 
   def self.build(options)
     unknown_keys = options.keys - KNOWN_BUILD_OPTIONS
@@ -27,7 +27,6 @@ module ForestAdminDatasourceRpc
     uri = options[:uri]
     auth_secret = options[:auth_secret] || ForestAdminAgent::Facades::Container.cache(:auth_secret)
     provided_introspection = options[:introspection]
-    provided_introspection_etag = options[:introspection_etag]
 
     polling_interval = options[:schema_polling_interval_sec] ||
                        ENV['SCHEMA_POLLING_INTERVAL_SEC']&.to_i ||
@@ -40,8 +39,7 @@ module ForestAdminDatasourceRpc
       uri,
       auth_secret,
       polling_interval: polling_interval,
-      introspection_schema: provided_introspection,
-      introspection_etag: provided_introspection_etag
+      introspection: provided_introspection
     ) do
       Thread.new do
         logger = ForestAdminAgent::Facades::Container.logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: forest_admin_datasource_rpc
 version: !ruby/object:Gem::Version
-  version: 1.25.0
+  version: 1.25.1
 platform: ruby
 authors:
 - Matthieu