Merge pull request #189 from ITV/publisher-refactor

combine all broker interactions in single class
ITV · Oct 31, 2020 · ff864e2 · ff864e2
2 parents bd4e977 + c55751e
commit ff864e2
Show file tree

Hide file tree

Showing 31 changed files with 406 additions and 474 deletions.
diff --git a/example/provider/delivered_pacts/scala-pact-consumer_scala-pact-provider.json b/example/provider/delivered_pacts/scala-pact-consumer_scala-pact-provider.json
@@ -6,6 +6,28 @@
     "name" : "scala-pact-consumer"
   },
   "interactions" : [
+    {
+      "providerState" : "Results: Bob, Fred, Harry",
+      "description" : "Fetching results",
+      "request" : {
+        "method" : "GET",
+        "path" : "/results"
+      },
+      "response" : {
+        "status" : 200,
+        "headers" : {
+          "Pact" : "modifiedRequest"
+        },
+        "body" : {
+          "count" : 3,
+          "results" : [
+            "Bob",
+            "Fred",
+            "Harry"
+          ]
+        }
+      }
+    },
     {
       "description" : "Fetching least secure auth token ever",
       "request" : {
@@ -37,28 +59,6 @@
           }
         }
       }
-    },
-    {
-      "providerState" : "Results: Bob, Fred, Harry",
-      "description" : "Fetching results",
-      "request" : {
-        "method" : "GET",
-        "path" : "/results"
-      },
-      "response" : {
-        "status" : 200,
-        "headers" : {
-          "Pact" : "modifiedRequest"
-        },
-        "body" : {
-          "count" : 3,
-          "results" : [
-            "Bob",
-            "Fred",
-            "Harry"
-          ]
-        }
-      }
     }
   ],
   "metadata" : {

diff --git a/example/provider_tests/delivered_pacts/scala-pact-consumer_scala-pact-provider.json b/example/provider_tests/delivered_pacts/scala-pact-consumer_scala-pact-provider.json
@@ -6,6 +6,28 @@
     "name" : "scala-pact-consumer"
   },
   "interactions" : [
+    {
+      "providerState" : "Results: Bob, Fred, Harry",
+      "description" : "Fetching results",
+      "request" : {
+        "method" : "GET",
+        "path" : "/results"
+      },
+      "response" : {
+        "status" : 200,
+        "headers" : {
+          "Pact" : "modifiedRequest"
+        },
+        "body" : {
+          "count" : 3,
+          "results" : [
+            "Bob",
+            "Fred",
+            "Harry"
+          ]
+        }
+      }
+    },
     {
       "description" : "Fetching least secure auth token ever",
       "request" : {
@@ -37,28 +59,6 @@
           }
         }
       }
