Skip to content

Added Exists, CreateIfNotExists, and DeleteIfExists to Data Lake #9996

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

Merged
seanmcc-msft merged 2 commits into from
Feb 18, 2020
Merged

Added Exists, CreateIfNotExists, and DeleteIfExists to Data Lake #9996

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
afc3f50
Added Exists, CreateIfNotExists, and DeleteIfExists to Data Lake
seanmcc-msft Feb 15, 2020
8cbafbc
PR comments
seanmcc-msft Feb 18, 2020
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: 2 additions & 2 deletions sdk/storage/Azure.Storage.Blobs/tests/AppendBlobClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
blob.AppendBlockAsync(
content: stream,
transactionalContentHash: MD5.Create().ComputeHash(Encoding.UTF8.GetBytes("garbage"))),
e => Assert.AreEqual("Md5Mismatch", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("Md5Mismatch", e.ErrorCode));
}
}

Expand All @@ -470,7 +470,7 @@ public async Task AppendBlockAsync_Error()
{
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
blob.AppendBlockAsync(stream),
e => Assert.AreEqual("BlobNotFound", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("BlobNotFound", e.ErrorCode));
}
}

Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/Azure.Storage.Blobs/tests/BlobBaseClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1376,7 +1376,7 @@ public async Task ExistsAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
unauthorizedBlobClient.ExistsAsync(),
e => Assert.AreEqual(BlobErrorCode.ResourceNotFound.ToString(), e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual(BlobErrorCode.ResourceNotFound.ToString(), e.ErrorCode));
}

[Test]
Expand Down
4 changes: 2 additions & 2 deletions sdk/storage/Azure.Storage.Blobs/tests/BlockBlobClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@ await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
{
LeaseId = garbageLeaseId
}),
e => Assert.AreEqual("LeaseNotPresentWithBlobOperation", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("LeaseNotPresentWithBlobOperation", e.ErrorCode));
}

[Test]
Expand Down Expand Up @@ -1504,7 +1504,7 @@ await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
blob.UploadAsync(
content: stream,
conditions: new BlobRequestConditions { LeaseId = garbageLeaseId }),
e => Assert.AreEqual("LeaseNotPresentWithBlobOperation", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("LeaseNotPresentWithBlobOperation", e.ErrorCode));
}
}

Expand Down
32 changes: 16 additions & 16 deletions sdk/storage/Azure.Storage.Blobs/tests/ContainerClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@ public async Task CreateAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
container.CreateAsync(),
e => Assert.AreEqual("ContainerAlreadyExists", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("ContainerAlreadyExists", e.ErrorCode));

// Cleanup
await container.DeleteAsync();
Expand Down Expand Up @@ -561,7 +561,7 @@ public async Task DeleteAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
container.DeleteAsync(),
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode));
}

[Test]
Expand Down Expand Up @@ -715,7 +715,7 @@ public async Task ExistsAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
unauthorizedContainerClient.ExistsAsync(),
e => Assert.AreEqual(BlobErrorCode.ResourceNotFound.ToString(), e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual(BlobErrorCode.ResourceNotFound.ToString(), e.ErrorCode));
}

[Test]
Expand Down Expand Up @@ -754,7 +754,7 @@ public async Task GetPropertiesAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
container.GetPropertiesAsync(),
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode));
}

[Test]
Expand Down Expand Up @@ -784,7 +784,7 @@ public async Task SetMetadataAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
container.SetMetadataAsync(metadata),
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode));
}

[Test]
Expand Down Expand Up @@ -905,7 +905,7 @@ public async Task GetAccessPolicyAsync_LeaseFail()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
test.Container.GetAccessPolicyAsync(conditions: leaseAccessConditions),
e => Assert.AreEqual("LeaseNotPresentWithContainerOperation", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("LeaseNotPresentWithContainerOperation", e.ErrorCode));
}

[Test]
Expand All @@ -918,7 +918,7 @@ public async Task GetAccessPolicyAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
container.GetAccessPolicyAsync(),
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode));
}

[Test]
Expand Down Expand Up @@ -961,7 +961,7 @@ public async Task SetAccessPolicyAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
container.SetAccessPolicyAsync(permissions: signedIdentifiers),
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode));
}

[Test]
Expand Down Expand Up @@ -1069,7 +1069,7 @@ public async Task AcquireLeaseAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
InstrumentClient(container.GetBlobLeaseClient(id)).AcquireAsync(duration: duration),
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode));
}

[Test]
Expand Down Expand Up @@ -1162,7 +1162,7 @@ public async Task RenewLeaseAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
InstrumentClient(container.GetBlobLeaseClient(id)).ReleaseAsync(),
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode));
}

[Test]
Expand Down Expand Up @@ -1256,7 +1256,7 @@ public async Task ReleaseLeaseAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
InstrumentClient(container.GetBlobLeaseClient(id)).ReleaseAsync(),
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode));
}

[Test]
Expand Down Expand Up @@ -1347,7 +1347,7 @@ public async Task BreakLeaseAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
InstrumentClient(container.GetBlobLeaseClient()).BreakAsync(),
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode));
}

[Test]
Expand Down Expand Up @@ -1444,7 +1444,7 @@ public async Task ChangeLeaseAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
InstrumentClient(container.GetBlobLeaseClient(id)).ChangeAsync(id),
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode));
}

[Test]
Expand Down Expand Up @@ -1692,7 +1692,7 @@ public async Task ListBlobsFlatSegmentAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
container.GetBlobsAsync().ToListAsync(),
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode));
}

[Test]
Expand Down Expand Up @@ -1912,7 +1912,7 @@ public async Task ListBlobsHierarchySegmentAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
container.GetBlobsByHierarchyAsync().ToListAsync(),
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode));
}

[Test]
Expand Down Expand Up @@ -1999,7 +1999,7 @@ public async Task DeleteBlobIfExistsAsync_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
container.DeleteBlobIfExistsAsync(GetNewBlobName()),
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("ContainerNotFound", e.ErrorCode));
}

#region Secondary Storage
Expand Down
2 changes: 1 addition & 1 deletion sdk/storage/Azure.Storage.Blobs/tests/ServiceClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ public async Task GetUserDelegationKey_Error()
// Act
await TestHelper.AssertExpectedExceptionAsync<RequestFailedException>(
service.GetUserDelegationKeyAsync(startsOn: null, expiresOn: Recording.UtcNow.AddHours(1)),
e => Assert.AreEqual("AuthenticationFailed", e.ErrorCode.Split('\n')[0]));
e => Assert.AreEqual("AuthenticationFailed", e.ErrorCode));
}

[Test]
Expand Down
Loading