diffend 0.2.31 → 0.2.36

data/lib/diffend/request.rb

@@ -14,7 +14,8 @@ module Diffend
       Errno::ECONNRESET,
       Errno::ENETUNREACH,
       Errno::EHOSTUNREACH,
-      Errno::ECONNREFUSED
+      Errno::ECONNREFUSED,
+      SocketError
     ].freeze
     # Message displayed when timeout occured and we will retry
     TIMEOUT_MESSAGE = 'We experienced a connection issue, retrying...'
@@ -67,7 +68,7 @@ module Diffend
       rescue Diffend::Errors::RequestServerError => e
         retry_count += 1
 
-        retry if handle_retry(SERVER_ERROR_MESSAGE, retry_count)
+        retry if handle_retry(request_object.config, SERVER_ERROR_MESSAGE, retry_count)
 
         Diffend::HandleErrors::Report.call(
           exception: e,
@@ -78,7 +79,7 @@ module Diffend
       rescue *CONNECTION_EXCEPTIONS => e
         retry_count += 1
 
-        retry if handle_retry(CONNECTION_MESSAGE, retry_count)
+        retry if handle_retry(request_object.config, CONNECTION_MESSAGE, retry_count)
 
         Diffend::HandleErrors::Report.call(
           exception: e,
@@ -89,7 +90,7 @@ module Diffend
       rescue *TIMEOUT_EXCEPTIONS => e
         retry_count += 1
 
-        retry if handle_retry(TIMEOUT_MESSAGE, retry_count)
+        retry if handle_retry(request_object.config, TIMEOUT_MESSAGE, retry_count)
 
         Diffend::HandleErrors::Report.call(
           exception: e,
@@ -101,12 +102,13 @@ module Diffend
 
       # Handle retry
       #
+      # @param config [Diffend::Config]
       # @param message [String] message we want to display
       # @param retry_count [Integer]
-      def handle_retry(message, retry_count)
+      def handle_retry(config, message, retry_count)
         return false if retry_count == RETRIES
 
-        Bundler.ui.warn(message)
+        config.logger.warn(message)
         sleep(exponential_backoff(retry_count))
 
         retry_count < RETRIES
@@ -132,7 +134,7 @@ module Diffend
       #
       # @param uri [URI::HTTPS]
       # @param request_method [Symbol]
-      # @param config [OpenStruct] Diffend config
+      # @param config [Diffend::Config]
       # @param payload [Hash] with versions to check
       #
       # @return [Net::HTTP::Post, Net::HTTP::Put]
@@ -160,9 +162,8 @@ module Diffend
       # Assigns basic authorization if provided in the config
       #
       # @param request [Net::HTTP::Post] prepared http post
-      # @param config [OpenStruct] Diffend config
+      # @param config [Diffend::Config]
       def assign_auth(request, config)
-        return unless config
         return unless config.shareable_id
         return unless config.shareable_key
 

data/lib/diffend/request_verdict.rb

@@ -5,19 +5,26 @@ require 'json'
 module Diffend
   # Module responsible for fetching diffend verdict on local context
   module RequestVerdict
+    # Exceptions that we handle when there is a resolve issue
+    RESOLVE_EXCEPTIONS = [
+      Bundler::GemNotFound,
+      Bundler::GitError,
+      Bundler::PermissionError,
+      Bundler::VersionConflict
+    ].freeze
+
     class << self
-      # @param command [String] either install or update
+      # @param config [Diffend::Config]
       # @param definition [Bundler::Definition] definition for your source
-      # @param config [OpenStruct] diffend config
-      def call(command, config, definition)
-        payload = Diffend::LocalContext.call(command, config.project_id, definition)
+      def call(config, definition)
+        payload = Diffend::LocalContext.call(config, definition)
 
         response = Diffend::Request.call(
-          build_request_object(command, config, payload)
+          build_request_object(config, payload)
         )
 
         JSON.parse(response.body)
-      rescue Bundler::GemNotFound
+      rescue *RESOLVE_EXCEPTIONS
         raise ::Diffend::Errors::DependenciesResolveException
       rescue StandardError => e
         Diffend::HandleErrors::Report.call(
@@ -29,31 +36,18 @@ module Diffend
         )
       end
 
-      # @param command [String] either install or update
-      # @param config [OpenStruct] diffend config
+      # @param config [Diffend::Config]
       # @param payload [Hash]
       #
       # @return [Diffend::RequestObject]
-      def build_request_object(command, config, payload)
+      def build_request_object(config, payload)
         Diffend::RequestObject.new(
           config: config,
-          url: commands_url(command, config.project_id),
+          url: config.commands_url,
           payload: payload,
           request_method: :post
         )
       end
-
-      # Provides diffend command endpoint url
-      #
-      # @param command [String] either install or update
-      # @param project_id [String] diffend project_id
-      #
-      # @return [String] diffend endpoint
-      def commands_url(command, project_id)
-        return ENV['DIFFEND_COMMAND_URL'] if ENV.key?('DIFFEND_COMMAND_URL')
-
-        "https://my.diffend.io/api/projects/#{project_id}/bundle/#{command}"
-      end
     end
   end
 end

data/lib/diffend/track.rb

@@ -9,14 +9,16 @@ module Diffend
     RETRY_SLEEP = 15
 
     # Initialize tracking
-    def initialize
+    #
+    # @param config [Diffend::Config]
+    def initialize(config)
       @mutex = Mutex.new
-      @config = Diffend::Config.call
+      @config = config
     end
 
     # Start tracking
     def start
-      response = exec_request
+      response = Diffend::Execute.call(@config)
 
       perform(response['id'])
     rescue Diffend::Errors::HandledException
@@ -40,19 +42,12 @@ module Diffend
     # @param request_id [String]
     def perform(request_id)
       loop do
-        @mutex.synchronize do
-          track_request(request_id)
-        end
+        @mutex.synchronize { track_request(request_id) }
 
         sleep(TRACK_SLEEP)
       end
     end
 
-    # Perform an exec request
-    def exec_request
-      Diffend::Execute.call(Diffend::Commands::EXEC, @config)
-    end
-
     # Perform a track request
     #
     # @param request_id [String]
@@ -68,18 +63,10 @@ module Diffend
     def build_request_object(request_id)
       Diffend::RequestObject.new(
         config: @config,
-        url: track_url(@config.project_id, request_id),
+        url: @config.track_url(request_id),
         payload: { id: request_id }.freeze,
         request_method: :put
       ).freeze
     end
-
-    # @param project_id [String] diffend project_id
-    # @param request_id [String]
-    #
-    # @return [String]
-    def track_url(project_id, request_id)
-      "https://my.diffend.io/api/projects/#{project_id}/bundle/#{request_id}/track"
-    end
   end
 end

data/lib/diffend/version.rb

@@ -2,5 +2,5 @@
 
 module Diffend
   # Current version
-  VERSION = '0.2.31'
+  VERSION = '0.2.36'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diffend
 version: !ruby/object:Gem::Version
-  version: 0.2.31
+  version: 0.2.36
 platform: ruby
 authors:
 - Tomasz Pajor
@@ -34,7 +34,7 @@ cert_chain:
   9MmF6uCQa1EjK2p8tYT0MnbHrFkoehxdX4VO9y99GAkhZyJNKPYPtyAUFV27sT2V
   LfCJRk4ifKIN/FUCwDSn8Cz0m6oH265q0p6wdzI6qrWOjP8tGOMBTA==
   -----END CERTIFICATE-----
-date: 2020-09-24 00:00:00.000000000 Z
+date: 2020-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,25 +90,27 @@ files:
 - bin/rspec
 - certs/mensfeld.pem
 - certs/tomaszpajor.pem
+- config/diffend.yml
 - diffend.gemspec
 - lib/diffend.rb
 - lib/diffend/build_bundler_definition.rb
 - lib/diffend/commands.rb
 - lib/diffend/config.rb
-- lib/diffend/config/fetcher.rb
-- lib/diffend/config/file_finder.rb
-- lib/diffend/config/validator.rb
+- lib/diffend/configs/fetcher.rb
+- lib/diffend/configs/validator.rb
 - lib/diffend/errors.rb
 - lib/diffend/execute.rb
 - lib/diffend/handle_errors/build_exception_payload.rb
 - lib/diffend/handle_errors/display_to_stdout.rb
 - lib/diffend/handle_errors/messages.rb
 - lib/diffend/handle_errors/report.rb
+- lib/diffend/latest_version.rb
 - lib/diffend/local_context.rb
 - lib/diffend/local_context/diffend.rb
 - lib/diffend/local_context/host.rb
 - lib/diffend/local_context/packages.rb
 - lib/diffend/local_context/platform.rb
+- lib/diffend/logger.rb
 - lib/diffend/monitor.rb
 - lib/diffend/plugin.rb
 - lib/diffend/request.rb
@@ -137,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: OSS supply chain security and management platform

data/lib/diffend/config/fetcher.rb

@@ -1,117 +0,0 @@
-# frozen_string_literal: true
-
-require 'yaml'
-
-module Diffend
-  # Module for all the components related to setting up the config
-  module Config
-    # Class responsible for fetching the config from .diffend.yml
-    module Fetcher
-      # All the errors for missing keys in the configuration file
-      MISSING_KEY_ERRORS = [
-        Errors::ProjectIdMissingInConfigurationFile,
-        Errors::ShareableIdMissingInConfigurationFile,
-        Errors::ShareableKeyMissingInConfigurationFile,
-        Errors::BuildPathMissingInConfigurationFile
-      ].freeze
-
-      class << self
-        # @param build_path [String] path of the current build
-        #
-        # @return [OpenStruct] open struct with config details
-        #
-        # @example
-        #   details = Fetcher.new.call('./')
-        #   details.build_path #=> './'
-        def call(build_path)
-          build(build_path)
-        rescue Errors::MissingConfigurationFile
-          Bundler.ui.error(build_missing_error_message(build_path))
-
-          raise Diffend::Errors::HandledException
-        rescue Errors::EmptyConfigurationFile
-          Bundler.ui.error(build_empty_error_message(build_path))
-
-          raise Diffend::Errors::HandledException
-        rescue Errors::MalformedConfigurationFile
-          Bundler.ui.error(build_malformed_error_message(build_path))
-
-          raise Diffend::Errors::HandledException
-        rescue *MISSING_KEY_ERRORS => e
-          Bundler.ui.error(build_missing_key_error_message(e))
-
-          raise Diffend::Errors::HandledException
-        end
-
-        private
-
-        # @param build_path [String] path of the current build
-        #
-        # @return [OpenStruct] open struct with config details
-        def build(build_path)
-          content = ERB.new(
-            File.read(
-              FileFinder.call(build_path)
-            )
-          ).result
-
-          raise Errors::EmptyConfigurationFile if content.empty?
-
-          OpenStruct.new(parse_file(content).merge(build_path: build_path))
-            .tap(&Validator.method(:call))
-        end
-
-        def parse_file(content)
-          YAML.safe_load(content)
-        rescue Psych::SyntaxError
-          raise Errors::MalformedConfigurationFile
-        end
-
-        # @param build_path [String] path of the current build
-        #
-        # @return [String] missing configuration file message
-        def build_missing_error_message(build_path)
-          <<~MSG
-            \nWe were unable to locate Diffend configuration file.\n
-            Please make sure that .diffend.yml is present in #{build_path} folder.\n
-          MSG
-        end
-
-        # @return [String] empty configuration file message
-        def build_empty_error_message
-          <<~MSG
-            \nYour Diffend configuration file is empty.\n
-            Please re-setup.\n
-          MSG
-        end
-
-        # @return [String] malformed configuration file message
-        def build_malformed_error_message
-          <<~MSG
-            \nYour Diffend configuration file is malformed.\n
-            Please re-setup.\n
-          MSG
-        end
-
-        # @return [String] malformed configuration file message
-        def build_missing_key_error_message(exception)
-          missing_key = missing_key_from_exception(exception)
-
-          <<~MSG
-            \nYour Diffend configuration file is missing #{missing_key} key.\n
-            Please re-setup.\n
-          MSG
-        end
-
-        def missing_key_from_exception(exception)
-          case exception
-          when Errors::ProjectIdMissingInConfigurationFile then 'project_id'
-          when Errors::ShareableIdMissingInConfigurationFile then 'shareable_id'
-          when Errors::ShareableKeyMissingInConfigurationFile then 'shareable_key'
-          when Errors::BuildPathMissingInConfigurationFile then 'build_path'
-          end
-        end
-      end
-    end
-  end
-end

data/lib/diffend/config/file_finder.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-module Diffend
-  module Config
-    # Class used to figure out the file from which we should load the settings
-    module FileFinder
-      # Names of the files or paths where we will look for the settings
-      #
-      # @note We do the double dot trick, to look outside of the current dir because when
-      #   executed from a docker container, we copy the local uncommitted settings into the
-      #   dir above the app location not to pollute the reset state of the git repo
-      #
-      # @note Order is important, as for local env we should load from
-      #   local file (if present first)
-      FILE_NAMES = %w[
-        .diffend.yml
-      ].map { |name| ["../#{name}", name] }.tap(&:flatten!).freeze
-
-      private_constant :FILE_NAMES
-
-      class << self
-        # Looks for Diffend settings file for a given env
-        #
-        # @param build_path [String] path of the current build
-        #
-        # @return [String] path to the file from which we should load all the settings
-        def call(build_path)
-          FILE_NAMES
-            .map { |name| File.join(build_path, name) }
-            .map { |name| Dir[name] }
-            .find { |selection| !selection.empty? }
-            .tap { |path| path || raise(Errors::MissingConfigurationFile) }
-            .first
-        end
-      end
-    end
-  end
-end

data/lib/diffend/config/validator.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-module Diffend
-  # Module for all the components related to setting up the config
-  module Config
-    # Class responsible for validating the config from .diffend.yml
-    module Validator
-      class << self
-        # @param config [OpenStruct] path of the current build
-        def call(config)
-          raise Errors::ProjectIdMissingInConfigurationFile if missing?(config, 'project_id')
-          raise Errors::ShareableIdMissingInConfigurationFile if missing?(config, 'shareable_id')
-          raise Errors::ShareableKeyMissingInConfigurationFile if missing?(config, 'shareable_key')
-          raise Errors::BuildPathMissingInConfigurationFile if missing?(config, 'build_path')
-        end
-
-        private
-
-        def missing?(config, key)
-          config.public_send(key).nil? || config.public_send(key).empty?
-        end
-      end
-    end
-  end
-end