nulogy_message_bus_producer 3.2.0 → 3.2.1

data/spec/integration/lib/nulogy_message_bus_producer/repopulate_replication_slots_spec.rb

@@ -1,5 +1,5 @@
 require "integration_spec_helper"
-require 'net/http'
+require "net/http"
 
 RSpec.describe NulogyMessageBusProducer::RepopulateReplicationSlots do
   let(:company_uuid) { SecureRandom.uuid }
@@ -23,20 +23,24 @@ RSpec.describe NulogyMessageBusProducer::RepopulateReplicationSlots do
 
       number_of_messages.times { |n| create_event(uuid(n)) }
 
-      configure_debezium
+      start_debezium
 
-      NulogyMessageBusProducer::RepopulateReplicationSlots.repopulate
+      described_class.repopulate
     end
 
     message_payloads = Kafka.wait_for_messages(consumer).map(&:payload)
-    matcher = number_of_messages.times.map { |n| include(uuid(n)) }
     expect(message_payloads.count).to eq(number_of_messages)
+    matcher = Array.new(number_of_messages) { |n| include(uuid(n)) }
     expect(message_payloads).to match(matcher)
   end
 
   def cleanup_everything
     truncate_db
-    Kafka.delete_topic(topic_name) rescue nil
+    begin
+      Kafka.delete_topic(topic_name)
+    rescue StandardError
+      nil
+    end
     kafka_connect.delete
     wait_for_replication_slot_cleanup(replication_slot_name)
   end
@@ -51,7 +55,7 @@ RSpec.describe NulogyMessageBusProducer::RepopulateReplicationSlots do
     trigger_event("testCreated", root_object)
   end
 
-  def configure_debezium
+  def start_debezium # rubocop:disable Metrics/AbcSize
     config = build_debezium_config
 
     response = kafka_connect.configure(config)
@@ -78,7 +82,7 @@ RSpec.describe NulogyMessageBusProducer::RepopulateReplicationSlots do
     end
   end
 
-  def build_debezium_config
+  def build_debezium_config # rubocop:disable Metrics/MethodLength
     db_config = Rails.configuration.database_configuration[Rails.env]
     events_table = NulogyMessageBusProducer::SubscriptionEvent.table_name
 
@@ -95,7 +99,11 @@ RSpec.describe NulogyMessageBusProducer::RepopulateReplicationSlots do
 
       "behavior.on.null.values": "delete",
       "connector.class": "io.debezium.connector.postgresql.PostgresConnector",
-      "database.initial.statements": "DO $$BEGIN IF not exists(select from pg_publication where pubname = 'debezium_public_events') THEN CREATE PUBLICATION debezium_public_events FOR TABLE #{events_table} WITH (publish = 'insert');; END IF;; END$$;",
+      "database.initial.statements": <<~SQL,
+        DO $$BEGIN
+          IF NOT EXISTS(SELECT FROM pg_publication WHERE pubname = 'debezium_public_events')
+          THEN CREATE PUBLICATION debezium_public_events FOR TABLE #{events_table} WITH (publish = 'insert');; END IF;; END$$;
+      SQL
       "errors.log.enable": "true",
       "errors.log.include.messages": "true",
       "heartbeat.interval.ms": "30000",

data/spec/integration/lib/nulogy_message_bus_producer/subscriber_graphql_schema_validator_spec.rb

@@ -1,7 +1,7 @@
 require "integration_spec_helper"
 
 RSpec.describe NulogyMessageBusProducer::SubscriberGraphqlSchemaValidator do
-  subject(:validator) { NulogyMessageBusProducer::SubscriberGraphqlSchemaValidator.new }
+  subject(:validator) { described_class.new }
 
   describe "#validate" do
     context "when a valid query is present" do
@@ -24,7 +24,7 @@ RSpec.describe NulogyMessageBusProducer::SubscriberGraphqlSchemaValidator do
           }
         GRAPHQL
 
-        subscription.query.gsub!(/\bid\b/, 'a_field_that_does_not_exist')
+        subscription.query.gsub!(/\bid\b/, "a_field_that_does_not_exist")
         subscription.save(validate: false)
         subscription
       end

data/spec/integration/lib/nulogy_message_bus_producer/subscription_spec.rb

@@ -28,13 +28,12 @@ RSpec.describe NulogyMessageBusProducer::Subscription do
 
     it "is invalid with an invalid query" do
       model = build_subscription(
-        schema_key: "test",
-        query: subscription_query(query: " foo { a_field_that_does_not_exist }")
+        query: subscription_query(query: "foo { a_field_that_does_not_exist }")
       )
 
       model.validate
 
