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

[Storage] Sync swagger changes from 2019-04-01 to 2019-06-01 apiversion #7552

Merged
merged 2 commits into from
Oct 21, 2019
Merged

[Storage] Sync swagger changes from 2019-04-01 to 2019-06-01 apiversion #7552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c67a83
[Storage] Sync swagger changes from 2019-04-01 to 2019-04-01 apiversion
prpandey3004 Oct 18, 2019
13c5cd0
Removing skiptoken which is not being used by the service
prpandey3004 Oct 18, 2019
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
6 changes: 0 additions & 6 deletions specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/blob.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,6 @@
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
},
{
"name": "$skipToken",
"in": "query",
"type": "string",
"description": "Optional. Continuation token for the list operation."
},
{
"name": "$maxpagesize",
"in": "query",
Expand Down
35 changes: 35 additions & 0 deletions ...manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountRegenerateKerbKey.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parameters": {
"subscriptionId": "{subscription-id}",
"resourceGroupName": "res4167",
"accountName": "sto3539",
"api-version": "2019-06-01",
"monitor": "true",
"regenerateKey": {
"keyName": "kerb1"
}
},
"responses": {
"200": {
"body": {
"keys": [
{
"keyName": "key1",
"permissions": "Full",
"value": "7xl+yQ4MrVpZCHspveCfy4f8jgTY1wv42gHO8k4bAX+EPvN4hY5uPau/bpofgeye+K9FtgvjkadkLISPfOxlMw=="
},
{
"keyName": "key2",
"permissions": "Full",
"value": "uC+kyJ9/gT81E/+9I1Go4xtOe8sW5rdIm3n6PNIyQ5kGO5OpFq69aWnrn3jLeFIyItzpln9P392U0353RYKvbg=="
},
{
"keyName": "kerb1",
"permissions": "Full",
"value": "34EzDQuCw1lYBXCGioUybN9dCWSLLzQPdAbYRcLhM957Fy/6IlO/SkaeR9QXKhVgCt8anDq4wYmDcaZ5VXr2Tg=="
}
]
}
}
}
}
22 changes: 22 additions & 0 deletions ...e/resource-manager/Microsoft.Storage/stable/2019-06-01/examples/StorageAccountUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,17 @@
"properties": {
"networkAcls": {
"defaultAction": "Allow"
},
"azureFilesIdentityBasedAuthentication": {
"directoryServiceOptions": "AD",
"activeDirectoryProperties": {
"domainName": "adtest.com",
"netBiosDomainName": "adtest.com",
"forestName": "adtest.com",
"domainGuid": "aebfc118-9fa9-4732-a21f-d98e41a77ae1",
"domainSid": "S-1-5-21-2400535526-2334094090-2402026252",
"azureStorageSid": "S-1-5-21-2400535526-2334094090-2402026252-0012"
}
}
}
}
Expand All @@ -29,6 +40,17 @@
"ipRules": [],
"virtualNetworkRules": []
},
"azureFilesIdentityBasedAuthentication": {
"directoryServiceOptions": "AD",
"activeDirectoryProperties": {
"domainName": "adtest.com",
"netBiosDomainName": "adtest.com",
"forestName": "adtest.com",
"domainGuid": "aebfc118-9fa9-4732-a21f-d98e41a77ae1",
"domainSid": "S-1-5-21-2400535526-2334094090-2402026252",
"azureStorageSid": "S-1-5-21-2400535526-2334094090-2402026252-0012"
}
},
"primaryEndpoints": {
"web": "https://sto8596.web.core.windows.net/",
"dfs": "https://sto8596.dfs.core.windows.net/",
Expand Down
6 changes: 0 additions & 6 deletions specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/file.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,12 +180,6 @@
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
},
{
"name": "$skipToken",
"in": "query",
"type": "string",
"description": "Optional. Continuation token for the list operation."
},
{
"name": "$maxpagesize",
"in": "query",
Expand Down
68 changes: 63 additions & 5 deletions specification/storage/resource-manager/Microsoft.Storage/stable/2019-06-01/storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
"StorageAccounts"
],
"operationId": "StorageAccounts_ListKeys",
"description": "Lists the access keys for the specified storage account.",
"description": "Lists the access keys or Kerberos keys (if active directory enabled) for the specified storage account.",
"x-ms-examples": {
"StorageAccountListKeys": {
"$ref": "./examples/StorageAccountListKeys.json"
Expand All @@ -385,6 +385,19 @@
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter"
},
{
"name": "$expand",
"in": "query",
"required": false,
"type": "string",
"enum": [
"kerb"
],
"x-ms-enum": {
"name": "ListKeyExpand"
},
"description": "Specifies type of the key to be listed. Possible value is kerb."
}
],
"responses": {
Expand All @@ -403,10 +416,13 @@
"StorageAccounts"
],
"operationId": "StorageAccounts_RegenerateKey",
"description": "Regenerates one of the access keys for the specified storage account.",
"description": "Regenerates one of the access keys or Kerberos keys for the specified storage account.",
"x-ms-examples": {
"StorageAccountRegenerateKey": {
"$ref": "./examples/StorageAccountRegenerateKey.json"
},
"StorageAccountRegenerateKerbKey": {
"$ref": "./examples/StorageAccountRegenerateKerbKey.json"
}
},
"parameters": [
Expand All @@ -423,7 +439,7 @@
"schema": {
"$ref": "#/definitions/StorageAccountRegenerateKeyParameters"
},
"description": "Specifies name of the key which should be regenerated -- key1 or key2."
"description": "Specifies name of the key which should be regenerated -- key1, key2, kerb1, kerb2."
},
{
"$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter"
Expand Down Expand Up @@ -1504,19 +1520,61 @@
"description": "Indicates the directory service used.",
"enum": [
"None",
"AADDS"
"AADDS",
"AD"
],
"x-ms-enum": {
"name": "DirectoryServiceOptions",
"modelAsString": true
}
},
"activeDirectoryProperties": {
"$ref": "#/definitions/ActiveDirectoryProperties",
"description": "Required if choose AD."
}
},
"required": [
"directoryServiceOptions"
],
"description": "Settings for Azure Files identity based authentication."
},
"ActiveDirectoryProperties": {
"properties": {
"domainName": {
"type": "string",
"description": "Specifies the primary domain that the AD DNS server is authoritative for."
},
"netBiosDomainName": {
"type": "string",
"description": "Specifies the NetBIOS domain name."
},
"forestName": {
"type": "string",
"description": "Specifies the Active Directory forest to get."
},
"domainGuid": {
"type": "string",
"description": "Specifies the domain GUID."
},
"domainSid": {
"type": "string",
"description": "Specifies the security identifier (SID)."
},
"azureStorageSid": {
"type": "string",
"description": "Specifies the security identifier (SID) for Azure Storage."
}
},
"required": [
"domainName",
"netBiosDomainName",
"forestName",
"domainGuid",
"domainSid",
"azureStorageSid"
],
"description": "Settings properties for Active Directory (AD)."
},
"StorageAccountPropertiesCreateParameters": {
"properties": {
"customDomain": {
Expand Down Expand Up @@ -1971,7 +2029,7 @@
"properties": {
"keyName": {
"type": "string",
"description": "The name of storage keys that want to be regenerated, possible values are key1, key2."
"description": "The name of storage keys that want to be regenerated, possible values are key1, key2, kerb1, kerb2."
}
},
"required": [
Expand Down