Skip to content

fix: handle trailing dots and case-insensitivity in PSC auto-DNS sorting #1473

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

Draft
hessjcg wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

fix: handle trailing dots and case-insensitivity in PSC auto-DNS sorting #1473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion google/cloud/sql/connector/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,9 @@ async def _get_metadata(
and d["dnsScope"] == "INSTANCE"
]
# Sort: .sql-psc.goog first
psc_dns_names.sort(key=lambda x: x.endswith(".sql-psc.goog"), reverse=True)
psc_dns_names.sort(
key=lambda x: x.lower().endswith(".sql-psc.goog"), reverse=True
)

# Fall back do dns_name field if dns_names is not set
if not psc_dns_names:
Expand Down
35 changes: 35 additions & 0 deletions tests/unit/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,6 +329,41 @@ async def test_get_metadata_multiple_psc_dns_sorted(fake_client: CloudSQLClient)
fake_client.instance.dns_names = ["abcde.12345.us-central1.sql.goog"]


@pytest.mark.asyncio
async def test_get_metadata_multiple_psc_dns_sorted_with_trailing_dots(
fake_client: CloudSQLClient,
) -> None:
"""
Test _get_metadata returns successfully with multiple PSC IP types sorted
even when names contain trailing dots or mixed case.
"""
fake_client.instance.psc_enabled = True
fake_client.instance.legacy_dns_name = False
fake_client.instance.dns_names = [
"dns1.sql.goog.",
"dns2.SQL-PSC.GOOG.",
"dns3.sql.goog.",
]
try:
resp = await fake_client._get_metadata(
"test-project",
"test-region",
"test-instance",
)
assert resp["database_version"] == "POSTGRES_15"
assert resp["ip_addresses"] == {
"PRIMARY": ["127.0.0.1"],
"PRIVATE": ["10.0.0.1"],
"PSC": ["dns2.SQL-PSC.GOOG", "dns1.sql.goog", "dns3.sql.goog"],
}
assert isinstance(resp["server_ca_cert"], str)
finally:
fake_client.instance.psc_enabled = False
fake_client.instance.legacy_dns_name = False
fake_client.instance.dns_names = ["abcde.12345.us-central1.sql.goog"]



async def test_CloudSQLClient_init_default_endpoint(
fake_credentials: FakeCredentials,
) -> None:
Expand Down
Loading