reply to daniel and garrets comments

philasmar · philasmar · commit 6e6834507e5f · 2025-12-02T17:31:00.000-05:00
diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.cs b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.cs
@@ -101,19 +101,23 @@ public override string TransformText()
                     "4800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a" +
                     "6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76ad" +
                     "c811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c" +
-                    "3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n[ass" +
-                    "embly: InternalsVisibleTo(\"AWSSDK.IntegrationTests.S3.NetFramework, PublicKey=00" +
-                    "24000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7" +
-                    "833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab562" +
-                    "6fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a" +
-                    "479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")" +
-                    "]\r\n[assembly: InternalsVisibleTo(\"DynamicProxyGenAssembly2, PublicKey=0024000004" +
-                    "800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6" +
-                    "c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2ed" +
-                    "fe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d1560509" +
-                    "3924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7\")]\r\n");
-            
-            #line 34 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
+                    "3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4\")]\r\n\r\n//" +
+                    " We should remove this in the future when TransferUtility Upload/Download direct" +
+                    "ory methods return responses.\r\n// We should update the Integration Tests in Tran" +
+                    "sferUtilityTests.cs to not use the internal methods and instead use the new publ" +
+                    "ic ones that return responses.\r\n[assembly: InternalsVisibleTo(\"AWSSDK.Integratio" +
+                    "nTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341" +
+                    "310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745" +
+                    "db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba89" +
+                    "1f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28" +
+                    "f3a0752a81203f03ccb7f684db373518b4\")]\r\n[assembly: InternalsVisibleTo(\"DynamicPro" +
+                    "xyGenAssembly2, PublicKey=002400000480000094000000060200000024000052534131000400" +
+                    "0001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734a" +
+                    "a39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64" +
+                    "bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be" +
+                    "11e6a7d3113e92484cf7045cc7\")]\r\n");
+            
+            #line 37 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
  } 
             
             #line default
