pact-provider-verifier 1.28.0 → 1.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d1650e2874f85a92584bd114367df7d3df6c86030249c7d754ea05553e336cb
-  data.tar.gz: 4ae568f9c7c34942ea6a5245d93d47edbc67d13631535beb35ab8d43c06e55be
+  metadata.gz: 63532bb1b371a5f8fa5ea69e5393eaab586a49183799d01713cde4ad06737152
+  data.tar.gz: a638f33f5391338163da93202a4bf994e374f39cb930838b5ca54870618f7684
 SHA512:
-  metadata.gz: 1fbeab699e77f4c6ef85a5b4dfd5ff83165e091dbc3a0f455b363e30cf45f90a25489e65e1d6e7616fd6b698d9022cd97df05a35873a5f248cc8eff934d87fe8
-  data.tar.gz: 331ebcaaa81632a537b94af9582b38ab2b0fbec4c937db0835bf8390ed92d08a12ab03888e8f9f8f81a1e3899edc9bfe0f5560118ebc8c619e3832f7ff8ee55e
+  metadata.gz: c1bc90f19b67c6dc051c43088ff736554d02990a1ea4abea5b965d0d3f388c2fe7773acb312c572e0e51b2047878ee31e93f0715621e708e36f82ca9ff9743ed
+  data.tar.gz: 6ae247c50649cd281331b848fcf3c2e3be93bf6328154904778c8e355dffda704b58bb0ae70da115b91861a90e836add5104ef730db48995056d2029cc92eff0

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v1.29.0-1"></a>
+### v1.29.0-1 (2020-02-18)
+
+
+#### Features
+
+* **cli**
+  * raise an error when basic auth credentials and bearer token are set at the same time	 ([7f4507e](/../../commit/7f4507e))
+
+
 <a name="v1.28.0-1"></a>
 ### v1.28.0-1 (2020-01-22)
 

data/lib/pact/provider_verifier/app.rb

@@ -157,9 +157,6 @@ module Pact
             pact_helper: PROXY_PACT_HELPER,
             pact_uri: pact_uri,
             backtrace: ENV['BACKTRACE'] == 'true',
-            pact_broker_username: options.broker_username,
-            pact_broker_password: options.broker_password,
-            pact_broker_token: options.broker_token,
             format: options.format,
             out: options.out,
             request_customizer: ProviderStates::AddProviderStatesHeader

data/lib/pact/provider_verifier/cli/verify.rb

@@ -15,6 +15,7 @@ module Pact
       class Verify < CustomThor
 
         class InvalidArgumentsError < ::Thor::Error; end
+        class AuthError < ::Thor::Error; end
 
         SELECTOR_DOCS = "Selectors: These are specified using JSON strings. The keys are 'tag' (the name of the consumer version tag) and 'latest' (true|false). " +
           "For example '{\"tag\": \"master\", \"latest\": true}'. For a detailed explanation of selectors, see https://pact.io/selectors"
@@ -49,6 +50,7 @@ module Pact
         method_option :wait, banner: "SECONDS", required: false, type: :numeric, desc: "The number of seconds to poll for the provider to become available before running the verification", default: 0
 
         def verify(*pact_urls)
+          validate_credentials
           validate_verify
           print_deprecation_warnings
           success = Pact::ProviderVerifier::App.call(merged_urls(pact_urls), options)
@@ -75,6 +77,12 @@ module Pact
             end
           end
 
+          def validate_credentials
+            if (options.broker_username || ENV['PACT_BROKER_USERNAME']) && (options.broker_token || ENV['PACT_BROKER_TOKEN'])
+              raise AuthError, "You cannot provide both a username/password and a bearer token. If your Pact Broker uses a bearer token, please remove the username and password configuration."
+            end
+          end
+
           def validate_verify
             if options.pact_broker_base_url && (options.provider.nil? || options.provider == "")
               raise InvalidArgumentsError, "No value provided for required option '--provider'"

data/lib/pact/provider_verifier/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module ProviderVerifier
-    VERSION = "1.28.0"
+    VERSION = "1.29.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-provider-verifier
 version: !ruby/object:Gem::Version
-  version: 1.28.0
+  version: 1.29.0
 platform: ruby
 authors:
 - Matt Fellows
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec