Skip to content

Commit a5c44c2

Browse files
jalauzon-msftjalauzon-msft
authored
[Storage][DataMovement] More GA API feedback (renames/refactors) (#47796)
1 parent 23c0c85 commit a5c44c2

File tree

62 files changed

+784
-665
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+784
-665
lines changed

‎sdk/storage/Azure.Storage.Blobs/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ BlobContainerClientTransferOptions options = new BlobContainerClientTransferOpti
216216
},
217217
TransferOptions = new TransferOptions()
218218
{
219-
CreationPreference = StorageResourceCreationPreference.OverwriteIfExists,
219+
CreationPreference = StorageResourceCreationMode.OverwriteIfExists,
220220
}
221221
};
222222

@@ -249,7 +249,7 @@ BlobContainerClientTransferOptions options = new BlobContainerClientTransferOpti
249249
},
250250
TransferOptions = new TransferOptions()
251251
{
252-
CreationPreference = StorageResourceCreationPreference.OverwriteIfExists,
252+
CreationPreference = StorageResourceCreationMode.OverwriteIfExists,
253253
}
254254
};
255255

‎sdk/storage/Azure.Storage.DataMovement.Blobs/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ BlobContainerClientTransferOptions options = new BlobContainerClientTransferOpti
272272
},
273273
TransferOptions = new TransferOptions()
274274
{
275-
CreationPreference = StorageResourceCreationPreference.OverwriteIfExists,
275+
CreationPreference = StorageResourceCreationMode.OverwriteIfExists,
276276
}
277277
};
278278

@@ -305,7 +305,7 @@ BlobContainerClientTransferOptions options = new BlobContainerClientTransferOpti
305305
},
306306
TransferOptions = new TransferOptions()
307307
{
308-
CreationPreference = StorageResourceCreationPreference.OverwriteIfExists,
308+
CreationPreference = StorageResourceCreationMode.OverwriteIfExists,
309309
}
310310
};
311311

‎sdk/storage/Azure.Storage.DataMovement.Blobs/perf/Azure.Storage.DataMovement.Blobs.Perf/Infrastructure/DirectoryTransferTest.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ public DirectoryTransferTest(TOptions options) : base(options)
2929

3030
TransferManagerOptions managerOptions = new()
3131
{
32-
ErrorHandling = TransferErrorMode.StopOnAnyFailure,
33-
CheckpointerOptions = Options.DisableCheckpointer ? TransferCheckpointStoreOptions.Disabled() : default,
32+
ErrorMode = TransferErrorMode.StopOnAnyFailure,
33+
CheckpointStoreOptions = Options.DisableCheckpointer ? TransferCheckpointStoreOptions.DisableCheckpoint() : default,
3434
MaximumConcurrency = Options.Concurrency
3535
};
3636
_transferManager = new TransferManager(managerOptions);
@@ -85,7 +85,7 @@ protected async Task RunAndVerifyTransferAsync(
8585
{
8686
TransferOptions options = new()
8787
{
88-
CreationPreference = StorageResourceCreationPreference.OverwriteIfExists,
88+
CreationPreference = StorageResourceCreationMode.OverwriteIfExists,
8989
InitialTransferSize = Options.InitialTransferSize,
9090
MaximumTransferChunkSize = Options.ChunkSize,
9191
};

‎sdk/storage/Azure.Storage.DataMovement.Blobs/samples/Sample01b_HelloWorldAsync.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ public async Task DownloadSingle_SharedKeyAuthAsync()
271271
// Create Blob Data Controller to skip through all failures
272272
TransferManagerOptions options = new TransferManagerOptions()
273273
{
274-
ErrorHandling = TransferErrorMode.ContinueOnFailure
274+
ErrorMode = TransferErrorMode.ContinueOnFailure
275275
};
276276
TransferManager transferManager = new TransferManager(options);
277277
BlobsStorageResourceProvider blobs = new();
@@ -368,7 +368,7 @@ public async Task UploadDirectory_SasAsync()
368368
TransferOptions options = new TransferOptions()
369369
{
370370
MaximumTransferChunkSize = 4 * Constants.MB,
371-
CreationPreference = StorageResourceCreationPreference.OverwriteIfExists,
371+
CreationPreference = StorageResourceCreationMode.OverwriteIfExists,
372372
};
373373
TransferManager transferManager = new TransferManager(transferManagerOptions);
374374

@@ -463,7 +463,7 @@ public async Task UploadDirectory_CompletedEventHandler()
463463
{
464464
using (StreamWriter logStream = File.AppendText(logFile))
465465
{
466-
logStream.WriteLine($"File Completed Transfer: {args.SourceResource.Uri.AbsoluteUri}");
466+
logStream.WriteLine($"File Completed Transfer: {args.Source.Uri.AbsoluteUri}");
467467
}
468468
return Task.CompletedTask;
469469
};
@@ -565,8 +565,8 @@ public async Task UploadDirectory_EventHandler_SasAsync()
565565
// Specifying specific resources that failed, since its a directory transfer
566566
// maybe only one file failed out of many
567567
logStream.WriteLine($"Exception occurred with TransferId: {args.TransferId}," +
568-
$"Source Resource: {args.SourceResource.Uri.AbsoluteUri}, +" +
569-
$"Destination Resource: {args.DestinationResource.Uri.AbsoluteUri}," +
568+
$"Source Resource: {args.Source.Uri.AbsoluteUri}, +" +
569+
$"Destination Resource: {args.Destination.Uri.AbsoluteUri}," +
570570
$"Exception Message: {args.Exception.Message}");
571571
}
572572
return Task.CompletedTask;
@@ -901,7 +901,7 @@ public async Task PauseAndResumeAsync_ManagerId()
901901

902902
// Pause from the Transfer Manager using the Transfer Id
903903
#region Snippet:PauseFromManager
904-
await transferManager.PauseTransferIfRunningAsync(transferId);
904+
await transferManager.PauseTransferAsync(transferId);
905905
#endregion
906906

907907
// Resume all transfers
@@ -1029,7 +1029,7 @@ public async Task UploadDirectory()
10291029
},
10301030
TransferOptions = new TransferOptions()
10311031
{
1032-
CreationPreference = StorageResourceCreationPreference.OverwriteIfExists,
1032+
CreationPreference = StorageResourceCreationMode.OverwriteIfExists,
10331033
}
10341034
};
10351035

