New independent config values: SamConfig extends CommonConfig

broadinstitute · Jun 15, 2018 · 2c04ec4 · 2c04ec4
1 parent d46d3ef
commit 2c04ec4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/automation/project/Dependencies.scala b/automation/project/Dependencies.scala
@@ -7,7 +7,7 @@ object Dependencies {
 
   val workbenchModelV  = "0.10-6800f3a"
   val workbenchGoogleV = "0.16-847c3ff"
-  val workbenchServiceTestV = "0.9-f339f30"
+  val workbenchServiceTestV = "0.10-5e957b6-SNAP"
 
   val workbenchModel: ModuleID = "org.broadinstitute.dsde.workbench" %% "workbench-model" % workbenchModelV
   val excludeWorkbenchModel = ExclusionRule(organization = "org.broadinstitute.dsde.workbench", name = "workbench-model_2.11")

diff --git a/automation/src/test/scala/org/broadinstitute/dsde/test/SamConfig.scala b/automation/src/test/scala/org/broadinstitute/dsde/test/SamConfig.scala
@@ -0,0 +1,10 @@
+package org.broadinstitute.dsde.test
+
+import org.broadinstitute.dsde.workbench.config.CommonConfig
+
+object SamConfig extends CommonConfig {
+  // from common: qaEmail, pathToQAPem
+  object GCS extends CommonGCS {
+    val appsDomain = gcsConfig.getString("appsDomain")
+  }
+}
diff --git a/automation/src/test/scala/org/broadinstitute/dsde/test/api/SamApiSpec.scala b/automation/src/test/scala/org/broadinstitute/dsde/test/api/SamApiSpec.scala
@@ -1,15 +1,14 @@
 package org.broadinstitute.dsde.test.api
 
-import com.google.api.client.googleapis.auth.oauth2.GoogleCredential
+import org.broadinstitute.dsde.test.SamConfig
 import org.broadinstitute.dsde.workbench.service.{Orchestration, Sam, Thurloe}
-import org.broadinstitute.dsde.workbench.service.Sam.user.UserStatusDetails
 import org.broadinstitute.dsde.workbench.auth.{AuthToken, ServiceAccountAuthTokenFromJson, ServiceAccountAuthTokenFromPem}
-import org.broadinstitute.dsde.workbench.config.{Config, Credentials, UserPool}
+import org.broadinstitute.dsde.workbench.config.{Credentials, UserPool}
 import org.broadinstitute.dsde.workbench.model._
 import org.broadinstitute.dsde.workbench.dao.Google.googleIamDAO
 import org.broadinstitute.dsde.workbench.fixture.BillingFixtures
 import org.broadinstitute.dsde.workbench.service.test.CleanUp
-import org.broadinstitute.dsde.workbench.model.google.{GoogleProject, ServiceAccount, ServiceAccountName}
+import org.broadinstitute.dsde.workbench.model.google.{GoogleProject, ServiceAccountName}
 import org.scalatest.concurrent.ScalaFutures
 import org.scalatest.time.{Seconds, Span}
 import org.scalatest.{FreeSpec, Matchers}
@@ -20,6 +19,8 @@ import scala.concurrent.duration.Duration
 class SamApiSpec extends FreeSpec with BillingFixtures with Matchers with ScalaFutures with CleanUp {
   implicit override val patienceConfig: PatienceConfig = PatienceConfig(timeout = scaled(Span(5, Seconds)))
 
+  val gcsConfig = SamConfig.GCS
+
   def registerAsNewUser(email: WorkbenchEmail)(implicit authToken: AuthToken): Unit = {
     val newUserProfile = Orchestration.profile.BasicProfile (
       firstName = "Generic",
@@ -129,9 +130,9 @@ class SamApiSpec extends FreeSpec with BillingFixtures with Matchers with ScalaF
     }
 
     "should not treat non-pet service accounts as pets" in {
-      val saEmail = WorkbenchEmail(Config.GCS.qaEmail)
+      val saEmail = WorkbenchEmail(gcsConfig.qaEmail)
 
-      implicit val saAuthToken = ServiceAccountAuthTokenFromPem(Config.GCS.qaEmail, Config.GCS.pathToQAPem)
+      implicit val saAuthToken = ServiceAccountAuthTokenFromPem(gcsConfig.qaEmail, gcsConfig.pathToQAPem)
 
       // I am no one's pet.  I am myself.
       Sam.user.status()(saAuthToken).map(_.userInfo.userEmail) shouldBe Some(saEmail.value)
@@ -157,17 +158,17 @@ class SamApiSpec extends FreeSpec with BillingFixtures with Matchers with ScalaF
       val proxyGroup2_2 = Sam.user.proxyGroup(email2.value)(authToken2)
 
 /* Re-enable this code and remove the temporary code below after fixing rawls for GAWB-2933
-      val expectedProxyEmail1 = s"${username1}_$userId1@${Config.GCS.appsDomain}"
+      val expectedProxyEmail1 = s"${username1}_$userId1@${gcsConfig.appsDomain}"
 */
-      val expectedProxyEmail1 = s"$userId1@${Config.GCS.appsDomain}"
+      val expectedProxyEmail1 = s"$userId1@${gcsConfig.appsDomain}"
 
       proxyGroup1_1.value should endWith (expectedProxyEmail1)
       proxyGroup1_2.value should endWith (expectedProxyEmail1)
 
 /* Re-enable this code and remove the temporary code below after fixing rawls for GAWB-2933
-      val expectedProxyEmail2 = s"${username2}_$userId2@${Config.GCS.appsDomain}"
+      val expectedProxyEmail2 = s"${username2}_$userId2@${gcsConfig.appsDomain}"
 */
-      val expectedProxyEmail2 = s"$userId2@${Config.GCS.appsDomain}"
+      val expectedProxyEmail2 = s"$userId2@${gcsConfig.appsDomain}"
 
       proxyGroup2_1.value should endWith (expectedProxyEmail2)
       proxyGroup2_2.value should endWith (expectedProxyEmail2)
@@ -189,9 +190,9 @@ class SamApiSpec extends FreeSpec with BillingFixtures with Matchers with ScalaF
         val proxyGroup_2 = Sam.user.proxyGroup(petSAEmail.value)(authToken2)
 
         /* Re-enable this code and remove the temporary code below after fixing rawls for GAWB-2933
-      val expectedProxyEmail = s"${username}_$userId@${Config.GCS.appsDomain}"
+      val expectedProxyEmail = s"${username}_$userId@${gcsConfig.appsDomain}"
 */
-        val expectedProxyEmail = s"$userId@${Config.GCS.appsDomain}"
+        val expectedProxyEmail = s"$userId@${gcsConfig.appsDomain}"
 
         proxyGroup_1.value should endWith(expectedProxyEmail)
         proxyGroup_2.value should endWith(expectedProxyEmail)