Skip to content

Commit 92952d4

Browse files
GarrettBeattyGarrettBeatty
authored
Added PutObjectResponse to TransferUtilityUploadResponse mapping (#4045)
1 parent 5c299e8 commit 92952d4

File tree

12 files changed

+1381
-11
lines changed

12 files changed

+1381
-11
lines changed

‎generator/.DevConfigs/433a9a6d-b8ea-4676-b763-70711e8288e4.json‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"services": [
3+
{
4+
"serviceName": "S3",
5+
"type": "patch",
6+
"changeLogMessages": [
7+
"Added PutObjectResponse to TransferUtilityUploadResponse mapping"
8+
]
9+
}
10+
]
11+
}

‎generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.cs‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace ServiceClientGenerator.Generators.SourceFiles
1515
/// Class to produce the template output
1616
/// </summary>
1717

18-
#line 1 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
18+
#line 1 "C:\dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
1919
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")]
2020
public partial class AssemblyInfo : BaseGenerator
2121
{
@@ -36,43 +36,43 @@ public override string TransformText()
3636
// associated with an assembly.
3737
[assembly: AssemblyTitle(""");
3838

39-
#line 12 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
39+
#line 12 "C:\dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
4040
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.AssemblyTitle));
4141

4242
#line default
4343
#line hidden
4444
this.Write("\")]\r\n#if BCL\r\n[assembly: AssemblyDescription(\"");
4545

46-
#line 14 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
46+
#line 14 "C:\dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
4747
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.AssemblyDescription(versionIdentifier: "4.7.2")));
4848

4949
#line default
5050
#line hidden
5151
this.Write("\")]\r\n#elif NETSTANDARD20\r\n[assembly: AssemblyDescription(\"");
5252

53-
#line 16 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
53+
#line 16 "C:\dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
5454
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.AssemblyDescription(versionIdentifier: "NetStandard 2.0")));
5555

5656
#line default
5757
#line hidden
5858
this.Write("\")]\r\n#elif NETCOREAPP3_1\r\n[assembly: AssemblyDescription(\"");
5959

60-
#line 18 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
60+
#line 18 "C:\dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
6161
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.AssemblyDescription(versionIdentifier: ".NET Core 3.1")));
6262

6363
#line default
6464
#line hidden
6565
this.Write("\")]\r\n#elif NET8_0\r\n[assembly: AssemblyDescription(\"");
6666

67-
#line 20 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
67+
#line 20 "C:\dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
6868
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.AssemblyDescription(versionIdentifier: ".NET 8.0")));
6969

7070
#line default
7171
#line hidden
7272
this.Write("\")]\r\n#else\r\n#error Unknown platform constant - unable to set correct AssemblyDesc" +
7373
"ription\r\n#endif\r\n\r\n");
7474

75-
#line 25 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
75+
#line 25 "C:\dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
7676
if (this.Config.AssemblyTitle=="AWSSDK.DynamoDBv2") {
7777

7878
#line default
@@ -81,7 +81,22 @@ public override string TransformText()
8181
[assembly: InternalsVisibleTo(""AWSSDK.UnitTests.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4"")]
8282
");
8383

84-
#line 28 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
84+
#line 28 "C:\dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
85+
}
86+
87+
#line default
88+
#line hidden
89+
90+
#line 29 "C:\dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
91+
if (this.Config.AssemblyTitle=="AWSSDK.S3") {
92+
93+
#line default
94+
#line hidden
95+
this.Write(@"[assembly: InternalsVisibleTo(""AWSSDK.UnitTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4"")]
96+
[assembly: InternalsVisibleTo(""AWSSDK.UnitTests.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4"")]
97+
");
98+
99+
#line 32 "C:\dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
85100
}
86101

87102
#line default
@@ -110,14 +125,14 @@ public override string TransformText()
110125
// [assembly: AssemblyVersion(""1.0.*"")]
111126
[assembly: AssemblyVersion(""");
112127

113-
#line 51 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
128+
#line 55 "C:\dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
114129
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceVersion));
115130

116131
#line default
117132
#line hidden
118133
this.Write("\")]\r\n[assembly: AssemblyFileVersion(\"");
119134

120-
#line 52 "C:\codebase\v4\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
135+
#line 56 "C:\dev\repos\aws-sdk-net\generator\ServiceClientGeneratorLib\Generators\SourceFiles\AssemblyInfo.tt"
121136
this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.ServiceFileVersion));
122137

123138
#line default

