-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
[upstream:a5601476fba508d1681fd88198e54c82980386c4] Signed-off-by: Modular Magician <[email protected]>
- Loading branch information
1 parent
c9b7401
commit 1a0b78d
Showing
6 changed files
with
229 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
```release-note:none | ||
|
||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
.teamcity/components/projects/feature_branches/FEATURE-BRANCH-ephemeral-write-only.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
/* | ||
* Copyright (c) HashiCorp, Inc. | ||
* SPDX-License-Identifier: MPL-2.0 | ||
*/ | ||
|
||
// This file is maintained in the GoogleCloudPlatform/magic-modules repository and copied into the downstream provider repositories. Any changes to this file in the downstream will be overwritten. | ||
|
||
package projects.feature_branches | ||
|
||
import ProviderNameBeta | ||
import ProviderNameGa | ||
import SharedResourceNameBeta | ||
import SharedResourceNameGa | ||
import SharedResourceNameVcr | ||
import builds.* | ||
import generated.ServicesListBeta | ||
import generated.ServicesListGa | ||
import jetbrains.buildServer.configs.kotlin.Project | ||
import replaceCharsId | ||
import vcs_roots.HashiCorpVCSRootBeta | ||
import vcs_roots.HashiCorpVCSRootGa | ||
import vcs_roots.ModularMagicianVCSRootBeta | ||
import vcs_roots.ModularMagicianVCSRootGa | ||
import components.projects.feature_branches.getServicesList | ||
import DefaultStartHour | ||
|
||
const val featureBranchEphemeralWriteOnly = "FEATURE-BRANCH-ephemeral-write-only" | ||
const val EphemeralWriteOnlyTfCoreVersion = "1.11.0-alpha20241211" | ||
|
||
fun featureBranchEphemeralWriteOnlySubProject(allConfig: AllContextParameters): Project { | ||
|
||
val trigger = NightlyTriggerConfiguration( | ||
branch = "refs/heads/$featureBranchEphemeralWriteOnly", // triggered builds must test the feature branch | ||
startHour = DefaultStartHour + 6, | ||
) | ||
val vcrConfig = getVcrAcceptanceTestConfig(allConfig) // Reused below for both MM testing build configs | ||
|
||
// GA | ||
val gaConfig = getGaAcceptanceTestConfig(allConfig) | ||
// These are the packages that have resources that will use write-only attributes | ||
var ServicesListWriteOnlyGA = getServicesList(arrayOf("compute", "secretmanager", "sql", "bigquerydatatransfer"), "GA") | ||
|
||
val buildConfigsGa = BuildConfigurationsForPackages(ServicesListWriteOnlyGA, ProviderNameGa, "EphemeralWriteOnlyGa - HC", HashiCorpVCSRootGa, listOf(SharedResourceNameGa), gaConfig, "TestAcc.*Ephemeral") | ||
buildConfigsGa.forEach{ builds -> | ||
builds.addTrigger(trigger) | ||
} | ||
|
||
var ServicesListWriteOnlyGaMM = getServicesList(arrayOf("compute", "secretmanager", "sql", "bigquerydatatransfer"), "GA-MM") | ||
val buildConfigsMMGa = BuildConfigurationsForPackages(ServicesListWriteOnlyGaMM, ProviderNameGa, "EphemeralWriteOnlyGa - MM", ModularMagicianVCSRootGa, listOf(SharedResourceNameGa), vcrConfig, "TestAcc.*Ephemeral") | ||
|
||
// Beta | ||
val betaConfig = getBetaAcceptanceTestConfig(allConfig) | ||
var ServicesListWriteOnlyBeta = getServicesList(arrayOf("compute", "secretmanager", "sql", "bigquerydatatransfer"), "Beta") | ||
val buildConfigsBeta = BuildConfigurationsForPackages(ServicesListWriteOnlyBeta, ProviderNameBeta, "EphemeralWriteOnlyBeta - HC", HashiCorpVCSRootBeta, listOf(SharedResourceNameBeta), betaConfig, "TestAcc.*Ephemeral") | ||
buildConfigsBeta.forEach{ builds -> | ||
builds.addTrigger(trigger) | ||
} | ||
|
||
var ServicesListWriteOnlyBetaMM = getServicesList(arrayOf("compute", "secretmanager", "sql", "bigquerydatatransfer"), "Beta-MM") | ||
val buildConfigsMMBeta = BuildConfigurationsForPackages(ServicesListWriteOnlyBetaMM, ProviderNameBeta, "EphemeralWriteOnlyBeta - MM", ModularMagicianVCSRootBeta, listOf(SharedResourceNameBeta), vcrConfig, "TestAcc.*Ephemeral") | ||
|
||
// Make all builds use a 1.11.0-ish version of TF core | ||
val allBuildConfigs = buildConfigsGa + buildConfigsBeta + buildConfigsMMGa + buildConfigsMMBeta | ||
allBuildConfigs.forEach{ builds -> | ||
builds.overrideTerraformCoreVersion(EphemeralWriteOnlyTfCoreVersion) | ||
} | ||
|
||
// ------ | ||
|
||
return Project{ | ||
id("FEATURE_BRANCH_ephemeral_write_only") | ||
name = featureBranchEphemeralWriteOnly | ||
description = "Subproject for testing feature branch $featureBranchEphemeralWriteOnly" | ||
|
||
// Register all build configs in the project | ||
allBuildConfigs.forEach{ builds -> | ||
buildType(builds) | ||
} | ||
|
||
params { | ||
readOnlySettings() | ||
} | ||
} | ||
} |
56 changes: 56 additions & 0 deletions
56
.teamcity/components/projects/feature_branches/get_services.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
/* | ||
* Copyright (c) HashiCorp, Inc. | ||
* SPDX-License-Identifier: MPL-2.0 | ||
*/ | ||
package components.projects.feature_branches | ||
|
||
import generated.ServicesListGa | ||
import generated.ServicesListBeta | ||
|
||
// This file is maintained in the GoogleCloudPlatform/magic-modules repository and copied into the downstream provider repositories. Any changes to this file in the downstream will be overwritten. | ||
|
||
// This function is used to get the services list for a given version. Typically used in feature branch builds for testing very specific services only. | ||
fun getServicesList(Services: Array<String>, version: String): Map<String,Map<String,String>> { | ||
if (Services.isEmpty()) { | ||
throw Exception("No services found for version $version") | ||
} | ||
|
||
var servicesList = mutableMapOf<String,Map<String,String>>() | ||
for (service in Services) { | ||
if (version == "GA" || version == "GA-MM") { | ||
servicesList[service] = ServicesListGa.getOrElse(service) { throw Exception("Service $service not found") } | ||
} else if (version == "Beta" || version == "Beta-MM") { | ||
servicesList[service] = ServicesListBeta.getOrElse(service) { throw Exception("Service $service not found") } | ||
} else { | ||
throw Exception("Invalid version $version") | ||
} | ||
} | ||
|
||
when (version) { | ||
"GA" -> servicesList | ||
"Beta" -> { | ||
servicesList.mapValues { (_, value) -> | ||
value + mapOf( | ||
"displayName" to "${value["displayName"]} - Beta" | ||
) | ||
}.toMutableMap() | ||
} | ||
"GA-MM" -> { | ||
servicesList.mapValues { (_, value) -> | ||
value + mapOf( | ||
"displayName" to "${value["displayName"]} - MM" | ||
) | ||
}.toMutableMap() | ||
} | ||
"Beta-MM" -> { | ||
servicesList.mapValues { (_, value) -> | ||
value + mapOf( | ||
"displayName" to "${value["displayName"]} - Beta - MM" | ||
) | ||
}.toMutableMap() | ||
} | ||
else -> throw Exception("Invalid version $version") | ||
}.also { servicesList = it as MutableMap<String, Map<String, String>> } | ||
|
||
return servicesList | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,79 @@ | ||
/* | ||
* Copyright (c) HashiCorp, Inc. | ||
* SPDX-License-Identifier: MPL-2.0 | ||
*/ | ||
|
||
// This file is maintained in the GoogleCloudPlatform/magic-modules repository and copied into the downstream provider repositories. Any changes to this file in the downstream will be overwritten. | ||
|
||
package tests | ||
|
||
import jetbrains.buildServer.configs.kotlin.triggers.ScheduleTrigger | ||
import org.junit.Assert | ||
import org.junit.Test | ||
import projects.feature_branches.featureBranchEphemeralWriteOnly | ||
import projects.googleCloudRootProject | ||
|
||
class FeatureBranchEphemeralWriteOnlySubProject { | ||
@Test | ||
fun buildsUsingHashiCorpReposAreOnSchedule() { | ||
val root = googleCloudRootProject(testContextParameters()) | ||
|
||
// Find feature branch project | ||
val project = getSubProject(root, featureBranchEphemeralWriteOnly ) | ||
|
||
// All builds using the HashiCorp owned GitHub repos | ||
val hashiBuilds = project.buildTypes.filter { bt -> | ||
bt.name.contains("HashiCorp downstream") | ||
} | ||
|
||
hashiBuilds.forEach{bt -> | ||
Assert.assertTrue( | ||
"Build configuration `${bt.name}` should contain at least one trigger", | ||
bt.triggers.items.isNotEmpty() | ||
) | ||
// Look for at least one CRON trigger | ||
var found = false | ||
lateinit var schedulingTrigger: ScheduleTrigger | ||
for (item in bt.triggers.items){ | ||
if (item.type == "schedulingTrigger") { | ||
schedulingTrigger = item as ScheduleTrigger | ||
found = true | ||
break | ||
} | ||
} | ||
|
||
Assert.assertTrue( | ||
"Build configuration `${bt.name}` should contain a CRON/'schedulingTrigger' trigger", | ||
found | ||
) | ||
|
||
// Check that triggered builds are being run on the feature branch | ||
val isCorrectBranch: Boolean = schedulingTrigger.branchFilter == "+:refs/heads/$featureBranchEphemeralWriteOnly" | ||
|
||
Assert.assertTrue( | ||
"Build configuration `${bt.name}` is using the $featureBranchEphemeralWriteOnly branch filter", | ||
isCorrectBranch | ||
) | ||
} | ||
} | ||
|
||
@Test | ||
fun buildsUsingModularMagicianReposAreNotTriggered() { | ||
val root = googleCloudRootProject(testContextParameters()) | ||
|
||
// Find feature branch project | ||
val project = getSubProject(root, featureBranchEphemeralWriteOnly) | ||
|
||
// All builds using the HashiCorp owned GitHub repos | ||
val magicianBuilds = project.buildTypes.filter { bt -> | ||
bt.name.contains("MM upstream") | ||
} | ||
|
||
magicianBuilds.forEach{bt -> | ||
Assert.assertTrue( | ||
"Build configuration `${bt.name}` should not have any triggers", | ||
bt.triggers.items.isEmpty() | ||
) | ||
} | ||
} | ||
} |