maestrano-connector-rails 2.3.4 → 2.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0794a88f0a65a6b53b28ab58e23fc0871ca6eaff
-  data.tar.gz: 597c52ff1576e7231e2aa594e1c95e99481dcb0c
+  metadata.gz: 281bc1ff015d7a52fea1344faf8043cb24d0dff7
+  data.tar.gz: a0cea7d9c59defc98176b45b64909afe523a7aa1
 SHA512:
-  metadata.gz: ef5fb1768878fa8eaac456858186a0e45c654d158a5209ba5fe935c76a959c3a104c7a1a0aa90a902f63f6b51fe28d4b72829a7002662f3cf659ef9b4924c91a
-  data.tar.gz: 2165702acab307200051e02e90f12dceaa449fb3be9d2351c5be3af9f87fbb968a3cb7cf9949de78d73aa78b3be5c4db1ef75ee4a280be370c56128b160ce55b
+  metadata.gz: 0cee71417cd68c6cc2b620a5ece25bc5dee1877a8327d47d1e7433e364e2fff1fa8c5eae1dc07b910f109df394fcad53801f4c2c1e3dcb129acfeb2e3227d874
+  data.tar.gz: 4501102c4571eab87459e7f84fdcb5e538bf7522b5dba7704e1693f12ec029a2ca103f52dff4613f6641efd142a4e829dffb48ef6c26f3228de71623e213d8f3

data/.rubocop.yml

@@ -8,6 +8,8 @@ Rails/ApplicationRecord:
   Enabled: false
 
 AllCops:
+  DisplayCopNames: true
+  DisplayStyleGuide: true
   TargetRubyVersion: 2.3
   Exclude:
     - 'maestrano-connector-rails.gemspec'

data/.rubocop_todo.yml

@@ -14,7 +14,7 @@ Lint/AssignmentInCondition:
 
 # Offense count: 28
 Metrics/AbcSize:
-  Max: 69
+  Max: 70
 
 # Offense count: 1
 # Configuration parameters: CountComments.

data/CHANGELOG.md

@@ -1,5 +1,17 @@
-## 2.3.4
-- Fix gemfile template to remove test/dev gems from the production group
+## [v2.3.5](https://github.com/maestrano/maestrano-connector-rails/tree/v2.3.5) (2018-11-02)
+[Full Changelog](https://github.com/maestrano/maestrano-connector-rails/compare/v2.3.4...v2.3.5)
+
+**Fixed bugs:**
+
+- \[APPINT-1323\] Retry call to Connec! [\#180](https://github.com/maestrano/maestrano-connector-rails/pull/180) ([ouranos](https://github.com/ouranos))
+-  \[APPINT-1205\] Fix cron jobs & cleanup template [\#179](https://github.com/maestrano/maestrano-connector-rails/pull/179) ([ouranos](https://github.com/ouranos))
+
+## [v2.3.4](https://github.com/maestrano/maestrano-connector-rails/tree/v2.3.4) (2018-10-04)
+[Full Changelog](https://github.com/maestrano/maestrano-connector-rails/compare/v2.3.3...v2.3.4)
+
+**Fixed bugs:**
+
+- Fix Gemfile template [\#178](https://github.com/maestrano/maestrano-connector-rails/pull/178) ([ouranos](https://github.com/ouranos))
 
 ## 2.3.3
 

data/app/jobs/maestrano/connector/rails/all_synchronizations_job.rb

@@ -4,15 +4,12 @@ module Maestrano::Connector::Rails
 
     # Trigger synchronization of all active organizations
     def perform(name = nil, count = nil)
-      active_organizations = Maestrano::Connector::Rails::Organization
-                             .where.not(oauth_provider: nil, encrypted_oauth_token: nil)
-                             .select { |o| [true, 1].include?(o.sync_enabled) }
-
-      return true if active_organizations.count.zero?
-
-      time_span_seconds = (3600 / active_organizations.count).to_i
-      active_organizations.each_with_index do |organization, i|
-        Maestrano::Connector::Rails::SynchronizationJob.set(wait: time_span_seconds * i).perform_later(organization.id, {})
+      Maestrano::Connector::Rails::Organization
+        .where.not(oauth_provider: nil, encrypted_oauth_token: nil)
+        .where(sync_enabled: true)
+        .select(:id)
+        .find_each do |organization|
+        Maestrano::Connector::Rails::SynchronizationJob.set(wait: rand(3600)).perform_later(organization.id, {})
       end
     end
   end

data/app/models/maestrano/connector/rails/concerns/entity.rb

@@ -465,7 +465,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
     # proc is a lambda to create a batch_op from an element of the array
     # Perform batch calls on Connec API and parse the response
     def batch_calls(array_with_idmap, proc, connec_entity_name, id_update_only = false)
-      request_per_call = @opts[:request_per_batch_call] || 100
+      request_per_call = @opts[:request_per_batch_call] || 50
       start = 0
       while start < array_with_idmap.size
         # Prepare batch request
@@ -479,7 +479,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
         # Batch call
         log_info = id_update_only ? 'with only ids' : ''
         Maestrano::Connector::Rails::ConnectorLogger.log('info', @organization, "Sending batch request to Connec! #{log_info} for #{self.class.normalize_connec_entity_name(connec_entity_name)}. Batch_request_size: #{batch_request[:ops].size}. Call_number: #{(start / request_per_call) + 1}")
-        response = @connec_client.batch(batch_request)
+        response = Retriable.with_context(:connec) { @connec_client.batch(batch_request) }
         Maestrano::Connector::Rails::ConnectorLogger.log('debug', @organization, "Received batch response from Connec! for #{self.class.normalize_connec_entity_name(connec_entity_name)}: #{response}")
         raise "No data received from Connec! when trying to send batch request #{log_info} for #{self.class.connec_entity_name.pluralize}" unless response && response.body.present?
 
@@ -505,7 +505,7 @@ module Maestrano::Connector::Rails::Concerns::Entity
 
     def fetch_connec(uri)
       Maestrano::Connector::Rails::ConnectorLogger.log('debug', @organization, "Fetching data from connec entity=#{self.class.connec_entity_name}, url=#{uri}")
-      response = @connec_client.get(uri)
+      response = Retriable.with_context(:connec) { @connec_client.get(uri) }
 
       raise "No data received from Connec! when trying to fetch #{self.class.normalized_connec_entity_name}" unless response && response.body.present?
 

data/config/initializers/retriable.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+CONNEC_RETRIABLE_ERRORS = [Net::OpenTimeout, Net::ReadTimeout].freeze
+
+Retriable.configure do |c|
+  c.tries = 3
+
+  c.contexts[:connec] = {
+    on: CONNEC_RETRIABLE_ERRORS,
+    on_retry: proc do |exception, try, elapsed_time, next_interval|
+      Rails.logger.info "Connec! error - #{exception.class}: '#{exception.message}' - #{try} tries in #{elapsed_time} seconds and #{next_interval} seconds until the next try."
+    end
+  }
+end

data/lib/generators/connector/install_generator.rb

@@ -71,5 +71,10 @@ module Connector
     def copy_oauth_controller
       copy_file 'oauth_controller.rb', 'app/controllers/oauth_controller.rb'
     end
+
+    def cleanup
+      # The connector framework already provide a working implementation of this controller
+      remove_file 'app/controllers/maestrano/account/groups_controller.rb'
+    end
   end
 end

data/lib/maestrano/connector/rails.rb

@@ -1,4 +1,5 @@
 require 'maestrano-rails'
+require 'retriable'
 
 require 'haml-rails'
 require 'bootstrap-sass'

data/lib/maestrano/connector/rails/version.rb

@@ -1,7 +1,7 @@
 module Maestrano
   module Connector
     module Rails
-      VERSION = '2.3.4'.freeze
+      VERSION = '2.3.5'.freeze
     end
   end
 end

data/maestrano-connector-rails.gemspec

@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency('hash_mapper', '>= 0.2.2')
   s.add_runtime_dependency('pundit')
   s.add_runtime_dependency('pundit-resources')
+  s.add_runtime_dependency('retriable', '~> 3.1.2')
   s.add_runtime_dependency('sidekiq', '~> 4.2.9')
   s.add_runtime_dependency('sidekiq-cron')
   s.add_runtime_dependency('sidekiq-unique-jobs')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: maestrano-connector-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.4
+  version: 2.3.5
 platform: ruby
 authors:
 - Maestrano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: retriable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
@@ -487,6 +501,7 @@ files:
 - app/resources/maestrano/api/synchronization_resource.rb
 - app/resources/maestrano/api/user_resource.rb
 - config/initializers/json_api.rb
+- config/initializers/retriable.rb
 - config/routes.rb
 - db/migrate/20151122162100_create_users.rb
 - db/migrate/20151122162414_create_organizations.rb