workato-connector-sdk 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 70241ed06aeae85f14f775ff2366ec4edbc54322aa034f0931dd987e9fd1fb2c
-  data.tar.gz: 1a99f10c8c3c4dfe036e591cddb81504980586b0fb48cd319f7cfd5e510a1512
+SHA1:
+  metadata.gz: f52b011085690e264b4e2082fb2f13c1375e74fe
+  data.tar.gz: 190c0bc7e6264ab9524acdda484e07154dd0b2b8
 SHA512:
-  metadata.gz: b74c573b4e5c00509b955a14477a132ce01cfa6824382f21e50646bc10ce5ee44f3f2bf9bbf06ad7e565ddedfd0cce8c5017ae31e28e3b470164600abbb29d6d
-  data.tar.gz: 1f1139718e2f18faa63087e3782c42a0bb0b3bae237086044873283bad8128f9ce42b26b3738d0a3a8ff22e529180a6d8df821f7c7eee9da68b85d3b97098340
+  metadata.gz: 29480d50f931dec0b0f18bf8f7c97f0a6029dd2656ba367ce0a3015a2a32e961bca9981083e01455d9c65cba2244dea5491b34d02e18a9cb8c4ac1a02f9a1d85
+  data.tar.gz: 1681f2fc8fc0eec6949361ae49ae26fdea3372eab98fb745e9d4a55d192b0e74a34d446655d2b5b08ede89d09cf748d4610ef86b08bab3210165de961004bbb6

data/lib/workato/cli/edit_command.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require 'active_support/encrypted_configuration'
@@ -33,9 +34,9 @@ module Workato
 
       private
 
-      attr_reader :key_path,
-                  :encrypted_file_path,
-                  :encrypted_config
+      attr_reader :key_path
+      attr_reader :encrypted_file_path
+      attr_reader :encrypted_config
 
       def ensure_encryption_key_present
         return if encrypted_config.key.present?

data/lib/workato/cli/exec_command.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require 'thor'
@@ -24,8 +25,8 @@ module Workato
 
       private
 
-      attr_reader :path,
-                  :options
+      attr_reader :path
+      attr_reader :options
 
       # rubocop:disable Style/GuardClause
       def load_from_default_files
