Skip to content

[SQL] Clean up server update handling for soft-delete #33933

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

Open
rambabu-yalla wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

[SQL] Clean up server update handling for soft-delete #33933

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
6 changes: 2 additions & 4 deletions src/azure-cli/azure/cli/command_modules/sql/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4673,12 +4673,10 @@ def server_update(
instance.federated_client_id = (federated_client_id or instance.federated_client_id)

# Handle soft delete retention days
# 0 = disable soft delete, 1-7 = enable with specified retention days
# If not specified, set to None to avoid sending existing value to API
# -1 = never configured, 0 = disable soft delete, 1-7 = enable with specified retention days
# If not specified, preserve the existing value. If specified, update the value to maintain standard PUT behavior.
if soft_delete_retention_days is not None:
instance.retention_days = soft_delete_retention_days
else:
instance.retention_days = None

return instance

Expand Down
226 changes: 161 additions & 65 deletions ...li/command_modules/sql/tests/latest/recordings/test_sql_deleted_server_list_and_show.yaml
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions ...mand_modules/sql/tests/latest/recordings/test_sql_deleted_server_list_empty_location.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ interactions:
uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers?api-version=2024-11-01-preview
response:
body:
string: '{"value":[{"properties":{"version":"12.0","deletionTime":"2026-08-18T09:35:04.037Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rghjx6ifbgo4e3zxzn3kuidnpyfsxdl3pkp53maguikyw3lh724mreul2j4phv7u4we/providers/Microsoft.Sql/servers/clitestserverwe662rpgyls5y2jrkchzkktlaxh4hygo5dbobd67njlbivdgp","fullyQualifiedDomainName":"clitestserverwe662rpgyls5y2jrkchzkktlaxh4hygo5dbobd67njlbivdgp.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/clitestserverwe662rpgyls5y2jrkchzkktlaxh4hygo5dbobd67njlbivdgp"},{"properties":{"version":"12.0","deletionTime":"2026-08-13T15:01:42.703Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ramyalRG/providers/Microsoft.Sql/servers/ramyaltest01","fullyQualifiedDomainName":"ramyaltest01.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/ramyaltest01"},{"properties":{"version":"12.0","deletionTime":"2026-08-18T10:39:27.497Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rghjaceu7ysdrku25yifppi7cdyicxvpy44zpo7xqo6wmzmvctc4nj2ai3tjsktwomj/providers/Microsoft.Sql/servers/clitestserverjjxl3zly6lv4zxaafqszumksifqkkxrcrgwqhyrsqlrwvimro","fullyQualifiedDomainName":"clitestserverjjxl3zly6lv4zxaafqszumksifqkkxrcrgwqhyrsqlrwvimro.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/clitestserverjjxl3zly6lv4zxaafqszumksifqkkxrcrgwqhyrsqlrwvimro"},{"properties":{"version":"12.0","deletionTime":"2026-08-13T14:53:03.103Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Sql/servers/ramyalserver-202608132021","fullyQualifiedDomainName":"ramyalserver-202608132021.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/ramyalserver-202608132021"},{"properties":{"version":"12.0","deletionTime":"2026-08-18T09:24:55.963Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgvrzniu4pwff6dtvpwblp546xcdzpyn3vrjbroljl7gv6rbv3z32jrwbc3fwwof3xo/providers/Microsoft.Sql/servers/clitestservert5366yceaqocyixrwc33e6w6hrx7jxtrovbjdzaldlsrf6ckv","fullyQualifiedDomainName":"clitestservert5366yceaqocyixrwc33e6w6hrx7jxtrovbjdzaldlsrf6ckv.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/clitestservert5366yceaqocyixrwc33e6w6hrx7jxtrovbjdzaldlsrf6ckv"},{"properties":{"version":"12.0","deletionTime":"2026-08-18T09:26:07.61Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgizwhkzct33aknk775ram2s55fve63efqiwc32s7zagw3yswpj3ml3rx6z3hxrihft/providers/Microsoft.Sql/servers/clitestserverdf45lmkev6gensqfhrt6dnnd43tepbxg4kci64wlwjzheustb","fullyQualifiedDomainName":"clitestserverdf45lmkev6gensqfhrt6dnnd43tepbxg4kci64wlwjzheustb.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/clitestserverdf45lmkev6gensqfhrt6dnnd43tepbxg4kci64wlwjzheustb"},{"properties":{"version":"12.0","deletionTime":"2026-08-18T09:27:54.207Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgxdfliukbxanjjlsnwlhxg5rbsvzatdyotvlqboncf4y4kt7hekjswbnskz63p6efn/providers/Microsoft.Sql/servers/clitestservereu3bnq4mbyux7v5fmo6xhopafuskwwrl2bcnqpx7kypwy2afd","fullyQualifiedDomainName":"clitestservereu3bnq4mbyux7v5fmo6xhopafuskwwrl2bcnqpx7kypwy2afd.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/clitestservereu3bnq4mbyux7v5fmo6xhopafuskwwrl2bcnqpx7kypwy2afd"}]}'
string: '{"value":[{"properties":{"version":"12.0","deletionTime":"2026-08-18T09:35:04.037Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rghjx6ifbgo4e3zxzn3kuidnpyfsxdl3pkp53maguikyw3lh724mreul2j4phv7u4we/providers/Microsoft.Sql/servers/clitestserverwe662rpgyls5y2jrkchzkktlaxh4hygo5dbobd67njlbivdgp","fullyQualifiedDomainName":"clitestserverwe662rpgyls5y2jrkchzkktlaxh4hygo5dbobd67njlbivdgp.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/clitestserverwe662rpgyls5y2jrkchzkktlaxh4hygo5dbobd67njlbivdgp"},{"properties":{"version":"12.0","deletionTime":"2026-08-19T11:50:44.933Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ramyalRG/providers/Microsoft.Sql/servers/ramyaltest0011","fullyQualifiedDomainName":"ramyaltest0011.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/ramyaltest0011"},{"properties":{"version":"12.0","deletionTime":"2026-08-13T15:01:42.703Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/ramyalRG/providers/Microsoft.Sql/servers/ramyaltest01","fullyQualifiedDomainName":"ramyaltest01.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/ramyaltest01"},{"properties":{"version":"12.0","deletionTime":"2026-08-18T10:39:27.497Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rghjaceu7ysdrku25yifppi7cdyicxvpy44zpo7xqo6wmzmvctc4nj2ai3tjsktwomj/providers/Microsoft.Sql/servers/clitestserverjjxl3zly6lv4zxaafqszumksifqkkxrcrgwqhyrsqlrwvimro","fullyQualifiedDomainName":"clitestserverjjxl3zly6lv4zxaafqszumksifqkkxrcrgwqhyrsqlrwvimro.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/clitestserverjjxl3zly6lv4zxaafqszumksifqkkxrcrgwqhyrsqlrwvimro"},{"properties":{"version":"12.0","deletionTime":"2026-08-13T14:53:03.103Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Sql/servers/ramyalserver-202608132021","fullyQualifiedDomainName":"ramyalserver-202608132021.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/ramyalserver-202608132021"},{"properties":{"version":"12.0","deletionTime":"2026-08-18T10:41:01.423Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rg3xnl4zaqzlowtmohxsr26j2dpqzhz6vjw66yer5rayaas3xdzh5exujfit6l3pfiw/providers/Microsoft.Sql/servers/delalls6huiviicocj7cxbycprqcbagyyfkur4ckstqrvcvhltkjxq2tp7ublp","fullyQualifiedDomainName":"delalls6huiviicocj7cxbycprqcbagyyfkur4ckstqrvcvhltkjxq2tp7ublp.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/delalls6huiviicocj7cxbycprqcbagyyfkur4ckstqrvcvhltkjxq2tp7ublp"},{"properties":{"version":"12.0","deletionTime":"2026-08-18T09:24:55.963Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgvrzniu4pwff6dtvpwblp546xcdzpyn3vrjbroljl7gv6rbv3z32jrwbc3fwwof3xo/providers/Microsoft.Sql/servers/clitestservert5366yceaqocyixrwc33e6w6hrx7jxtrovbjdzaldlsrf6ckv","fullyQualifiedDomainName":"clitestservert5366yceaqocyixrwc33e6w6hrx7jxtrovbjdzaldlsrf6ckv.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/clitestservert5366yceaqocyixrwc33e6w6hrx7jxtrovbjdzaldlsrf6ckv"},{"properties":{"version":"12.0","deletionTime":"2026-08-18T10:42:50.767Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgpxuo275m5742ubm6kamloezpykwaq3hc3hwcnyn6mpbdnyucinut2tv4bvx23qsqo/providers/Microsoft.Sql/servers/delwrongqpr6lbwblpldsbe4djs2n6lh6vod7rv7vfyaamqe56k2nfhs7avugq","fullyQualifiedDomainName":"delwrongqpr6lbwblpldsbe4djs2n6lh6vod7rv7vfyaamqe56k2nfhs7avugq.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/delwrongqpr6lbwblpldsbe4djs2n6lh6vod7rv7vfyaamqe56k2nfhs7avugq"},{"properties":{"version":"12.0","deletionTime":"2026-08-18T09:26:07.61Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgizwhkzct33aknk775ram2s55fve63efqiwc32s7zagw3yswpj3ml3rx6z3hxrihft/providers/Microsoft.Sql/servers/clitestserverdf45lmkev6gensqfhrt6dnnd43tepbxg4kci64wlwjzheustb","fullyQualifiedDomainName":"clitestserverdf45lmkev6gensqfhrt6dnnd43tepbxg4kci64wlwjzheustb.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/clitestserverdf45lmkev6gensqfhrt6dnnd43tepbxg4kci64wlwjzheustb"},{"properties":{"version":"12.0","deletionTime":"2026-08-19T16:58:10.65Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rglbpujgd33fgqgmuhdxv6aegl5bidujzllauxn6nrcwn2ziptfpk2oppqnclihf6zv/providers/Microsoft.Sql/servers/delallp6lntasau7wyeyo2kcexfc3fwohksvlrf2dj7mpcjlgqur2ivneoigho","fullyQualifiedDomainName":"delallp6lntasau7wyeyo2kcexfc3fwohksvlrf2dj7mpcjlgqur2ivneoigho.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/delallp6lntasau7wyeyo2kcexfc3fwohksvlrf2dj7mpcjlgqur2ivneoigho"},{"properties":{"version":"12.0","deletionTime":"2026-08-19T16:58:06.66Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgsyv7tve3ia3t6khdpj2xddfxgdktzdvd5bwjm7tma2k45grj2u4pys6mw6f2fmalj/providers/Microsoft.Sql/servers/delwrongmiwg5y3kwtk7gj3chney2i6vftjhu75teqf5ch6yov6jwb6lz4lm32","fullyQualifiedDomainName":"delwrongmiwg5y3kwtk7gj3chney2i6vftjhu75teqf5ch6yov6jwb6lz4lm32.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/delwrongmiwg5y3kwtk7gj3chney2i6vftjhu75teqf5ch6yov6jwb6lz4lm32"},{"properties":{"version":"12.0","deletionTime":"2026-08-18T09:27:54.207Z","originalId":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/clitest.rgxdfliukbxanjjlsnwlhxg5rbsvzatdyotvlqboncf4y4kt7hekjswbnskz63p6efn/providers/Microsoft.Sql/servers/clitestservereu3bnq4mbyux7v5fmo6xhopafuskwwrl2bcnqpx7kypwy2afd","fullyQualifiedDomainName":"clitestservereu3bnq4mbyux7v5fmo6xhopafuskwwrl2bcnqpx7kypwy2afd.database.windows.net"},"id":"/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Sql/locations/centralus/deletedServers/clitestservereu3bnq4mbyux7v5fmo6xhopafuskwwrl2bcnqpx7kypwy2afd"}]}'
headers:
cache-control:
- no-cache
content-length:
- '3983'
- '6885'
content-type:
- application/json; charset=utf-8
date:
- Tue, 18 Aug 2026 10:39:57 GMT
- Thu, 20 Aug 2026 06:45:35 GMT
expires:
- '-1'
pragma:
Expand All @@ -39,11 +39,11 @@ interactions:
x-content-type-options:
- nosniff
x-ms-operation-identifier:
- tenantId=291664dd-5ef7-4989-bcf5-c04f0d1b370d,objectId=23054630-f9c0-4e69-bec2-276da4339e9b/southeastasia/789f5e1f-54cc-47c9-9d3d-ba748bef1eb9
- tenantId=291664dd-5ef7-4989-bcf5-c04f0d1b370d,objectId=23054630-f9c0-4e69-bec2-276da4339e9b/southeastasia/58235a2c-cd9e-4e4b-86af-4147289f800f
x-ms-ratelimit-remaining-subscription-global-reads:
- '3749'
x-msedge-ref:
- 'Ref A: 766C8D7D06404C64924FA61EA3E476DD Ref B: SG2AA1070304023 Ref C: 2026-08-18T10:39:56Z'
- 'Ref A: 72E914AC6F8C41D9A1F8A0C5566BC3AD Ref B: SG2AA1040515036 Ref C: 2026-08-20T06:45:34Z'
status:
code: 200
message: OK
Expand Down
Loading
Loading