Merge pull request #6978 from terraform-providers/ci/additional-subsc…

…ription Added alt subscription to tc config
hashicorp · May 18, 2020 · e77174e · e77174e
2 parents 7e0b868 + 1885773
commit e77174e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/.teamcity/components/build_azure.kt b/.teamcity/components/build_azure.kt
@@ -4,21 +4,23 @@ class ClientConfiguration(var clientId: String,
                           var clientSecret: String,
                           val subscriptionId : String,
                           val tenantId : String,
-                          val altClientId: String,
-                          val altClientSecret: String) {
+                          val clientIdAlt: String,
+                          val clientSecretAlt: String,
+                          val subscriptionIdAlt : String) {
 }
 
 class LocationConfiguration(var primary : String, var secondary : String, var ternary : String, var rotate : Boolean) {
 }
 
 fun ParametrizedWithType.ConfigureAzureSpecificTestParameters(environment: String, config: ClientConfiguration, locationsForEnv: LocationConfiguration) {
     hiddenPasswordVariable("env.ARM_CLIENT_ID", config.clientId, "The ID of the Service Principal used for Testing")
-    hiddenPasswordVariable("env.ARM_CLIENT_ID_ALT", config.altClientId, "The ID of the Alternate Service Principal used for Testing")
+    hiddenPasswordVariable("env.ARM_CLIENT_ID_ALT", config.clientIdAlt, "The ID of the Alternate Service Principal used for Testing")
     hiddenPasswordVariable("env.ARM_CLIENT_SECRET", config.clientSecret, "The Client Secret of the Service Principal used for Testing")
-    hiddenPasswordVariable("env.ARM_CLIENT_SECRET_ALT", config.altClientSecret, "The Client Secret of the Alternate Service Principal used for Testing")
+    hiddenPasswordVariable("env.ARM_CLIENT_SECRET_ALT", config.clientSecretAlt, "The Client Secret of the Alternate Service Principal used for Testing")
     hiddenVariable("env.ARM_ENVIRONMENT", environment, "The Azure Environment in which the tests are running")
     hiddenVariable("env.ARM_PROVIDER_DYNAMIC_TEST", "%b".format(locationsForEnv.rotate), "Should tests rotate between the supported regions?")
     hiddenPasswordVariable("env.ARM_SUBSCRIPTION_ID", config.subscriptionId, "The ID of the Azure Subscription used for Testing")
+    hiddenPasswordVariable("env.ARM_SUBSCRIPTION_ID_ALT", config.subscriptionIdAlt, "The ID of the Alternate Azure Subscription used for Testing")
     hiddenPasswordVariable("env.ARM_TENANT_ID", config.tenantId, "The ID of the Azure Tenant used for Testing")
     hiddenVariable("env.ARM_TEST_LOCATION", locationsForEnv.primary, "The Primary region which should be used for testing")
     hiddenVariable("env.ARM_TEST_LOCATION_ALT", locationsForEnv.secondary, "The Primary region which should be used for testing")

diff --git a/.teamcity/pom.xml b/.teamcity/pom.xml
@@ -20,6 +20,13 @@
         <enabled>true</enabled>
       </snapshots>
     </repository>
+    <repository>
+      <id>teamcity-server</id>
+      <url>https://teamcity.jetbrains.com/app/dsl-plugins-repository</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
   </repositories>
 
   <pluginRepositories>

diff --git a/.teamcity/settings.kts b/.teamcity/settings.kts
@@ -7,11 +7,12 @@ version = "2019.2"
 var clientId = DslContext.getParameter("clientId", "")
 var clientSecret = DslContext.getParameter("clientSecret", "")
 var subscriptionId = DslContext.getParameter("subscriptionId", "")
+var subscriptionIdAlt = DslContext.getParameter("subscriptionIdAlt", "")
 var tenantId = DslContext.getParameter("tenantId", "")
 var environment = DslContext.getParameter("environment", "public")
 var clientIdAlt = DslContext.getParameter("clientIdAlt", "")
 var clientSecretAlt = DslContext.getParameter("clientSecretAlt", "")
 
-var clientConfig = ClientConfiguration(clientId, clientSecret, subscriptionId, tenantId, clientIdAlt, clientSecretAlt)
+var clientConfig = ClientConfiguration(clientId, clientSecret, subscriptionId, subscriptionIdAlt, tenantId, clientIdAlt, clientSecretAlt)
 
 project(AzureRM(environment, clientConfig))
diff --git a/.teamcity/tests/helpers.kt b/.teamcity/tests/helpers.kt
@@ -3,5 +3,5 @@ package tests
 import ClientConfiguration
 
 fun TestConfiguration() : ClientConfiguration {
-    return ClientConfiguration("clientId", "clientSecret", "subscriptionId", "tenantId", "altClientId", "altClientSecret")
+    return ClientConfiguration("clientId", "clientSecret", "subscriptionId", "subscriptionIdAlt", "tenantId", "clientIdAlt", "clientSecretAlt")
 }