Skip to content

Commit

Permalink
[Storage] merge new storage features from Az.storage sdk 22.0.0 to ma…
Browse files Browse the repository at this point in the history
…ster (#14991)

* [Storage] Support File share snapshot (#14937)

* [Storage] Support File share snapshot

* Update SRP SDK for other projects

* fix comments

* [Storage] Support Blob inventory (#14966)

* [Storage] Support DefaultSharePermission and CrossTenantReplication (#14982)

* [Storage] Support AllowCrossTenantReplication

* [Storage] Support DefaultSharePermission

* Add test and help example

* remove the private SRP SDK, to use public released SDK
  • Loading branch information
blueww authored May 14, 2021
1 parent 9980fb5 commit afcd29f
Show file tree
Hide file tree
Showing 110 changed files with 10,034 additions and 2,542 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.ApplicationInsights" Version="0.3.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="21.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="22.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/EventGrid/EventGrid.Test/EventGrid.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.7.0" />
<PackageReference Include="Microsoft.Azure.Management.Relay" Version="2.0.2" />
<PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="2.1.0" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="21.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="22.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/IotHub/IotHub.Test/IotHub.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PackageReference Include="Microsoft.Azure.Devices" Version="1.22.0" />
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.7.0" />
<PackageReference Include="Microsoft.Azure.Management.IotHub" Version="3.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="21.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="22.0.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Network/Network.Test/Network.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<PackageReference Include="Microsoft.Azure.Management.Redis" Version="4.4.1" />
<PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.21.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.ManagedServiceIdentity" Version="0.10.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="21.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="22.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.OperationalInsights" Version="0.21.0-preview" />
<PackageReference Include="Microsoft.Azure.OperationalInsights" Version="0.10.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="21.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="22.0.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -317,8 +317,8 @@
"StatusCode": 201
},
{
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/providers/Microsoft.Storage/checkNameAvailability?api-version=2021-02-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Byb3ZpZGVycy9NaWNyb3NvZnQuU3RvcmFnZS9jaGVja05hbWVBdmFpbGFiaWxpdHk/YXBpLXZlcnNpb249MjAyMS0wMi0wMQ==",
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/providers/Microsoft.Storage/checkNameAvailability?api-version=2021-04-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Byb3ZpZGVycy9NaWNyb3NvZnQuU3RvcmFnZS9jaGVja05hbWVBdmFpbGFiaWxpdHk/YXBpLXZlcnNpb249MjAyMS0wNC0wMQ==",
"RequestMethod": "POST",
"RequestBody": "{\r\n \"name\": \"azpstestaccountmock1\",\r\n \"type\": \"Microsoft.Storage/storageAccounts\"\r\n}",
"RequestHeaders": {
Expand Down Expand Up @@ -386,8 +386,8 @@
"StatusCode": 200
},
{
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/providers/Microsoft.Storage/checkNameAvailability?api-version=2021-02-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Byb3ZpZGVycy9NaWNyb3NvZnQuU3RvcmFnZS9jaGVja05hbWVBdmFpbGFiaWxpdHk/YXBpLXZlcnNpb249MjAyMS0wMi0wMQ==",
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/providers/Microsoft.Storage/checkNameAvailability?api-version=2021-04-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Byb3ZpZGVycy9NaWNyb3NvZnQuU3RvcmFnZS9jaGVja05hbWVBdmFpbGFiaWxpdHk/YXBpLXZlcnNpb249MjAyMS0wNC0wMQ==",
"RequestMethod": "POST",
"RequestBody": "{\r\n \"name\": \"azpstestaccountmock2\",\r\n \"type\": \"Microsoft.Storage/storageAccounts\"\r\n}",
"RequestHeaders": {
Expand Down Expand Up @@ -455,8 +455,8 @@
"StatusCode": 200
},
{
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/ps9940/providers/Microsoft.Storage/storageAccounts/azpstestaccountmock1?api-version=2021-02-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Jlc291cmNlR3JvdXBzL3BzOTk0MC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL2F6cHN0ZXN0YWNjb3VudG1vY2sxP2FwaS12ZXJzaW9uPTIwMjEtMDItMDE=",
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/ps9940/providers/Microsoft.Storage/storageAccounts/azpstestaccountmock1?api-version=2021-04-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Jlc291cmNlR3JvdXBzL3BzOTk0MC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL2F6cHN0ZXN0YWNjb3VudG1vY2sxP2FwaS12ZXJzaW9uPTIwMjEtMDQtMDE=",
"RequestMethod": "PUT",
"RequestBody": "{\r\n \"sku\": {\r\n \"name\": \"Standard_LRS\"\r\n },\r\n \"kind\": \"StorageV2\",\r\n \"location\": \"East US\"\r\n}",
"RequestHeaders": {
Expand Down Expand Up @@ -487,7 +487,7 @@
"no-cache"
],
"Location": [
"https://management.azure.com/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/providers/Microsoft.Storage/locations/eastus/asyncoperations/be97bb47-8892-4065-92aa-d764724f60f8?monitor=true&api-version=2021-02-01"
"https://management.azure.com/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/providers/Microsoft.Storage/locations/eastus/asyncoperations/be97bb47-8892-4065-92aa-d764724f60f8?monitor=true&api-version=2021-04-01"
],
"Retry-After": [
"17"
Expand Down Expand Up @@ -530,8 +530,8 @@
"StatusCode": 202
},
{
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/providers/Microsoft.Storage/locations/eastus/asyncoperations/be97bb47-8892-4065-92aa-d764724f60f8?monitor=true&api-version=2021-02-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Byb3ZpZGVycy9NaWNyb3NvZnQuU3RvcmFnZS9sb2NhdGlvbnMvZWFzdHVzL2FzeW5jb3BlcmF0aW9ucy9iZTk3YmI0Ny04ODkyLTQwNjUtOTJhYS1kNzY0NzI0ZjYwZjg/bW9uaXRvcj10cnVlJmFwaS12ZXJzaW9uPTIwMjEtMDItMDE=",
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/providers/Microsoft.Storage/locations/eastus/asyncoperations/be97bb47-8892-4065-92aa-d764724f60f8?monitor=true&api-version=2021-04-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Byb3ZpZGVycy9NaWNyb3NvZnQuU3RvcmFnZS9sb2NhdGlvbnMvZWFzdHVzL2FzeW5jb3BlcmF0aW9ucy9iZTk3YmI0Ny04ODkyLTQwNjUtOTJhYS1kNzY0NzI0ZjYwZjg/bW9uaXRvcj10cnVlJmFwaS12ZXJzaW9uPTIwMjEtMDQtMDE=",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
Expand Down Expand Up @@ -587,8 +587,8 @@
"StatusCode": 200
},
{
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/ps9940/providers/Microsoft.Storage/storageAccounts/azpstestaccountmock1?api-version=2021-02-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Jlc291cmNlR3JvdXBzL3BzOTk0MC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL2F6cHN0ZXN0YWNjb3VudG1vY2sxP2FwaS12ZXJzaW9uPTIwMjEtMDItMDE=",
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/ps9940/providers/Microsoft.Storage/storageAccounts/azpstestaccountmock1?api-version=2021-04-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Jlc291cmNlR3JvdXBzL3BzOTk0MC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL2F6cHN0ZXN0YWNjb3VudG1vY2sxP2FwaS12ZXJzaW9uPTIwMjEtMDQtMDE=",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
Expand Down Expand Up @@ -650,8 +650,8 @@
"StatusCode": 200
},
{
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/ps9940/providers/Microsoft.Storage/storageAccounts/azpstestaccountmock2?api-version=2021-02-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Jlc291cmNlR3JvdXBzL3BzOTk0MC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL2F6cHN0ZXN0YWNjb3VudG1vY2syP2FwaS12ZXJzaW9uPTIwMjEtMDItMDE=",
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/ps9940/providers/Microsoft.Storage/storageAccounts/azpstestaccountmock2?api-version=2021-04-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Jlc291cmNlR3JvdXBzL3BzOTk0MC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL2F6cHN0ZXN0YWNjb3VudG1vY2syP2FwaS12ZXJzaW9uPTIwMjEtMDQtMDE=",
"RequestMethod": "PUT",
"RequestBody": "{\r\n \"sku\": {\r\n \"name\": \"Standard_LRS\"\r\n },\r\n \"kind\": \"StorageV2\",\r\n \"location\": \"East US\"\r\n}",
"RequestHeaders": {
Expand Down Expand Up @@ -682,7 +682,7 @@
"no-cache"
],
"Location": [
"https://management.azure.com/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/providers/Microsoft.Storage/locations/eastus/asyncoperations/355b5a7c-6991-4f35-9bac-e5d358452b50?monitor=true&api-version=2021-02-01"
"https://management.azure.com/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/providers/Microsoft.Storage/locations/eastus/asyncoperations/355b5a7c-6991-4f35-9bac-e5d358452b50?monitor=true&api-version=2021-04-01"
],
"Retry-After": [
"17"
Expand Down Expand Up @@ -725,8 +725,8 @@
"StatusCode": 202
},
{
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/providers/Microsoft.Storage/locations/eastus/asyncoperations/355b5a7c-6991-4f35-9bac-e5d358452b50?monitor=true&api-version=2021-02-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Byb3ZpZGVycy9NaWNyb3NvZnQuU3RvcmFnZS9sb2NhdGlvbnMvZWFzdHVzL2FzeW5jb3BlcmF0aW9ucy8zNTViNWE3Yy02OTkxLTRmMzUtOWJhYy1lNWQzNTg0NTJiNTA/bW9uaXRvcj10cnVlJmFwaS12ZXJzaW9uPTIwMjEtMDItMDE=",
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/providers/Microsoft.Storage/locations/eastus/asyncoperations/355b5a7c-6991-4f35-9bac-e5d358452b50?monitor=true&api-version=2021-04-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Byb3ZpZGVycy9NaWNyb3NvZnQuU3RvcmFnZS9sb2NhdGlvbnMvZWFzdHVzL2FzeW5jb3BlcmF0aW9ucy8zNTViNWE3Yy02OTkxLTRmMzUtOWJhYy1lNWQzNTg0NTJiNTA/bW9uaXRvcj10cnVlJmFwaS12ZXJzaW9uPTIwMjEtMDQtMDE=",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
Expand Down Expand Up @@ -782,8 +782,8 @@
"StatusCode": 200
},
{
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/ps9940/providers/Microsoft.Storage/storageAccounts/azpstestaccountmock2?api-version=2021-02-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Jlc291cmNlR3JvdXBzL3BzOTk0MC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL2F6cHN0ZXN0YWNjb3VudG1vY2syP2FwaS12ZXJzaW9uPTIwMjEtMDItMDE=",
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/ps9940/providers/Microsoft.Storage/storageAccounts/azpstestaccountmock2?api-version=2021-04-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Jlc291cmNlR3JvdXBzL3BzOTk0MC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL2F6cHN0ZXN0YWNjb3VudG1vY2syP2FwaS12ZXJzaW9uPTIwMjEtMDQtMDE=",
"RequestMethod": "GET",
"RequestBody": "",
"RequestHeaders": {
Expand Down Expand Up @@ -1298,8 +1298,8 @@
"StatusCode": 200
},
{
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/ps9940/providers/Microsoft.Storage/storageAccounts/azpstestaccountmock1?api-version=2021-02-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Jlc291cmNlR3JvdXBzL3BzOTk0MC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL2F6cHN0ZXN0YWNjb3VudG1vY2sxP2FwaS12ZXJzaW9uPTIwMjEtMDItMDE=",
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/ps9940/providers/Microsoft.Storage/storageAccounts/azpstestaccountmock1?api-version=2021-04-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Jlc291cmNlR3JvdXBzL3BzOTk0MC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL2F6cHN0ZXN0YWNjb3VudG1vY2sxP2FwaS12ZXJzaW9uPTIwMjEtMDQtMDE=",
"RequestMethod": "DELETE",
"RequestBody": "",
"RequestHeaders": {
Expand Down Expand Up @@ -1361,8 +1361,8 @@
"StatusCode": 200
},
{
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/ps9940/providers/Microsoft.Storage/storageAccounts/azpstestaccountmock2?api-version=2021-02-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Jlc291cmNlR3JvdXBzL3BzOTk0MC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL2F6cHN0ZXN0YWNjb3VudG1vY2syP2FwaS12ZXJzaW9uPTIwMjEtMDItMDE=",
"RequestUri": "/subscriptions/9e223dbe-3399-4e19-88eb-0975f02ac87f/resourceGroups/ps9940/providers/Microsoft.Storage/storageAccounts/azpstestaccountmock2?api-version=2021-04-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvOWUyMjNkYmUtMzM5OS00ZTE5LTg4ZWItMDk3NWYwMmFjODdmL3Jlc291cmNlR3JvdXBzL3BzOTk0MC9wcm92aWRlcnMvTWljcm9zb2Z0LlN0b3JhZ2Uvc3RvcmFnZUFjY291bnRzL2F6cHN0ZXN0YWNjb3VudG1vY2syP2FwaS12ZXJzaW9uPTIwMjEtMDQtMDE=",
"RequestMethod": "DELETE",
"RequestBody": "",
"RequestHeaders": {
Expand Down
2 changes: 1 addition & 1 deletion src/Search/Search.Test/Search.Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Management.Search" Version="4.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="21.0.0" />
<PackageReference Include="Microsoft.Azure.Management.Storage" Version="22.0.0" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,13 @@ public void TestAzureStorageAccountKeySASPolicy()
public void TestAzureStorageAccountUserAssignedIdentity()
{
TestRunner.RunTestScript("Test-AzureStorageAccountUserAssignedIdentity");
}
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestStorageBlobInventory()
{
TestRunner.RunTestScript("Test-StorageBlobInventory");
}
}
}
Loading

0 comments on commit afcd29f

Please sign in to comment.