‎generator/ServiceClientGeneratorLib/Generators/SourceFiles/AssemblyInfo.tt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ using System.Runtime.CompilerServices;
2626
[assembly: InternalsVisibleTo("AWSSDK.UnitTests.DynamoDBv2.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
2727
[assembly: InternalsVisibleTo("AWSSDK.UnitTests.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
2828
<# } #>
29+
<# if (this.Config.AssemblyTitle=="AWSSDK.S3") { #>
30+
[assembly: InternalsVisibleTo("AWSSDK.UnitTests.S3.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
31+
[assembly: InternalsVisibleTo("AWSSDK.UnitTests.NetFramework, PublicKey=0024000004800000940000000602000000240000525341310004000001000100db5f59f098d27276c7833875a6263a3cc74ab17ba9a9df0b52aedbe7252745db7274d5271fd79c1f08f668ecfa8eaab5626fa76adc811d3c8fc55859b0d09d3bc0a84eecd0ba891f2b8a2fc55141cdcc37c2053d53491e650a479967c3622762977900eddbf1252ed08a2413f00a28f3a0752a81203f03ccb7f684db373518b4")]
32+
<# } #>
2933
[assembly: AssemblyConfiguration("")]
3034
[assembly: AssemblyProduct("Amazon Web Services SDK for .NET")]
3135
[assembly: AssemblyCompany("Amazon.com, Inc")]

‎generator/ServiceModels/_manifest.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@
6060
"Custom\\Runtime\\TestResponses\\*.txt",
6161
"Custom\\Runtime\\EventStreams\\test_vectors\\*",
6262
"Custom\\Runtime\\TestEndpoints\\*.json",
63-
"Custom\\TestTools\\ComparerTest.json"
63+
"Custom\\TestTools\\ComparerTest.json",
64+
"..\\Services\\S3\\UnitTests\\Custom\\EmbeddedResource\\*"
6465
],
6566
"packageReferences": [
6667
{

‎sdk/src/Services/S3/Custom/Transfer/Internal/ResponseMapper.cs‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
/*******************************************************************************
2+
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3+
* Licensed under the Apache License, Version 2.0 (the "License"). You may not use
4+
* this file except in compliance with the License. A copy of the License is located at
5+
*
6+
* http://aws.amazon.com/apache2.0
7+
*
8+
* or in the "license" file accompanying this file.
9+
* This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
10+
* CONDITIONS OF ANY KIND, either express or implied. See the License for the
11+
* specific language governing permissions and limitations under the License.
12+
* *****************************************************************************
13+
* __ _ _ ___
14+
* ( )( \/\/ )/ __)
15+
* /__\ \ / \__ \
16+
* (_)(_) \/\/ (___/
17+
*
18+
* AWS SDK for .NET
19+
* API Version: 2006-03-01
20+
*
21+
*/
22+
23+
using Amazon.S3.Model;
24+
25+
namespace Amazon.S3.Transfer.Internal
26+
{
27+
/// <summary>
28+
/// Utility class for mapping S3 response objects to TransferUtilityUploadResponse.
29+
/// Maps fields based on the mapping.json configuration used by the Transfer Utility.
30+
/// </summary>
31+
internal static class ResponseMapper
32+
{
33+
/// <summary>
34+
/// Maps a PutObjectResponse to TransferUtilityUploadResponse.
35+
/// Uses the field mappings defined in mapping.json "Conversion" -> "PutObjectResponse" -> "UploadResponse".
36+
/// </summary>
37+
/// <param name="source">The PutObjectResponse to map from</param>
38+
/// <returns>A new TransferUtilityUploadResponse with mapped fields</returns>
39+
internal static TransferUtilityUploadResponse MapPutObjectResponse(PutObjectResponse source)
40+
{
41+
if (source == null)
42+
return null;
43+
44+
var response = new TransferUtilityUploadResponse();
45+
46+
// Map all fields as defined in mapping.json "Conversion" -> "PutObjectResponse" -> "UploadResponse"
47+
if (source.IsSetBucketKeyEnabled())
48+
response.BucketKeyEnabled = source.BucketKeyEnabled.GetValueOrDefault();
49+
50+
if (source.IsSetChecksumCRC32())
51+
response.ChecksumCRC32 = source.ChecksumCRC32;
52+
53+
if (source.IsSetChecksumCRC32C())
54+
response.ChecksumCRC32C = source.ChecksumCRC32C;
55+
56+
if (source.IsSetChecksumCRC64NVME())
57+
response.ChecksumCRC64NVME = source.ChecksumCRC64NVME;
58+
59+
if (source.IsSetChecksumSHA1())
60+
response.ChecksumSHA1 = source.ChecksumSHA1;
61+
62+
if (source.IsSetChecksumSHA256())
63+
response.ChecksumSHA256 = source.ChecksumSHA256;
64+
65+
if (source.IsSetChecksumType())
66+
response.ChecksumType = source.ChecksumType;
67+
68+
if (source.IsSetETag())
69+
response.ETag = source.ETag;
70+
71+
if (source.Expiration != null)
72+
response.Expiration = source.Expiration;
73+
74+
if (source.IsSetRequestCharged())
75+
response.RequestCharged = source.RequestCharged;
76+
77+
if (source.ServerSideEncryptionCustomerMethod != null)
78+
response.ServerSideEncryptionCustomerMethod = source.ServerSideEncryptionCustomerMethod;
79+
80+
if (source.ServerSideEncryptionCustomerProvidedKeyMD5 != null)
81+
response.ServerSideEncryptionCustomerProvidedKeyMD5 = source.ServerSideEncryptionCustomerProvidedKeyMD5;
82+
83+
if (source.ServerSideEncryptionKeyManagementServiceEncryptionContext != null)
84+
response.ServerSideEncryptionKeyManagementServiceEncryptionContext = source.ServerSideEncryptionKeyManagementServiceEncryptionContext;
85+
86+
if (source.IsSetServerSideEncryptionKeyManagementServiceKeyId())
87+
response.ServerSideEncryptionKeyManagementServiceKeyId = source.ServerSideEncryptionKeyManagementServiceKeyId;
88+
89+
if (source.ServerSideEncryptionMethod != null)
90+
response.ServerSideEncryptionMethod = source.ServerSideEncryptionMethod;
91+
92+
if (source.IsSetVersionId())
93+
response.VersionId = source.VersionId;
94+
95+
// Copy response metadata
96+
response.ResponseMetadata = source.ResponseMetadata;
97+
response.ContentLength = source.ContentLength;
98+
response.HttpStatusCode = source.HttpStatusCode;
99+
100+
return response;
101+
}
102+
103+
}
104+
}

0 commit comments

Comments
 (0)