@@ -142,14 +146,14 @@ public override string TransformText()
 // [assembly: AssemblyVersion(""1.0.*"")]
 [assembly: AssemblyVersion(""");
             
-            #line 57 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
+            #line 60 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceVersion));
             
             #line default
             #line hidden
             this.Write("\")]\r\n[assembly: AssemblyFileVersion(\"");
             
-            #line 58 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
+            #line 61 "D:\CodeBase\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
             this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceFileVersion));
             
             #line default
diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.tt b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.tt
@@ -29,6 +29,9 @@ using System.Runtime.CompilerServices;
 <# if (this.Config.AssemblyTitle=="AWSSDK.S3") { #>
 [assembly: InternalsVisibleTo("AWSSDK.UnitTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
 [assembly: InternalsVisibleTo("AWSSDK.UnitTests.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
+
+// We should remove this in the future when TransferUtility Upload/Download directory methods return responses.
+// We should update the Integration Tests in TransferUtilityTests.cs to not use the internal methods and instead use the new public ones that return responses.
 [assembly: InternalsVisibleTo("AWSSDK.IntegrationTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
 <# } #>
diff --git a/sdk/src/Services/S3/Custom/Transfer/Internal/_bcl+netstandard/UploadDirectoryCommand.cs b/sdk/src/Services/S3/Custom/Transfer/Internal/_bcl+netstandard/UploadDirectoryCommand.cs
@@ -90,9 +90,9 @@ public override async Task<TransferUtilityUploadDirectoryResponse> ExecuteAsync(
 
                 foreach (string filepath in filePaths)
                 {
-                    _logger.DebugFormat("Waiting for fileOperationThrottler to schedule file: {0}", filepath);
+                    _logger.DebugFormat("Waiting for fileOperationThrottler to schedule file.");
                     await fileOperationThrottler.WaitAsync(cancellationToken).ConfigureAwait(continueOnCapturedContext: false);
-                    _logger.DebugFormat("Acquired fileOperationThrottler for file: {0}. Currently scheduled: {1}", filepath, pendingTasks.Count + 1);
+                    _logger.DebugFormat("Acquired fileOperationThrottler. Currently scheduled: {0}", pendingTasks.Count + 1);
 
                     try
                     {
@@ -108,11 +108,9 @@ public override async Task<TransferUtilityUploadDirectoryResponse> ExecuteAsync(
                         }
 
                         var uploadRequest = ConstructRequest(basePath, filepath, prefix);
-                        _logger.DebugFormat("Constructed upload request for Key={0}, FilePath={1}", uploadRequest.Key, uploadRequest.FilePath);
 
                         Action<Exception> onFailure = (ex) =>
                         {
-                            _logger.Debug(ex, "Upload failed for Key={0}, FilePath={1}.", uploadRequest.Key, uploadRequest.FilePath);
                             this._request.OnRaiseObjectUploadFailedEvent(
                                 new ObjectUploadFailedEventArgs(
                                     this._request,
@@ -122,24 +120,23 @@ public override async Task<TransferUtilityUploadDirectoryResponse> ExecuteAsync(
 
                         var task = _failurePolicy.ExecuteAsync(
                             async () => {
-                                _logger.DebugFormat("Starting upload command for Key={0}", uploadRequest.Key);
+                                _logger.DebugFormat("Starting upload command");
                                 var command = _utility.GetUploadCommand(uploadRequest, sharedHttpRequestThrottler);
                                 await command.ExecuteAsync(internalCts.Token)
                                     .ConfigureAwait(false);
                                 var uploaded = Interlocked.Increment(ref _numberOfFilesSuccessfullyUploaded);
-                                _logger.DebugFormat("Completed upload for Key={0}. FilesSuccessfullyUploaded={1}", uploadRequest.Key, uploaded);
+                                _logger.DebugFormat("Completed upload. FilesSuccessfullyUploaded={0}", uploaded);
                             },
                             onFailure,
                             internalCts
                         );
 
                         pendingTasks.Add(task);
-                        _logger.DebugFormat("Scheduled upload task for Key={0}. PendingTasks={1}", uploadRequest.Key, pendingTasks.Count);
+                        _logger.DebugFormat("Scheduled upload task. PendingTasks=01}", pendingTasks.Count);
                     }
                     finally
                     {
                         fileOperationThrottler.Release();
-                        _logger.DebugFormat("Released fileOperationThrottler for file: {0}", filepath);
                     }
                 }
 
diff --git a/sdk/src/Services/S3/Properties/AssemblyInfo.cs b/sdk/src/Services/S3/Properties/AssemblyInfo.cs
@@ -21,6 +21,9 @@
 
 [assembly: InternalsVisibleTo("AWSSDK.UnitTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
 [assembly: InternalsVisibleTo("AWSSDK.UnitTests.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
+
+// We should remove this in the future when TransferUtility Upload/Download directory methods return responses.
+// We should update the Integration Tests in TransferUtilityTests.cs to not use the internal methods and instead use the new public ones that return responses.
 [assembly: InternalsVisibleTo("AWSSDK.IntegrationTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
 [assembly: AssemblyConfiguration("")]

Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,9 @@ public override async Task<TransferUtilityUploadDirectoryResponse> ExecuteAsync(`
`90`	`90`
`91`	`91`	`foreach (string filepath in filePaths)`
`92`	`92`	`{`
`93`		`- _logger.DebugFormat("Waiting for fileOperationThrottler to schedule file: {0}", filepath);`
	`93`	`+ _logger.DebugFormat("Waiting for fileOperationThrottler to schedule file.");`
`94`	`94`	`await fileOperationThrottler.WaitAsync(cancellationToken).ConfigureAwait(continueOnCapturedContext: false);`
`95`		`- _logger.DebugFormat("Acquired fileOperationThrottler for file: {0}. Currently scheduled: {1}", filepath, pendingTasks.Count + 1);`
	`95`	`+ _logger.DebugFormat("Acquired fileOperationThrottler. Currently scheduled: {0}", pendingTasks.Count + 1);`
`96`	`96`
`97`	`97`	`try`
`98`	`98`	`{`
`@@ -108,11 +108,9 @@ public override async Task<TransferUtilityUploadDirectoryResponse> ExecuteAsync(`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`var uploadRequest = ConstructRequest(basePath, filepath, prefix);`
`111`		`- _logger.DebugFormat("Constructed upload request for Key={0}, FilePath={1}", uploadRequest.Key, uploadRequest.FilePath);`
`112`	`111`
`113`	`112`	`Action<Exception> onFailure = (ex) =>`
`114`	`113`	`{`
`115`		`- _logger.Debug(ex, "Upload failed for Key={0}, FilePath={1}.", uploadRequest.Key, uploadRequest.FilePath);`
`116`	`114`	`this._request.OnRaiseObjectUploadFailedEvent(`
`117`	`115`	`new ObjectUploadFailedEventArgs(`
`118`	`116`	`this._request,`
`@@ -122,24 +120,23 @@ public override async Task<TransferUtilityUploadDirectoryResponse> ExecuteAsync(`
`122`	`120`
`123`	`121`	`var task = _failurePolicy.ExecuteAsync(`
`124`	`122`	`async () => {`
`125`		`- _logger.DebugFormat("Starting upload command for Key={0}", uploadRequest.Key);`
	`123`	`+ _logger.DebugFormat("Starting upload command");`
`126`	`124`	`var command = _utility.GetUploadCommand(uploadRequest, sharedHttpRequestThrottler);`
`127`	`125`	`await command.ExecuteAsync(internalCts.Token)`
`128`	`126`	`.ConfigureAwait(false);`
`129`	`127`	`var uploaded = Interlocked.Increment(ref _numberOfFilesSuccessfullyUploaded);`
`130`		`- _logger.DebugFormat("Completed upload for Key={0}. FilesSuccessfullyUploaded={1}", uploadRequest.Key, uploaded);`
	`128`	`+ _logger.DebugFormat("Completed upload. FilesSuccessfullyUploaded={0}", uploaded);`
`131`	`129`	`},`
`132`	`130`	`onFailure,`
`133`	`131`	`internalCts`
`134`	`132`	`);`
`135`	`133`
`136`	`134`	`pendingTasks.Add(task);`
`137`		`- _logger.DebugFormat("Scheduled upload task for Key={0}. PendingTasks={1}", uploadRequest.Key, pendingTasks.Count);`
	`135`	`+ _logger.DebugFormat("Scheduled upload task. PendingTasks=01}", pendingTasks.Count);`
`138`	`136`	`}`
`139`	`137`	`finally`
`140`	`138`	`{`
`141`	`139`	`fileOperationThrottler.Release();`
`142`		`- _logger.DebugFormat("Released fileOperationThrottler for file: {0}", filepath);`
`143`	`140`	`}`
`144`	`141`	`}`
`145`	`142`