From cc2f270d5e9d3b8c958d5388aa1b933c77e7dafc Mon Sep 17 00:00:00 2001 From: Blake Geno Date: Thu, 24 Aug 2023 16:02:44 -0400 Subject: [PATCH 1/2] put back profile to v1 billing proxy (#1202) --- .../dsde/firecloud/webservice/UserApiService.scala | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/scala/org/broadinstitute/dsde/firecloud/webservice/UserApiService.scala b/src/main/scala/org/broadinstitute/dsde/firecloud/webservice/UserApiService.scala index b9e166646..973f4d5c3 100644 --- a/src/main/scala/org/broadinstitute/dsde/firecloud/webservice/UserApiService.scala +++ b/src/main/scala/org/broadinstitute/dsde/firecloud/webservice/UserApiService.scala @@ -94,6 +94,18 @@ trait UserApiService } } } ~ + pathPrefix("profile" / "billing") { + pathEnd { + get { + passthrough(UserApiService.billingUrl, HttpMethods.GET) + } + } ~ + path(Segment) { projectName => + get { + passthrough(UserApiService.billingProjectUrl(projectName), HttpMethods.GET) + } + } + } ~ pathPrefix("api") { path("profile" / "billingAccounts") { get { From e851a898b927dce435875a3a411222d5bc2687b1 Mon Sep 17 00:00:00 2001 From: Broad Bot <61600560+broadbot@users.noreply.github.com> Date: Fri, 25 Aug 2023 09:49:06 -0400 Subject: [PATCH 2/2] Update google-api-services-admin-directory from directory_v1-rev20230802-2.0.0 to directory_v1-rev20230814-2.0.0 (#1199) Co-authored-by: Bria Morgan --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 9cb741783..a89d82f2b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -80,7 +80,7 @@ object Dependencies { excludeGuava("com.google.apis" % "google-api-services-pubsub" % "v1-rev20230801-2.0.0"), - excludeGuava("com.google.apis" % "google-api-services-admin-directory" % "directory_v1-rev20230802-2.0.0"), + excludeGuava("com.google.apis" % "google-api-services-admin-directory" % "directory_v1-rev20230814-2.0.0"), "com.github.jwt-scala" %% "jwt-core" % "9.4.3",