-    },
-    {
-      "providerState" : "Results: Bob, Fred, Harry",
-      "description" : "Fetching results",
-      "request" : {
-        "method" : "GET",
-        "path" : "/results"
-      },
-      "response" : {
-        "status" : 200,
-        "headers" : {
-          "Pact" : "modifiedRequest"
-        },
-        "body" : {
-          "count" : 3,
-          "results" : [
-            "Bob",
-            "Fred",
-            "Harry"
-          ]
-        }
-      }
     }
   ],
   "metadata" : {

diff --git a/sbt-scalapact-shared/src/main/scala/com/itv/scalapact/plugin/ScalaPactEnv.scala b/sbt-scalapact-shared/src/main/scala/com/itv/scalapact/plugin/ScalaPactEnv.scala
@@ -1,7 +1,6 @@
 package com.itv.scalapact.plugin
 
-import com.itv.scalapact.shared.ScalaPactSettings
-import com.itv.scalapact.shared.typeclasses.BrokerPublishData
+import com.itv.scalapact.shared.{BrokerPublishData, ScalaPactSettings}
 
 import scala.concurrent.duration._
 

diff --git a/sbt-scalapact-shared/src/main/scala/com/itv/scalapact/plugin/shared/PactContractWriter.scala b/sbt-scalapact-shared/src/main/scala/com/itv/scalapact/plugin/shared/PactContractWriter.scala
@@ -2,11 +2,12 @@ package com.itv.scalapact.plugin.shared
 
 import java.io.{File, PrintWriter}
 
+//todo make defs
 object PactContractWriter {
 
   private val simplifyName: String => String = name => "[^a-zA-Z0-9-]".r.replaceAllIn(name.replace(" ", "-"), "")
 
-  val writePactContracts: String => String => String => String => Unit = dirPath =>
+  val writePactToFile: String => String => String => String => Unit = dirPath =>
     provider =>
       consumer =>
         contents => {

diff --git a/sbt-scalapact-shared/src/main/scala/com/itv/scalapact/plugin/shared/Publisher.scala b/sbt-scalapact-shared/src/main/scala/com/itv/scalapact/plugin/shared/Publisher.scala
diff --git a/...apact-shared/src/main/scala/com/itv/scalapact/plugin/shared/ScalaPactPublishCommand.scala b/...apact-shared/src/main/scala/com/itv/scalapact/plugin/shared/ScalaPactPublishCommand.scala
@@ -1,15 +1,15 @@
 package com.itv.scalapact.plugin.shared
 
 import com.itv.scalapact.shared.ColourOutput._
-import com.itv.scalapact.shared.typeclasses.{IPactReader, IPactWriter, IScalaPactHttpClientBuilder}
 import com.itv.scalapact.shared._
-import com.itv.scalapactcore.common.LocalPactFileLoader
+import com.itv.scalapact.shared.typeclasses.{IPactReader, IPactWriter, IScalaPactHttpClientBuilder}
+import com.itv.scalapactcore.publisher.{PublishFailed, PublishResult, PublishSuccess, Publisher}
 
 import scala.concurrent.duration._
 
 object ScalaPactPublishCommand {
 
-  def doPactPublish[F[_]](
+  def doPactPublish(
       scalaPactSettings: ScalaPactSettings,
       pactBrokerAddress: String,
       providerBrokerPublishMap: Map[String, String],
@@ -20,10 +20,7 @@ object ScalaPactPublishCommand {
       pactBrokerAuthorization: Option[PactBrokerAuthorization],
       pactBrokerClientTimeout: Duration,
       sslContextName: Option[String]
-  )(implicit pactReader: IPactReader, pactWriter: IPactWriter, httpClientBuilder: IScalaPactHttpClientBuilder[F]): Unit = {
-    import Publisher._
-
-    val httpClient = httpClientBuilder.build(pactBrokerClientTimeout, sslContextName)
+  )(implicit pactReader: IPactReader, pactWriter: IPactWriter, httpClientBuilder: IScalaPactHttpClientBuilder): Unit = {
 
     PactLogger.message("*************************************".white.bold)
     PactLogger.message("** ScalaPact: Publishing Contracts **".white.bold)
@@ -37,32 +34,19 @@ object ScalaPactPublishCommand {
       PactLogger.error("Pact broker does not cope well with snapshot contracts.".yellow)
       PactLogger.error("To enable this feature, add \"allowSnapshotPublish := true\" to your pact.sbt file.".yellow)
     } else {
-      val configAndPactFiles =
-        LocalPactFileLoader.loadPactFiles(pactReader)(false)(scalaPactSettings.giveOutputPath)(scalaPactSettings)
-
-      // Publish all to main broker
-      val mainPublishResults: List[PublishResult] = publishToBroker(
-        httpClient.doRequestSync,
+      val publishSettings = PactPublishSettings(
         pactBrokerAddress,
+        providerBrokerPublishMap,
         versionToPublishAs,
-        tagsToPublishWith,
-        pactBrokerAuthorization
-      )(pactWriter)(configAndPactFiles)
-
-      // Publish to other specified brokers
-      val otherPublishResults: List[PublishResult] = for {
-        pactContract <- configAndPactFiles
-        broker       <- providerBrokerPublishMap.get(pactContract.provider.name).toList
-        publishResult <- publishToBroker(
-          httpClient.doRequestSync,
-          broker,
-          versionToPublishAs,
-          tagsToPublishWith,
-          pactBrokerAuthorization
-        )(pactWriter)(List(pactContract))
-      } yield publishResult
-
-      evaluatePublishResults(mainPublishResults ++ otherPublishResults)
+        pactContractVersion,
+        allowSnapshotPublish,
+        tagsToPublishWith.toList,
+        pactBrokerAuthorization,
+        pactBrokerClientTimeout,
+        sslContextName
+      )
+      val publishResults = Publisher.apply.publishPacts(publishSettings, scalaPactSettings)
+      evaluatePublishResults(publishResults)
     }
   }
 
@@ -72,9 +56,7 @@ object ScalaPactPublishCommand {
       case result: PublishFailed  => PactLogger.error(result.renderAsString)
     }
 
-    val noErrors = publishResults.collectFirst { case _: PublishFailed => () }.isEmpty
-
-    if (noErrors) exitSuccess()
+    if (publishResults.forall(_.isSuccess)) exitSuccess()
     else exitFailure()
   }
 

diff --git a/...calapact-shared/src/main/scala/com/itv/scalapact/plugin/shared/ScalaPactTestCommand.scala b/...calapact-shared/src/main/scala/com/itv/scalapact/plugin/shared/ScalaPactTestCommand.scala
@@ -58,7 +58,7 @@ object ScalaPactTestCommand {
       .collect { case Some(pact) => pact }
       .reduceOption(combinePacts)
       .foreach { combined =>
-        PactContractWriter.writePactContracts(outputPath)(combined.provider.name)(combined.consumer.name)(
+        PactContractWriter.writePactToFile(outputPath)(combined.provider.name)(combined.consumer.name)(
           pactWriter.pactToJsonString(combined, BuildInfo.version)
         )
       }
@@ -68,7 +68,9 @@ object ScalaPactTestCommand {
 
   private def fileToJsonString(file: File): Option[String] =
     Try {
-      val contents = Source.fromFile(file).getLines().mkString
+      val source = Source.fromFile(file)
+      val contents = source.getLines().mkString
+      source.close()
       file.delete()
       contents
     }.toOption.orElse {

diff --git a/...lapact-shared/src/main/scala/com/itv/scalapact/plugin/shared/ScalaPactVerifyCommand.scala b/...lapact-shared/src/main/scala/com/itv/scalapact/plugin/shared/ScalaPactVerifyCommand.scala
@@ -2,15 +2,15 @@ package com.itv.scalapact.plugin.shared
 
 import com.itv.scalapact.shared.ColourOutput._
 import com.itv.scalapact.shared._
-import com.itv.scalapact.shared.typeclasses.{IPactReader, IPactWriter, IResultPublisherBuilder, IScalaPactHttpClientBuilder}
+import com.itv.scalapact.shared.typeclasses.{IPactReader, IPactWriter, IScalaPactHttpClientBuilder}
 import com.itv.scalapact.shared.ProviderStateResult.SetupProviderState
 import com.itv.scalapactcore.verifier.Verifier
 
 import scala.concurrent.duration._
 
 object ScalaPactVerifyCommand {
 
-  def doPactVerify[F[_]](
+  def doPactVerify(
       scalaPactSettings: ScalaPactSettings,
       providerStates: Seq[(String, SetupProviderState)],
       providerStateMatcher: PartialFunction[String, ProviderStateResult],
@@ -27,8 +27,7 @@ object ScalaPactVerifyCommand {
       includePendingStatus: Boolean
   )(implicit pactReader: IPactReader,
     pactWriter: IPactWriter,
-    httpClientBuilder: IScalaPactHttpClientBuilder[F],
-    publisher: IResultPublisherBuilder): Unit = {
+    httpClientBuilder: IScalaPactHttpClientBuilder): Unit = {
     PactLogger.message("*************************************".white.bold)
     PactLogger.message("** ScalaPact: Running Verifier     **".white.bold)
     PactLogger.message("*************************************".white.bold)
@@ -66,7 +65,7 @@ object ScalaPactVerifyCommand {
       }
     }
 
-    val successfullyVerified = Verifier[F].verify(pactVerifySettings, scalaPactSettings)
+    val successfullyVerified = Verifier.apply.verify(pactVerifySettings, scalaPactSettings)
 
     if (successfullyVerified) sys.exit(0) else sys.exit(1)