bmx-event_hook_client_server 1.0.16 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ad50020fc0d513ed12ac54d12e073ba6120e8902
-  data.tar.gz: 27ee68a719edb0feb98ada33fa91d995e71a50ed
+SHA256:
+  metadata.gz: 65f5db2708169020749675c25acc1e2667ef71ced128f7425b587d72d95fcc9a
+  data.tar.gz: 9afb75af27e4e750c5c03deb9ac031e187e80c645a5f75f61743fc98d58b9226
 SHA512:
-  metadata.gz: 6b4f3070f8279366f50cd69c01ef7c863983d2afeaf5655955139fbf9aa32625cc2d58c438a86c70bb651a94405c48e96e53b3be6ebee27ae310e3c2aac6031f
-  data.tar.gz: 3d3fd7de52be8c1a81af8fb7a0126b15c3756ad1d10f0825d50eccaa9152b45f6ef1bb5db07266d7f0424644b6a674381a6bcdc0f268341c05680f45d81e1d48
+  metadata.gz: ebb32fac1060f42430883b9d40a12306a1b4bbdaa7b524b85aa02c1d24cc876d7093ceb39594b15930866c2e078c92916a8414a6b4b0534fdefa8617becd7e56
+  data.tar.gz: bb5c45221e429c82ebe67796cc3c338b4217a94d58ea25afab7dfd3c8f90d6398235d37eefff21ca273ac35df84f09c8fc3e6102337bd776b872f4006ab4795a

data/Gemfile.lock

@@ -1,33 +1,31 @@
 PATH
   remote: .
   specs:
-    bmx-event_hook_client_server (1.0.16)
+    bmx-event_hook_client_server (1.1.1)
       dry-struct (~> 1.0)
-      google-protobuf (~> 3.9.2)
-      grpc (~> 1.24.0)
+      google-protobuf (~> 3.14)
+      grpc (~> 1.34)
       retriable (~> 3.1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.2)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     diff-lcs (1.3)
-    dry-configurable (0.11.5)
+    dry-configurable (0.12.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5.0)
     dry-container (0.7.2)
       concurrent-ruby (~> 1.0)
       dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
+    dry-core (0.5.0)
       concurrent-ruby (~> 1.0)
     dry-equalizer (0.3.0)
     dry-inflector (0.2.0)
-    dry-logic (1.0.6)
+    dry-logic (1.1.0)
       concurrent-ruby (~> 1.0)
-      dry-core (~> 0.2)
-      dry-equalizer (~> 0.2)
+      dry-core (~> 0.5, >= 0.5)
     dry-struct (1.3.0)
       dry-core (~> 0.4, >= 0.4.4)
       dry-equalizer (~> 0.3)
@@ -40,11 +38,11 @@ GEM
       dry-equalizer (~> 0.3)
       dry-inflector (~> 0.1, >= 0.1.2)
       dry-logic (~> 1.0, >= 1.0.2)
-    google-protobuf (3.9.2)
-    googleapis-common-protos-types (1.0.4)
-      google-protobuf (~> 3.0)
-    grpc (1.24.0)
-      google-protobuf (~> 3.8)
+    google-protobuf (3.14.0)
+    googleapis-common-protos-types (1.0.5)
+      google-protobuf (~> 3.11)
+    grpc (1.34.0)
+      google-protobuf (~> 3.13)
       googleapis-common-protos-types (~> 1.0)
     grpc-tools (1.27.0)
     ice_nine (0.11.2)

data/event_hook_client_server.gemspec

@@ -57,9 +57,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'dry-struct', '~> 1.0'
-  spec.add_dependency 'google-protobuf', '~> 3.9.2'
-  spec.add_dependency 'grpc', '~> 1.24.0'
+  spec.add_dependency 'google-protobuf', '~> 3.14'
+  spec.add_dependency 'grpc', '~> 1.34'
   spec.add_dependency 'retriable', '~> 3.1.2'
+  # spec.add_dependency 'zeitwerk'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/event_hook_client_server/client/models/integration.rb

@@ -17,9 +17,12 @@ module EventHookClientServer
       attribute :building_id, Types::Strict::String.optional
       attribute :tenant_id, Types::Strict::String.optional
       attribute :company_id, Types::Strict::String.optional
+      attribute :unit_id, Types::Strict::String.optional
       attribute :integrator, Types::Strict::Symbol
       attribute :config, Types::Strict::Hash
       attribute :bindings, Types::Array.of(Binding)
+      attribute :created_by_id, Types::Strict::String
+      attribute :oauth_client_id, Types::Strict::String
     end
   end
 end

data/lib/event_hook_client_server/client.rb

@@ -40,10 +40,14 @@ module EventHookClientServer
         'grpc.http2.max_ping_strikes': 0,
         'grpc.http2.min_time_between_pings_ms': 75 * 100,
         'grpc.http2.min_ping_interval_without_data_ms': 75 * 100
-      }
+      },
+      interceptors: []
     }.freeze
     private_constant :DEFAULT_CONFIG
 
