diff --git a/changelog.txt b/changelog.txt index 88c68bdb51..32373c5882 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,6 @@ vNext ---------- +- [PATCH] Rename SovSG to GovSG for the Singapore sovereign cloud identifiers (#3068) Version 24.1.0 ---------- diff --git a/common4j/src/main/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectory.java b/common4j/src/main/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectory.java index 09a62c189a..dbc453fe23 100644 --- a/common4j/src/main/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectory.java +++ b/common4j/src/main/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectory.java @@ -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; @@ -116,7 +116,7 @@ public class AzureActiveDirectory US_GOV_CLOUD_HOST, BLEU_CLOUD_HOST, DELOS_CLOUD_HOST, - SOVSG_CLOUD_HOST + GOVSG_CLOUD_HOST ))); static { @@ -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), diff --git a/common4j/src/main/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectoryCloud.java b/common4j/src/main/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectoryCloud.java index 9c3c5a2bdd..45c9c3f83f 100644 --- a/common4j/src/main/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectoryCloud.java +++ b/common4j/src/main/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectoryCloud.java @@ -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). */ @@ -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) ); } diff --git a/common4j/src/test/com/microsoft/identity/common/java/authorities/AuthorityKnownAuthorityTest.kt b/common4j/src/test/com/microsoft/identity/common/java/authorities/AuthorityKnownAuthorityTest.kt index 25ab04c67c..949d62cc34 100644 --- a/common4j/src/test/com/microsoft/identity/common/java/authorities/AuthorityKnownAuthorityTest.kt +++ b/common4j/src/test/com/microsoft/identity/common/java/authorities/AuthorityKnownAuthorityTest.kt @@ -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)) } diff --git a/common4j/src/test/com/microsoft/identity/common/java/authorities/AzureActiveDirectoryAuthorityCloudTest.kt b/common4j/src/test/com/microsoft/identity/common/java/authorities/AzureActiveDirectoryAuthorityCloudTest.kt index 3f6b7c4ad9..a49b830161 100644 --- a/common4j/src/test/com/microsoft/identity/common/java/authorities/AzureActiveDirectoryAuthorityCloudTest.kt +++ b/common4j/src/test/com/microsoft/identity/common/java/authorities/AzureActiveDirectoryAuthorityCloudTest.kt @@ -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)) } @@ -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)) } } diff --git a/common4j/src/test/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectoryCloudTest.kt b/common4j/src/test/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectoryCloudTest.kt index 547587f382..5f83af1790 100644 --- a/common4j/src/test/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectoryCloudTest.kt +++ b/common4j/src/test/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectoryCloudTest.kt @@ -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 @@ -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) } } diff --git a/common4j/src/test/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectoryTest.kt b/common4j/src/test/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectoryTest.kt index b87344ad94..a410db6d6f 100644 --- a/common4j/src/test/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectoryTest.kt +++ b/common4j/src/test/com/microsoft/identity/common/java/providers/microsoft/azureactivedirectory/AzureActiveDirectoryTest.kt @@ -65,7 +65,7 @@ class AzureActiveDirectoryTest { } @Test - fun testIsKnownCloudDiscoveryHost_sovsg() { + fun testIsKnownCloudDiscoveryHost_govsg() { assertTrue(AzureActiveDirectory.isKnownCloudDiscoveryHost("login.sovcloud-identity.sg")) }