chore: update build system service principals (#2181)

microsoft · Mar 19, 2024 · 3f4e12c · 3f4e12c
1 parent 59f8250
commit 3f4e12c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 81 deletions.
diff --git a/core/src/test/scala/com/microsoft/azure/synapse/ml/Secrets.scala b/core/src/test/scala/com/microsoft/azure/synapse/ml/Secrets.scala
@@ -63,7 +63,7 @@ object Secrets {
   lazy val PowerbiURL: String = getSecret("powerbi-url")
   lazy val AdbToken: String = getSecret("adb-token")
   lazy val SynapseStorageKey: String = getSecret("synapse-storage-key")
-  lazy val SynapseSpnKey: String = getSecret("synapse-spn-key")
+
   lazy val MADTestStorageKey: String = getSecret("madtest-storage-key")
 
   lazy val ArtifactStore: String = getSecret("synapse-artifact-store")

diff --git a/core/src/test/scala/com/microsoft/azure/synapse/ml/nbtest/SynapseTests.scala b/core/src/test/scala/com/microsoft/azure/synapse/ml/nbtest/SynapseTests.scala
@@ -71,7 +71,7 @@ class SynapseTests extends TestBase {
 
   println(s"Creating $expectedPoolCount Spark Pools...")
   // val sparkPools: Seq[String] = createSparkPools(expectedPoolCount)
-  val sparkPools: Seq[String] = Seq.fill(expectedPoolCount)("synapseml34pool")
+  val sparkPools: Seq[String] = Seq.fill(expectedPoolCount)("sml34pool3")
 
 
   val livyBatches: Array[LivyBatch] = selectedPythonFiles.zip(sparkPools).map { case (file, poolName) =>

diff --git a/core/src/test/scala/com/microsoft/azure/synapse/ml/nbtest/SynapseUtilities.scala b/core/src/test/scala/com/microsoft/azure/synapse/ml/nbtest/SynapseUtilities.scala
@@ -118,9 +118,9 @@ object SynapseUtilities {
 
   import SynapseJsonProtocol._
 
-  lazy val SynapseToken: String = getAccessToken(ClientId, Secrets.SynapseSpnKey,
+  lazy val SynapseToken: String = getAccessToken(ClientId, Secrets.ServiceConnectionSecret,
     "https://dev.azuresynapse.net/")
-  lazy val ArmToken: String = getAccessToken(ClientId, Secrets.SynapseSpnKey,
+  lazy val ArmToken: String = getAccessToken(ClientId, Secrets.ServiceConnectionSecret,
     "https://management.azure.com/")
 
   val LineSeparator: String = sys.props("line.separator").toLowerCase // Platform agnostic (\r\n:windows, \n:linux)
@@ -129,7 +129,7 @@ object SynapseUtilities {
   val StorageAccount: String = "mmlsparkbuildsynapse"
   val StorageContainer: String = "synapse"
   val TenantId: String = "72f988bf-86f1-41af-91ab-2d7cd011db47"
-  val ClientId: String = "85dde348-dd2b-43e5-9f5a-22262af45332"
+  val ClientId: String = Secrets.ServicePrincipalClientId
   val PoolNodeSize: String = "Small"
   val PoolLocation: String = "eastus2"
   val WorkspaceName: String = "mmlsparkbuild"

diff --git a/tools/docker/clean_acr.py b/tools/docker/clean_acr.py