Skip to content

Add updated 2020-11-01-preview versions of LongTermRetenionBackups.json and Databases.json #12146

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

Merged
akning-ms merged 37 commits into from
Feb 24, 2021
Merged

Add updated 2020-11-01-preview versions of LongTermRetenionBackups.json and Databases.json #12146

Show file tree
Hide file tree
Changes from 36 commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
c4d20b1
add updated databases.json swagger
xaliciayang Nov 9, 2020
f9778e4
update readme with new package
xaliciayang Nov 9, 2020
2e974f6
v4 -> v5
xaliciayang Nov 10, 2020
55963c2
add missing chunk in readme
xaliciayang Nov 10, 2020
0f1ecdd
add correct swaggeR
xaliciayang Nov 11, 2020
8821669
add examples
xaliciayang Dec 2, 2020
d075c00
add correct examplese
xaliciayang Dec 2, 2020
8570270
remove unreferenced examples
xaliciayang Dec 3, 2020
f18ba24
Merge branch 'master' into backupStorageRedundancy
xaliciayang Dec 10, 2020
cdb1226
update swagger and examples. add 2020-11 pure package
xaliciayang Dec 11, 2020
e572121
Fix reference to 2020-08-01 reference to ElasticPools.json
xaliciayang Dec 11, 2020
4885d02
update Databases.json name
xaliciayang Dec 11, 2020
b25cf27
update examples
xaliciayang Dec 16, 2020
40031a6
Merge branch 'backupStorageRedundancy' of https://github.com/xaliciay…
xaliciayang Dec 17, 2020
8f2a301
remove nonexistant swagger
xaliciayang Dec 17, 2020
cabadaf
fixed reference capitals in readme
xaliciayang Dec 17, 2020
600f045
update package composite and fix ref to ManagedInstances.jsON
xaliciayang Dec 17, 2020
91b1735
make backupstorageredundancy settings consistent
xaliciayang Dec 17, 2020
4301781
add requestedBackupStorageRedundancy to properties object in example
xaliciayang Dec 17, 2020
6d1bc06
Merge branch '20201101swagger' of https://github.com/xaliciayang/azur…
xaliciayang Dec 17, 2020
1442c47
add LTR swagger and examples
xaliciayang Feb 1, 2021
5a92ef1
Merge branch 'master' into 20201101swagger
xaliciayang Feb 1, 2021
46b5a77
add LTR Policies swagger and examples
xaliciayang Feb 2, 2021
47ff649
make v5 match v4
xaliciayang Feb 2, 2021
092b1af
merge from dev branch
xaliciayang Feb 2, 2021
a602c44
add updated Databses.json
xaliciayang Feb 8, 2021
4a5a026
merge conflicts in LTR Policies swagger'
xaliciayang Feb 8, 2021
fc40418
take out comments in readme
xaliciayang Feb 8, 2021
441527b
taking ImportExport.json out from 2020-11 package
xaliciayang Feb 8, 2021
0ac9cdf
remove duplicate 2020-11 tag in readme
xaliciayang Feb 8, 2021
0f78887
modify Databases_legacy.json to exclude ImportExport-related APIs
xaliciayang Feb 9, 2021
3fd002c
add servers.json for IE APIS and remove unused databases examples
xaliciayang Feb 9, 2021
cb40321
fix model & prettier errors; add missing server example
xaliciayang Feb 9, 2021
831a30c
add missing servers examples
xaliciayang Feb 9, 2021
b4097c7
fix example to exclude property from server obj
xaliciayang Feb 9, 2021
60ecb8b
change RecommendedActions definitoins
xaliciayang Feb 10, 2021
472b1de
change tag to composite v4
xaliciayang Feb 23, 2021
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
20 changes: 5 additions & 15 deletions ...ation/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/DatabaseAdvisors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,6 +581,11 @@
"RecommendedAction": {
"description": "Database, Server or Elastic Pool Recommended Action.",
"type": "object",
"allOf": [
Copy link
Contributor

@akning-ms akning-ms Feb 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the reason to change to proxy resource?

Copy link
Contributor Author

@xaliciayang xaliciayang Feb 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Had a LintDiff error before that said there were conflicting definitions for RecommendedAction accross multiple swaggers. Changed all to use ProxyResource for consistency.

{
"$ref": "../../../common/v1/types.json#/definitions/ProxyResource"
}
],
"properties": {
"kind": {
"description": "Resource kind.",
Expand All @@ -596,21 +601,6 @@
"$ref": "#/definitions/RecommendedActionProperties",
"description": "Resource properties.",
"x-ms-client-flatten": true
},
"id": {
"description": "Resource ID.",
"type": "string",
"readOnly": true
},
"name": {
"description": "Resource name.",
"type": "string",
"readOnly": true
},
"type": {
"description": "Resource type.",
"type": "string",
"readOnly": true
}
}
},
Expand Down
220 changes: 36 additions & 184 deletions specification/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/Databases.json
View file
Open in desktop

