From 9a18d0d32542947d99021891bcf5a0b3a9da7f33 Mon Sep 17 00:00:00 2001 From: rebeccaxu Date: Thu, 13 Jul 2023 14:54:32 -0700 Subject: [PATCH 1/2] Updated the examples for LTR Policies and LTR Backups --- .../examples/LongTermRetentionBackupDelete.json | 2 +- .../examples/LongTermRetentionBackupGet.json | 4 ++-- .../examples/LongTermRetentionBackupListByLocation.json | 6 +++--- .../examples/LongTermRetentionPolicyCreateOrUpdate.json | 6 ++---- .../examples/LongTermRetentionPolicyGet.json | 3 +-- .../examples/LongTermRetentionPolicyListByDatabase.json | 3 +-- .../ResourceGroupBasedLongTermRetentionBackupDelete.json | 2 +- .../ResourceGroupBasedLongTermRetentionBackupGet.json | 4 ++-- ...urceGroupBasedLongTermRetentionBackupListByLocation.json | 6 +++--- 9 files changed, 16 insertions(+), 20 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionBackupDelete.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionBackupDelete.json index 87314630bbc2..6884bfcf9101 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionBackupDelete.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionBackupDelete.json @@ -11,7 +11,7 @@ "200": {}, "202": { "headers": { - "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.Sql/locations/japaneast/longTermRetentionServers/testserver/longTermRetentionDatabases/testDatabase/longTermRetentionBackups/55555555-6666-7777-8888-999999999999;131637960820000000/operations/55555555-6666-7777-8888-999999999999?api-version=2021-05-01" + "Azure-AsyncOperation": "https://management.azure.com/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.Sql/locations/japaneast/longTermRetentionServers/testserver/longTermRetentionDatabases/testDatabase/longTermRetentionBackups/55555555-6666-7777-8888-999999999999;131637960820000000/operations/55555555-6666-7777-8888-999999999999?api-version=2023-02-01-Preview" } } } diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionBackupGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionBackupGet.json index 8aa75e0baf90..3c6f4dc0f14e 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionBackupGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionBackupGet.json @@ -10,8 +10,8 @@ "responses": { "200": { "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.Sql/locations/japaneast/longTermRetentionServers/testserver/longTermRetentionDatabases/testDatabase/longTermRetentionBackups/2017-03-10T08:00:00.000Z;55555555-6666-7777-8888-999999999999;2017-09-06T08:00:00.000Z", - "name": "2017-03-10T08:00:00.000Z;55555555-6666-7777-8888-999999999999;131637960820000000", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.Sql/locations/japaneast/longTermRetentionServers/testserver/longTermRetentionDatabases/testDatabase/longTermRetentionBackups/55555555-6666-7777-8888-999999999999;131637960820000000", + "name": "55555555-6666-7777-8888-999999999999;131637960820000000", "type": "Microsoft.Sql/locations/longTermRetentionServers/longTermRetentionDatabases/longTermRetentionBackups", "properties": { "serverName": "testserver", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionBackupListByLocation.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionBackupListByLocation.json index 962eb3b02a02..de03c0848535 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionBackupListByLocation.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionBackupListByLocation.json @@ -10,7 +10,7 @@ "value": [ { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.Sql/locations/japaneast/longTermRetentionServers/testserver1/longTermRetentionDatabases/testDatabase1/longTermRetentionBackups/55555555-6666-7777-8888-999999999999;131637960820000000", - "name": "55555555-6666-7777-8888-999999999999;2017-08-23T08:00:00.000Z", + "name": "55555555-6666-7777-8888-999999999999;131637960820000000", "type": "Microsoft.Sql/locations/longTermRetentionServers/longTermRetentionDatabases/longTermRetentionBackups", "properties": { "serverName": "testserver1", @@ -24,7 +24,7 @@ }, { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.Sql/locations/japaneast/longTermRetentionServers/testserver2/longTermRetentionDatabases/testDatabase2/longTermRetentionBackups/12341234-1234-1234-1234-123123123123;131657960820000000", - "name": "12341234-1234-1234-1234-123123123123;2017-08-30T08:00:00.000Z", + "name": "12341234-1234-1234-1234-123123123123;131657960820000000", "type": "Microsoft.Sql/locations/longTermRetentionServers/longTermRetentionDatabases/longTermRetentionBackups", "properties": { "serverName": "testserver2", @@ -38,7 +38,7 @@ }, { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/providers/Microsoft.Sql/locations/japaneast/longTermRetentionServers/testserver3/longTermRetentionDatabases/testDatabase3/longTermRetentionBackups/43214321-4321-4321-4321-321321321321;131677960820000000", - "name": "43214321-4321-4321-4321-321321321321;2017-09-06T08:00:00.000Z", + "name": "43214321-4321-4321-4321-321321321321;131677960820000000", "type": "Microsoft.Sql/locations/longTermRetentionServers/longTermRetentionDatabases/longTermRetentionBackups", "properties": { "serverName": "testserver3", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyCreateOrUpdate.json index 468c9aced370..e7b43895f7d4 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyCreateOrUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyCreateOrUpdate.json @@ -11,8 +11,7 @@ "weeklyRetention": "P1M", "monthlyRetention": "P1Y", "yearlyRetention": "P5Y", - "weekOfYear": 5, - "makeBackupsImmutable": true + "weekOfYear": 5 } } }, @@ -26,8 +25,7 @@ "weeklyRetention": "P1M", "monthlyRetention": "P1Y", "yearlyRetention": "P5Y", - "weekOfYear": 5, - "makeBackupsImmutable": true + "weekOfYear": 5 } } }, diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyGet.json index 2d7dd13e64a4..2db60730f356 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyGet.json @@ -17,8 +17,7 @@ "weeklyRetention": "P1M", "monthlyRetention": "P1Y", "yearlyRetention": "P5Y", - "weekOfYear": 5, - "makeBackupsImmutable": true + "weekOfYear": 5 } } } diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyListByDatabase.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyListByDatabase.json index 40289d7b1459..332ffa5ad0b7 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyListByDatabase.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyListByDatabase.json @@ -18,8 +18,7 @@ "weeklyRetention": "P1M", "monthlyRetention": "P1Y", "yearlyRetention": "P5Y", - "weekOfYear": 5, - "makeBackupsImmutable": true + "weekOfYear": 5 } } ] diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/ResourceGroupBasedLongTermRetentionBackupDelete.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/ResourceGroupBasedLongTermRetentionBackupDelete.json index 0759053c849e..4e2db7c90486 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/ResourceGroupBasedLongTermRetentionBackupDelete.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/ResourceGroupBasedLongTermRetentionBackupDelete.json @@ -12,7 +12,7 @@ "200": {}, "202": { "headers": { - "Location": "https://management.azure.com/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testResourceGroup/providers/Microsoft.Sql/locations/japanEast/longTermRetentionBackupOperationResults/a1aa7c77-961b-4fbb-bcd6-aa9acfcd1706?api-version=2021-05-01" + "Location": "https://management.azure.com/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testResourceGroup/providers/Microsoft.Sql/locations/japanEast/longTermRetentionBackupOperationResults/a1aa7c77-961b-4fbb-bcd6-aa9acfcd1706?api-version=2023-02-01-Preview" } } } diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/ResourceGroupBasedLongTermRetentionBackupGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/ResourceGroupBasedLongTermRetentionBackupGet.json index 4e5a5e705370..38edcdc1bf0d 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/ResourceGroupBasedLongTermRetentionBackupGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/ResourceGroupBasedLongTermRetentionBackupGet.json @@ -11,8 +11,8 @@ "responses": { "200": { "body": { - "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testResourceGroup/providers/Microsoft.Sql/locations/japaneast/longTermRetentionServers/testserver/longTermRetentionDatabases/testDatabase/longTermRetentionBackups/2017-03-10T08:00:00.000Z;55555555-6666-7777-8888-999999999999;2017-09-06T08:00:00.000Z", - "name": "2017-03-10T08:00:00.000Z;55555555-6666-7777-8888-999999999999;131637960820000000", + "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testResourceGroup/providers/Microsoft.Sql/locations/japaneast/longTermRetentionServers/testserver/longTermRetentionDatabases/testDatabase/longTermRetentionBackups/55555555-6666-7777-8888-999999999999;131637960820000000", + "name": "55555555-6666-7777-8888-999999999999;131637960820000000", "type": "Microsoft.Sql/locations/longTermRetentionServers/longTermRetentionDatabases/longTermRetentionBackups", "properties": { "serverName": "testserver", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/ResourceGroupBasedLongTermRetentionBackupListByLocation.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/ResourceGroupBasedLongTermRetentionBackupListByLocation.json index 9acce487a77c..8f78ba3ee15e 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/ResourceGroupBasedLongTermRetentionBackupListByLocation.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/ResourceGroupBasedLongTermRetentionBackupListByLocation.json @@ -11,7 +11,7 @@ "value": [ { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testResourceGroup/providers/Microsoft.Sql/locations/japaneast/longTermRetentionServers/testserver1/longTermRetentionDatabases/testDatabase1/longTermRetentionBackups/55555555-6666-7777-8888-999999999999;131637960820000000", - "name": "55555555-6666-7777-8888-999999999999;2017-08-23T08:00:00.000Z", + "name": "55555555-6666-7777-8888-999999999999;131637960820000000", "type": "Microsoft.Sql/locations/longTermRetentionServers/longTermRetentionDatabases/longTermRetentionBackups", "properties": { "serverName": "testserver1", @@ -25,7 +25,7 @@ }, { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testResourceGroup/providers/Microsoft.Sql/locations/japaneast/longTermRetentionServers/testserver2/longTermRetentionDatabases/testDatabase2/longTermRetentionBackups/12341234-1234-1234-1234-123123123123;131657960820000000", - "name": "12341234-1234-1234-1234-123123123123;2017-08-30T08:00:00.000Z", + "name": "12341234-1234-1234-1234-123123123123;131657960820000000", "type": "Microsoft.Sql/locations/longTermRetentionServers/longTermRetentionDatabases/longTermRetentionBackups", "properties": { "serverName": "testserver2", @@ -39,7 +39,7 @@ }, { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testResourceGroup/providers/Microsoft.Sql/locations/japaneast/longTermRetentionServers/testserver3/longTermRetentionDatabases/testDatabase3/longTermRetentionBackups/43214321-4321-4321-4321-321321321321;131677960820000000", - "name": "43214321-4321-4321-4321-321321321321;2017-09-06T08:00:00.000Z", + "name": "43214321-4321-4321-4321-321321321321;131677960820000000", "type": "Microsoft.Sql/locations/longTermRetentionServers/longTermRetentionDatabases/longTermRetentionBackups", "properties": { "serverName": "testserver3", From c9ef1ebe5a8431f000d8eabe68513369ed07ece4 Mon Sep 17 00:00:00 2001 From: rebeccaxu Date: Thu, 13 Jul 2023 16:04:00 -0700 Subject: [PATCH 2/2] Not sure why makeBackupsImmutable got deleted --- .../examples/LongTermRetentionPolicyCreateOrUpdate.json | 6 ++++-- .../examples/LongTermRetentionPolicyGet.json | 3 ++- .../examples/LongTermRetentionPolicyListByDatabase.json | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyCreateOrUpdate.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyCreateOrUpdate.json index e7b43895f7d4..468c9aced370 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyCreateOrUpdate.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyCreateOrUpdate.json @@ -11,7 +11,8 @@ "weeklyRetention": "P1M", "monthlyRetention": "P1Y", "yearlyRetention": "P5Y", - "weekOfYear": 5 + "weekOfYear": 5, + "makeBackupsImmutable": true } } }, @@ -25,7 +26,8 @@ "weeklyRetention": "P1M", "monthlyRetention": "P1Y", "yearlyRetention": "P5Y", - "weekOfYear": 5 + "weekOfYear": 5, + "makeBackupsImmutable": true } } }, diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyGet.json index 2db60730f356..4b0a830d7245 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyGet.json @@ -17,7 +17,8 @@ "weeklyRetention": "P1M", "monthlyRetention": "P1Y", "yearlyRetention": "P5Y", - "weekOfYear": 5 + "weekOfYear": 5, + "makeBackupsImmutable": false } } } diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyListByDatabase.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyListByDatabase.json index 332ffa5ad0b7..22ad5ff5266d 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyListByDatabase.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/examples/LongTermRetentionPolicyListByDatabase.json @@ -18,7 +18,8 @@ "weeklyRetention": "P1M", "monthlyRetention": "P1Y", "yearlyRetention": "P5Y", - "weekOfYear": 5 + "weekOfYear": 5, + "makeBackupsImmutable": false } } ]