Skip to content

Rename SovSG → GovSG in Common module, Fixes AB#3565148 #3068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mohitc1 merged 3 commits into from
Apr 3, 2026
Merged

Rename SovSG → GovSG in Common module, Fixes AB#3565148 #3068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62d55fd
Initial plan
Copilot Apr 3, 2026
3b0d3b0
Rename SovSG to GovSG in Common module (fixes AB#3565148)
Copilot Apr 3, 2026
0ff87f4
Add changelog entry for SovSG → GovSG rename (#3068)
Copilot Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
vNext
----------
- [PATCH] Rename SovSG to GovSG for the Singapore sovereign cloud identifiers (#3068)
Comment thread
mohitc1 marked this conversation as resolved.

Version 24.1.0
----------
Expand Down
6 changes: 3 additions & 3 deletions ...t/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import static com.microsoft.identity.common.java.providers.microsoft.azureactivedirectory.AzureActiveDirectoryCloud.DELOS_CLOUD_HOST;
import static com.microsoft.identity.common.java.providers.microsoft.azureactivedirectory.AzureActiveDirectoryCloud.PPE_CLOUD_HOST;
import static com.microsoft.identity.common.java.providers.microsoft.azureactivedirectory.AzureActiveDirectoryCloud.PUBLIC_CLOUD_HOST;
import static com.microsoft.identity.common.java.providers.microsoft.azureactivedirectory.AzureActiveDirectoryCloud.SOVSG_CLOUD_HOST;
import static com.microsoft.identity.common.java.providers.microsoft.azureactivedirectory.AzureActiveDirectoryCloud.GOVSG_CLOUD_HOST;
import static com.microsoft.identity.common.java.providers.microsoft.azureactivedirectory.AzureActiveDirectoryCloud.US_GOV_CLOUD_HOST;

import com.google.gson.Gson;
Expand Down Expand Up @@ -116,7 +116,7 @@ public class AzureActiveDirectory
US_GOV_CLOUD_HOST,
BLEU_CLOUD_HOST,
DELOS_CLOUD_HOST,
SOVSG_CLOUD_HOST
GOVSG_CLOUD_HOST
)));

static {
Expand All @@ -134,7 +134,7 @@ private static void preSeedSovereignClouds() {
for (final AzureActiveDirectoryCloud cloud : new AzureActiveDirectoryCloud[]{
AzureActiveDirectoryCloud.BLEU,
AzureActiveDirectoryCloud.DELOS,
AzureActiveDirectoryCloud.SOVSG
AzureActiveDirectoryCloud.GOVSG
}) {
sAadClouds.put(
cloud.getPreferredNetworkHostName().toLowerCase(Locale.US),
Expand Down
12 changes: 6 additions & 6 deletions ...ntity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectoryCloud.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ void setIsValidated(final boolean isValidated) {
public static final String US_GOV_CLOUD_HOST = "login.microsoftonline.us";
public static final String BLEU_CLOUD_HOST = "login.sovcloud-identity.fr";
public static final String DELOS_CLOUD_HOST = "login.sovcloud-identity.de";
public static final String SOVSG_CLOUD_HOST = "login.sovcloud-identity.sg";
public static final String GOVSG_CLOUD_HOST = "login.sovcloud-identity.sg";

// These are added without network calls because they are not part of instance discovery yet.
/** Bleu sovereign cloud (France). */
Expand All @@ -141,10 +141,10 @@ void setIsValidated(final boolean isValidated) {
Collections.singletonList(DELOS_CLOUD_HOST)
);

/** SovSG sovereign cloud (Singapore). */
public static final AzureActiveDirectoryCloud SOVSG = new AzureActiveDirectoryCloud(
SOVSG_CLOUD_HOST,
SOVSG_CLOUD_HOST,
Collections.singletonList(SOVSG_CLOUD_HOST)
/** GovSG sovereign cloud (Singapore). */
public static final AzureActiveDirectoryCloud GOVSG = new AzureActiveDirectoryCloud(
GOVSG_CLOUD_HOST,
GOVSG_CLOUD_HOST,
Collections.singletonList(GOVSG_CLOUD_HOST)
);
}
6 changes: 3 additions & 3 deletions ...4j/src/test/com/microsoft/identity/common/java/authorities/AuthorityKnownAuthorityTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,12 @@ class AuthorityKnownAuthorityTest {
}

/**
* Verifies that a sovereign cloud authority (SovSG) is recognized as known.
* Verifies that a sovereign cloud authority (GovSG) is recognized as known.
*/
@Test
fun testIsKnownAuthority_sovsgSovereignCloud() {
fun testIsKnownAuthority_govsgSovereignCloud() {
val authority = Authority.getAuthorityFromAuthorityUrl(
"https://${AzureActiveDirectoryCloud.SOVSG_CLOUD_HOST}/common"
"https://${AzureActiveDirectoryCloud.GOVSG_CLOUD_HOST}/common"
)
assertTrue(Authority.isKnownAuthority(authority))
}
Expand Down
18 changes: 9 additions & 9 deletions .../com/microsoft/identity/common/java/authorities/AzureActiveDirectoryAuthorityCloudTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ class AzureActiveDirectoryAuthorityCloudTest {
}

@Test
fun testIsSameCloudAsAuthority_bothSovsg_returnsTrue() {
val authority1 = createAuthority(AzureActiveDirectoryCloud.SOVSG_CLOUD_HOST)
val authority2 = createAuthority(AzureActiveDirectoryCloud.SOVSG_CLOUD_HOST)
fun testIsSameCloudAsAuthority_bothGovsg_returnsTrue() {
val authority1 = createAuthority(AzureActiveDirectoryCloud.GOVSG_CLOUD_HOST)
val authority2 = createAuthority(AzureActiveDirectoryCloud.GOVSG_CLOUD_HOST)
assertTrue(authority1.isSameCloudAsAuthority(authority2))
}

Expand All @@ -65,16 +65,16 @@ class AzureActiveDirectoryAuthorityCloudTest {
}

@Test
fun testIsSameCloudAsAuthority_bleuVsSovsg_returnsFalse() {
fun testIsSameCloudAsAuthority_bleuVsGovsg_returnsFalse() {
val bleu = createAuthority(AzureActiveDirectoryCloud.BLEU_CLOUD_HOST)
val sovsg = createAuthority(AzureActiveDirectoryCloud.SOVSG_CLOUD_HOST)
assertFalse(bleu.isSameCloudAsAuthority(sovsg))
val govsg = createAuthority(AzureActiveDirectoryCloud.GOVSG_CLOUD_HOST)
assertFalse(bleu.isSameCloudAsAuthority(govsg))
}

@Test
fun testIsSameCloudAsAuthority_delosVsSovsg_returnsFalse() {
fun testIsSameCloudAsAuthority_delosVsGovsg_returnsFalse() {
val delos = createAuthority(AzureActiveDirectoryCloud.DELOS_CLOUD_HOST)
val sovsg = createAuthority(AzureActiveDirectoryCloud.SOVSG_CLOUD_HOST)
assertFalse(delos.isSameCloudAsAuthority(sovsg))
val govsg = createAuthority(AzureActiveDirectoryCloud.GOVSG_CLOUD_HOST)
assertFalse(delos.isSameCloudAsAuthority(govsg))
}
}
26 changes: 13 additions & 13 deletions ...ity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectoryCloudTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class AzureActiveDirectoryCloudTest {
}

@Test
fun testSovsgCloudHostConstant() {
assertEquals("login.sovcloud-identity.sg", AzureActiveDirectoryCloud.SOVSG_CLOUD_HOST)
fun testGovsgCloudHostConstant() {
assertEquals("login.sovcloud-identity.sg", AzureActiveDirectoryCloud.GOVSG_CLOUD_HOST)
}

@Test
Expand Down Expand Up @@ -67,21 +67,21 @@ class AzureActiveDirectoryCloudTest {
}

@Test
fun testSovsgCloudInstance() {
val sovsg = AzureActiveDirectoryCloud.SOVSG
assertNotNull(sovsg)
assertEquals(AzureActiveDirectoryCloud.SOVSG_CLOUD_HOST, sovsg.preferredNetworkHostName)
assertEquals(AzureActiveDirectoryCloud.SOVSG_CLOUD_HOST, sovsg.preferredCacheHostName)
assertNotNull(sovsg.hostAliases)
assertEquals(1, sovsg.hostAliases.size)
assertEquals(AzureActiveDirectoryCloud.SOVSG_CLOUD_HOST, sovsg.hostAliases[0])
assertTrue(sovsg.isValidated)
fun testGovsgCloudInstance() {
val govsg = AzureActiveDirectoryCloud.GOVSG
assertNotNull(govsg)
assertEquals(AzureActiveDirectoryCloud.GOVSG_CLOUD_HOST, govsg.preferredNetworkHostName)
assertEquals(AzureActiveDirectoryCloud.GOVSG_CLOUD_HOST, govsg.preferredCacheHostName)
assertNotNull(govsg.hostAliases)
assertEquals(1, govsg.hostAliases.size)
assertEquals(AzureActiveDirectoryCloud.GOVSG_CLOUD_HOST, govsg.hostAliases[0])
assertTrue(govsg.isValidated)
}

@Test
fun testSovereignCloudInstancesAreDistinct() {
assertNotEquals(AzureActiveDirectoryCloud.BLEU, AzureActiveDirectoryCloud.DELOS)
assertNotEquals(AzureActiveDirectoryCloud.BLEU, AzureActiveDirectoryCloud.SOVSG)
assertNotEquals(AzureActiveDirectoryCloud.DELOS, AzureActiveDirectoryCloud.SOVSG)
assertNotEquals(AzureActiveDirectoryCloud.BLEU, AzureActiveDirectoryCloud.GOVSG)
assertNotEquals(AzureActiveDirectoryCloud.DELOS, AzureActiveDirectoryCloud.GOVSG)
}
}
2 changes: 1 addition & 1 deletion ...identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class AzureActiveDirectoryTest {
}

@Test
fun testIsKnownCloudDiscoveryHost_sovsg() {
fun testIsKnownCloudDiscoveryHost_govsg() {
assertTrue(AzureActiveDirectory.isKnownCloudDiscoveryHost("login.sovcloud-identity.sg"))
}

Expand Down
Loading