Fix passwordless JDBC and Redis azure.scopes defaulting to Azure Global when cloud-type=azure_china/azure_us_government by Copilot · Pull Request #48683 · Azure/azure-sdk-for-java

Copilot · 2026-04-03T06:55:59Z

This pull request fixes the defaulting logic for passwordless connection scopes in Azure JDBC and Redis for Spring Cloud Azure, ensuring the correct cloud-specific scopes are used when the cloud type is set to Azure China or Azure US Government. It introduces new methods for determining effective scopes, updates property conversion logic, and adds comprehensive tests to verify correct behavior. The changes also improve the merging of global and resource-specific properties to avoid overwriting explicit user configuration.

Bug Fixes and Scope Resolution Improvements

Fixed the logic for defaulting JDBC/Azure Database and Redis passwordless connection scopes so that the correct azure.scopes value is used for Azure China and Azure US Government clouds, based on the merged cloud type. Previously, the wrong scope could be used if the cloud type was set via spring.cloud.azure.profile.cloud-type.
Added getEffectiveScopes() methods to both AzureJdbcPasswordlessProperties and AzureRedisPasswordlessProperties, which return the appropriate default scope for the merged cloud type when scopes are not explicitly set. [1] [2]

Property Conversion and Merging

Updated the toPasswordlessProperties() method in both JDBC and Redis passwordless properties classes to use the effective, cloud-type-aware scopes instead of the raw value, ensuring correct values are propagated to downstream consumers. [1] [2]
Modified the property merging utility to only copy the scopes field if it is explicitly set, preventing accidental overwriting of user-provided values during the merge process.

Testing Enhancements

Added and updated unit tests to verify that the correct default scopes are used for Azure China and Azure US Government clouds, that explicit scopes override defaults, and that property merging behaves as expected for both JDBC and Redis passwordless properties. [1] [2]

These changes ensure passwordless authentication works reliably across different Azure environments and that user intent is preserved in configuration.

…government Agent-Logs-Url: https://github.com/Azure/azure-sdk-for-java/sessions/5f56cd61-af29-4585-a48b-d7bc109977a6 Co-authored-by: rujche <171773178+rujche@users.noreply.github.com>

Agent-Logs-Url: https://github.com/Azure/azure-sdk-for-java/sessions/2f82f4f9-ea2e-46a7-a2fc-062b403c19bd Co-authored-by: rujche <171773178+rujche@users.noreply.github.com>

Copilot

Pull request overview

Fixes passwordless JDBC azure.scopes resolution so that when spring.cloud.azure.profile.cloud-type is set (e.g., azure_china / azure_us_government) and JDBC-specific scopes aren’t explicitly configured, the effective default scope is derived from the merged cloud type (instead of incorrectly defaulting to Azure Global).

Changes:

Update JDBC passwordless properties so getScopes() returns the raw (possibly null) configured value, and add getEffectiveScopes() for cloud-aware defaults; ensure JDBC URL generation uses the effective scopes.
Adjust copyAzureCommonPropertiesIgnoreNull to avoid overwriting target scopes when the source scopes are null.
Update/add tests for China/US Gov scope behavior and update changelogs.

Reviewed changes

Copilot reviewed 6 out of 6 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
sdk/spring/spring-cloud-azure-core/src/main/java/com/azure/spring/cloud/core/implementation/util/AzurePasswordlessPropertiesUtils.java	Adds null-guard around copying `scopes` during passwordless property merge.
sdk/spring/spring-cloud-azure-core/CHANGELOG.md	Notes the change in scopes merge behavior.
sdk/spring/spring-cloud-azure-autoconfigure/src/main/java/com/azure/spring/cloud/autoconfigure/implementation/passwordless/properties/AzureJdbcPasswordlessProperties.java	Separates raw vs effective scopes and ensures `toPasswordlessProperties()` uses cloud-aware default scopes.
sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/passwordless/MergeAzureCommonPropertiesTest.java	Adds merge tests validating JDBC effective scopes behavior.
sdk/spring/spring-cloud-azure-autoconfigure/src/test/java/com/azure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorTest.java	Fixes US Gov expected scope and adds Azure China scenario coverage.
sdk/spring/spring-cloud-azure-autoconfigure/CHANGELOG.md	Adds a bug-fix entry for the cloud-type-specific default scopes behavior.

rujche · 2026-04-22T08:26:43Z

@copilot apply changes based on the comments in this thread

…nvention Agent-Logs-Url: https://github.com/Azure/azure-sdk-for-java/sessions/177be99d-3645-4a73-a56c-753ad743f82b Co-authored-by: rujche <171773178+rujche@users.noreply.github.com>

…tant, rename test method Agent-Logs-Url: https://github.com/Azure/azure-sdk-for-java/sessions/e12bfcb2-e753-484c-9f60-d4bd0aabc999 Co-authored-by: rujche <171773178+rujche@users.noreply.github.com>