Large diffs are not rendered by default.

63 changes: 34 additions & 29 deletions ...ation/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/Databases_legacy.json
View file
Open in desktop

Large diffs are not rendered by default.

507 changes: 497 additions & 10 deletions ...l/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/LongTermRetentionBackups.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions .../resource-manager/Microsoft.Sql/preview/2020-11-01-preview/LongTermRetentionPolicies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
}
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 LongTermRetentionPolicyNotSupported - Long Term Retention is not supported on this database.\n\n * 400 LongTermRetentionPolicyInvalid - Long Term Retention policy is invalid.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 ResourceNotFound - The requested resource was not found."
"description": "*** Error Responses: ***\n\n * 400 LongTermRetentionPolicyNotSupported - Long Term Retention is not supported on this database.\n\n * 400 LongTermRetentionPolicyInvalid - Long Term Retention policy is invalid.\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ResourceNotFound - The requested resource was not found."
}
},
"x-ms-examples": {
Expand Down Expand Up @@ -125,7 +125,7 @@
}
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 InvalidResourceRequestBody - The resource or resource properties in the request body is empty or invalid.\n\n * 400 InvalidParameterValue - An invalid value was given to a parameter.\n\n * 400 LongTermRetentionMissingWeekOfYear - WeekOfYear is required to be set between 1 and 52 in order to set yearly retention.\n\n * 400 LongTermRetentionPolicyNotSupported - Long Term Retention is not supported on this database.\n\n * 400 LongTermRetentionPolicyInvalid - Long Term Retention policy is invalid.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 ResourceNotFound - The requested resource was not found."
"description": "*** Error Responses: ***\n\n * 400 InvalidResourceRequestBody - The resource or resource properties in the request body is empty or invalid.\n\n * 400 InvalidParameterValue - An invalid value was given to a parameter.\n\n * 400 LongTermRetentionMissingWeekOfYear - WeekOfYear is required to be set between 1 and 52 in order to set yearly retention.\n\n * 400 LongTermRetentionPolicyNotSupported - Long Term Retention is not supported on this database.\n\n * 400 LongTermRetentionPolicyInvalid - Long Term Retention policy is invalid.\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ResourceNotFound - The requested resource was not found."
},
"202": {
"description": "Accepted"
Expand Down Expand Up @@ -171,7 +171,7 @@
}
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 LongTermRetentionPolicyNotSupported - Long Term Retention is not supported on this database.\n\n * 400 LongTermRetentionPolicyInvalid - Long Term Retention policy is invalid.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 ResourceNotFound - The requested resource was not found."
"description": "*** Error Responses: ***\n\n * 400 LongTermRetentionPolicyNotSupported - Long Term Retention is not supported on this database.\n\n * 400 LongTermRetentionPolicyInvalid - Long Term Retention policy is invalid.\n\n * 404 ServerNotInSubscriptionResourceGroup - Specified server does not exist in the specified resource group and subscription.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 ResourceNotFound - The requested resource was not found."
}
},
"x-ms-pageable": {
Expand Down
20 changes: 5 additions & 15 deletions ...ication/sql/resource-manager/Microsoft.Sql/preview/2020-11-01-preview/ServerAdvisors.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,11 @@
"RecommendedAction": {
"description": "Database, Server or Elastic Pool Recommended Action.",
"type": "object",
"allOf": [
{
"$ref": "../../../common/v1/types.json#/definitions/ProxyResource"
}
],
"properties": {
"kind": {
"description": "Resource kind.",
Expand All @@ -587,21 +592,6 @@
"$ref": "#/definitions/RecommendedActionProperties",
"description": "Resource properties.",
"x-ms-client-flatten": true
},
"id": {
"description": "Resource ID.",
"type": "string",
"readOnly": true
},
"name": {
"description": "Resource name.",
"type": "string",
"readOnly": true
},
"type": {
"description": "Resource type.",
"type": "string",
"readOnly": true
}
}
},
Expand Down
Loading