refactor: fixed broken test and missed parts of code to update

commercetools · Nov 8, 2024 · c786c70 · c786c70
1 parent ec6b71c
commit c786c70
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/gcp/pubsub/integration/src/test/scala/com/commercetools/queue/pubsub/PubSubClientSuite.scala b/gcp/pubsub/integration/src/test/scala/com/commercetools/queue/pubsub/PubSubClientSuite.scala
@@ -42,7 +42,7 @@ class PubSubClientSuite extends QueueClientSuite {
   private def config: IO[(String, CredentialsProvider, Option[String], PubSubConfig)] =
     booleanOrDefault(isEmulatorEnvVar, default = isEmulatorDefault).ifM(
       ifTrue =
-        IO.pure(("test-project", NoCredentialsProvider.create(), Some("localhost:8042"), PubSubConfig("test-suite"))),
+        IO.pure(("test-project", NoCredentialsProvider.create(), Some("localhost:8042"), PubSubConfig("test-suite-"))),
       ifFalse = for {
         project <- string("GCP_PUBSUB_PROJECT")
         credentials = GoogleCredentialsProvider
@@ -52,7 +52,7 @@ class PubSubClientSuite extends QueueClientSuite {
             "https://www.googleapis.com/auth/monitoring.read" // monitoring (for fetching stats)
           ).asJava)
           .build()
-      } yield (project, credentials, None, PubSubConfig("test-suite"))
+      } yield (project, credentials, None, PubSubConfig("test-suite-"))
     )
 
   override def client: Resource[IO, QueueClient[IO]] =

diff --git a/gcp/pubsub/src/main/scala/com/commercetools/queue/gcp/pubsub/PubSubAdministration.scala b/gcp/pubsub/src/main/scala/com/commercetools/queue/gcp/pubsub/PubSubAdministration.scala
@@ -73,7 +73,7 @@ private class PubSubAdministration[F[_]](
             Subscription
               .newBuilder()
               .setTopic(topicName.toString())
-              .setName(SubscriptionName.of(project, s"${configs.subscriptionNamePrefix}-$name").toString())
+              .setName(SubscriptionName.of(project, s"${configs.subscriptionNamePrefix}$name").toString())
               .setAckDeadlineSeconds(lockTTL.toSeconds.toInt)
               .setMessageRetentionDuration(ttl)
               // An empty expiration policy (no TTL set) ensures the subscription is never deleted
@@ -85,7 +85,7 @@ private class PubSubAdministration[F[_]](
     .adaptError(makeQueueException(_, name))
 
   override def update(name: String, messageTTL: Option[FiniteDuration], lockTTL: Option[FiniteDuration]): F[Unit] = {
-    val subscriptionName = SubscriptionName.of(project, s"${configs.subscriptionNamePrefix}-$name")
+    val subscriptionName = SubscriptionName.of(project, s"${configs.subscriptionNamePrefix}$name")
     val updateSubscriptionRequest = (messageTTL, lockTTL) match {
       case (Some(messageTTL), Some(lockTTL)) =>
         val mttl = Duration.newBuilder().setSeconds(messageTTL.toSeconds).build()
@@ -151,7 +151,7 @@ private class PubSubAdministration[F[_]](
   override def configuration(name: String): F[QueueConfiguration] =
     subscriptionClient.use { client =>
       wrapFuture[F, Subscription](F.delay {
-        val subscriptionName = SubscriptionName.of(project, s"${configs.subscriptionNamePrefix}-$name")
+        val subscriptionName = SubscriptionName.of(project, s"${configs.subscriptionNamePrefix}$name")
         client
           .getSubscriptionCallable()
           .futureCall(GetSubscriptionRequest.newBuilder().setSubscription(subscriptionName.toString()).build())
@@ -179,7 +179,7 @@ private class PubSubAdministration[F[_]](
           .futureCall(
             DeleteSubscriptionRequest
               .newBuilder()
-              .setSubscription(SubscriptionName.of(project, s"${configs.subscriptionNamePrefix}-$name").toString())
+              .setSubscription(SubscriptionName.of(project, s"${configs.subscriptionNamePrefix}$name").toString())
               .build())
       })
     }.void

diff --git a/gcp/pubsub/src/main/scala/com/commercetools/queue/gcp/pubsub/PubSubClient.scala b/gcp/pubsub/src/main/scala/com/commercetools/queue/gcp/pubsub/PubSubClient.scala
@@ -40,7 +40,7 @@ private class PubSubClient[F[_]: Async] private (
   override def statistics(name: String): QueueStatistics[F] =
     new PubSubStatistics(
       name,
-      SubscriptionName.of(project, s"${configs.subscriptionNamePrefix}-$name"),
+      SubscriptionName.of(project, s"${configs.subscriptionNamePrefix}$name"),
       monitoringChannelProvider,
       credentials,
       endpoint)