Copilot · 2026-04-22T08:38:45Z

@copilot apply changes based on the comments in this thread

Applied all changes from the review thread in cc3ef95:

Cached source.getScopes() in a local variable in copyAzureCommonPropertiesIgnoreNull to avoid double-call
Renamed testJdbcPropertiesGetCorrectScopeFromGlobalCloudType → testJdbcPropertiesGetCorrectScopeFromChinaCloudTypeInGlobalProperties
Replaced hard-coded "azure.scopes" string with AuthProperty.SCOPES.getPropertyKey() in both test methods

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

rujche · 2026-04-23T05:52:09Z

@copilot apply changes based on the comments in this thread

… pattern; clarify CHANGELOG entry Agent-Logs-Url: https://github.com/Azure/azure-sdk-for-java/sessions/bdd4ce6e-14e3-4a50-92e0-608069e8c44c Co-authored-by: rujche <171773178+rujche@users.noreply.github.com>

Copilot · 2026-04-23T06:02:06Z

@copilot apply changes based on the comments in this thread

Applied both changes in 2919235:

Updated AzureRedisPasswordlessProperties to align with the JDBC raw/effective scopes pattern: getScopes() now returns the raw field (null when not explicitly set), added getEffectiveScopes() for cloud-type-aware defaults, and overrode toPasswordlessProperties() to use getEffectiveScopes(). This ensures copyAzureCommonPropertiesIgnoreNull won't propagate a computed default scope from the unmerged Redis profile.
Updated the CHANGELOG entry to specifically mention JDBC/Azure Database passwordless scope defaulting.

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated 2 comments.

rujche · 2026-04-24T00:14:10Z

@copilot apply changes based on the comments in this thread

Agent-Logs-Url: https://github.com/Azure/azure-sdk-for-java/sessions/40b2a63f-fac7-442b-a70a-f33b4e2a67a3 Co-authored-by: rujche <171773178+rujche@users.noreply.github.com>

Copilot · 2026-04-24T00:19:05Z

@copilot apply changes based on the comments in this thread

Applied in 35a158a:

Updated the CHANGELOG entry to mention both JDBC/Azure Database and Redis passwordless scope defaulting fix.
Added three new Redis tests to MergeAzureCommonPropertiesTest: testRedisPropertiesGetCorrectScopeFromChinaCloudTypeInGlobalProperties, testRedisPropertiesGetCorrectScopeFromUsGovCloudTypeInGlobalProperties, and testRedisPropertiesExplicitScopesOverridesDefault.

Copilot

Pull request overview

Copilot reviewed 6 out of 6 changed files in this pull request and generated no new comments.

Netyyyy

LGTM.

Initial plan

7237905

Copilot AI assigned Copilot and rujche Apr 3, 2026

Copilot started work on behalf of rujche April 3, 2026 06:56 View session

Copilot AI linked an issue Apr 3, 2026 that may be closed by this pull request

[BUG] azure.scopes is wrong when set spring.cloud.azure.profile.cloud-type=azure_china #47096

Closed

3 tasks

Fix azure.scopes wrong value when cloud-type=azure_china or azure_us_…

6ccc847

…government Agent-Logs-Url: https://github.com/Azure/azure-sdk-for-java/sessions/5f56cd61-af29-4585-a48b-d7bc109977a6 Co-authored-by: rujche <171773178+rujche@users.noreply.github.com>

Copilot AI changed the title ~~[WIP] Fix azure.scopes configuration for Azure China profile~~ Fix azure.scopes defaulting to Azure Global when cloud-type=azure_china/azure_us_government Apr 3, 2026

Copilot AI requested a review from rujche April 3, 2026 07:41

Copilot finished work on behalf of rujche April 3, 2026 07:41

rujche reviewed Apr 3, 2026

View reviewed changes

Comment thread sdk/spring/spring-cloud-azure-autoconfigure/CHANGELOG.md Outdated

Copilot started work on behalf of rujche April 3, 2026 08:00 View session

rujche requested a review from Copilot April 3, 2026 08:01

Fix issue number in CHANGELOG to #47096

f56b6ba

Agent-Logs-Url: https://github.com/Azure/azure-sdk-for-java/sessions/2f82f4f9-ea2e-46a7-a2fc-062b403c19bd Co-authored-by: rujche <171773178+rujche@users.noreply.github.com>

Copilot finished work on behalf of rujche April 3, 2026 08:04

Copilot AI requested a review from rujche April 3, 2026 08:04

Copilot AI reviewed Apr 3, 2026

View reviewed changes

Merge branch 'main' into copilot/fix-azure-scopes-for-china-again

a1db494

rujche reviewed Apr 22, 2026

View reviewed changes

Comment thread sdk/spring/spring-cloud-azure-core/CHANGELOG.md Outdated

Copilot started work on behalf of rujche April 22, 2026 08:26 View session

Move CHANGELOG entries to sdk/spring/CHANGELOG.md only per project co…

