remove unneccessary transformation of paths in get_services.kt

GoogleCloudPlatform · Dec 17, 2024 · 18aa211 · 18aa211
1 parent cc29570
commit 18aa211
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/...orm/.teamcity/components/projects/feature_branches/FEATURE-BRANCH-ephemeral-write-only.kt b/...orm/.teamcity/components/projects/feature_branches/FEATURE-BRANCH-ephemeral-write-only.kt
@@ -21,7 +21,7 @@ import vcs_roots.HashiCorpVCSRootBeta
 import vcs_roots.HashiCorpVCSRootGa
 import vcs_roots.ModularMagicianVCSRootBeta
 import vcs_roots.ModularMagicianVCSRootGa
-import getServicesList
+import components.projects.feature_branches.getServicesList
 
 const val featureBranchEphemeralWriteOnly = "FEATURE-BRANCH-ephemeral-write-only"
 const val EphemeralWriteOnlyTfCoreVersion = "1.11.0-alpha20241211"

diff --git a/...form/.teamcity/components/get_services.kt → ...projects/feature_branches/get_services.kt b/...form/.teamcity/components/get_services.kt → ...projects/feature_branches/get_services.kt
@@ -2,11 +2,14 @@
  * 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")
@@ -24,32 +27,30 @@ fun getServicesList(Services: Array<String>, version: String): Map<String,Map<St
     }
 
     when (version) {
-        "GA" -> return servicesList
+        "GA" -> servicesList
         "Beta" -> {
-            servicesList = servicesList.mapValues { (_, value) ->
+            servicesList.mapValues { (_, value) ->
                 value + mapOf(
-                    "displayName" to "${value["displayName"]} - Beta",
-                    "path" to (value["path"]?.replace("./google/", "./google-beta/") ?: "")
+                        "displayName" to "${value["displayName"]} - Beta"
                 )
             }.toMutableMap()
         }
         "GA-MM" -> {
-            servicesList = servicesList.mapValues { (_, value) ->
+            servicesList.mapValues { (_, value) ->
                 value + mapOf(
-                    "displayName" to "${value["displayName"]} - MM"
+                        "displayName" to "${value["displayName"]} - MM"
                 )
             }.toMutableMap()
         }
         "Beta-MM" -> {
-            servicesList = servicesList.mapValues { (_, value) ->
+            servicesList.mapValues { (_, value) ->
                 value + mapOf(
-                    "displayName" to "${value["displayName"]} - Beta - MM",
-                    "path" to (value["path"]?.replace("./google-beta/", "./google-beta/services/") ?: "")
+                        "displayName" to "${value["displayName"]} - Beta - MM"
                 )
             }.toMutableMap()
         }
         else -> throw Exception("Invalid version $version")
-    }
-    
+    }.also { servicesList = it as MutableMap<String, Map<String, String>> }
+
     return servicesList
 }