-      expect(model).to_not be_valid
+      expect(model).not_to be_valid
       expect(model.errors[:query]).to contain_exactly(
         "Field 'a_field_that_does_not_exist' doesn't exist on type 'testObject' (id: <new_record>)"
       )
@@ -42,13 +41,12 @@ RSpec.describe NulogyMessageBusProducer::Subscription do
 
     it "valid with a valid query" do
       model = build_subscription(
-        schema_key: "test",
         query: subscription_query(query: "foo { id }")
       )
 
       model.validate
 
-      expect(model.errors).to_not include(:query)
+      expect(model.errors).not_to include(:query)
     end
   end
 

data/spec/integration/lib/nulogy_message_bus_producer/subscriptions/no_variables_spec.rb

@@ -0,0 +1,46 @@
+require "integration_spec_helper"
+
+RSpec.describe NulogyMessageBusProducer::Subscriptions::NoVariables do
+  it "blocks subscriptions with variables" do
+    query = <<~SUBSCRIPTION
+      subscription($sub_id: ID!, $sg_id: ID!, $topic: String!)  {
+        testCreated(subscriptionId: $sub_id, subscriptionGroupId: $sg_id, topicName: $topic) {
+          foo { id }
+        }
+      }
+    SUBSCRIPTION
+
+    result = execute_graphql(
+      query,
+      NulogyMessageBusProducer::Specs::TestSchema,
+      variables: {
+        sub_id: SecureRandom.uuid,
+        sg_id: SecureRandom.uuid,
+        topic: "test_topic"
+      }
+    )
+
+    expect(result).to include_json(
+      errors: [{ message: include("Subscriptions should not be created with arguments") }]
+    )
+  end
+
+  it "does not block subscriptions without variables" do
+    query = <<~SUBSCRIPTION
+      subscription  {
+        testCreated(
+          subscriptionId: "#{SecureRandom.uuid}",
+          subscriptionGroupId: "#{SecureRandom.uuid}",
+          topicName: "test_topic"
+        ) { foo { id } }
+      }
+    SUBSCRIPTION
+
+    result = execute_graphql(
+      query,
+      NulogyMessageBusProducer::Specs::TestSchema
+    )
+
+    expect(result).not_to include(:errors)
+  end
+end

data/spec/integration/lib/nulogy_message_bus_producer/subscriptions/postgres_transport_spec.rb

@@ -46,9 +46,7 @@ RSpec.describe NulogyMessageBusProducer::Subscriptions::PostgresTransport do
 
       event = NulogyMessageBusProducer::SubscriptionEvent.find_by!(subscription_id: subscription.id)
       expect(event).to have_attributes(
-        event_json: include_json(
-          testCreated: { foo: { contextData: "some contextual information" } }
-        )
+        event_json: include_json(testCreated: { foo: { contextData: "some contextual information" } })
       )
     end
 

data/spec/integration/lib/nulogy_message_bus_producer/subscriptions/risky_subscription_blocker_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe NulogyMessageBusProducer::Subscriptions::RiskySubscriptionBlocker
   end
 
   def attempt_subscription(query)
-    gql = <<~GRAPHQL
+    execute_graphql(<<~GRAPHQL, NulogyMessageBusProducer::Specs::TestSchema)
       subscription {
         testCreated (
           subscriptionId: "#{SecureRandom.uuid}",
@@ -45,7 +45,5 @@ RSpec.describe NulogyMessageBusProducer::Subscriptions::RiskySubscriptionBlocker
         }
       }
     GRAPHQL
-
-    execute_graphql(gql, NulogyMessageBusProducer::Specs::TestSchema)
   end
 end

data/spec/support/kafka.rb

@@ -44,11 +44,9 @@ module Kafka
     loop do
       message = consumer.poll(timeout)
 
-      if message
-        messages << message
-      else
-        return messages
-      end
+      return messages unless message
+
+      messages << message
     end
   end
 
@@ -62,7 +60,16 @@ module Kafka
   end
 
   def create_topic(topic_name)
-    run("docker-compose exec -T kafka kafka-topics --zookeeper zookeeper:2181 --create --replication-factor 1 --partitions 3 --if-not-exists --topic #{topic_name}")
+    cmd = [
+      "docker-compose exec",
+      "-T kafka kafka-topics",
+      "--zookeeper zookeeper:2181",
+      "--create",
+      "--replication-factor 1",
+      "--partitions 3",
+      "--if-not-exists --topic #{topic_name}"
+    ]
+    run(cmd.join(" "))
   end
 
   def delete_topic(topic_name)