+    NON_STUB_OPTIONS = %i[host channel_mode].freeze
+    private_constant :NON_STUB_OPTIONS
+
     RETRIABLE_ERRORS = [
       GRPC::DeadlineExceeded, GRPC::Unavailable, GRPC::ResourceExhausted,
       GRPC::Unknown
@@ -58,7 +62,11 @@ module EventHookClientServer
     end
 
     def self.default_config
-      @default_config ||= DEFAULT_CONFIG.dup
+      @default_config ||= DEFAULT_CONFIG.dup.tap do |config|
+        if defined?(ElasticAPM::GRPC::ClientInterceptor)
+          config[:interceptors] << ElasticAPM::GRPC::ClientInterceptor.new
+        end
+      end
     end
 
     attr_reader :hosts
@@ -91,11 +99,12 @@ module EventHookClientServer
     end
 
     def recreate_grpc_client!
+      grpc_options = options.reject { |k, _| NON_STUB_OPTIONS.include?(k) }
+
       @grpc_client = GRPC_CLIENT_CLASS.new(
         hosts.next,
         options[:channel_mode],
-        timeout: options[:timeout],
-        channel_args: options[:channel_args]
+        grpc_options
       )
     end
 
@@ -211,7 +220,7 @@ module EventHookClientServer
 
     def retry_on_failure(&block)
       Retriable
-        .retriable(on: RETRIABLE_ERRORS, on_retry: method(:rotate_host!)) do
+        .retriable(on: RETRIABLE_ERRORS, on_retry: proc { rotate_host! }) do
           block.call
         end
     end

data/lib/event_hook_client_server/protobuf/event_hook_client_server/v1/enums/integrator_pb.rb

@@ -8,6 +8,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
     add_enum "event_hook_client_server.v1.enums.Integrator" do
       value :WEBHOOK, 0
       value :PDK, 9
+      value :AIRBNB, 1
     end
   end
 end

data/lib/event_hook_client_server/protobuf/event_hook_client_server/v1/messages/integration_pb.rb

@@ -18,6 +18,9 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :building_id, :message, 10, "google.protobuf.StringValue"
       optional :tenant_id, :message, 11, "google.protobuf.StringValue"
       optional :company_id, :message, 12, "google.protobuf.StringValue"
+      optional :unit_id, :message, 13, "google.protobuf.StringValue"
+      optional :oauth_client_id, :message, 14, "google.protobuf.StringValue"
+      optional :created_by_id, :message, 15, "google.protobuf.StringValue"
     end
     add_message "event_hook_client_server.v1.messages.IntegrationConfiguration" do
       optional :type, :enum, 1, "event_hook_client_server.v1.enums.Integrator"
@@ -34,6 +37,9 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :building_id, :message, 10, "google.protobuf.StringValue"
       optional :tenant_id, :message, 11, "google.protobuf.StringValue"
       optional :company_id, :message, 12, "google.protobuf.StringValue"
+      optional :unit_id, :message, 13, "google.protobuf.StringValue"
+      optional :oauth_client_id, :message, 14, "google.protobuf.StringValue"
+      optional :created_by_id, :message, 15, "google.protobuf.StringValue"
     end
     add_message "event_hook_client_server.v1.messages.IntegrationInputConfiguration" do
       optional :type, :enum, 1, "event_hook_client_server.v1.enums.Integrator"
@@ -80,6 +86,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
       optional :building_id, :message, 10, "google.protobuf.StringValue"
       optional :tenant_id, :message, 11, "google.protobuf.StringValue"
       optional :company_id, :message, 12, "google.protobuf.StringValue"
+      optional :unit_id, :message, 13, "google.protobuf.StringValue"
     end
   end
 end

data/lib/event_hook_client_server/server.rb

@@ -28,12 +28,17 @@ module EventHookClientServer
         'grpc.http2.max_ping_strikes': 0,
         'grpc.http2.min_time_between_pings_ms': 75 * 100,
         'grpc.http2.min_ping_interval_without_data_ms': 75 * 100
-      }
+      },
+      interceptors: []
     }.freeze
     private_constant :DEFAULT_CONFIG
 
     def self.default_config
-      @default_config ||= DEFAULT_CONFIG.dup
+      @default_config ||= DEFAULT_CONFIG.dup.tap do |config|
+        if defined?(ElasticAPM::GRPC::ClientInterceptor)
+          config[:interceptors] << ElasticAPM::GRPC::ClientInterceptor.new
+        end
+      end
     end
 
     attr_writer :logger

data/lib/event_hook_client_server/version.rb

@@ -2,7 +2,7 @@
 
 module EventHookClientServer
   MAJOR = 1
-  MINOR = 0
-  PATCH = 16
+  MINOR = 2
+  PATCH = 0
   VERSION = [MAJOR, MINOR, PATCH].join('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bmx-event_hook_client_server
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.2.0
 platform: ruby
 authors:
 - Stanko K.R.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-struct
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.2
+        version: '3.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.9.2
+        version: '3.14'
 - !ruby/object:Gem::Dependency
   name: grpc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: '1.34'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.24.0
+        version: '1.34'
 - !ruby/object:Gem::Dependency
   name: retriable
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,7 @@ metadata:
   homepage_uri: https://github.com/runslikebutter/event_hook_client_server
   source_code_uri: https://github.com/runslikebutter/event_hook_client_server
   changelog_uri: https://github.com/runslikebutter/event_hook_client_server/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -165,9 +165,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Client and server implementation for the Webhook Configurator service.
 test_files: []