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

[SRP] Remove azureFilesAadIntegration and add AzureFilesIdentityBased Authentication in storage account properties #6250

Merged
merged 1 commit into from
Jun 10, 2019
Merged

[SRP] Remove azureFilesAadIntegration and add AzureFilesIdentityBased Authentication in storage account properties #6250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions ...e/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountCreate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
"kind": "Storage",
"location": "eastus2euap",
"properties": {
"isHnsEnabled": true,
"azureFilesAadIntegration": true
"isHnsEnabled": true
},
"tags": {
"key1": "value1",
Expand All @@ -29,7 +28,6 @@
"name": "sto4445",
"properties": {
"isHnsEnabled": true,
"azureFilesAadIntegration": true,
"creationTime": "2017-05-24T13:25:33.4863236Z",
"primaryEndpoints": {
"web": "https://sto4445.web.core.windows.net/",
Expand Down
1 change: 0 additions & 1 deletion ...rce-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountGetProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"canFailover": true
},
"isHnsEnabled": true,
"azureFilesAadIntegration": true,
"creationTime": "2017-06-01T02:42:41.7633306Z",
"networkAcls": {
"bypass": "AzureServices",
Expand Down
1 change: 0 additions & 1 deletion ...age/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"name": "sto1125",
"properties": {
"isHnsEnabled": true,
"azureFilesAadIntegration": true,
"creationTime": "2017-05-24T13:28:53.4540398Z",
"primaryEndpoints": {
"web": "https://sto1125.web.core.windows.net/",
Expand Down
1 change: 0 additions & 1 deletion ...nager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"name": "sto4036",
"properties": {
"isHnsEnabled": true,
"azureFilesAadIntegration": true,
"creationTime": "2017-05-24T13:24:47.818801Z",
"primaryEndpoints": {
"web": "https://sto4036.web.core.windows.net/",
Expand Down
1 change: 0 additions & 1 deletion ...e/resource-manager/Microsoft.Storage/stable/2019-04-01/examples/StorageAccountUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"name": "sto8596",
"properties": {
"isHnsEnabled": true,
"azureFilesAadIntegration": true,
"creationTime": "2017-06-01T02:42:41.7633306Z",
"networkAcls": {
"bypass": "AzureServices",
Expand Down
39 changes: 27 additions & 12 deletions specification/storage/resource-manager/Microsoft.Storage/stable/2019-04-01/storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,6 +1313,24 @@
],
"description": "Network rule set"
},
"AzureFilesIdentityBasedAuthentication": {
"properties": {
"directoryServiceOptions": {
"type": "string",
"description": "Indicates the directory service used.",
"enum": [
"None",
"AADDS"
],
"x-ms-enum": {
"name": "DirectoryServiceOptions",
"modelAsString": true
}
}
},
"required": ["directoryServiceOptions"],
"description": "Settings for Azure Files identity based authentication."
},
"StorageAccountPropertiesCreateParameters": {
"properties": {
"customDomain": {
Expand Down Expand Up @@ -1340,10 +1358,9 @@
"modelAsString": false
}
},
"azureFilesAadIntegration": {
"type": "boolean",
"x-ms-client-name": "EnableAzureFilesAadIntegration",
"description": "Enables Azure Files AAD Integration for SMB if sets to true."
"azureFilesIdentityBasedAuthentication": {
"$ref": "#/definitions/AzureFilesIdentityBasedAuthentication",
"description": "Provides the identity based authentication settings for Azure Files."
},
"supportsHttpsTrafficOnly": {
"type": "boolean",
Expand Down Expand Up @@ -1598,10 +1615,9 @@
"modelAsString": false
}
},
"azureFilesAadIntegration": {
"type": "boolean",
"x-ms-client-name": "EnableAzureFilesAadIntegration",
"description": "Enables Azure Files AAD Integration for SMB if sets to true."
"azureFilesIdentityBasedAuthentication": {
"$ref": "#/definitions/AzureFilesIdentityBasedAuthentication",
"description": "Provides the identity based authentication settings for Azure Files."
},
"supportsHttpsTrafficOnly": {
"type": "boolean",
Expand Down Expand Up @@ -1762,10 +1778,9 @@
"modelAsString": false
}
},
"azureFilesAadIntegration": {
"type": "boolean",
"x-ms-client-name": "EnableAzureFilesAadIntegration",
"description": "Enables Azure Files AAD Integration for SMB if sets to true."
"azureFilesIdentityBasedAuthentication": {
"$ref": "#/definitions/AzureFilesIdentityBasedAuthentication",
"description": "Provides the identity based authentication settings for Azure Files."
},
"supportsHttpsTrafficOnly": {
"type": "boolean",
Expand Down