Using function wrapper for location mapping in cluster.go

HigashikataZhangsuke · HigashikataZhangsuke · commit 2d63d1f961be · 2025-09-01T01:35:15.000-07:00
diff --git a/azure/scope/cluster.go b/azure/scope/cluster.go
@@ -1201,7 +1201,7 @@ func (s *ClusterScope) Location() string {
 	// Only apply region normalization if both conditions are met:
 	// 1. We're in AzureUSSecretCloud environment AND
 	// 2. Resource manager endpoint contains .scombine.scloud suffix
-	if s.AzureCluster.Spec.AzureEnvironment == "AzureUSSecretCloud" &&
+	if s.isAzureSecretCloudEnvironment() &&
 		strings.Contains(s.ResourceManagerEndpoint, ".scombine.scloud") {
 		return azureutil.NormalizeAzureRegion(s.AzureCluster.Spec.Location)
 	}

Original file line number	Diff line number	Diff line change
`@@ -1201,7 +1201,7 @@ func (s *ClusterScope) Location() string {`
`1201`	`1201`	`// Only apply region normalization if both conditions are met:`
`1202`	`1202`	`// 1. We're in AzureUSSecretCloud environment AND`
`1203`	`1203`	`// 2. Resource manager endpoint contains .scombine.scloud suffix`
`1204`		`- if s.AzureCluster.Spec.AzureEnvironment == "AzureUSSecretCloud" &&`
	`1204`	`+ if s.isAzureSecretCloudEnvironment() &&`
`1205`	`1205`	`strings.Contains(s.ResourceManagerEndpoint, ".scombine.scloud") {`
`1206`	`1206`	`return azureutil.NormalizeAzureRegion(s.AzureCluster.Spec.Location)`
`1207`	`1207`	`}`