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

Feature/storage/blob container client request conditions #22076

Merged
merged 8 commits into from
Jun 23, 2021
Merged

Feature/storage/blob container client request conditions #22076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3d6eaba
Added BlobRequestConditions validation to BlobContainerClient
seanmcc-msft Jun 23, 2021
8ac36a5
Added BlobRequestConditions validation to ContainerClient.GetAccessPo…
seanmcc-msft Jun 23, 2021
c5aede8
GetProperties()
seanmcc-msft Jun 23, 2021
0c532ac
Rename
seanmcc-msft Jun 23, 2021
d5118a9
SetAccessPolicy
seanmcc-msft Jun 23, 2021
f082e8b
SetMetadata
seanmcc-msft Jun 23, 2021
1bf2ade
update
seanmcc-msft Jun 23, 2021
c7c1424
update
seanmcc-msft Jun 23, 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
63 changes: 54 additions & 9 deletions sdk/storage/Azure.Storage.Blobs/src/BlobContainerClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,6 +1457,14 @@ private async Task<Response> DeleteInternal(

DiagnosticScope scope = ClientConfiguration.ClientDiagnostics.CreateScope($"{nameof(BlobContainerClient)}.{nameof(Delete)}");

conditions.ValidateConditionsNotPresent(
invalidConditions:
BlobRequestConditionProperty.TagConditions
| BlobRequestConditionProperty.IfMatch
| BlobRequestConditionProperty.IfNoneMatch,
operationName: nameof(BlobContainerClient.Delete),
parameterName: nameof(conditions));

try
{
scope.Start();
Expand Down Expand Up @@ -1733,6 +1741,16 @@ private async Task<Response<BlobContainerProperties>> GetPropertiesInternal(

DiagnosticScope scope = ClientConfiguration.ClientDiagnostics.CreateScope($"{nameof(BlobContainerClient)}.{nameof(GetProperties)}");

conditions.ValidateConditionsNotPresent(
invalidConditions:
BlobRequestConditionProperty.TagConditions
| BlobRequestConditionProperty.IfMatch
| BlobRequestConditionProperty.IfNoneMatch
| BlobRequestConditionProperty.IfModifiedSince
| BlobRequestConditionProperty.IfUnmodifiedSince,
operationName: nameof(BlobContainerClient.GetProperties),
parameterName: nameof(conditions));

try
{
scope.Start();
Expand Down Expand Up @@ -1895,15 +1913,14 @@ private async Task<Response<BlobContainerInfo>> SetMetadataInternal(
{
scope.Start();

if (conditions?.IfUnmodifiedSince != default ||
conditions?.IfMatch != default ||
conditions?.IfNoneMatch != default)
{
throw BlobErrors.BlobConditionsMustBeDefault(
nameof(RequestConditions.IfUnmodifiedSince),
nameof(RequestConditions.IfMatch),
nameof(RequestConditions.IfNoneMatch));
}
conditions.ValidateConditionsNotPresent(
invalidConditions:
BlobRequestConditionProperty.TagConditions
| BlobRequestConditionProperty.IfMatch
| BlobRequestConditionProperty.IfNoneMatch
| BlobRequestConditionProperty.IfUnmodifiedSince,
operationName: nameof(BlobContainerClient.SetMetadata),
parameterName: nameof(conditions));

ResponseWithHeaders<ContainerSetMetadataHeaders> response;

Expand Down Expand Up @@ -2056,6 +2073,16 @@ private async Task<Response<BlobContainerAccessPolicy>> GetAccessPolicyInternal(

DiagnosticScope scope = ClientConfiguration.ClientDiagnostics.CreateScope($"{nameof(BlobContainerClient)}.{nameof(GetAccessPolicy)}");

conditions.ValidateConditionsNotPresent(
invalidConditions:
BlobRequestConditionProperty.TagConditions
| BlobRequestConditionProperty.IfMatch
| BlobRequestConditionProperty.IfNoneMatch
| BlobRequestConditionProperty.IfModifiedSince
| BlobRequestConditionProperty.IfUnmodifiedSince,
operationName: nameof(BlobContainerClient.GetAccessPolicy),
parameterName: nameof(conditions));

try
{
scope.Start();
Expand Down Expand Up @@ -2267,6 +2294,14 @@ private async Task<Response<BlobContainerInfo>> SetAccessPolicyInternal(

DiagnosticScope scope = ClientConfiguration.ClientDiagnostics.CreateScope($"{nameof(BlobContainerClient)}.{nameof(SetAccessPolicy)}");

conditions.ValidateConditionsNotPresent(
invalidConditions:
BlobRequestConditionProperty.TagConditions
| BlobRequestConditionProperty.IfMatch
| BlobRequestConditionProperty.IfNoneMatch,
operationName: nameof(BlobContainerClient.SetAccessPolicy),
parameterName: nameof(conditions));

try
{
scope.Start();
Expand Down Expand Up @@ -3286,6 +3321,16 @@ internal async Task<Response<BlobContainerClient>> RenameInternal(

DiagnosticScope scope = ClientConfiguration.ClientDiagnostics.CreateScope($"{nameof(BlobContainerClient)}.{nameof(Rename)}");

sourceConditions.ValidateConditionsNotPresent(
invalidConditions:
BlobRequestConditionProperty.TagConditions
| BlobRequestConditionProperty.IfMatch
| BlobRequestConditionProperty.IfNoneMatch
| BlobRequestConditionProperty.IfModifiedSince
| BlobRequestConditionProperty.IfUnmodifiedSince,
operationName: nameof(BlobContainerClient.Rename),
parameterName: nameof(sourceConditions));

try
{
scope.Start();
Expand Down
Loading