data/spec/support/spec_utils.rb

@@ -4,12 +4,13 @@ module SpecUtils
   def wait_for(attempts: 100, interval: 0.1)
     attempts.times do
       return if yield
+
       sleep interval
     end
     raise "Waited for #{attempts} times but it never resolved"
   end
 
   def uuid(entity_number)
-    sprintf("00000000-0000-0000-0000-%12.12d", entity_number)
+    format("00000000-0000-0000-0000-%<id>12.12d", id: entity_number)
   end
-end
+end

data/spec/support/sql_helpers.rb

@@ -1,11 +1,9 @@
 module SqlHelpers
   def without_transaction
-    begin
-      ActiveRecord::Base.connection.rollback_transaction
-      yield
-    ensure
-      truncate_db
-    end
+    ActiveRecord::Base.connection.rollback_transaction
+    yield
+  ensure
+    truncate_db
   end
 
   def truncate_db
@@ -19,7 +17,7 @@ module SqlHelpers
     ActiveRecord::Base.connection.execute("TRUNCATE #{NulogyMessageBusProducer::Subscription.table_name}")
   end
 
-  def get_replication_slots
+  def replication_slots
     results = ActiveRecord::Base.connection.exec_query(<<~SQL)
       SELECT slot_name FROM pg_replication_slots
     SQL
@@ -35,13 +33,13 @@ module SqlHelpers
 
   def wait_for_replication_slot(slot_name)
     wait_for do
-      get_replication_slots.any? { |replication_slot| replication_slot == slot_name }
+      replication_slots.any? { |replication_slot| replication_slot == slot_name }
     end
   end
 
   def wait_for_replication_slot_cleanup(slot_name)
     wait_for do
-      get_replication_slots.none? { |replication_slot| replication_slot == slot_name }
+      replication_slots.none? { |replication_slot| replication_slot == slot_name }
     end
   end
-end
+end

data/spec/support/test_graphql_schema.rb

@@ -42,6 +42,7 @@ module NulogyMessageBusProducer
       subscription TestSubscription
 
       query_analyzer NulogyMessageBusProducer::Subscriptions::RiskySubscriptionBlocker
+      query_analyzer NulogyMessageBusProducer::Subscriptions::NoVariables
     end
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: nulogy_message_bus_producer
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Nulogy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: graphql
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 1.11.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 1.11.4
 - !ruby/object:Gem::Dependency
-  name: graphql
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.4
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.4
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +226,7 @@ files:
 - lib/nulogy_message_bus_producer/subscriber_graphql_schema_validator.rb
 - lib/nulogy_message_bus_producer/subscription.rb
 - lib/nulogy_message_bus_producer/subscription_event.rb
+- lib/nulogy_message_bus_producer/subscriptions/no_variables.rb
 - lib/nulogy_message_bus_producer/subscriptions/postgres_transport.rb
 - lib/nulogy_message_bus_producer/subscriptions/risky_subscription_blocker.rb
 - lib/nulogy_message_bus_producer/version.rb
@@ -288,6 +289,7 @@ files:
 - spec/integration/lib/nulogy_message_bus_producer/repopulate_replication_slots_spec.rb
 - spec/integration/lib/nulogy_message_bus_producer/subscriber_graphql_schema_validator_spec.rb
 - spec/integration/lib/nulogy_message_bus_producer/subscription_spec.rb
+- spec/integration/lib/nulogy_message_bus_producer/subscriptions/no_variables_spec.rb
 - spec/integration/lib/nulogy_message_bus_producer/subscriptions/postgres_transport_spec.rb
 - spec/integration/lib/nulogy_message_bus_producer/subscriptions/risky_subscription_blocker_spec.rb
 - spec/integration_spec_helper.rb
@@ -307,9 +309,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -381,6 +383,7 @@ test_files:
 - spec/integration/lib/nulogy_message_bus_producer/repopulate_replication_slots_spec.rb
 - spec/integration/lib/nulogy_message_bus_producer/subscriptions/risky_subscription_blocker_spec.rb
 - spec/integration/lib/nulogy_message_bus_producer/subscriptions/postgres_transport_spec.rb
+- spec/integration/lib/nulogy_message_bus_producer/subscriptions/no_variables_spec.rb
 - spec/integration/lib/nulogy_message_bus_producer/subscription_spec.rb
 - spec/integration/lib/nulogy_message_bus_producer/subscriber_graphql_schema_validator_spec.rb
 - spec/support/kafka_connect.rb