Skip to content
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

Jump to bottom

swagger changes for adding new parameter in dc telemetry #24834

Merged
merged 10 commits into from
Aug 16, 2023
Merged

swagger changes for adding new parameter in dc telemetry #24834

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
35c7bc1
testing push
Nidhi-Gupta6198 Jul 14, 2023
be51f4f
reverting push
Nidhi-Gupta6198 Jul 14, 2023
b66833f
swagger files for DC add parameter change
Nidhi-Gupta6198 Jul 14, 2023
78f3496
delete added file
Nidhi-Gupta6198 Jul 14, 2023
2ecb4d4
modified swagger files without Venkat's change
Nidhi-Gupta6198 Jul 18, 2023
490b53a
modified swagger files
Nidhi-Gupta6198 Jul 18, 2023
ced88c4
changed modelAsString to true
Nidhi-Gupta6198 Jul 19, 2023
453c4d9
add example files
Nidhi-Gupta6198 Jul 19, 2023
72daf44
add example files
Nidhi-Gupta6198 Jul 19, 2023
0a89b90
fix mismatch
Nidhi-Gupta6198 Jul 19, 2023
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
25 changes: 19 additions & 6 deletions ...ce-manager/Microsoft.Sql/preview/2023-02-01-preview/ManagedDatabaseSensitivityLabels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
"current"
],
"x-ms-enum": {
"name": "WritableSensitivityLabelSource",
"name": "CurrentSensitivityLabelSource",
"modelAsString": false
}
},
Expand Down Expand Up @@ -463,7 +463,7 @@
"current"
],
"x-ms-enum": {
"name": "WritableSensitivityLabelSource",
"name": "CurrentSensitivityLabelSource",
"modelAsString": false
}
},
Expand Down Expand Up @@ -540,7 +540,7 @@
"recommended"
],
"x-ms-enum": {
"name": "SensitivityLabelSource",
"name": "RecommendedSensitivityLabelSource",
"modelAsString": false
}
},
Expand All @@ -556,7 +556,7 @@
"description": "Successfully disabled the sensitivity recommendations on the given column."
},
"default": {
"description": "*** Error Responses: ***\n\n * 404 SensitivityLabelsColumnNotFound - The column {0} could not be found in table {2}.{1}\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 SubscriptionNotFound - The requested subscription was not found.\n\n * 404 CannotFindObject - Cannot find the object because it does not exist or you do not have permissions\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout."
"description": "*** Error Responses: ***\n\n * 404 CannotFindObject - Cannot find the object because it does not exist or you do not have permissions\n\n * 404 SensitivityLabelsColumnNotFound - The column {0} could not be found in table {2}.{1}\n\n * 404 SubscriptionNotFound - The requested subscription was not found.\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout."
}
},
"x-ms-examples": {
Expand Down Expand Up @@ -617,7 +617,7 @@
"recommended"
],
"x-ms-enum": {
"name": "SensitivityLabelSource",
"name": "RecommendedSensitivityLabelSource",
"modelAsString": false
}
},
Expand All @@ -633,7 +633,7 @@
"description": "Successfully enabled the sensitivity recommendations on the given column."
},
"default": {
"description": "*** Error Responses: ***\n\n * 404 SensitivityLabelsColumnNotFound - The column {0} could not be found in table {2}.{1}\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 SubscriptionNotFound - The requested subscription was not found.\n\n * 404 CannotFindObject - Cannot find the object because it does not exist or you do not have permissions\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout."
"description": "*** Error Responses: ***\n\n * 404 CannotFindObject - Cannot find the object because it does not exist or you do not have permissions\n\n * 404 SensitivityLabelsColumnNotFound - The column {0} could not be found in table {2}.{1}\n\n * 404 SubscriptionNotFound - The requested subscription was not found.\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout."
}
},
"x-ms-examples": {
Expand Down Expand Up @@ -854,6 +854,19 @@
"name": "SensitivityLabelRank",
"modelAsString": false
}
},
Copy link
Contributor

Choose a reason for hiding this comment

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

can you please revert Venkat's change? when your PR is merged, it would auto rebase or sync.

Copy link
Member Author

Choose a reason for hiding this comment

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

done

"clientClassificationSource": {
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we have example files for this new enum property in DSMainDev?

Copy link
Member Author

Choose a reason for hiding this comment

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

yes I have added example file

"enum": [
"None",
"Native",
"Recommended",
"MIP"
],
"type": "string",
"x-ms-enum": {
"name": "ClientClassificationSource",
"modelAsString": false
}
}
}
},
Expand Down
25 changes: 19 additions & 6 deletions ...tion/sql/resource-manager/Microsoft.Sql/preview/2023-02-01-preview/SensitivityLabels.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@
"current"
],
"x-ms-enum": {
"name": "WritableSensitivityLabelSource",
"name": "CurrentSensitivityLabelSource",
"modelAsString": false
}
},
Expand Down Expand Up @@ -451,7 +451,7 @@
"current"
],
"x-ms-enum": {
"name": "WritableSensitivityLabelSource",
"name": "CurrentSensitivityLabelSource",
"modelAsString": false
}
},
Expand Down Expand Up @@ -524,7 +524,7 @@
"recommended"
],
"x-ms-enum": {
"name": "SensitivityLabelSource",
"name": "RecommendedSensitivityLabelSource",
"modelAsString": false
}
},
Expand All @@ -540,7 +540,7 @@
"description": "Successfully disabled the sensitivity recommendation on the given column."
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 DatawarehouseDatabaseIsDeactivated - Could not execute Data Classification operation because the database is paused. Please resume it.\n\n * 404 SensitivityLabelsColumnNotFound - The column {0} could not be found in table {2}.{1}\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 SubscriptionNotFound - The requested subscription was not found.\n\n * 404 CannotFindObject - Cannot find the object because it does not exist or you do not have permissions\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout."
"description": "*** Error Responses: ***\n\n * 400 DatawarehouseDatabaseIsDeactivated - Could not execute Data Classification operation because the database is paused. Please resume it.\n\n * 404 CannotFindObject - Cannot find the object because it does not exist or you do not have permissions\n\n * 404 SensitivityLabelsColumnNotFound - The column {0} could not be found in table {2}.{1}\n\n * 404 SubscriptionNotFound - The requested subscription was not found.\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout."
}
},
"x-ms-examples": {
Expand Down Expand Up @@ -597,7 +597,7 @@
"recommended"
],
"x-ms-enum": {
"name": "SensitivityLabelSource",
"name": "RecommendedSensitivityLabelSource",
"modelAsString": false
}
},
Expand All @@ -613,7 +613,7 @@
"description": "Successfully enabled the sensitivity recommendations on the given column."
},
"default": {
"description": "*** Error Responses: ***\n\n * 400 DatawarehouseDatabaseIsDeactivated - Could not execute Data Classification operation because the database is paused. Please resume it.\n\n * 404 SensitivityLabelsColumnNotFound - The column {0} could not be found in table {2}.{1}\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 SubscriptionNotFound - The requested subscription was not found.\n\n * 404 CannotFindObject - Cannot find the object because it does not exist or you do not have permissions\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout."
"description": "*** Error Responses: ***\n\n * 400 DatawarehouseDatabaseIsDeactivated - Could not execute Data Classification operation because the database is paused. Please resume it.\n\n * 404 CannotFindObject - Cannot find the object because it does not exist or you do not have permissions\n\n * 404 SensitivityLabelsColumnNotFound - The column {0} could not be found in table {2}.{1}\n\n * 404 SubscriptionNotFound - The requested subscription was not found.\n\n * 404 DatabaseDoesNotExist - User has specified a database name that does not exist on this server instance.\n\n * 404 SubscriptionDoesNotHaveServer - The requested server was not found\n\n * 429 SubscriptionTooManyCreateUpdateRequests - Requests beyond max requests that can be processed by available resources.\n\n * 429 SubscriptionTooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 503 TooManyRequests - Requests beyond max requests that can be processed by available resources.\n\n * 504 RequestTimeout - Service request exceeded the allowed timeout."
}
},
"x-ms-examples": {
Expand Down Expand Up @@ -834,6 +834,19 @@
"name": "SensitivityLabelRank",
"modelAsString": false
}
},
"clientClassificationSource": {
"enum": [
"None",
"Native",
"Recommended",
"MIP"
],
"type": "string",
"x-ms-enum": {
"name": "ClientClassificationSource",
"modelAsString": false
Copy link
Contributor

Choose a reason for hiding this comment

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

please use "modelAsString": true in DSMaindev code

}
}
}
},
Expand Down