@@ -1099,7 +1099,7 @@ public async Task DownloadDirectory()
10991099
},
11001100
TransferOptions = new TransferOptions()
11011101
{
1102-
CreationPreference = StorageResourceCreationPreference.OverwriteIfExists,
1102+
CreationPreference = StorageResourceCreationMode.OverwriteIfExists,
11031103
}
11041104
};
11051105

@@ -1152,7 +1152,7 @@ async Task<TransferOperation> ListenToTransfersAsync(TransferManager transferMan
11521152
transferOptions.ItemTransferCompleted += (TransferItemCompletedEventArgs args) =>
11531153
{
11541154
using StreamWriter logStream = File.AppendText(logFile);
1155-
logStream.WriteLine($"File Completed Transfer: {args.SourceResource.Uri.LocalPath}");
1155+
logStream.WriteLine($"File Completed Transfer: {args.Source.Uri.LocalPath}");
11561156
return Task.CompletedTask;
11571157
};
11581158
return await transferManager.StartTransferAsync(

‎sdk/storage/Azure.Storage.DataMovement.Blobs/src/DataMovementBlobsExtensions.cs‎

Lines changed: 31 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,13 @@ internal static StorageResourceItemProperties ToStorageResourceProperties(this B
5252
properties.Add(DataMovementConstants.ResourceProperties.AccessTier, new AccessTier(blobProperties.AccessTier));
5353
}
5454

55-
return new StorageResourceItemProperties(
56-
resourceLength: blobProperties.ContentLength,
57-
eTag: blobProperties.ETag,
58-
lastModifiedTime: blobProperties.LastModified,
59-
properties: properties);
55+
return new StorageResourceItemProperties()
56+
{
57+
ResourceLength = blobProperties.ContentLength,
58+
ETag = blobProperties.ETag,
59+
LastModifiedTime = blobProperties.LastModified,
60+
RawProperties = properties
61+
};
6062
}
6163

6264
internal static StorageResourceItemProperties ToStorageResourceItemProperties(this BlobDownloadStreamingResult result)
@@ -102,11 +104,13 @@ internal static StorageResourceItemProperties ToStorageResourceItemProperties(th
102104
size = contentRange.Size;
103105
}
104106

105-
return new StorageResourceItemProperties(
106-
resourceLength: size,
107-
eTag : result?.Details.ETag,
108-
lastModifiedTime: result?.Details.LastModified,
109-
properties: properties);
107+
return new StorageResourceItemProperties()
108+
{
109+
ResourceLength = size,
110+
ETag = result?.Details.ETag,
111+
LastModifiedTime = result?.Details.LastModified,
112+
RawProperties = properties
113+
};
110114
}
111115

112116
internal static StorageResourceReadStreamResult ToReadStreamStorageResourceInfo(this BlobDownloadStreamingResult result)
@@ -162,11 +166,13 @@ internal static StorageResourceReadStreamResult ToReadStreamStorageResourceInfo(
162166
return new StorageResourceReadStreamResult(
163167
content: result.Content,
164168
range: range,
165-
properties: new StorageResourceItemProperties(
166-
resourceLength: size.HasValue ? size : result.Details.ContentLength,
167-
eTag: result.Details.ETag,
168-
lastModifiedTime: result?.Details.LastModified,
169-
properties: properties));
169+
properties: new StorageResourceItemProperties()
170+
{
171+
ResourceLength = size.HasValue ? size : result.Details.ContentLength,
172+
ETag = result.Details.ETag,
173+
LastModifiedTime = result?.Details.LastModified,
174+
RawProperties = properties
175+
});
170176
}
171177

