Skip to content
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

Jump to bottom

fix(apollo): Fix using Apollo to connect to AppSync in China #2947

Merged
merged 2 commits into from
Nov 15, 2024
Merged

fix(apollo): Fix using Apollo to connect to AppSync in China #2947

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a22b13
Fix using Apollo to connect to AppSync in China
mattcreaser Nov 14, 2024
01597a4
Merge branch 'main' into mattcreaser/apollo-extensions-china
mattcreaser Nov 15, 2024
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
2 changes: 1 addition & 1 deletion apollo/apollo-appsync/src/main/java/com/amplifyframework/apollo/appsync/AppSyncEndpoint.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import java.net.URL
import okhttp3.HttpUrl.Companion.toHttpUrlOrNull

private val standardEndpointRegex =
"^https://\\w{26}\\.appsync-api\\.\\w{2}(?:-\\w{2,})+-\\d\\.amazonaws.com/graphql$".toRegex()
"^https://\\w{26}\\.appsync-api\\.\\w{2}(?:-\\w{2,})+-\\d\\.amazonaws.com(?:\\.cn)?/graphql$".toRegex()

/**
* Class representing the AppSync endpoint. There are multiple URLs associated with each AppSync endpoint: the
Expand Down
9 changes: 9 additions & 0 deletions ...o/apollo-appsync/src/test/java/com/amplifyframework/apollo/appsync/AppSyncEndpointTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import org.junit.Test

class AppSyncEndpointTest {
private val standardAppSyncUrl = "https://example1234567890123456789.appsync-api.us-east-1.amazonaws.com/graphql"
private val standardAppSyncUrlChina =
"https://example1234567890123456789.appsync-api.us-east-1.amazonaws.com.cn/graphql"
private val customAppSyncUrl = "https://api.example.com/graphql"

@Test
Expand All @@ -48,6 +50,13 @@ class AppSyncEndpointTest {
"https://example1234567890123456789.appsync-realtime-api.us-east-1.amazonaws.com/graphql/connect"
}

@Test
fun `uses expected realtime URL for standard endpoint in China`() {
val endpoint = AppSyncEndpoint(standardAppSyncUrlChina)
endpoint.websocketConnection.toString() shouldBe
"https://example1234567890123456789.appsync-realtime-api.us-east-1.amazonaws.com.cn/graphql/connect"
}

@Test
fun `uses expected realtime URL for custom endpoint`() {
val endpoint = AppSyncEndpoint(customAppSyncUrl)
Expand Down
Loading