Skip to content

Fix ARM Errors and update the swagger files. #12293

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 10 commits into from
Jan 14, 2021
Merged

Fix ARM Errors and update the swagger files. #12293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d44421c
Fix ARM Errors and update the swagger files.
ericshape Jan 5, 2021
efea9b1
update
ericshape Jan 6, 2021
28e8816
update import export spec file.
ericshape Jan 12, 2021
07bb86c
Merge branch 'master' into fix_arm_errors
ericshape Jan 12, 2021
cc24856
remove import/export from v2 and v1
ericshape Jan 12, 2021
4fcb4d6
update import export spec file.
ericshape Jan 12, 2021
a8306e2
Merge branch 'fix_arm_errors' of https://github.com/ericshape/azure-r…
ericshape Jan 12, 2021
8d55f36
separate db import export from this PR.
ericshape Jan 12, 2021
3987121
Merge branch 'master' of https://github.com/ericshape/azure-rest-api-…
ericshape Jan 12, 2021
f113b7a
revert importdatabases
ericshape Jan 13, 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
12 changes: 8 additions & 4 deletions ...ification/sql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/BlobAuditing.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,7 @@
"type": "integer"
},
"state": {
"description": "Specifies the state of the policy. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"description": "Specifies the state of the audit. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"enum": [
"Enabled",
"Disabled"
Expand All @@ -661,6 +661,7 @@
"storageAccountAccessKey": {
"description": "Specifies the identifier key of the auditing storage account. \r\nIf state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL server system-assigned managed identity to access the storage.\r\nPrerequisites for using managed identity authentication:\r\n1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).\r\n2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to the server identity.\r\nFor more information, see [Auditing to storage using Managed Identity authentication](https://go.microsoft.com/fwlink/?linkid=2114355)",
"type": "string",
"x-ms-secret": true,
"x-ms-mutability": [
"create",
"update"
Expand Down Expand Up @@ -749,7 +750,7 @@
"type": "integer"
},
"state": {
"description": "Specifies the state of the policy. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"description": "Specifies the state of the audit. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"enum": [
"Enabled",
"Disabled"
Expand All @@ -767,6 +768,7 @@
"storageAccountAccessKey": {
"description": "Specifies the identifier key of the auditing storage account. \r\nIf state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL server system-assigned managed identity to access the storage.\r\nPrerequisites for using managed identity authentication:\r\n1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).\r\n2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to the server identity.\r\nFor more information, see [Auditing to storage using Managed Identity authentication](https://go.microsoft.com/fwlink/?linkid=2114355)",
"type": "string",
"x-ms-secret": true,
"x-ms-mutability": [
"create",
"update"
Expand Down Expand Up @@ -851,7 +853,7 @@
"type": "integer"
},
"state": {
"description": "Specifies the state of the policy. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"description": "Specifies the state of the audit. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"enum": [
"Enabled",
"Disabled"
Expand All @@ -869,6 +871,7 @@
"storageAccountAccessKey": {
"description": "Specifies the identifier key of the auditing storage account. \r\nIf state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL server system-assigned managed identity to access the storage.\r\nPrerequisites for using managed identity authentication:\r\n1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).\r\n2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to the server identity.\r\nFor more information, see [Auditing to storage using Managed Identity authentication](https://go.microsoft.com/fwlink/?linkid=2114355)",
"type": "string",
"x-ms-secret": true,
"x-ms-mutability": [
"create",
"update"
Expand Down Expand Up @@ -949,7 +952,7 @@
"type": "integer"
},
"state": {
"description": "Specifies the state of the policy. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"description": "Specifies the state of the audit. If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.",
"enum": [
"Enabled",
"Disabled"
Expand All @@ -967,6 +970,7 @@
"storageAccountAccessKey": {
"description": "Specifies the identifier key of the auditing storage account. \r\nIf state is Enabled and storageEndpoint is specified, not specifying the storageAccountAccessKey will use SQL server system-assigned managed identity to access the storage.\r\nPrerequisites for using managed identity authentication:\r\n1. Assign SQL Server a system-assigned managed identity in Azure Active Directory (AAD).\r\n2. Grant SQL Server identity access to the storage account by adding 'Storage Blob Data Contributor' RBAC role to the server identity.\r\nFor more information, see [Auditing to storage using Managed Identity authentication](https://go.microsoft.com/fwlink/?linkid=2114355)",
"type": "string",
"x-ms-secret": true,
"x-ms-mutability": [
"create",
"update"
Expand Down
4 changes: 2 additions & 2 deletions ...ion/sql/resource-manager/Microsoft.Sql/preview/2020-02-02-preview/DatabaseOperations.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading