deimos-ruby 2.0.0.pre.beta1 → 2.0.0.pre.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5a771b9dee159bd0827bd8d3068cec505e8494e9b57a4e9c3038d0d48309dfc
-  data.tar.gz: 82cb497cc46f8cd3812399a36fd3520b7d7716c1f389d6474dac76326b5761be
+  metadata.gz: ab3cdef123f93f1d1413cd4028f25787d5024709a021bc49f40932466a001696
+  data.tar.gz: 0d0b0a62f592d517a610d08cbc10372edc541c18d95071f6238c365d5dfc5d98
 SHA512:
-  metadata.gz: 3a2ddfdae480ed35c08815d65d708e468e201c7421f9edca36c5df8c725c69821d4a2978c80544028539926fc24e52045a2eda67cafb19458798dadf91cb9c71
-  data.tar.gz: f8cbd6e123c31a69198fd4c20d2adbda9527258fa35048e15660604cf4aaecd607adfb639ad91d3d6e5b19784555e4096bbd388d2dad33b349b1f9ca4d79af2e
+  metadata.gz: 6fd99053fb0cd110dc3518bb798c68920d341d45e1f5d63c2830e06ae467598249812aaf25734137994070c2b09c646291916477e0a07196f84af42f6aca5bcb
+  data.tar.gz: 80a510ca35476e303f9189635f12951eb63f0fd4d9145452f22eaaf6f41ddf669cfd5b5ba59008a2e62e7a8facae5e7a5435c0f0af1c8f94528b375765fb1f5f

data/lib/deimos/active_record_consume/batch_consumption.rb

@@ -66,7 +66,7 @@ module Deimos
       def record_key(key)
         if key.nil?
           {}
-        elsif key.is_a?(Hash)
+        elsif key.is_a?(Hash) || key.is_a?(SchemaClass::Record)
           self.key_converter.convert(key)
         elsif self.topic.key_config[:field].nil?
           { @klass.primary_key => key }

data/lib/deimos/config/configuration.rb

@@ -63,7 +63,7 @@ module Deimos # rubocop:disable Metrics/ModuleLength
     setting :phobos_logger, removed: 'Separate logger for Phobos is no longer supported'
 
     setting :kafka do
-      setting :logger, removed: "Karafka uses Rails logger by default"
+      setting :logger, Logger.new(STDOUT), removed: "Karafka uses Rails logger by default"
       setting :seed_brokers, ['localhost:9092'], removed: 'Use kafka(bootstrap.servers) in Karafka settings'
       setting :client_id, 'phobos', removed: 'Use client_id in Karafka setup block.'
       setting :connect_timeout, 15, removed: 'Use kafka(socket.connection.setup.timeout.ms) in Karafka settings'

data/lib/deimos/logging.rb

@@ -45,8 +45,12 @@ module Deimos
             if m.respond_to?(:payload)
               m.key || m.payload['message_id']
             elsif m
-              payload = m[:payload]&.with_indifferent_access
-              m[:key] || m[:payload_key] || payload[:payload_key] || payload[:message_id]
+              if m[:payload].is_a?(String)
+                m[:key] || m[:payload_key]
+              else
+                payload = m[:payload]&.with_indifferent_access
+                m[:key] || m[:payload_key] || payload[:payload_key] || payload[:message_id]
+              end
             end
           end
           log_message.merge!(

data/lib/deimos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deimos
-  VERSION = '2.0.0-beta1'
+  VERSION = '2.0.0-beta3'
 end

data/lib/generators/deimos/v2/templates/karafka.rb.tt

@@ -26,11 +26,11 @@ class KarafkaApp < Karafka::App
     <%- setup_configs.each do |k, v| -%>
     config.<%= k %> = <%= v.inspect %>
     <%- end -%>
-    config.kafka = {
+    config.kafka.merge!({
       <%- default_kafka_configs.compact.each do |k, v| -%>
       "<%= k.to_s %>": <%= v.inspect %>,
       <%- end -%>
-    }
+    })
     # Recreate consumers with each batch. This will allow Rails code reload to work in the
     # development mode. Otherwise Karafka process would not be aware of code changes
     config.consumer_persistence = !Rails.env.development?
@@ -104,6 +104,7 @@ class KarafkaApp < Karafka::App
         <%- consumer[:kafka].each do |k, v| -%>
         "<%= k.to_s %>": <%= v.inspect %>,
         <%- end -%>
+        inherit: true
       )
       <%- end -%>
       <%- consumer.except(:topic, :kafka).each do |k, v| -%>

data/lib/generators/deimos/v2_generator.rb

@@ -80,9 +80,9 @@ module Deimos
                                              "sasl_plain"
                                            end
                                          end
-          configs["ssl.ca.pem"] = deimos_config.kafka.ssl.ca_cert
-          configs["ssl.certificate.pem"] = deimos_config.kafka.ssl.client_cert
-          configs["ssl.key.pem"] = deimos_config.kafka.ssl.client_cert_key
+          configs["ssl.ca.location"] = deimos_config.kafka.ssl.ca_cert
+          configs["ssl.certificate.location"] = deimos_config.kafka.ssl.client_cert
+          configs["ssl.key.location"] = deimos_config.kafka.ssl.client_cert_key
           configs["ssl.endpoint.identification.algorithm"] = "https" if deimos_config.kafka.ssl.verify_hostname
           configs["sasl.kerberos.principal"] = deimos_config.kafka.sasl.gssapi_principal
           configs["sasl.kerberos.keytab"] = deimos_config.kafka.sasl.gssapi_keytab
@@ -126,6 +126,7 @@ module Deimos
               configs[:max_db_batch_size] = consumer.max_db_batch_size unless consumer.default_value?(:max_db_batch_size)
               configs[:bulk_import_id_column] = consumer.bulk_import_id_column unless consumer.default_value?(:bulk_import_id_column)
               configs[:replace_associations] = consumer.replace_associations unless consumer.default_value?(:replace_associations)
+              configs[:save_associations_first] = consumer.save_associations_first unless consumer.default_value?(:save_associations_first)
               configs[:active] = false if consumer.disabled
               configs[:each_message] = true unless consumer.delivery.to_s == 'inline_batch'
               configs
@@ -172,6 +173,9 @@ module Deimos
           template('karafka.rb.tt', "karafka.rb", force: true)
           rename_consumer_methods
           fix_specs
+          insert_into_file("Gemfile", "  gem 'karafka-testing'\n", after: "group :test do\n")
+          # to avoid inserting multiple times, just in case there isn't a single group :test
+          insert_into_file("Gemfile", "  gem 'karafka-testing'\n", after: /group .*test.* do\n/)
         end
 
       end
@@ -181,10 +185,18 @@ module Deimos
       def generate
         process_all_files
         say "Generation complete! You are safe to remove the existing initializer that configures Deimos.", :green
+        print_warnings
+      end
+
+      def print_warnings
         say "Note: The following settings cannot be determined by the generator:", :yellow
         say "*  logger / phobos_logger (dynamic object, cannot be printed out)", :yellow
         say "*  kafka.sasl.oauth_token_provider", :yellow
         say "*  producers.max_buffer_size", :yellow
+        say "*  metrics", :yellow
+        say "*  tracer", :yellow
+        say "*  consumers.bulk_import_id_generator", :yellow
+        say "*  consumer.fatal_error", :yellow
         say "*  consumer.backoff (only handles minimum, not maximum)", :yellow
         say "For more information, see https://github.com/flipp-oss/deimos/blob/master/docs/UPGRADING.md", :yellow
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deimos-ruby
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta1
+  version: 2.0.0.pre.beta3
 platform: ruby
 authors:
 - Daniel Orner
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-12 00:00:00.000000000 Z
+date: 2025-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf