fix: remove dead code, fix bug in URL vs file handling

pact-foundation · Feb 23, 2022 · dcd53e0 · dcd53e0
1 parent bbc2321
commit dcd53e0
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 28 deletions.
diff --git a/native/provider.cc b/native/provider.cc
@@ -2,7 +2,6 @@
 #include <map>
 #include "pact-cpp.h"
 #include <vector>
-#include <iostream>
 
 using namespace Napi;
 
@@ -13,7 +12,6 @@ std::map<int, VerifierHandle*> handles;
   std::vector<const char*> cVec;
   for(size_t i = 0; i < arr.Length(); i++) {
       std::string tag = arr.Get(i).As<Napi::String>().Utf8Value();
-      std::cout << "element: " << tag.c_str() << "\n";
       char *cstr = strdup(tag.c_str());
       cVec.push_back(cstr);
   }
@@ -109,8 +107,6 @@ Napi::Value PactffiVerifierNewForApplication(const Napi::CallbackInfo& info) {
 Napi::Value PactffiVerifierExecute(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
 
-  std::cout << "Pactffiverifierexecute \n";
-
   if (info.Length() < 1) {
     throw Napi::Error::New(env, "PactffiInit(arguments) received < 1 argument");
   }
@@ -119,18 +115,13 @@ Napi::Value PactffiVerifierExecute(const Napi::CallbackInfo& info) {
     throw Napi::Error::New(env, "PactffiInit(arguments) expected a number");
   }
 
-  std::cout << "Pactffiverifierexecute 1 \n";
   // Extract arguments to verifier
   size_t handle = info[0].As<Napi::Number>().Uint32Value();
-  std::cout << "Pactffiverifierexecute 2 \n";
 
   // Execute the function asynchronously
   Napi::Function callback = info[1].As<Napi::Function>();
-  std::cout << "Pactffiverifierexecute 3 \n";
   VerificationWorker* verificationWorker = new VerificationWorker(callback, handle);
-  std::cout << "Pactffiverifierexecute 4 \n";
   verificationWorker->Queue();
-  std::cout << "Pactffiverifierexecute 5 \n";
 
   return info.Env().Undefined();
 }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pact-foundation/pact-core",
-  "version": "13.4.1-beta.16",
+  "version": "13.4.1-beta.18",
   "description": "Core of @pact-foundation/pact. You almost certainly don't want to depend on this directly.",
   "main": "src/index.js",
   "homepage": "https://github.com/pact-foundation/pact-js-core#readme",

diff --git a/src/ffi/types.ts b/src/ffi/types.ts
@@ -180,8 +180,8 @@ export type Ffi = {
   pactffiVerifierSetFilterInfo(
     handle: FfiVerifierHandle,
     description: string,
-    filterState: string,
-    filterNoState: boolean
+    state: string,
+    noState: boolean
   ): void;
   pactffiVerifierSetProviderState(
     handle: FfiVerifierHandle,

diff --git a/src/verifier/nativeVerifier.ts b/src/verifier/nativeVerifier.ts
@@ -43,20 +43,33 @@ export const verify = (opts: VerifierOptions): Promise<string> => {
     );
   }
 
+  const filterDescription = process.env.PACT_DESCRIPTION || '';
+  const filterState = process.env.PACT_PROVIDER_STATE || '';
+  const filterNoState = process.env.PACT_PROVIDER_NO_STATE ? true : false;
+
+  ffi.pactffiVerifierSetFilterInfo(
+    handle,
+    filterDescription,
+    filterState,
+    filterNoState
+  );
+
   if (opts.pactUrls) {
     opts.pactUrls.forEach((file) => {
       logger.debug(`checking source type of given pactUrl: ${file}`);
       try {
-        new URL(file);
-        logger.debug(`adding ${file} as a Url source`);
-
-        ffi.pactffiVerifierUrlSource(
-          handle,
-          file,
-          opts.pactBrokerUsername || '',
-          opts.pactBrokerPassword || '',
-          opts.pactBrokerToken || ''
-        );
+        const u = new URL(file);
+
+        if (u.hostname) {
+          logger.debug(`adding ${file} as a Url source`);
+          ffi.pactffiVerifierUrlSource(
+            handle,
+            file,
+            opts.pactBrokerUsername || '',
+            opts.pactBrokerPassword || '',
+            opts.pactBrokerToken || ''
+          );
+        }
       } catch {
         logger.debug(`${file} is not a URI`);
       }
@@ -90,7 +103,6 @@ export const verify = (opts: VerifierOptions): Promise<string> => {
   if (
     opts.publishVerificationResult ||
     opts.providerVersion ||
-    opts.publishVerificationResult ||
     opts.buildUrl ||
     opts.disableSslVerification ||
     opts.timeout ||
@@ -105,13 +117,15 @@ export const verify = (opts: VerifierOptions): Promise<string> => {
     );
   }
 
-  if (opts.pactBrokerUrl && opts.provider) {
+  const brokerUrl = opts.pactBrokerUrl || process.env.PACT_BROKER_BASE_URL;
+
+  if (brokerUrl && opts.provider) {
     ffi.pactffiVerifierBrokerSourceWithSelectors(
       handle,
-      opts.pactBrokerUrl,
-      opts.pactBrokerUsername || '',
-      opts.pactBrokerPassword || '',
-      opts.pactBrokerToken || '',
+      brokerUrl,
+      opts.pactBrokerUsername || process.env.PACT_BROKER_USERNAME || '',
+      opts.pactBrokerPassword || process.env.PACT_BROKER_PASSWORD || '',
+      opts.pactBrokerToken || process.env.PACT_BROKER_TOKEN || '',
       opts.enablePending || false,
       opts.includeWipPactsSince || '',
       opts.providerVersionTags || [],