@@ -46,11 +47,9 @@ module Workato
 
       def params
         @params ||= {
-          connector: connector,
           settings: settings,
           input: from_json(options[:input]),
-          output: from_json(options[:input]),
-          webhook_subscribe_output: from_json(options[:webhook_subscribe_output]).presence,
+          webhook_subscribe_output: from_json(options[:webhook_subscribe_output]),
           args: from_json(options[:args]).presence || [],
           extended_input_schema: from_json(options[:extended_input_schema]).presence || [],
           extended_output_schema: from_json(options[:extended_output_schema]).presence || [],
@@ -69,7 +68,7 @@ module Workato
       end
 
       def connector
-        Workato::Connector::Sdk::Connector.from_file(
+        @connector ||= Workato::Connector::Sdk::Connector.from_file(
           options[:connector] || Workato::Connector::Sdk::DEFAULT_CONNECTOR_PATH,
           settings
         )
@@ -85,16 +84,23 @@ module Workato
         )
         @settings = settings_store.read
 
-        Workato::Connector::Sdk::Operation.on_settings_updated = lambda do |message, new_settings|
-          $stdout.pause if verbose?
-          say('')
-          say(message)
-          loop do
-            answer = ask('Updated settings file with new connection attributes? (Yes or No)').to_s.downcase
-            break if %w[n no].include?(answer)
-            break settings_store.update(new_settings) if %w[y yes].include?(answer)
+        Workato::Connector::Sdk::Connection.on_settings_update = lambda do |message, &refresher|
+          begin
+            $stdout.pause if verbose?
+            say('')
+            say(message)
+            new_settings = refresher.call
+            loop do
+              answer = ask('Updated settings file with new connection attributes? (Yes or No)').to_s.downcase
+              break new_settings if %w[n no].include?(answer)
+              next unless %w[y yes].include?(answer)
+
+              settings_store.update(new_settings)
+              break new_settings
+            end
+          ensure
+            $stdout.resume if verbose?
           end
-          $stdout.resume if verbose?
         end
 
         @settings
@@ -103,9 +109,9 @@ module Workato
       def from_json(path, parse_json_times: false)
         old_parse_json_times = ActiveSupport.parse_json_times
         ::ActiveSupport.parse_json_times = parse_json_times
-        result = path ? ::ActiveSupport::JSON.decode(File.read(path)) : {}
+        path ? ::ActiveSupport::JSON.decode(File.read(path)) : {}
+      ensure
         ::ActiveSupport.parse_json_times = old_parse_json_times
-        result
       end
 
       def inspect_params(params)
@@ -121,30 +127,13 @@ module Workato
       end
 
       def execute_path
-        methods = path.split('.')
-        method = methods.pop
-        object = methods.inject(params[:connector]) { |obj, m| obj.public_send(m) }
-        output = invoke_method(object, method)
-        if output.respond_to?(:invoke)
-          invoke_method(output, :invoke)
-        else
-          output
-        end
+        connector.invoke(path, params)
       rescue Exception => e # rubocop:disable Lint/RescueException
         raise DebugExceptionError, e if options[:debug]
 
         raise
       end
 
-      def invoke_method(object, method)
-        parameters = object.method(method).parameters.reject { |p| p[0] == :block }.map(&:second)
-        args = params.values_at(*parameters)
-        if parameters.last == :args
-          args = args.take(args.length - 1) + Array.wrap(args.last).flatten(1)
-        end
-        object.public_send(method, *args)
-      end
-
       def show_output(output)
         if options[:output].present?
           File.open(options[:output], 'w') do |f|

data/lib/workato/cli/generate_command.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Workato

data/lib/workato/cli/generators/connector_generator.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Workato

data/lib/workato/cli/generators/master_key_generator.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 module Workato

data/lib/workato/cli/main.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require 'thor'

data/lib/workato/cli/oauth2_command.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require 'securerandom'
@@ -55,11 +56,11 @@ module Workato
 
       private
 
-      attr_reader :https,
-                  :base_url,
-                  :redirect_url,
-                  :port,
-                  :options
+      attr_reader :https
+      attr_reader :base_url
+      attr_reader :redirect_url
+      attr_reader :port
+      attr_reader :options
 
       def verbose?
         !!options[:verbose]

data/lib/workato/cli/push_command.rb

@@ -1,3 +1,4 @@
+# typed: true
 # frozen_string_literal: true
 
 require 'uri'
@@ -55,10 +56,10 @@ module Workato
 
       private
 
-      attr_reader :options,
-                  :api_token,
-                  :api_email,
-                  :api_base_url
+      attr_reader :options
+      attr_reader :api_token
+      attr_reader :api_email
+      attr_reader :api_base_url
 
       def verbose?
         @options[:verbose]

data/lib/workato/cli/schema_command.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Workato
@@ -31,9 +32,9 @@ module Workato
 
       private
 
-      attr_reader :options,
-                  :api_token,
-                  :api_email
+      attr_reader :options
+      attr_reader :api_token
+      attr_reader :api_email
 
       def verbose?
         @options[:verbose]

data/lib/workato/connector/sdk/account_properties.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 require 'csv'

data/lib/workato/connector/sdk/action.rb

@@ -1,3 +1,4 @@
+# typed: strict
 # frozen_string_literal: true
 
 require_relative './operation'
@@ -7,27 +8,52 @@ module Workato
   module Connector
     module Sdk
       class Action < Operation
+        extend T::Sig
         using BlockInvocationRefinements
 
-        RETRY_DEFAULT_CODES = [429, 500, 502, 503, 504, 507].freeze
-        RETRY_DEFAULT_METHODS = %i[get head].freeze
-        RETRY_DELAY = 5.seconds
+        RETRY_DEFAULT_CODES = T.let([429, 500, 502, 503, 504, 507].freeze, T::Array[Integer])
+        RETRY_DEFAULT_METHODS = T.let(%i[get head].freeze, T::Array[Symbol])
+        RETRY_DELAY = T.let(5, Integer) # seconds
         MAX_RETRIES = 3
 
         MAX_REINVOKES = 5
 
-        def initialize(action:, connection: {}, methods: {}, settings: {}, object_definitions: nil)
+        sig do
+          params(
+            action: SorbetTypes::SourceHash,
+            methods: SorbetTypes::SourceHash,
+            connection: Connection,
+            object_definitions: T.nilable(ObjectDefinitions)
+          ).void
+        end
+        def initialize(action:, methods: {}, connection: Connection.new, object_definitions: nil)
           super(
             operation: action,
             connection: connection,
             methods: methods,
-            settings: settings,
             object_definitions: object_definitions
           )
 
+          @retries_left = T.let(0, Integer)
+          @retry_codes = T.let([], T::Array[Integer])
+          @retry_methods = T.let([], T::Array[String])
+          @retry_matchers = T.let([], T::Array[T.any(Symbol, String, Regexp)])
+
           initialize_retry
         end
 
+        sig do
+          params(
+            settings: T.nilable(SorbetTypes::SettingsHash),
+            input: SorbetTypes::OperationInputHash,
+            extended_input_schema: SorbetTypes::OperationSchema,
+            extended_output_schema: SorbetTypes::OperationSchema,
+            continue: T::Hash[T.any(Symbol, String), T.untyped],
+            block: T.nilable(SorbetTypes::OperationExecuteProc)
+          ).returns(
+            T.untyped
+          )
+        end
         def execute(settings = nil, input = {}, extended_input_schema = [], extended_output_schema = [], continue = {},
                     &block)
           raise InvalidDefinitionError, "'execute' block is required for action" unless block || action[:execute]
@@ -39,7 +65,7 @@ module Workato
 
             reinvoke_sleep if @reinvoke_after
 
-            @reinvoke_after = nil
+            reinvoke_reset
 
             result = super(
               settings,
@@ -52,15 +78,17 @@ module Workato
 
             break result unless @reinvoke_after
 
-            continue = @reinvoke_after[:continue]
+            continue = @reinvoke_after.continue
           end
         rescue RequestError => e
           raise e unless retry?(e)
 
           @retries_left -= 1
-          sleep(RETRY_DELAY) && retry
+          sleep(RETRY_DELAY)
+          retry
         end
 
+        sig { params(input: SorbetTypes::OperationInputHash).returns(T::Hash[T.any(String, Symbol), T.untyped]) }
         def invoke(input = {})
           extended_schema = extended_schema(nil, input)
           config_schema = Schema.new(schema: config_fields_schema)
@@ -72,63 +100,93 @@ module Workato
           apply_output_schema(output, output_schema)
         end
 
+        sig do
+          params(
+            continue: T::Hash[T.untyped, T.untyped],
+            temp_output: T.nilable(T::Hash[T.untyped, T.untyped])
+          ).void
+        end
         def checkpoint!(continue:, temp_output: nil)
           # no-op
         end
 
-        def reinvoke_after(seconds:, continue:, temp_output: nil)
+        sig do
+          params(
+            seconds: Integer,
+            continue: T::Hash[T.untyped, T.untyped],
+            temp_output: T.nilable(T::Hash[T.untyped, T.untyped])
+          ).void
+        end
+        def reinvoke_after(seconds:, continue:, temp_output: nil) # rubocop:disable Lint/UnusedMethodArgument
+          @reinvokes_remaining = T.let(@reinvokes_remaining, T.nilable(Integer))
           @reinvokes_remaining = (@reinvokes_remaining ? @reinvokes_remaining - 1 : reinvoke_limit)
-          @reinvoke_after = {
+          @reinvoke_after = ReinvokeAfter.new(
             seconds: seconds,
-            continue: continue,
-            temp_output: temp_output
-          }
+            continue: continue
+          )
         end
 
         private
 
+        sig { returns(T::Array[T.any(Symbol, String, Regexp, Integer)]) }
         def retry_on_response
           Array(action[:retry_on_response])
         end
 
+        sig { returns(T::Array[T.any(Symbol, String, Regexp, Integer)]) }
         def retry_on_request
           Array(action[:retry_on_request])
         end
 
+        sig { returns(T.nilable(Integer)) }
         def max_retries
           action[:max_retries]
         end
 
+        sig { void }
         def initialize_retry
-          @retries_left = 0
           return if retry_on_response.blank?
 
-          @retry_codes = []
-          @retry_matchers = []
           retry_on_response.each { |m| m.is_a?(::Integer) ? @retry_codes << m : @retry_matchers << m }
           @retry_codes = RETRY_DEFAULT_CODES if @retry_codes.empty?
           @retry_methods = (retry_on_request.presence || RETRY_DEFAULT_METHODS).map(&:to_s).map(&:downcase)
           @retries_left = [[max_retries.is_a?(::Integer) && max_retries || MAX_RETRIES, MAX_RETRIES].min, 0].max
         end
 
+        sig { params(exception: RequestError).returns(T::Boolean) }
         def retry?(exception)
-          return unless @retries_left.positive?
-          return unless @retry_codes.include?(exception.code.to_i)
-          return unless @retry_matchers.empty? || @retry_matchers.any? do |m|
+          return false unless @retries_left.positive?
+          return false unless @retry_codes.include?(exception.code.to_i)
+          return false unless @retry_matchers.empty? || @retry_matchers.any? do |m|
             m === exception.message || m === exception.response
           end
 
           @retry_methods.include?(exception.method.to_s.downcase)
         end
 
+        sig { void }
         def reinvoke_sleep
-          sleep((ENV['WAIT_REINVOKE_AFTER'].presence || @reinvoke_after[:seconds]).to_f)
+          sleep((ENV['WAIT_REINVOKE_AFTER'].presence || T.must(@reinvoke_after).seconds).to_f)
         end
 
+        sig { returns(Integer) }
         def reinvoke_limit
+          @reinvoke_limit = T.let(@reinvoke_limit, T.nilable(Integer))
           @reinvoke_limit ||= (ENV['MAX_REINVOKES'].presence || MAX_REINVOKES).to_i
         end
 
+        sig { void }
+        def reinvoke_reset
+          @reinvoke_after = T.let(nil, T.nilable(ReinvokeAfter))
+        end
+
+        class ReinvokeAfter < T::Struct
+          prop :seconds, T.any(Float, Integer)
+          prop :continue, T::Hash[T.untyped, T.untyped]
+        end
+
+        private_constant :ReinvokeAfter
+
         alias action operation
       end
     end

data/lib/workato/connector/sdk/block_invocation_refinements.rb

@@ -1,3 +1,4 @@
+# typed: false
 # frozen_string_literal: true
 
 module Workato