c49ccba

…nvention Agent-Logs-Url: https://github.com/Azure/azure-sdk-for-java/sessions/177be99d-3645-4a73-a56c-753ad743f82b Co-authored-by: rujche <171773178+rujche@users.noreply.github.com>

Copilot finished work on behalf of rujche April 22, 2026 08:33

Copilot AI requested a review from rujche April 22, 2026 08:33

Copilot started work on behalf of rujche April 22, 2026 08:33 View session

Apply PR review suggestions: cache getScopes(), use AuthProperty cons…

cc3ef95

…tant, rename test method Agent-Logs-Url: https://github.com/Azure/azure-sdk-for-java/sessions/e12bfcb2-e753-484c-9f60-d4bd0aabc999 Co-authored-by: rujche <171773178+rujche@users.noreply.github.com>

Copilot finished work on behalf of rujche April 22, 2026 08:40

rujche requested a review from Copilot April 22, 2026 08:40

Copilot started reviewing on behalf of rujche April 22, 2026 08:41 View session

Copilot AI reviewed Apr 22, 2026

View reviewed changes

Comment thread ...n/java/com/azure/spring/cloud/core/implementation/util/AzurePasswordlessPropertiesUtils.java Outdated

Comment thread ...zure/spring/cloud/autoconfigure/implementation/jdbc/JdbcPropertiesBeanPostProcessorTest.java Outdated

Copilot stopped work on behalf of rujche due to an error April 23, 2026 03:04
The "Install azsdk mcp server" custom setup step from your .github/workflows/copilot-setup-steps.yml file failed.

rujche requested a review from Copilot April 23, 2026 05:24

Copilot started reviewing on behalf of rujche April 23, 2026 05:25 View session

Copilot AI reviewed Apr 23, 2026

View reviewed changes

Comment thread ...n/java/com/azure/spring/cloud/core/implementation/util/AzurePasswordlessPropertiesUtils.java

Comment thread sdk/spring/CHANGELOG.md Outdated

Copilot started work on behalf of rujche April 23, 2026 05:52 View session

Align AzureRedisPasswordlessProperties with JDBC raw/effective scopes…

2919235

… pattern; clarify CHANGELOG entry Agent-Logs-Url: https://github.com/Azure/azure-sdk-for-java/sessions/bdd4ce6e-14e3-4a50-92e0-608069e8c44c Co-authored-by: rujche <171773178+rujche@users.noreply.github.com>

Copilot AI changed the title ~~Fix azure.scopes defaulting to Azure Global when cloud-type=azure_china/azure_us_government~~ Fix passwordless JDBC and Redis azure.scopes defaulting to Azure Global when cloud-type=azure_china/azure_us_government Apr 23, 2026

Copilot finished work on behalf of rujche April 23, 2026 06:03

rujche requested a review from Copilot April 23, 2026 23:51

Copilot started reviewing on behalf of rujche April 23, 2026 23:53 View session

Copilot AI reviewed Apr 23, 2026

View reviewed changes

Comment thread sdk/spring/CHANGELOG.md Outdated

Comment thread ...d/autoconfigure/implementation/passwordless/properties/AzureRedisPasswordlessProperties.java

Copilot started work on behalf of rujche April 24, 2026 00:14 View session

Update CHANGELOG to mention Redis; add Redis cloud-type scope tests

35a158a

Agent-Logs-Url: https://github.com/Azure/azure-sdk-for-java/sessions/40b2a63f-fac7-442b-a70a-f33b4e2a67a3 Co-authored-by: rujche <171773178+rujche@users.noreply.github.com>

Copilot finished work on behalf of rujche April 24, 2026 00:20

rujche requested a review from Copilot April 24, 2026 01:25

Copilot started reviewing on behalf of rujche April 24, 2026 01:26 View session

Copilot AI reviewed Apr 24, 2026

View reviewed changes

rujche marked this pull request as ready for review April 24, 2026 01:47

rujche requested review from a team, Netyyyy, moarychan and saragluna as code owners April 24, 2026 01:47

rujche approved these changes Apr 24, 2026

View reviewed changes

Netyyyy approved these changes Apr 28, 2026

View reviewed changes

rujche merged commit ab2626d into main Apr 28, 2026
38 checks passed

rujche deleted the copilot/fix-azure-scopes-for-china-again branch April 28, 2026 01:57

Conversation

Copilot AI commented Apr 3, 2026 • edited by rujche Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Bug Fixes and Scope Resolution Improvements

Property Conversion and Merging

Testing Enhancements

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rujche commented Apr 22, 2026

Uh oh!

Copilot AI commented Apr 22, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

rujche commented Apr 23, 2026

Uh oh!

Copilot AI commented Apr 23, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

rujche commented Apr 24, 2026

Uh oh!

Copilot AI commented Apr 24, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Netyyyy left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Copilot AI commented Apr 3, 2026 •

edited by rujche

Loading