Skip to content

Commit c1ef74a

Browse files
Merge pull request #1301 from Azure/anthony-c-martin-patch-1
[ReleasePR sql] revert V2020-02-02-Preview ShortTermRetentionPolicy
2 parents 8b42aae + 5f2b43f commit c1ef74a

File tree

2 files changed

+2
-80
lines changed

2 files changed

+2
-80
lines changed

schemas/2020-02-02-preview/Microsoft.Sql.json

Lines changed: 1 addition & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -340,53 +340,6 @@
340340
],
341341
"description": "Microsoft.Sql/servers/azureADOnlyAuthentications"
342342
},
343-
"servers_databases_backupShortTermRetentionPolicies": {
344-
"type": "object",
345-
"properties": {
346-
"apiVersion": {
347-
"type": "string",
348-
"enum": [
349-
"2020-02-02-preview"
350-
]
351-
},
352-
"name": {
353-
"oneOf": [
354-
{
355-
"type": "string",
356-
"pattern": "^.*/default$"
357-
},
358-
{
359-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
360-
}
361-
],
362-
"description": "The policy name. Should always be \"default\"."
363-
},
364-
"properties": {
365-
"oneOf": [
366-
{
367-
"$ref": "#/definitions/BackupShortTermRetentionPolicyProperties"
368-
},
369-
{
370-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
371-
}
372-
],
373-
"description": "Properties of a short term retention policy"
374-
},
375-
"type": {
376-
"type": "string",
377-
"enum": [
378-
"Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies"
379-
]
380-
}
381-
},
382-
"required": [
383-
"apiVersion",
384-
"name",
385-
"properties",
386-
"type"
387-
],
388-
"description": "Microsoft.Sql/servers/databases/backupShortTermRetentionPolicies"
389-
},
390343
"servers_databases_securityAlertPolicies": {
391344
"type": "object",
392345
"properties": {
@@ -503,34 +456,6 @@
503456
],
504457
"description": "Properties of a active directory only authentication."
505458
},
506-
"BackupShortTermRetentionPolicyProperties": {
507-
"type": "object",
508-
"properties": {
509-
"diffBackupIntervalInHours": {
510-
"oneOf": [
511-
{
512-
"type": "integer"
513-
},
514-
{
515-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
516-
}
517-
],
518-
"description": "The differential backup interval in hours. This is how many interval hours between each differential backup will be supported. This is only applicable to live databases but not dropped databases."
519-
},
520-
"retentionDays": {
521-
"oneOf": [
522-
{
523-
"type": "integer"
524-
},
525-
{
526-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
527-
}
528-
],
529-
"description": "The backup retention period in days. This is how many days Point-in-Time Restore will be supported."
530-
}
531-
},
532-
"description": "Properties of a short term retention policy"
533-
},
534459
"ManagedDatabaseProperties": {
535460
"type": "object",
536461
"properties": {
@@ -1062,4 +987,4 @@
1062987
"description": "An ARM Resource SKU."
1063988
}
1064989
}
1065-
}
990+
}

schemas/common/autogeneratedResources.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4912,9 +4912,6 @@
49124912
{
49134913
"$ref": "https://schema.management.azure.com/schemas/2020-02-02-preview/Microsoft.Sql.json#/resourceDefinitions/servers_azureADOnlyAuthentications"
49144914
},
4915-
{
4916-
"$ref": "https://schema.management.azure.com/schemas/2020-02-02-preview/Microsoft.Sql.json#/resourceDefinitions/servers_databases_backupShortTermRetentionPolicies"
4917-
},
49184915
{
49194916
"$ref": "https://schema.management.azure.com/schemas/2020-02-02-preview/Microsoft.Sql.json#/resourceDefinitions/servers_databases_securityAlertPolicies"
49204917
},
@@ -5533,4 +5530,4 @@
55335530
]
55345531
}
55355532
]
5536-
}
5533+
}

0 commit comments

Comments
 (0)