Merge c05b9f7 into 255941e

broadinstitute · Jan 16, 2020 · 6b8ae1b · 6b8ae1b
2 parents 255941e + c05b9f7
commit 6b8ae1b
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ To depend on the `MockGoogle*` classes, additionally depend on:
 
 Contains utility functions for talking to Google APIs via com.google.cloud client library (more recent) via gRPC. 
 
-Latest SBT dependency: `"org.broadinstitute.dsde.workbench" %% "workbench-google2" % "0.6-ca8509e"`
+Latest SBT dependency: `"org.broadinstitute.dsde.workbench" %% "workbench-google2" % "0.6-TRAVIS-REPLACE-ME"`
 
 To start the Google PubSub emulator for unit testing:
 

diff --git a/google2/CHANGELOG.md b/google2/CHANGELOG.md
@@ -9,11 +9,13 @@ Changed
 - Remove `LineBacker` usage
 - Add arguments to `insertBucket`
 - Fix `scala.MatchError` from `handleErrorWith`
+- Add `delete` function to `GoogleTopicAdmin` trait and implementation
 
 Add
 - Add `GoogleDataproc` and `GoogleDataprocInterpreter`
 
-SBT dependency: `"org.broadinstitute.dsde.workbench" %% "workbench-google2" % "0.6-ca8509e"`
+SBT dependency: `"org.broadinstitute.dsde.workbench" %% "workbench-google2" % "0.6-TRAVIS-REPLACE-ME"`
+
 
 ## 0.5
 

diff --git a/google2/src/main/scala/org/broadinstitute/dsde/workbench/google2/GooglePublisher.scala b/google2/src/main/scala/org/broadinstitute/dsde/workbench/google2/GooglePublisher.scala
@@ -15,6 +15,7 @@ trait GooglePublisher[F[_]] {
     * Watch out message size quota and limitations https://cloud.google.com/pubsub/quotas
     */
   def publishString: Pipe[F, String, Unit]
+
 }
 
 object GooglePublisher {

diff --git a/google2/src/main/scala/org/broadinstitute/dsde/workbench/google2/GoogleTopicAdmin.scala b/google2/src/main/scala/org/broadinstitute/dsde/workbench/google2/GoogleTopicAdmin.scala
@@ -16,6 +16,8 @@ trait GoogleTopicAdmin[F[_]] {
     */
   def create(projectTopicName: ProjectTopicName, traceId: Option[TraceId] = None): Stream[F, Unit]
 
+  def delete(projectTopicName: ProjectTopicName, traceId: Option[TraceId] = None): Stream[F, Unit]
+
   /**
     * @param projectTopicName
     * @param members can have the following values
@@ -46,4 +48,4 @@ object GoogleTopicAdmin {
   def fromServiceAccountCrendential[F[_]: Logger: Sync: Timer](serviceAccountCredentials: ServiceAccountCredentials, retryConfig: RetryConfig): Resource[F, GoogleTopicAdmin[F]] = for {
     topicAdminClient <- topicAdminClientResource(serviceAccountCredentials)
   } yield new GoogleTopicAdminInterpreter[F](topicAdminClient, retryConfig)
-}
+}
diff --git a/...rc/main/scala/org/broadinstitute/dsde/workbench/google2/GoogleTopicAdminInterpreter.scala b/...rc/main/scala/org/broadinstitute/dsde/workbench/google2/GoogleTopicAdminInterpreter.scala
@@ -31,6 +31,13 @@ class GoogleTopicAdminInterpreter[F[_]: Logger: Sync: Timer](topicAdminClient: T
     retryHelper[Unit](createTopic, traceId, s"com.google.cloud.pubsub.v1.TopicAdminClient.createTopic($projectTopicName)")
   }
 
+  def delete(projectTopicName: ProjectTopicName, traceId: Option[TraceId] = None): Stream[F, Unit] = {
+      val loggingCtx = Map("topic" -> projectTopicName.asJson, "traceId" -> traceId.asJson)
+      val deleteTopic = Sync[F].delay(topicAdminClient.deleteTopic(projectTopicName))
+
+      retryHelper[Unit](deleteTopic, traceId, s"com.google.cloud.pubsub.v1.TopicAdminClient.deleteTopic($projectTopicName)")
+  }
+
   def createWithPublisherMembers(projectTopicName: ProjectTopicName, members: List[Identity], traceId: Option[TraceId] = None): Stream[F, Unit] = {
     val loggingCtx = Map("topic" -> projectTopicName.asJson, "traceId" -> traceId.asJson)
     val createTopic = Sync[F].delay(topicAdminClient.createTopic(projectTopicName)).void.onError {

diff --git a/google2/src/test/scala/org/broadinstitute/dsde/workbench/google2/GoogleTopicAdminSpec.scala b/google2/src/test/scala/org/broadinstitute/dsde/workbench/google2/GoogleTopicAdminSpec.scala
@@ -31,6 +31,27 @@ class GoogleTopicAdminSpec extends FlatSpec with Matchers with WorkbenchTestSuit
     }
   }
 
+  "GoogleTopicAdminInterpreter" should "be able to delete topic" in {
+    forAll{
+      (topic: ProjectTopicName) =>
+        val result = localTopicAdmin.use {
+          topicAdmin =>
+            val googleTopicAdmin = new GoogleTopicAdminInterpreter[IO](topicAdmin, GoogleTopicAdminInterpreter.defaultRetryConfig)
+            val res = for {
+              _ <- googleTopicAdmin.create(topic)
+              _ <- googleTopicAdmin.delete(topic)
+              caught = the[com.google.api.gax.rpc.NotFoundException] thrownBy {
+                topicAdmin.getTopic(topic)
+              }
+            } yield (caught.getMessage should include("NOT_FOUND"))
+
+            res.compile.lastOrError
+        }
+
+        result.unsafeRunSync()
+    }
+  }
+
   //pubsub getIamPolicy isn't implemented in emulator
 }
 
@@ -45,4 +66,4 @@ object GoogleTopicAdminSpec {
         .setCredentialsProvider(credentialsProvider)
         .build())))(client => IO(client.shutdown()))
   } yield topicClient
-}
+}