Style tweaks

Author: loic-sharma

src/BaGet.AWS/Extensions/ServiceCollectionExtensions.cs

@@ -1,4 +1,4 @@
-using Amazon;
+using Amazon;
 using Amazon.Runtime;
 using Amazon.S3;
 using BaGet.AWS.Configuration;
@@ -15,7 +15,7 @@ public static IServiceCollection AddS3StorageService(this IServiceCollection ser
             {
                 var options = provider.GetRequiredService<IOptions<S3StorageOptions>>().Value;
 
-                AmazonS3Config config = new AmazonS3Config
+                var config = new AmazonS3Config
                 {
                     RegionEndpoint = RegionEndpoint.GetBySystemName(options.Region)
                 };

src/BaGet.AWS/S3StorageService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -34,12 +34,14 @@ private string PrepareKey(string path)
 
         public async Task<Stream> GetAsync(string path, CancellationToken cancellationToken = default)
         {
-            MemoryStream stream = new MemoryStream();
+            var stream = new MemoryStream();
 
             try
             {
-                using (GetObjectResponse res = await _client.GetObjectAsync(_bucket, PrepareKey(path), cancellationToken))
-                    await res.ResponseStream.CopyToAsync(stream);
+                using (var request = await _client.GetObjectAsync(_bucket, PrepareKey(path), cancellationToken))
+                {
+                    await request.ResponseStream.CopyToAsync(stream);
+                }
 
                 stream.Seek(0, SeekOrigin.Begin);
             }
@@ -56,31 +58,31 @@ public async Task<Stream> GetAsync(string path, CancellationToken cancellationTo
 
         public Task<Uri> GetDownloadUriAsync(string path, CancellationToken cancellationToken = default)
         {
-            string res = _client.GetPreSignedURL(new GetPreSignedUrlRequest
+            var url = _client.GetPreSignedURL(new GetPreSignedUrlRequest
             {
                 BucketName = _bucket,
                 Key = PrepareKey(path)
             });
 
-            return Task.FromResult(new Uri(res));
+            return Task.FromResult(new Uri(url));
         }
 
         public async Task<PutResult> PutAsync(string path, Stream content, string contentType, CancellationToken cancellationToken = default)
         {
             // TODO: Uploads should be idempotent. This should fail if and only if the blob
             // already exists but has different content.
 
-            using (MemoryStream ms = new MemoryStream())
+            using (var seekableContent = new MemoryStream())
             {
-                await content.CopyToAsync(ms, 4096, cancellationToken);
+                await content.CopyToAsync(seekableContent, 4096, cancellationToken);
 
-                ms.Seek(0, SeekOrigin.Begin);
+                seekableContent.Seek(0, SeekOrigin.Begin);
 
                 await _client.PutObjectAsync(new PutObjectRequest
                 {
                     BucketName = _bucket,
                     Key = PrepareKey(path),
-                    InputStream = ms,
+                    InputStream = seekableContent,
                     ContentType = contentType,
                     AutoResetStreamPosition = false,
                     AutoCloseStream = false

src/BaGet.Core/Services/FileStorageService.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
@@ -104,7 +104,7 @@ private string GetFullPath(string path)
                 throw new ArgumentException("Path is required", nameof(path));
             }
 
-            string fullPath = Path.GetFullPath(Path.Combine(_storePath, path));
+            var fullPath = Path.GetFullPath(Path.Combine(_storePath, path));
 
             // Verify path is under the _storePath.
             if (!fullPath.StartsWith(_storePath, StringComparison.Ordinal) ||