Skip to content

[storage] Force copy blob with track2 SDK and fix help issue. #17588

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.

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
merged 2 commits into from
Mar 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 0 deletions src/Storage/Storage.Management/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,12 @@
- `New-AzStorageAccountSASToken`
- `New-AzStorageContainerSASToken`
- `New-AzStorageBlobSASToken`
* Supported asynchronous blob copy run on new API version
- `Start-AzStorageBlobCopy`
* Fixed IpRule examples in help
- `Add-AzStorageAccountNetworkRule`
- `Remove-AzStorageAccountNetworkRule`
- `Update-AzStorageAccountNetworkRuleSet`

## Version 4.3.0
* Supported download blob from managed disk account with Sas Uri and bearer token
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ The **Add-AzStorageAccountNetworkRule** cmdlet adds IpRules or VirtualNetworkRul

### Example 1: Add several IpRules with IPAddressOrRange
```
PS C:\>Add-AzStorageAccountNetworkRule -ResourceGroupName "myResourceGroup" -Name "mystorageaccount" -IPAddressOrRange "10.0.0.0/24","28.2.0.0/16"
PS C:\>Add-AzStorageAccountNetworkRule -ResourceGroupName "myResourceGroup" -Name "mystorageaccount" -IPAddressOrRange "10.0.0.0/7","28.2.0.0/16"
```

This command add several IpRules with IPAddressOrRange.
Expand All @@ -82,7 +82,7 @@ This command add VirtualNetworkRules with VirtualNetworkRule Objects from anothe

### Example 4: Add several IpRule with IpRule objects, input with JSON
```
PS C:\>Add-AzStorageAccountNetworkRule -ResourceGroupName "myResourceGroup" -Name "mystorageaccount" -IPRule (@{IPAddressOrRange="10.0.0.0/24";Action="allow"},@{IPAddressOrRange="28.2.0.0/16";Action="allow"})
PS C:\>Add-AzStorageAccountNetworkRule -ResourceGroupName "myResourceGroup" -Name "mystorageaccount" -IPRule (@{IPAddressOrRange="10.0.0.0/7";Action="allow"},@{IPAddressOrRange="28.2.0.0/16";Action="allow"})
```

This command add several IpRule with IpRule objects, input with JSON.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ The **Remove-AzStorageAccountNetworkRule** cmdlet removes IpRules or VirtualNetw

### Example 1: Remove several IpRules with IPAddressOrRange
```
PS C:\>Remove-AzStorageAccountNetworkRule -ResourceGroupName "myResourceGroup" -AccountName "mystorageaccount" -IPAddressOrRange "10.0.0.0/24,28.1.0.0/16"
PS C:\>Remove-AzStorageAccountNetworkRule -ResourceGroupName "myResourceGroup" -AccountName "mystorageaccount" -IPAddressOrRange "10.0.0.0/7,28.1.0.0/16"
```

This command remove several IpRules with IPAddressOrRange.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ The **Update-AzStorageAccountNetworkRuleSet** cmdlet updates the NetworkRule pro

### Example 1: Update all properties of NetworkRule, input Rules with JSON
```
PS C:\> Update-AzStorageAccountNetworkRuleSet -ResourceGroupName "myResourceGroup" -AccountName "mystorageaccount" -Bypass Logging,Metrics -DefaultAction Allow -IpRule (@{IPAddressOrRange="10.0.0.0/24";Action="allow"},@{IPAddressOrRange="28.2.0.0/16";Action="allow"})
PS C:\> Update-AzStorageAccountNetworkRuleSet -ResourceGroupName "myResourceGroup" -AccountName "mystorageaccount" -Bypass Logging,Metrics -DefaultAction Allow -IpRule (@{IPAddressOrRange="10.0.0.0/7";Action="allow"},@{IPAddressOrRange="28.2.0.0/16";Action="allow"})
-VirtualNetworkRule (@{VirtualNetworkResourceId="/subscriptions/s1/resourceGroups/g1/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1";Action="allow"},@{VirtualNetworkResourceId="/subscriptions/s1/resourceGroups/g1/providers/Microsoft.Network/virtualN
etworks/vnet2/subnets/subnet2";Action="allow"}) -ResourceAccessRule (@{ResourceId=$ResourceId1;TenantId=$tenantId1},@{ResourceId=$ResourceId2;TenantId=$tenantId1})
```
Expand Down
6 changes: 1 addition & 5 deletions src/Storage/Storage/Blob/Cmdlet/StartAzureStorageBlobCopy.cs
Original file line number Diff line number Diff line change
Expand Up @@ -300,11 +300,7 @@ public Hashtable Tag

protected override bool UseTrack2Sdk()
{
if (this.BlobTag != null || this.TagCondition != null || this.DestTagCondition != null)
{
return true;
}
return base.UseTrack2Sdk();
return true;
}

private bool skipSourceChannelInit;
Expand Down