fix(API): Fixing issue with CN endpoints (#3941)

aws-amplify · Dec 12, 2024 · 5016f36 · 5016f36
1 parent 2a17a77
commit 5016f36
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 2 deletions.
diff --git a/...fyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift b/...fyPlugins/API/Sources/AWSAPIPlugin/SubscriptionFactory/AppSyncRealTimeClientFactory.swift
@@ -136,7 +136,7 @@ extension AppSyncRealTimeClientFactory {
             return url
         }
 
-        guard host.hasSuffix("amazonaws.com") else {
+        guard host.hasSuffix("amazonaws.com") || host.hasSuffix("amazonaws.com.cn") else {
             return url.appendingPathComponent("realtime")
         }
 
@@ -163,7 +163,7 @@ extension AppSyncRealTimeClientFactory {
             return url
         }
 
-        guard host.hasSuffix("amazonaws.com") else {
+        guard host.hasSuffix("amazonaws.com") || host.hasSuffix("amazonaws.com.cn") else {
             if url.lastPathComponent == "realtime" {
                 return url.deletingLastPathComponent()
             }

diff --git a/...s/API/Tests/AWSAPIPluginTests/SubscriptionFactory/AppSyncRealTimeClientFactoryTests.swift b/...s/API/Tests/AWSAPIPluginTests/SubscriptionFactory/AppSyncRealTimeClientFactoryTests.swift
@@ -17,6 +17,12 @@ class AppSyncRealTimeClientFactoryTests: XCTestCase {
             AppSyncRealTimeClientFactory.appSyncRealTimeEndpoint(appSyncEndpoint),
             URL(string: "wss://abc.appsync-realtime-api.amazonaws.com/graphql")
         )
+
+        let appSyncEndpointCN = URL(string: "https://abc.appsync-api.amazonaws.com.cn/graphql")!
+        XCTAssertEqual(
+            AppSyncRealTimeClientFactory.appSyncRealTimeEndpoint(appSyncEndpointCN),
+            URL(string: "wss://abc.appsync-realtime-api.amazonaws.com.cn/graphql")
+        )
     }
 
     func testAppSyncRealTimeEndpoint_withAWSAppSyncRealTimeDomain_returnTheSameDomain() {
@@ -25,6 +31,12 @@ class AppSyncRealTimeClientFactoryTests: XCTestCase {
             AppSyncRealTimeClientFactory.appSyncRealTimeEndpoint(appSyncEndpoint),
             URL(string: "wss://abc.appsync-realtime-api.amazonaws.com/graphql")
         )
+
+        let appSyncEndpointCN = URL(string: "wss://abc.appsync-realtime-api.amazonaws.com.cn/graphql")!
+        XCTAssertEqual(
+            AppSyncRealTimeClientFactory.appSyncRealTimeEndpoint(appSyncEndpointCN),
+            URL(string: "wss://abc.appsync-realtime-api.amazonaws.com.cn/graphql")
+        )
     }
 
     func testAppSyncRealTimeEndpoint_withCustomDomain_returnCorrectRealtimePath() {
@@ -33,6 +45,12 @@ class AppSyncRealTimeClientFactoryTests: XCTestCase {
             AppSyncRealTimeClientFactory.appSyncRealTimeEndpoint(appSyncEndpoint),
             URL(string: "https://test.example.com/graphql/realtime")
         )
+
+        let appSyncEndpointCN = URL(string: "https://test.example.com.cn/graphql")!
+        XCTAssertEqual(
+            AppSyncRealTimeClientFactory.appSyncRealTimeEndpoint(appSyncEndpointCN),
+            URL(string: "https://test.example.com.cn/graphql/realtime")
+        )
     }
 
     func testAppSyncApiEndpoint_withAWSAppSyncRealTimeDomain_returnCorrectApiDomain() {
@@ -41,6 +59,12 @@ class AppSyncRealTimeClientFactoryTests: XCTestCase {
             AppSyncRealTimeClientFactory.appSyncApiEndpoint(appSyncEndpoint),
             URL(string: "https://abc.appsync-api.amazonaws.com/graphql")
         )
+
+        let appSyncEndpointCN = URL(string: "wss://abc.appsync-realtime-api.amazonaws.com.cn/graphql")!
+        XCTAssertEqual(
+            AppSyncRealTimeClientFactory.appSyncApiEndpoint(appSyncEndpointCN),
+            URL(string: "https://abc.appsync-api.amazonaws.com.cn/graphql")
+        )
     }
 
     func testAppSyncApiEndpoint_withAWSAppSyncApiDomain_returnTheSameDomain() {
@@ -49,6 +73,12 @@ class AppSyncRealTimeClientFactoryTests: XCTestCase {
             AppSyncRealTimeClientFactory.appSyncApiEndpoint(appSyncEndpoint),
             URL(string: "https://abc.appsync-api.amazonaws.com/graphql")
         )
+
+        let appSyncEndpointCN = URL(string: "https://abc.appsync-api.amazonaws.com.cn/graphql")!
+        XCTAssertEqual(
+            AppSyncRealTimeClientFactory.appSyncApiEndpoint(appSyncEndpointCN),
+            URL(string: "https://abc.appsync-api.amazonaws.com.cn/graphql")
+        )
     }
 
     func testAppSyncApiEndpoint_withCustomDomain_returnCorrectRealtimePath() {
@@ -57,5 +87,11 @@ class AppSyncRealTimeClientFactoryTests: XCTestCase {
             AppSyncRealTimeClientFactory.appSyncApiEndpoint(appSyncEndpoint),
             URL(string: "https://test.example.com/graphql")
         )
+
+        let appSyncEndpointCN = URL(string: "https://test.example.com.cn/graphql")!
+        XCTAssertEqual(
+            AppSyncRealTimeClientFactory.appSyncApiEndpoint(appSyncEndpointCN),
+            URL(string: "https://test.example.com.cn/graphql")
+        )
     }
 }