172178
/// <summary>
@@ -631,11 +637,13 @@ internal static StorageResourceItemProperties ToResourceProperties(this BlobItem
631637
properties.Add(DataMovementConstants.ResourceProperties.CacheControl, blobItem.Properties.CacheControl);
632638
}
633639

634-
return new StorageResourceItemProperties(
635-
resourceLength: blobItem.Properties.ContentLength,
636-
eTag: blobItem.Properties.ETag,
637-
lastModifiedTime: blobItem.Properties.LastModified,
638-
properties: properties);
640+
return new StorageResourceItemProperties()
641+
{
642+
ResourceLength = blobItem.Properties.ContentLength,
643+
ETag = blobItem.Properties.ETag,
644+
LastModifiedTime = blobItem.Properties.LastModified,
645+
RawProperties = properties
646+
};
639647
}
640648

641649
private static string ConvertContentPropertyObjectToString(string contentPropertyName, object contentPropertyValue)
@@ -656,7 +664,7 @@ private static string ConvertContentPropertyObjectToString(string contentPropert
656664

657665
private static BlobHttpHeaders GetHttpHeaders(
658666
BlobStorageResourceOptions options,
659-
Dictionary<string, object> properties)
667+
IDictionary<string, object> properties)
660668
=> new()
661669
{
662670
ContentType = (options?.ContentType?.Preserve ?? true)
@@ -689,7 +697,7 @@ private static BlobHttpHeaders GetHttpHeaders(
689697
// Get the access tier property
690698
private static AccessTier? GetAccessTier(
691699
BlobStorageResourceOptions options,
692-
Dictionary<string, object> properties)
700+
IDictionary<string, object> properties)
693701
=> options?.AccessTier != default
694702
? options?.AccessTier
695703
: properties?.TryGetValue(DataMovementConstants.ResourceProperties.AccessTier, out object accessTierObject) == true
@@ -699,7 +707,7 @@ private static BlobHttpHeaders GetHttpHeaders(
699707
// By default we preserve the metadata
700708
private static Metadata GetMetadata(
701709
BlobStorageResourceOptions options,
702-
Dictionary<string, object> properties)
710+
IDictionary<string, object> properties)
703711
=> (options?.Metadata?.Preserve ?? true)
704712
? properties?.TryGetValue(DataMovementConstants.ResourceProperties.Metadata, out object metadataObject) == true
705713
? (Metadata) metadataObject

‎sdk/storage/Azure.Storage.DataMovement.Blobs/stress/src/Infrastructure/StressEventsRaised.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ public void AssertUnexpectedFailureCheck()
137137
{
138138
Assert.Fail(
139139
$"Failure occurred at Transfer id: {failure.TransferId}.\n" +
140-
$"Source Resource Path: {failure.SourceResource.Uri.AbsoluteUri}\n" +
141-
$"Destination Resource Path: {failure.DestinationResource.Uri.AbsoluteUri}\n" +
140+
$"Source Resource Path: {failure.Source.Uri.AbsoluteUri}\n" +
141+
$"Destination Resource Path: {failure.Destination.Uri.AbsoluteUri}\n" +
142142
$"Exception Message: {failure.Exception.Message}\n" +
143143
$"Exception Stack: {failure.Exception.StackTrace}\n");
144144
}
@@ -177,8 +177,8 @@ public async Task AssertSingleSkippedCheck()
177177
AssertUnexpectedFailureCheck();
178178
Assert.IsEmpty(SingleCompletedEvents);
179179
Assert.AreEqual(1, SkippedEvents.Count);
180-
Assert.NotNull(SkippedEvents.First().SourceResource.Uri);
181-
Assert.NotNull(SkippedEvents.First().DestinationResource.Uri);
180+
Assert.NotNull(SkippedEvents.First().Source.Uri);
181+
Assert.NotNull(SkippedEvents.First().Destination.Uri);
182182

183183
AssertTransferStatusCollection(
184184
new TransferStatus[] {
@@ -202,8 +202,8 @@ public async Task AssertSingleFailedCheck(int failureCount)
202202
foreach (TransferItemFailedEventArgs args in FailedEvents)
203203
{
204204
Assert.NotNull(args.Exception);
205-
Assert.NotNull(args.SourceResource.Uri);
206-
Assert.NotNull(args.DestinationResource.Uri);
205+
Assert.NotNull(args.Source.Uri);
206+
Assert.NotNull(args.Destination.Uri);
207207
}
208208

209209
AssertTransferStatusCollection(

0 commit comments

Comments
 (0)