pact-provider-verifier 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33b7a1e5844f5e9cc469f8fb86e3c3cffd6666a8
-  data.tar.gz: c717b51a619226af098202ca5fd3ced93557800b
+  metadata.gz: d3800ba2fc1e875cccbd3a7af6df46277ebbdce3
+  data.tar.gz: 0f3a59cb071ac1ac7cc0b816beac91ba5e9b5246
 SHA512:
-  metadata.gz: 137627401c24bc920031b61e53c34cb8a5ffb58acc477b9600401599303dd51082c924b5312239e4f3b3aedd30d1f97031c9757378c7467101d0a4f883970ac8
-  data.tar.gz: a3aca7c4aa96211d052306a3fe1b6c0c51162b207720b805276bd65992cf6124042d316ce1e6c8718ad5d35fb2cab3ec31315f0bccd4f4437441153b923483cd
+  metadata.gz: 444afd60eb2015055a7b9a2bda7065cecd10e0d7e77c5fdf5c5c2491c86b3e355dfcc8f82b528ff3da7c5c558e07ee0b5bff241e80f4e8b8fbdddfa4ca2c9dd9
+  data.tar.gz: 211233f1740a0336814a32ad215836b2c08984c9271c86dd7dd48ae92eeaa2883035c853bced8590966505b77e5914118d4e1c2c92d3c9fd9ccfeaa2dab3b4d9

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+<a name="v1.4.0-1"></a>
+### v1.4.0-1 (2017-08-11)
+
+#### Features
+
+* **run single interaction**
+  * allow env vars to be set to run a single interaction   ([3e39517](/../../commit/3e39517))
+
+#### Bug Fixes
+
+* Turn off SSL verification for provider states setup call.  ([744add2](/../../commit/744add2))
+
 <a name="v1.3.1"></a>
 ### v1.3.1 (2017-08-08)
 

data/lib/pact/provider_verifier/app.rb

@@ -1,53 +1,57 @@
-require 'pact/provider/proxy/tasks'
-require 'pact/provider/proxy'
+require 'pact/provider_verifier/add_header_middlware'
 require 'pact/provider/rspec'
-require 'rack/reverse_proxy'
 require 'pact/cli/run_pact_verification'
-require 'net/https'
+require 'rack/reverse_proxy'
 require 'faraday_middleware'
 require 'json'
-require 'pact/provider_verifier/add_header_middlware'
 
 module Pact
   module ProviderVerifier
 
-    def self.new *args
-      App.new(*args)
-    end
-
     class App
+
+      PROXY_PACT_HELPER = File.expand_path(File.join(File.dirname(__FILE__), "pact_helper.rb"))
+
       def initialize options = {}
         @options = options
       end
 
-      def call env
-        @app.call env
+      def self.call options
+        new(options).call
       end
 
-      def to_s
-        "#{@name} #{super.to_s}"
+      def call
+        setup
+
+        exit_statuses = pact_urls.collect do |pact_url|
+          verify_pact pact_url
+        end
+
+        # Return non-zero exit code if failures - increment for each Pact
+        exit exit_statuses.count{ | status | status != 0 }
       end
 
-      def verify_pacts
+      def setup
         print_deprecation_note
-        pacts = @options.pact_urls.split(',')
-        proxy_pact_helper = File.expand_path(File.join(File.dirname(__FILE__), "pact_helper.rb"))
+        set_environment_variables
+        configure_service_provider
+        require_pact_project_pact_helper # Beth: not sure if this is needed, hangover from pact-provider-proxy?
+      end
+
+      def set_environment_variables
         ENV['PROVIDER_STATES_SETUP_URL'] = @options.provider_states_setup_url
         ENV['VERBOSE_LOGGING'] = @options.verbose if @options.verbose
         ENV['CUSTOM_PROVIDER_HEADER'] = @options.custom_provider_header if @options.custom_provider_header
-        provider_base_url = @options.provider_base_url
+      end
+
+      def configure_service_provider
+        # Have to declare these locally as the class scope gets lost within the block
+        rack_reverse_proxy = configure_reverse_proxy
+        rack_reverse_proxy = configure_custom_header_middlware(rack_reverse_proxy)
 
         provider_application_version = @options.provider_app_version
         publish_results  = @options.publish_verification_results
 
-        rack_reverse_proxy = Rack::ReverseProxy.new do
-          reverse_proxy '/', provider_base_url
-        end
-
-        if @options.custom_provider_header
-          rack_reverse_proxy = Pact::ProviderVerifier::AddHeaderMiddlware.new(rack_reverse_proxy, parse_header)
-        end
-
         Pact.service_provider "Running Provider Application" do
           app do
             rack_reverse_proxy
@@ -59,27 +63,49 @@ module Pact
 
           publish_verification_results publish_results
         end
+      end
 
-        require ENV['PACT_PROJECT_PACT_HELPER'] if ENV.fetch('PACT_PROJECT_PACT_HELPER','') != ''
+      def configure_reverse_proxy
+        provider_base_url = @options.provider_base_url
+        Rack::ReverseProxy.new do
+          reverse_proxy_options verify_mode: OpenSSL::SSL::VERIFY_NONE
+          reverse_proxy '/', provider_base_url
+        end
+      end
 
-        exit_statuses = pacts.collect do |pact_url|
-          begin
-            options = {
-              :pact_helper => proxy_pact_helper,
-              :pact_uri => pact_url,
-              :backtrace => false,
-              :pact_broker_username => @options.broker_username,
-              :pact_broker_password => @options.broker_password
-            }
-            Cli::RunPactVerification.call(options)
-          rescue SystemExit => e
-            puts ""
-            e.status
-          end
+      def configure_custom_header_middlware rack_reverse_proxy
+        if @options.custom_provider_header
+          Pact::ProviderVerifier::AddHeaderMiddlware.new(rack_reverse_proxy, parse_header)
+        else
+          rack_reverse_proxy
         end
+      end
 
-        # Return non-zero exit code if failures - increment for each Pact
-        exit exit_statuses.count{ | status | status != 0 }
+      def pact_urls
+        @options.pact_urls.split(',')
+      end
+
+      def verify_pact pact_url
+        begin
+          options = {
+            :pact_helper => PROXY_PACT_HELPER,
+            :pact_uri => pact_url,
+            :backtrace => false,
+            :pact_broker_username => @options.broker_username,
+            :pact_broker_password => @options.broker_password
+          }
+          options[:description] = ENV['PACT_DESCRIPTION'] if ENV['PACT_DESCRIPTION']
+          options[:provider_state] = ENV['PACT_PROVIDER_STATE'] if ENV['PACT_PROVIDER_STATE']
+
+          Cli::RunPactVerification.call(options)
+        rescue SystemExit => e
+          puts ""
+          e.status
+        end
+      end
+
+      def require_pact_project_pact_helper
+        require ENV['PACT_PROJECT_PACT_HELPER'] if ENV.fetch('PACT_PROJECT_PACT_HELPER','') != ''
       end
 
       def parse_header

data/lib/pact/provider_verifier/cli.rb

@@ -18,8 +18,7 @@ module Pact
       method_option :provider_states_url, aliases: "-s", desc: "DEPRECATED", :required => false
 
       def verify
-        app = Pact::ProviderVerifier::App.new(options)
-        app.verify_pacts
+        Pact::ProviderVerifier::App.call(options)
       end
 
       default_task :verify

data/lib/pact/provider_verifier/set_up_provider_state.rb

@@ -34,7 +34,13 @@ module Pact
 
       def post_to_provider_state
         verbose = verbose?
-        connection = Faraday.new(:url => provider_states_setup_url) do | faraday |
+        options = {url: provider_states_setup_url}
+
+        if provider_states_setup_url.start_with?("https:")
+          options[:ssl] = {verify: false}
+        end
+
+        connection = Faraday.new(options) do | faraday |
           # Have encountered flakiness on windows build for pact-go
           # Using retries as a hacky solution to try and get around this
           # until/if we can work out what the underlying cause is.

data/lib/pact/provider_verifier/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module ProviderVerifier
-    VERSION = "1.3.1"
+    VERSION = "1.4.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pact-provider-verifier
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Matt Fellows
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.13'
-- !ruby/object:Gem::Dependency
-  name: pact-provider-proxy
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -134,6 +120,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 10.4.2
+- !ruby/object:Gem::Dependency
+  name: rack-reverse-proxy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -204,6 +204,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   A cross-platform Pact verification tool to validate API Providers.
                         Used in the pact-js-provider project to simplify development