Made acceptance tests set empty string for compatibility with pre-7.X providers (#15134) (#24363)

[upstream:15470c49782155700b933a6b55b515af28dabb22]

Signed-off-by: Modular Magician <magic-modules@google.com>

Author: modular-magician

.teamcity/components/builds/build_configuration_per_package.kt

@@ -20,7 +20,7 @@ import replaceCharsId
 
 // BuildConfigurationsForPackages accepts a map containing details of multiple packages in a provider and returns a list of build configurations for them all.
 // Intended to be used in projects where we're testing all packages, e.g. the nightly test projects
-fun BuildConfigurationsForPackages(packages: Map<String, Map<String, String>>, providerName: String, parentProjectName: String, vcsRoot: GitVcsRoot, sharedResources: List<String>, environmentVariables: AccTestConfiguration, testPrefix: String = "TestAcc", releaseDiffTest: String = "false"): List<BuildType> {
+fun BuildConfigurationsForPackages(packages: Map<String, Map<String, String>>, providerName: String, parentProjectName: String, vcsRoot: GitVcsRoot, sharedResources: List<String>, environmentVariables: AccTestConfiguration, testPrefix: String = "TestAcc", releaseDiffTest: Boolean = false): List<BuildType> {
     val list = ArrayList<BuildType>()
 
     // Create build configurations for all packages, except sweeper
@@ -38,16 +38,16 @@ fun BuildConfigurationsForPackages(packages: Map<String, Map<String, String>>, p
 
 // BuildConfigurationForSinglePackage accepts details of a single package in a provider and returns a build configuration for it
 // Intended to be used in short-lived projects where we're testing specific packages, e.g. feature branch testing
-fun BuildConfigurationForSinglePackage(packageName: String, packagePath: String, packageDisplayName: String, providerName: String, parentProjectName: String, vcsRoot: GitVcsRoot, sharedResources: List<String>, environmentVariables: AccTestConfiguration, testPrefix: String = "TestAcc", releaseDiffTest: String = "false"): BuildType{
+fun BuildConfigurationForSinglePackage(packageName: String, packagePath: String, packageDisplayName: String, providerName: String, parentProjectName: String, vcsRoot: GitVcsRoot, sharedResources: List<String>, environmentVariables: AccTestConfiguration, testPrefix: String = "TestAcc", releaseDiffTest: Boolean = false): BuildType{
     val pkg = PackageDetails(packageName, packageDisplayName, providerName, parentProjectName, releaseDiffTest = releaseDiffTest)
     return pkg.buildConfiguration(packagePath, vcsRoot, sharedResources, environmentVariables, testPrefix = testPrefix, releaseDiffTest = releaseDiffTest)
 }
 
-class PackageDetails(private val packageName: String, private val displayName: String, private val providerName: String, private val parentProjectName: String, private val releaseDiffTest: String) {
+class PackageDetails(private val packageName: String, private val displayName: String, private val providerName: String, private val parentProjectName: String, private val releaseDiffTest: Boolean) {
 
     // buildConfiguration returns a BuildType for a service package
     // For BuildType docs, see https://teamcity.jetbrains.com/app/dsl-documentation/root/build-type/index.html
-    fun buildConfiguration(path: String, vcsRoot: GitVcsRoot, sharedResources: List<String>, environmentVariables: AccTestConfiguration, buildTimeout: Int = DefaultBuildTimeoutDuration, testPrefix: String, releaseDiffTest: String): BuildType {
+    fun buildConfiguration(path: String, vcsRoot: GitVcsRoot, sharedResources: List<String>, environmentVariables: AccTestConfiguration, buildTimeout: Int = DefaultBuildTimeoutDuration, testPrefix: String, releaseDiffTest: Boolean): BuildType {
         val testPrefix = "TestAcc"
         val testTimeout = "12"
 
@@ -72,7 +72,7 @@ class PackageDetails(private val packageName: String, private val displayName: S
                 tagBuildToIndicateTriggerMethod()
                 configureGoEnv()
                 downloadTerraformBinary()
-                if (releaseDiffTest.toBoolean()) {
+                if (releaseDiffTest) {
                     runDiffTests()
                 } else {
                     runAcceptanceTests()

.teamcity/components/builds/build_configuration_sweepers.kt

@@ -61,7 +61,7 @@ class SweeperDetails(private val sweeperName: String, private val parentProjectN
         // These hardcoded values affect the sweeper CLI command's behaviour
         val testPrefix = "TestAcc"
         val testTimeout = "12"
-        val releaseDiffTest = "false"
+        val releaseDiffTest = false
 
         return BuildType {
 

.teamcity/components/builds/build_configuration_vcr_recording.kt

@@ -27,7 +27,7 @@ class VcrDetails(private val providerName: String, private val buildId: String,
         val testTimeout = "12"
         val parallelism = DefaultParallelism
         val buildTimeout: Int = DefaultBuildTimeoutDuration
-        val releaseDiffTest = "false"
+        val releaseDiffTest = false
 
         // Path is just ./google(-beta) here, whereas nightly test builds use paths like ./google/something/specific
         // This helps VCR testing builds to run tests across multiple packages

.teamcity/components/builds/build_parameters.kt

@@ -205,12 +205,17 @@ fun ParametrizedWithType.configureGoogleSpecificTestParameters(config: AccTestCo
 
 // ParametrizedWithType.acceptanceTestBuildParams sets build params that affect how commands to run
 //  acceptance tests are templated
-fun ParametrizedWithType.acceptanceTestBuildParams(parallelism: Int, prefix: String, timeout: String, releaseDiffTest: String) {
+fun ParametrizedWithType.acceptanceTestBuildParams(parallelism: Int, prefix: String, timeout: String, releaseDiffTest: Boolean) {
     hiddenVariable("env.TF_ACC", "1", "Set to a value to run the Acceptance Tests")
     text("PARALLELISM", "%d".format(parallelism))
     text("TEST_PREFIX", prefix)
     text("TIMEOUT", timeout)
-    text("env.RELEASE_DIFF", releaseDiffTest)
+    if (releaseDiffTest) {
+        text("env.RELEASE_DIFF", "true")
+    } else {
+        // Use an empty string for backwards-compatibility with pre-7.X release diff behavior.
+        text("env.RELEASE_DIFF", "")
+    }
 }
 
 // ParametrizedWithType.sweeperParameters sets build parameters that affect how sweepers are run

.teamcity/components/projects/reused/weekly_diff_tests.kt

@@ -37,7 +37,7 @@ fun weeklyDiffTests(parentProject:String, providerName: String, vcsRoot: GitVcsR
     // Create build configs to run acceptance tests for each package defined in packages.kt and services.kt files
     // and add cron trigger to them all
     val allPackages = getAllPackageInProviderVersion(providerName)
-    val packageBuildConfigs = BuildConfigurationsForPackages(allPackages, providerName, projectId, vcsRoot, sharedResources, config, releaseDiffTest = "true")
+    val packageBuildConfigs = BuildConfigurationsForPackages(allPackages, providerName, projectId, vcsRoot, sharedResources, config, releaseDiffTest = true)
     packageBuildConfigs.forEach { buildConfiguration ->
         buildConfiguration.addTrigger(cron)
     }