Skip to content

CORE-669: update to workbench-notifications 2.0 without Azure notifications #1669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 3, 2025
Merged

CORE-669: update to workbench-notifications 2.0 without Azure notifications #1669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e82f31
update to workbench-notifications 2.0 without Azure notifications
davidangb Sep 3, 2025
bc41cc3
unused import
davidangb Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ object Dependencies {
val akkaHttpV = "10.6.3"
val jacksonV = "2.19.2"
val jacksonHotfixV = "2.19.2" // for when only some of the Jackson libs have hotfix releases
val workbenchLibsHash = "9df42f5" // see https://github.com/broadinstitute/workbench-libs readme for hash values
val workbenchLibsHash = "56f2c74" // see https://github.com/broadinstitute/workbench-libs readme for hash values

val excludeAkkaActor = ExclusionRule(organization = "com.typesafe.akka", name = "akka-actor_2.13")
val excludeAkkaStream = ExclusionRule(organization = "com.typesafe.akka", name = "akka-stream_2.13")
Expand Down Expand Up @@ -54,7 +54,7 @@ object Dependencies {
exclude ("com.google.cloud", "google-cloud-storage-transfer"),
"org.broadinstitute.dsde.workbench" %% "workbench-oauth2" % s"0.9-$workbenchLibsHash",
"org.broadinstitute.dsde.workbench" %% "sam-client" % "v0.0.407",
"org.broadinstitute.dsde.workbench" %% "workbench-notifications" % s"1.1-$workbenchLibsHash",
"org.broadinstitute.dsde.workbench" %% "workbench-notifications" % s"2.0-$workbenchLibsHash",
"org.databiosphere" % "workspacedataservice-client-okhttp-jakarta" % "0.2.167-SNAPSHOT",
"bio.terra" % "externalcreds-client-resttemplate" % "1.83.0-SNAPSHOT" excludeAll (excludeSpring, excludeSpringBoot),
"org.springframework" % "spring-web" % "6.2.9" excludeAll (excludeSpringBoot, excludeSpringJcl),
Expand Down
12 changes: 3 additions & 9 deletions src/main/scala/org/broadinstitute/dsde/firecloud/service/RegisterService.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
package org.broadinstitute.dsde.firecloud.service

import akka.http.scaladsl.model.StatusCodes
import com.typesafe.scalalogging.LazyLogging
import org.broadinstitute.dsde.firecloud.FireCloudConfig.Sam
import org.broadinstitute.dsde.firecloud.dataaccess._
import org.broadinstitute.dsde.firecloud.model.ModelJsonProtocol._
import org.broadinstitute.dsde.firecloud.model._
import org.broadinstitute.dsde.firecloud.service.PerRequest.{PerRequestMessage, RequestComplete}
import org.broadinstitute.dsde.firecloud.{Application, FireCloudConfig, FireCloudExceptionWithErrorReport}
import org.broadinstitute.dsde.workbench.model.Notifications.{
ActivationNotification,
AzurePreviewActivationNotification,
AzurePreviewActivationNotificationType,
Notification,
NotificationFormat
}
import org.broadinstitute.dsde.rawls.model.ErrorReport
import akka.http.scaladsl.model.StatusCodes
import org.broadinstitute.dsde.firecloud.FireCloudConfig.Sam
import org.broadinstitute.dsde.workbench.model.Notifications.{ActivationNotification, Notification, NotificationFormat}
import org.broadinstitute.dsde.workbench.model.WorkbenchUserId

import scala.concurrent.{ExecutionContext, Future}
Expand Down
5 changes: 1 addition & 4 deletions src/test/scala/org/broadinstitute/dsde/firecloud/service/RegisterServiceSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ import org.broadinstitute.dsde.firecloud.model.{
WorkbenchEnabled,
WorkbenchUserInfo
}
import org.broadinstitute.dsde.workbench.model.Notifications.{
ActivationNotification,
AzurePreviewActivationNotification
}
import org.broadinstitute.dsde.workbench.model.Notifications.ActivationNotification
import org.mockito.ArgumentMatchers
import org.mockito.ArgumentMatchers.any
import org.mockito.Mockito._
Expand Down
Loading