Merge 089d1c5 into 539e672

broadinstitute · Nov 12, 2020 · e1a11ca · e1a11ca
2 parents 539e672 + 089d1c5
commit e1a11ca
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/google2/src/main/scala/org/broadinstitute/dsde/workbench/google2/GoogleBigQueryService.scala b/google2/src/main/scala/org/broadinstitute/dsde/workbench/google2/GoogleBigQueryService.scala
@@ -2,9 +2,11 @@ package org.broadinstitute.dsde.workbench.google2
 
 import cats.effect.{Blocker, ContextShift, Resource, Sync, Timer}
 import com.google.auth.Credentials
+import com.google.cloud.ServiceOptions.getDefaultProjectId
 import com.google.cloud.bigquery.BigQueryOptions.DefaultBigQueryFactory
 import com.google.cloud.bigquery.{BigQuery, BigQueryOptions, JobId, QueryJobConfiguration, TableResult}
 import io.chrisdavenport.log4cats.StructuredLogger
+import org.broadinstitute.dsde.workbench.model.google.GoogleProject
 
 trait GoogleBigQueryService[F[_]] {
   def query(queryJobConfiguration: QueryJobConfiguration, options: BigQuery.JobOption*): F[TableResult]
@@ -22,6 +24,13 @@ object GoogleBigQueryService {
   def resource[F[_]: Sync: ContextShift: Timer: StructuredLogger](
     credentials: Credentials,
     blocker: Blocker
+  ): Resource[F, GoogleBigQueryService[F]] =
+    resource(credentials, blocker, GoogleProject(getDefaultProjectId))
+
+  def resource[F[_]: Sync: ContextShift: Timer: StructuredLogger](
+    credentials: Credentials,
+    blocker: Blocker,
+    projectId: GoogleProject
   ): Resource[F, GoogleBigQueryService[F]] =
     for {
       client <- Resource.liftF[F, BigQuery](
@@ -30,6 +39,7 @@ object GoogleBigQueryService {
             BigQueryOptions
               .newBuilder()
               .setCredentials(credentials)
+              .setProjectId(projectId.value)
               .build()
           )
         )