From f8e3fbb7b93a545b17c40a6f8409e507b6ee1a97 Mon Sep 17 00:00:00 2001 From: Peter Song Date: Tue, 25 Nov 2025 13:34:41 -0800 Subject: [PATCH 1/4] Generate ListObjects stack-info: PR: https://github.com/aws/aws-sdk-net/pull/4205, branch: peterrsongg/petesong/phase-3-pr5-rebased-2/2 --- sdk/src/Services/S3/Generated/Model/ListObjectsRequest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/src/Services/S3/Generated/Model/ListObjectsRequest.cs b/sdk/src/Services/S3/Generated/Model/ListObjectsRequest.cs index a90c11b1939b..adf4148572ee 100644 --- a/sdk/src/Services/S3/Generated/Model/ListObjectsRequest.cs +++ b/sdk/src/Services/S3/Generated/Model/ListObjectsRequest.cs @@ -31,7 +31,7 @@ namespace Amazon.S3.Model { /// /// Container for the parameters to the ListObjects operation. - /// + /// /// /// This operation is not supported for directory buckets. /// From b261549ef5a37c84d2abd745c9a056f80c1ab24f Mon Sep 17 00:00:00 2001 From: Peter Song Date: Tue, 25 Nov 2025 15:12:45 -0800 Subject: [PATCH 2/4] Generate UpdateBucketMetadataTableConfiguration stack-info: PR: https://github.com/aws/aws-sdk-net/pull/4206, branch: peterrsongg/petesong/phase-3-pr5-rebased-2/3 --- generator/ServiceModels/s3/s3.customizations.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/generator/ServiceModels/s3/s3.customizations.json b/generator/ServiceModels/s3/s3.customizations.json index b2187c34e0ae..0fd90c769cb4 100644 --- a/generator/ServiceModels/s3/s3.customizations.json +++ b/generator/ServiceModels/s3/s3.customizations.json @@ -1629,6 +1629,17 @@ "ExpectedBucketOwner" :{"injectXmlIsSet":["return !string.IsNullOrEmpty(this._expectedBucketOwner);"]} } ] + }, + "UpdateBucketMetadataJournalTableConfigurationRequest":{ + "modify":[ + { + "ContentMD5":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._contentMD5);"]} + }, + { + "ExpectedBucketOwner":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]} + } + + ] } }, "operationModifiers": { From 9e9ba43bc4bf9d88ff5efd010d1d7b1e9c78d122 Mon Sep 17 00:00:00 2001 From: Peter Song Date: Tue, 25 Nov 2025 16:06:32 -0800 Subject: [PATCH 3/4] generate ListMultipartUploads stack-info: PR: https://github.com/aws/aws-sdk-net/pull/4207, branch: peterrsongg/petesong/phase-3-pr5-rebased-2/4 --- .../ServiceModels/s3/s3.customizations.json | 25 +++++++++++++++++++ .../Model/ListMultipartUploadsRequest.cs | 19 +++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/generator/ServiceModels/s3/s3.customizations.json b/generator/ServiceModels/s3/s3.customizations.json index 0fd90c769cb4..e171d8714f4a 100644 --- a/generator/ServiceModels/s3/s3.customizations.json +++ b/generator/ServiceModels/s3/s3.customizations.json @@ -1640,6 +1640,31 @@ } ] + }, + "ListMultipartUploadsRequest":{ + "modify":[ + { + "EncodingType":{"emitPropertyName":"Encoding"} + }, + { + "ExpectedBucketOwner":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]} + } + ] + }, + "ListMultipartUploadsOutput":{ + "modify":[ + { + "CommonPrefixes":{ + "injectXmlUnmarshallCode":["CommonPrefixesCustomUnmarshall(context, response);"], + "skipContextTestExpressionUnmarshallingLogic" : true + } + }, + { + "Uploads":{"emitPropertyName":"MultipartUploads"} + + + } + ] } }, "operationModifiers": { diff --git a/sdk/src/Services/S3/Generated/Model/ListMultipartUploadsRequest.cs b/sdk/src/Services/S3/Generated/Model/ListMultipartUploadsRequest.cs index 4d72c2d30a1a..6aa3231af2c9 100644 --- a/sdk/src/Services/S3/Generated/Model/ListMultipartUploadsRequest.cs +++ b/sdk/src/Services/S3/Generated/Model/ListMultipartUploadsRequest.cs @@ -31,10 +31,27 @@ namespace Amazon.S3.Model { /// /// Container for the parameters to the ListMultipartUploads operation. + /// + /// + /// End of support notice: Beginning November 21, 2025, Amazon S3 will stop returning + /// DisplayName. Update your applications to use canonical IDs (unique identifier + /// for Amazon Web Services accounts), Amazon Web Services account ID (12 digit identifier) + /// or IAM ARNs (full resource naming) as a direct replacement of DisplayName. + /// + /// + /// + /// + /// This change affects the following Amazon Web Services Regions: US East (N. Virginia) + /// Region, US West (N. California) Region, US West (Oregon) Region, Asia Pacific (Singapore) + /// Region, Asia Pacific (Sydney) Region, Asia Pacific (Tokyo) Region, Europe (Ireland) + /// Region, and South America (São Paulo) Region. + /// + /// + /// /// This operation lists in-progress multipart uploads in a bucket. An in-progress multipart /// upload is a multipart upload that has been initiated by the CreateMultipartUpload /// request, but has not yet been completed or aborted. - /// + /// /// /// /// Directory buckets - If multipart uploads in a directory bucket are in progress, From 5c8090967cfa09a23df06f982e141482b1186626 Mon Sep 17 00:00:00 2001 From: Peter Song Date: Wed, 3 Dec 2025 09:49:29 -0800 Subject: [PATCH 4/4] generate RestoreObject stack-info: PR: https://github.com/aws/aws-sdk-net/pull/4208, branch: peterrsongg/petesong/phase-3-pr5-rebased-2/5 --- .../GeneratorDriver.cs | 7 +- .../SourceFiles/ServiceEnumerations.cs | 40 +- .../SourceFiles/StructureGenerator.cs | 320 +++++++------- .../SourceFiles/StructureGenerator.tt | 6 + .../ServiceClientGeneratorLib/Operation.cs | 29 -- .../ServiceClientGeneratorLib/ServiceModel.cs | 2 +- .../ServiceModels/s3/s3.customizations.json | 99 +++-- sdk/src/Services/S3/Custom/Model/CSVInput.cs | 91 +--- sdk/src/Services/S3/Custom/Model/CSVOutput.cs | 52 +-- .../S3/Custom/Model/InputSerialization.cs | 30 +- .../RestoreObjectRequestMarshaller.cs | 104 ++--- .../RestoreObjectResponseUnmarshaller.cs | 70 ---- sdk/src/Services/S3/Custom/Model/JSONInput.cs | 13 +- .../Services/S3/Custom/Model/JSONOutput.cs | 9 +- .../Services/S3/Custom/Model/MetadataEntry.cs | 58 --- .../S3/Custom/Model/OutputSerialization.cs | 15 +- .../Services/S3/Custom/Model/ParquetInput.cs | 2 +- .../Services/S3/Custom/Model/S3Encryption.cs | 38 +- .../Services/S3/Custom/Model/S3Location.cs | 85 +--- .../S3/Custom/Model/SelectParameters.cs | 44 +- .../Services/S3/Generated/Model/CSVInput.cs | 214 ++++++++++ .../Services/S3/Generated/Model/CSVOutput.cs | 148 +++++++ .../Generated/Model/GlacierJobParameters.cs | 59 +++ .../S3/Generated/Model/InputSerialization.cs | 116 ++++++ ...yInActiveTierErrorExceptionUnmarshaller.cs | 92 ++++ .../RestoreObjectRequestMarshaller.cs | 277 ++++++++++++ .../RestoreObjectResponseUnmarshaller.cs | 106 +++++ .../Services/S3/Generated/Model/JSONInput.cs | 58 +++ .../Services/S3/Generated/Model/JSONOutput.cs | 59 +++ .../S3/Generated/Model/MetadataEntry.cs | 77 ++++ ...ObjectAlreadyInActiveTierErrorException.cs | 133 ++++++ .../Model/OutputLocation.cs | 42 +- .../S3/Generated/Model/OutputSerialization.cs | 77 ++++ .../S3/Generated/Model/ParquetInput.cs | 39 ++ .../Model/RestoreObjectRequest.cs | 393 +++++++++--------- .../Model/RestoreObjectResponse.cs | 45 +- .../S3/Generated/Model/RestoreRequest.cs | 190 +++++++++ .../S3/Generated/Model/S3Encryption.cs | 104 +++++ .../Services/S3/Generated/Model/S3Location.cs | 200 +++++++++ .../S3/Generated/Model/SelectParameters.cs | 141 +++++++ .../S3/Generated/_bcl/AmazonS3Client.cs | 8 +- .../Services/S3/Generated/_bcl/IAmazonS3.cs | 8 +- .../Generated/_netstandard/AmazonS3Client.cs | 4 +- .../S3/Generated/_netstandard/IAmazonS3.cs | 4 +- .../S3/IntegrationTests/RestoreObjectTests.cs | 93 +++++ 45 files changed, 2781 insertions(+), 1020 deletions(-) delete mode 100644 sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/RestoreObjectResponseUnmarshaller.cs delete mode 100644 sdk/src/Services/S3/Custom/Model/MetadataEntry.cs create mode 100644 sdk/src/Services/S3/Generated/Model/CSVInput.cs create mode 100644 sdk/src/Services/S3/Generated/Model/CSVOutput.cs create mode 100644 sdk/src/Services/S3/Generated/Model/GlacierJobParameters.cs create mode 100644 sdk/src/Services/S3/Generated/Model/InputSerialization.cs create mode 100644 sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/ObjectAlreadyInActiveTierErrorExceptionUnmarshaller.cs create mode 100644 sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/RestoreObjectRequestMarshaller.cs create mode 100644 sdk/src/Services/S3/Generated/Model/Internal/MarshallTransformations/RestoreObjectResponseUnmarshaller.cs create mode 100644 sdk/src/Services/S3/Generated/Model/JSONInput.cs create mode 100644 sdk/src/Services/S3/Generated/Model/JSONOutput.cs create mode 100644 sdk/src/Services/S3/Generated/Model/MetadataEntry.cs create mode 100644 sdk/src/Services/S3/Generated/Model/ObjectAlreadyInActiveTierErrorException.cs rename sdk/src/Services/S3/{Custom => Generated}/Model/OutputLocation.cs (57%) create mode 100644 sdk/src/Services/S3/Generated/Model/OutputSerialization.cs create mode 100644 sdk/src/Services/S3/Generated/Model/ParquetInput.cs rename sdk/src/Services/S3/{Custom => Generated}/Model/RestoreObjectRequest.cs (58%) rename sdk/src/Services/S3/{Custom => Generated}/Model/RestoreObjectResponse.cs (55%) create mode 100644 sdk/src/Services/S3/Generated/Model/RestoreRequest.cs create mode 100644 sdk/src/Services/S3/Generated/Model/S3Encryption.cs create mode 100644 sdk/src/Services/S3/Generated/Model/S3Location.cs create mode 100644 sdk/src/Services/S3/Generated/Model/SelectParameters.cs create mode 100644 sdk/test/Services/S3/IntegrationTests/RestoreObjectTests.cs diff --git a/generator/ServiceClientGeneratorLib/GeneratorDriver.cs b/generator/ServiceClientGeneratorLib/GeneratorDriver.cs index a34e5cc985b2..d52023f0a683 100644 --- a/generator/ServiceClientGeneratorLib/GeneratorDriver.cs +++ b/generator/ServiceClientGeneratorLib/GeneratorDriver.cs @@ -206,11 +206,10 @@ public void Execute() // Any enumerations for the service // skip s3 until we're at the end of s3 client generation - if (this.Configuration.ServiceId != "S3") + if (this.Configuration.ServiceModel.ServiceId != "S3") { this.ExecuteGenerator(new ServiceEnumerations(), enumFileName); } - // Any paginators for the service // skip paginators for s3 until we're at the end of s3 client generation if (Configuration.ServiceModel.HasPaginators && Configuration.ServiceId != "S3") @@ -1725,7 +1724,9 @@ private void S3NeedsCustomUpdate(Shape shape) { "IntelligentTieringFilter", 3 }, { "MetricsAndOperator", 3 }, { "AnalyticsAndOperator", 2 }, - { "IntelligentTieringAndOperator", 2} + { "IntelligentTieringAndOperator", 2}, + //TODO: Add runbook entry as to why this excluded and how to do a customization for this. + { "GlacierJobParameters", 1 } }; if (customUpdateShapes.TryGetValue(shape.Name, out int membersCount)) { diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceEnumerations.cs b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceEnumerations.cs index 40bfa2a9cb0d..dcbfca8c8f37 100644 --- a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceEnumerations.cs +++ b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceEnumerations.cs @@ -18,7 +18,7 @@ namespace ServiceClientGenerator.Generators.SourceFiles /// Class to produce the template output /// - #line 1 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 1 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")] public partial class ServiceEnumerations : BaseGenerator { @@ -29,7 +29,7 @@ public partial class ServiceEnumerations : BaseGenerator public override string TransformText() { - #line 6 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 6 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" AddLicenseHeader(); @@ -38,14 +38,14 @@ public override string TransformText() #line hidden this.Write("\r\nusing System;\r\n\r\nusing Amazon.Runtime;\r\n\r\nnamespace "); - #line 14 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 14 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace)); #line default #line hidden this.Write("\r\n{\r\n"); - #line 16 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 16 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" foreach(var enumeration in this.Config.ServiceModel.Enumerations(false)) { @@ -55,21 +55,21 @@ public override string TransformText() #line hidden this.Write("\r\n /// \r\n /// Constants used for properties of type "); - #line 22 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 22 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" this.Write(this.ToStringHelper.ToStringWithCulture(enumeration.Name)); #line default #line hidden this.Write(".\r\n /// \r\n public class "); - #line 24 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 24 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" this.Write(this.ToStringHelper.ToStringWithCulture(enumeration.Name)); #line default #line hidden this.Write(" : ConstantClass\r\n {\r\n\r\n"); - #line 27 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 27 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" foreach(var enumValue in enumeration.EnumerationValues) { @@ -80,56 +80,56 @@ public override string TransformText() #line hidden this.Write(" /// \r\n /// Constant "); - #line 33 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 33 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" this.Write(this.ToStringHelper.ToStringWithCulture(enumValue.PropertyName)); #line default #line hidden this.Write(" for "); - #line 33 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 33 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" this.Write(this.ToStringHelper.ToStringWithCulture(enumeration.Name)); #line default #line hidden this.Write("\r\n /// \r\n public "); - #line 35 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 35 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" this.Write(this.ToStringHelper.ToStringWithCulture(enumValue.PropertyName.Equals("Equals") ? "new " : "")); #line default #line hidden this.Write("static readonly "); - #line 35 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 35 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" this.Write(this.ToStringHelper.ToStringWithCulture(enumeration.Name)); #line default #line hidden this.Write(" "); - #line 35 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 35 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" this.Write(this.ToStringHelper.ToStringWithCulture(enumValue.PropertyName)); #line default #line hidden this.Write(" = new "); - #line 35 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 35 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" this.Write(this.ToStringHelper.ToStringWithCulture(enumeration.Name)); #line default #line hidden this.Write("(\""); - #line 35 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 35 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" this.Write(this.ToStringHelper.ToStringWithCulture(enumValue.MarshallName)); #line default #line hidden this.Write("\");\r\n"); - #line 36 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 36 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" } @@ -147,7 +147,7 @@ public override string TransformText() /// public "); - #line 48 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 48 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" this.Write(this.ToStringHelper.ToStringWithCulture(enumeration.Name)); #line default @@ -164,14 +164,14 @@ public override string TransformText() /// The constant for the unique value public static "); - #line 58 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 58 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" this.Write(this.ToStringHelper.ToStringWithCulture(enumeration.Name)); #line default #line hidden this.Write(" FindValue(string value)\r\n {\r\n return FindValue<"); - #line 60 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 60 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" this.Write(this.ToStringHelper.ToStringWithCulture(enumeration.Name)); #line default @@ -186,7 +186,7 @@ public override string TransformText() /// public static implicit operator "); - #line 68 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 68 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" this.Write(this.ToStringHelper.ToStringWithCulture(enumeration.Name)); #line default @@ -194,7 +194,7 @@ public override string TransformText() this.Write("(string value)\r\n {\r\n return FindValue(value);\r\n }\r\n }" + "\r\n\r\n"); - #line 74 "C:\codebase\v3\AWSDotNetPublic\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" + #line 74 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\ServiceEnumerations.tt" } diff --git a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/StructureGenerator.cs b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/StructureGenerator.cs index a742f82aa9bf..83320af4a155 100644 --- a/generator/ServiceClientGeneratorLib/Generators/SourceFiles/StructureGenerator.cs +++ b/generator/ServiceClientGeneratorLib/Generators/SourceFiles/StructureGenerator.cs @@ -18,7 +18,7 @@ namespace ServiceClientGenerator.Generators.SourceFiles /// Class to produce the template output /// - #line 1 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 1 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.TextTemplating", "17.0.0.0")] public partial class StructureGenerator : BaseGenerator { @@ -30,7 +30,7 @@ public override string TransformText() { this.Write("\r\n"); - #line 7 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 7 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" AddLicenseHeader(); @@ -41,7 +41,7 @@ public override string TransformText() "\r\nusing System.Text;\r\nusing System.IO;\r\nusing System.Net;\r\n\r\nusing Amazon.Runtim" + "e;\r\nusing Amazon.Runtime.Internal;\r\n"); - #line 19 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 19 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" bool structureIsNotEventStream = this.Structure != null && !this.Structure.IsEventStream; bool structureIsEventStream = this.Structure != null && this.Structure.IsEventStream; @@ -52,7 +52,7 @@ public override string TransformText() #line default #line hidden - #line 25 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 25 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if(structureIsEvent || structureIsEventStream) { @@ -64,7 +64,7 @@ public override string TransformText() #line hidden this.Write(" using Amazon.Extensions.CborProtocol.Internal.Transform; \r\n"); - #line 32 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 32 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -74,7 +74,7 @@ public override string TransformText() this.Write("using Amazon.Runtime.EventStreams;\r\nusing Amazon.Runtime.EventStreams.Internal;\r\n" + "using "); - #line 37 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 37 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace)); #line default @@ -82,7 +82,7 @@ public override string TransformText() this.Write(".Model.Internal.MarshallTransformations;\r\nusing Amazon.Runtime.EventStreams.Utils" + ";\r\nusing Amazon.Runtime.Internal.Util;\r\n"); - #line 40 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 40 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -91,14 +91,14 @@ public override string TransformText() #line hidden this.Write("\r\n#pragma warning disable CS0612,CS0618,CS1570\r\nnamespace "); - #line 45 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 45 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Config.Namespace)); #line default #line hidden this.Write(".Model\r\n{\r\n"); - #line 47 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 47 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if(this.StructureType == StructureType.Request) this.FormatOperationRequestDocumentation(this.Operation); @@ -112,14 +112,14 @@ public override string TransformText() #line hidden this.Write(" /// \r\n /// This is the response object from the "); - #line 56 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 56 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Operation.Name)); #line default #line hidden this.Write(" operation.\r\n /// \r\n"); - #line 58 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 58 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } else @@ -129,7 +129,7 @@ public override string TransformText() #line default #line hidden - #line 63 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 63 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if(this.Structure != null && this.Structure.IsDeprecated) { @@ -139,14 +139,14 @@ public override string TransformText() #line hidden this.Write(" [Obsolete(\""); - #line 67 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 67 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.DeprecationMessage)); #line default #line hidden this.Write("\")]\r\n"); - #line 68 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 68 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } if(this.Structure is ExceptionShape) @@ -157,7 +157,7 @@ public override string TransformText() #line hidden this.Write(" #if !NETSTANDARD\r\n [Serializable]\r\n #endif\r\n"); - #line 76 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 76 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -165,7 +165,7 @@ public override string TransformText() #line default #line hidden - #line 79 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 79 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if(this.Structure != null && structureIsEventOutputStream) @@ -182,14 +182,14 @@ public override string TransformText() #line hidden this.Write(" "); - #line 90 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 90 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(eventStreamContent)); #line default #line hidden this.Write("\r\n"); - #line 91 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 91 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -197,7 +197,7 @@ public override string TransformText() #line default #line hidden - #line 94 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 94 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" bool structureContainsEventPayload = this.Structure?.Members.Any(member => member.IsEventPayload) ?? false; Member payloadMember = this.Structure?.GetExplicitEventPayloadMember(); @@ -214,20 +214,20 @@ public override string TransformText() #line hidden this.Write(" public partial class "); - #line 105 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 105 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.ClassName)); #line default #line hidden - #line 105 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 105 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.BaseClassString)); #line default #line hidden this.Write(", IDisposable\r\n {\r\n"); - #line 107 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 107 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } else @@ -237,7 +237,7 @@ public override string TransformText() #line default #line hidden - #line 112 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 112 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" // In the case of a bi-directional operation the response object will own the // EventInputStreamContext which is a handle to the HttpRequest. This allows the response @@ -250,13 +250,13 @@ public override string TransformText() #line hidden this.Write(" public partial class "); - #line 119 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 119 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.ClassName)); #line default #line hidden - #line 119 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 119 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.BaseClassString)); #line default @@ -264,7 +264,7 @@ public override string TransformText() this.Write(", Amazon.Runtime.EventStreams.IEventInputStreamContextOwner, IDisposable\r\n {\r\n" + ""); - #line 121 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 121 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } else if( this.StructureType == StructureType.Response && this.Operation.IsEventStreamOutput) @@ -275,20 +275,20 @@ public override string TransformText() #line hidden this.Write(" public partial class "); - #line 126 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 126 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.ClassName)); #line default #line hidden - #line 126 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 126 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.BaseClassString)); #line default #line hidden this.Write(", IDisposable\r\n {\r\n"); - #line 128 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 128 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } else if( (this.Structure == null) || (structureIsNotEventStream)) @@ -299,20 +299,20 @@ public override string TransformText() #line hidden this.Write(" public partial class "); - #line 133 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 133 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.ClassName)); #line default #line hidden - #line 133 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 133 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.BaseClassString)); #line default #line hidden this.Write("\r\n"); - #line 134 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 134 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if(structureIsEvent) { @@ -324,7 +324,7 @@ public override string TransformText() #line hidden this.Write(" , IEventStreamEvent\r\n"); - #line 141 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 141 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } else @@ -335,7 +335,7 @@ public override string TransformText() #line hidden this.Write(" : IEventStreamEvent\r\n"); - #line 147 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 147 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } } @@ -345,7 +345,7 @@ public override string TransformText() #line hidden this.Write(" {\r\n"); - #line 152 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 152 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -353,7 +353,7 @@ public override string TransformText() #line default #line hidden - #line 155 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 155 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -361,7 +361,7 @@ public override string TransformText() #line default #line hidden - #line 158 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 158 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if(structureIsNotEventStream) { @@ -373,28 +373,28 @@ public override string TransformText() #line hidden this.Write(" private "); - #line 164 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 164 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default #line hidden this.Write(" _response;\r\n\r\n /// \r\n /// Gets and sets the "); - #line 167 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 167 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default #line hidden this.Write(" property.\r\n /// \r\n public "); - #line 169 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 169 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default #line hidden this.Write(" "); - #line 169 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 169 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -402,7 +402,7 @@ public override string TransformText() this.Write("\r\n {\r\n get { return this._response; }\r\n set { this._" + "response = value; }\r\n }\r\n"); - #line 174 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 174 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } else @@ -436,13 +436,13 @@ public override string TransformText() #line default #line hidden - #line 203 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 203 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" WriteInjectXmlCode(injectModifier.InjectXmlPrivateMemberAssignment, 2); #line default #line hidden - #line 204 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 204 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" continue; @@ -453,27 +453,27 @@ public override string TransformText() #line hidden this.Write(" private "); - #line 209 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 209 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineType())); #line default #line hidden this.Write(" "); - #line 209 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 209 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.VariableName)); #line default #line hidden - #line 209 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 209 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.IsCollection ? string.Format(" = AWSConfigs.InitializeCollections ? new {0}() : null;", member.DetermineType()) : ";")); #line default #line hidden this.Write("\r\n"); - #line 210 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 210 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -482,7 +482,7 @@ public override string TransformText() #line hidden this.Write("\r\n"); - #line 214 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 214 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" AddSimpleRequestConstructors(this.ClassName, this.Structure, this.Config.Namespace); @@ -497,14 +497,14 @@ public override string TransformText() #line hidden this.Write(" private RetryableDetails _retryableDetails = new RetryableDetails("); - #line 223 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 223 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(exceptionShape.Throttling.ToString().ToLower())); #line default #line hidden this.Write(");\r\n"); - #line 224 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 224 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" @@ -512,7 +512,7 @@ public override string TransformText() #line hidden this.Write("\r\n"); - #line 227 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 227 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -521,7 +521,7 @@ public override string TransformText() #line hidden this.Write(" /// \r\n /// Constructs a new "); - #line 2 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 2 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -530,7 +530,7 @@ public override string TransformText() "/// \r\n /// Describes the error encountered.\r\n " + " /// \r\n public "); - #line 8 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 8 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -538,7 +538,7 @@ public override string TransformText() this.Write("(string message) \r\n : base(message) {}\r\n\r\n /// \r\n " + " /// Construct instance of "); - #line 12 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 12 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -546,7 +546,7 @@ public override string TransformText() this.Write("\r\n /// \r\n /// \r\n ///" + " \r\n public "); - #line 16 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 16 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -554,7 +554,7 @@ public override string TransformText() this.Write("(string message, Exception innerException) \r\n : base(message, innerExc" + "eption) {}\r\n\r\n /// \r\n /// Construct instance of "); - #line 20 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 20 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -562,7 +562,7 @@ public override string TransformText() this.Write("\r\n /// \r\n /// \r\n " + " public "); - #line 23 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 23 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -570,7 +570,7 @@ public override string TransformText() this.Write("(Exception innerException) \r\n : base(innerException) {}\r\n\r\n ///" + " \r\n /// Construct instance of "); - #line 27 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 27 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -585,7 +585,7 @@ public override string TransformText() /// public "); - #line 35 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 35 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -596,7 +596,7 @@ public override string TransformText() /// /// Construct instance of "); - #line 39 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 39 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -610,7 +610,7 @@ public override string TransformText() /// public "); - #line 46 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" + #line 46 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -622,7 +622,7 @@ public override string TransformText() this.Write("#if !NETSTANDARD\r\n /// \r\n /// Constructs a new instance of" + " the "); - #line 3 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 3 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -635,7 +635,7 @@ public override string TransformText() /// The class name is null or is zero (0). protected "); - #line 9 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 9 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -643,7 +643,7 @@ public override string TransformText() this.Write("(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serializatio" + "n.StreamingContext context)\r\n : base(info, context)\r\n {\r\n"); - #line 12 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 12 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" foreach(var member in this.Structure.Members) { @@ -653,35 +653,35 @@ public override string TransformText() #line hidden this.Write(" this."); - #line 16 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 16 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden this.Write(" = ("); - #line 16 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 16 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineType())); #line default #line hidden this.Write(")info.GetValue(\""); - #line 16 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 16 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden this.Write("\", typeof("); - #line 16 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 16 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(member.DetermineType())); #line default #line hidden this.Write("));\r\n"); - #line 17 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 17 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" } @@ -705,7 +705,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf base.GetObjectData(info, context); "); - #line 35 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 35 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" foreach(var member in this.Structure.Members) { @@ -715,21 +715,21 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" info.AddValue(\""); - #line 39 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 39 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden this.Write("\", this."); - #line 39 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 39 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" this.Write(this.ToStringHelper.ToStringWithCulture(member.PropertyName)); #line default #line hidden this.Write(");\r\n"); - #line 40 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" + #line 40 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\ExceptionSerialization.t4" } @@ -739,7 +739,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf this.Write(" }\r\n#endif\r\n"); this.Write("\r\n"); - #line 232 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 232 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if (this.BaseClass == "AmazonS3Exception") { @@ -749,7 +749,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" /// \r\n /// Construct instance of "); - #line 2 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\S3ExceptionConstructors.t4" + #line 2 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\S3ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -766,7 +766,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf /// public "); - #line 12 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\S3ExceptionConstructors.t4" + #line 12 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\.\Exceptions\S3ExceptionConstructors.t4" this.Write(this.ToStringHelper.ToStringWithCulture(this.Structure.Name)); #line default @@ -775,7 +775,7 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf : base(message, innerException, errorType, errorCode, requestId, statusCode, amazonId2, amazonCfId) { }"); this.Write("\r\n"); - #line 237 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 237 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } } @@ -811,13 +811,13 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line default #line hidden - #line 268 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 268 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.FormatPropertyDocumentation(member, null, eventPublisherDocumentation, member.IsCollection); #line default #line hidden - #line 269 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 269 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" if(member.IsDeprecated) { @@ -827,14 +827,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" [Obsolete(\""); - #line 273 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 273 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.DeprecationMessage)); #line default #line hidden this.Write("\")]\r\n"); - #line 274 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 274 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -863,14 +863,14 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" [AWSProperty("); - #line 297 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 297 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(string.Join(", ", propertyAttributes))); #line default #line hidden this.Write(")]\r\n"); - #line 298 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 298 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" } @@ -898,35 +898,35 @@ public override void GetObjectData(System.Runtime.Serialization.SerializationInf #line hidden this.Write(" "); - #line 320 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 320 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(member.AccessModifier)); #line default #line hidden this.Write(" "); - #line 320 "C:\repos\aws-sdk-net-v4\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" + #line 320 "C:\Dev\Repos\aws-sdk-net-staging\generator\ServiceClientGeneratorLib\Generators\SourceFiles\StructureGenerator.tt" this.Write(this.ToStringHelper.ToStringWithCulture(memberModifier)); #line default #line hidden this.Write(" Func /// The bucket name containing the object to restore. Access points - When you use this action with an access point for general purpose buckets, you must provide the alias of the access point in place of the bucket name or specify the access point ARN. When you use this action with an access point for directory buckets, you must provide the access point name in place of the bucket name. When using the access point ARN, you must direct requests to the access point hostname. The access point hostname takes the form AccessPointName-AccountId.s3-accesspoint.Region.amazonaws.com. When using this action with an access point through the Amazon Web Services SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see Using access points in the Amazon S3 User Guide. S3 on Outposts - When you use this action with S3 on Outposts, you must direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname takes the form AccessPointName-AccountId.outpostID.s3-outposts.Region.amazonaws.com. When you use this action with S3 on Outposts, the destination bucket must be the Outposts access point ARN or the access point alias. For more information about S3 on Outposts, see What is S3 on Outposts? in the Amazon S3 User Guide. /// Object key for which the action was initiated. - /// A property of RestoreObjectRequest used to execute the RestoreObject service method. + /// Lifetime of the active copy in days. Do not use with restores that specify OutputLocation. The Days element is required for regular restores, and must not be provided for select requests. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// @@ -33383,7 +33383,7 @@ public virtual RestoreObjectResponse RestoreObject(RestoreObjectRequest request) /// The bucket name containing the object to restore. Access points - When you use this action with an access point for general purpose buckets, you must provide the alias of the access point in place of the bucket name or specify the access point ARN. When you use this action with an access point for directory buckets, you must provide the access point name in place of the bucket name. When using the access point ARN, you must direct requests to the access point hostname. The access point hostname takes the form AccessPointName-AccountId.s3-accesspoint.Region.amazonaws.com. When using this action with an access point through the Amazon Web Services SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see Using access points in the Amazon S3 User Guide. S3 on Outposts - When you use this action with S3 on Outposts, you must direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname takes the form AccessPointName-AccountId.outpostID.s3-outposts.Region.amazonaws.com. When you use this action with S3 on Outposts, the destination bucket must be the Outposts access point ARN or the access point alias. For more information about S3 on Outposts, see What is S3 on Outposts? in the Amazon S3 User Guide. /// Object key for which the action was initiated. /// VersionId used to reference a specific version of the object. - /// A property of RestoreObjectRequest used to execute the RestoreObject service method. + /// Lifetime of the active copy in days. Do not use with restores that specify OutputLocation. The Days element is required for regular restores, and must not be provided for select requests. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// diff --git a/sdk/src/Services/S3/Generated/_bcl/IAmazonS3.cs b/sdk/src/Services/S3/Generated/_bcl/IAmazonS3.cs index f6c4e2b9a175..91fb60447cf7 100644 --- a/sdk/src/Services/S3/Generated/_bcl/IAmazonS3.cs +++ b/sdk/src/Services/S3/Generated/_bcl/IAmazonS3.cs @@ -29580,7 +29580,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// The bucket name containing the object to restore. Access points - When you use this action with an access point for general purpose buckets, you must provide the alias of the access point in place of the bucket name or specify the access point ARN. When you use this action with an access point for directory buckets, you must provide the access point name in place of the bucket name. When using the access point ARN, you must direct requests to the access point hostname. The access point hostname takes the form AccessPointName-AccountId.s3-accesspoint.Region.amazonaws.com. When using this action with an access point through the Amazon Web Services SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see Using access points in the Amazon S3 User Guide. S3 on Outposts - When you use this action with S3 on Outposts, you must direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname takes the form AccessPointName-AccountId.outpostID.s3-outposts.Region.amazonaws.com. When you use this action with S3 on Outposts, the destination bucket must be the Outposts access point ARN or the access point alias. For more information about S3 on Outposts, see What is S3 on Outposts? in the Amazon S3 User Guide. /// Object key for which the action was initiated. - /// A property of RestoreObjectRequest used to execute the RestoreObject service method. + /// Lifetime of the active copy in days. Do not use with restores that specify OutputLocation. The Days element is required for regular restores, and must not be provided for select requests. /// /// The response from the RestoreObject service method, as returned by S3. /// REST API Reference for RestoreObject Operation @@ -30031,7 +30031,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// The bucket name containing the object to restore. Access points - When you use this action with an access point for general purpose buckets, you must provide the alias of the access point in place of the bucket name or specify the access point ARN. When you use this action with an access point for directory buckets, you must provide the access point name in place of the bucket name. When using the access point ARN, you must direct requests to the access point hostname. The access point hostname takes the form AccessPointName-AccountId.s3-accesspoint.Region.amazonaws.com. When using this action with an access point through the Amazon Web Services SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see Using access points in the Amazon S3 User Guide. S3 on Outposts - When you use this action with S3 on Outposts, you must direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname takes the form AccessPointName-AccountId.outpostID.s3-outposts.Region.amazonaws.com. When you use this action with S3 on Outposts, the destination bucket must be the Outposts access point ARN or the access point alias. For more information about S3 on Outposts, see What is S3 on Outposts? in the Amazon S3 User Guide. /// Object key for which the action was initiated. /// VersionId used to reference a specific version of the object. - /// A property of RestoreObjectRequest used to execute the RestoreObject service method. + /// Lifetime of the active copy in days. Do not use with restores that specify OutputLocation. The Days element is required for regular restores, and must not be provided for select requests. /// /// The response from the RestoreObject service method, as returned by S3. /// REST API Reference for RestoreObject Operation @@ -30707,7 +30707,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// The bucket name containing the object to restore. Access points - When you use this action with an access point for general purpose buckets, you must provide the alias of the access point in place of the bucket name or specify the access point ARN. When you use this action with an access point for directory buckets, you must provide the access point name in place of the bucket name. When using the access point ARN, you must direct requests to the access point hostname. The access point hostname takes the form AccessPointName-AccountId.s3-accesspoint.Region.amazonaws.com. When using this action with an access point through the Amazon Web Services SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see Using access points in the Amazon S3 User Guide. S3 on Outposts - When you use this action with S3 on Outposts, you must direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname takes the form AccessPointName-AccountId.outpostID.s3-outposts.Region.amazonaws.com. When you use this action with S3 on Outposts, the destination bucket must be the Outposts access point ARN or the access point alias. For more information about S3 on Outposts, see What is S3 on Outposts? in the Amazon S3 User Guide. /// Object key for which the action was initiated. - /// A property of RestoreObjectRequest used to execute the RestoreObject service method. + /// Lifetime of the active copy in days. Do not use with restores that specify OutputLocation. The Days element is required for regular restores, and must not be provided for select requests. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// @@ -31164,7 +31164,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// The bucket name containing the object to restore. Access points - When you use this action with an access point for general purpose buckets, you must provide the alias of the access point in place of the bucket name or specify the access point ARN. When you use this action with an access point for directory buckets, you must provide the access point name in place of the bucket name. When using the access point ARN, you must direct requests to the access point hostname. The access point hostname takes the form AccessPointName-AccountId.s3-accesspoint.Region.amazonaws.com. When using this action with an access point through the Amazon Web Services SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see Using access points in the Amazon S3 User Guide. S3 on Outposts - When you use this action with S3 on Outposts, you must direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname takes the form AccessPointName-AccountId.outpostID.s3-outposts.Region.amazonaws.com. When you use this action with S3 on Outposts, the destination bucket must be the Outposts access point ARN or the access point alias. For more information about S3 on Outposts, see What is S3 on Outposts? in the Amazon S3 User Guide. /// Object key for which the action was initiated. /// VersionId used to reference a specific version of the object. - /// A property of RestoreObjectRequest used to execute the RestoreObject service method. + /// Lifetime of the active copy in days. Do not use with restores that specify OutputLocation. The Days element is required for regular restores, and must not be provided for select requests. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// diff --git a/sdk/src/Services/S3/Generated/_netstandard/AmazonS3Client.cs b/sdk/src/Services/S3/Generated/_netstandard/AmazonS3Client.cs index 804d28a48b5e..3a20261d60f1 100644 --- a/sdk/src/Services/S3/Generated/_netstandard/AmazonS3Client.cs +++ b/sdk/src/Services/S3/Generated/_netstandard/AmazonS3Client.cs @@ -17576,7 +17576,7 @@ internal virtual RestoreObjectResponse RestoreObject(RestoreObjectRequest reques /// /// The bucket name containing the object to restore. Access points - When you use this action with an access point for general purpose buckets, you must provide the alias of the access point in place of the bucket name or specify the access point ARN. When you use this action with an access point for directory buckets, you must provide the access point name in place of the bucket name. When using the access point ARN, you must direct requests to the access point hostname. The access point hostname takes the form AccessPointName-AccountId.s3-accesspoint.Region.amazonaws.com. When using this action with an access point through the Amazon Web Services SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see Using access points in the Amazon S3 User Guide. S3 on Outposts - When you use this action with S3 on Outposts, you must direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname takes the form AccessPointName-AccountId.outpostID.s3-outposts.Region.amazonaws.com. When you use this action with S3 on Outposts, the destination bucket must be the Outposts access point ARN or the access point alias. For more information about S3 on Outposts, see What is S3 on Outposts? in the Amazon S3 User Guide. /// Object key for which the action was initiated. - /// A property of RestoreObjectRequest used to execute the RestoreObject service method. + /// Lifetime of the active copy in days. Do not use with restores that specify OutputLocation. The Days element is required for regular restores, and must not be provided for select requests. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// @@ -18049,7 +18049,7 @@ internal virtual RestoreObjectResponse RestoreObject(RestoreObjectRequest reques /// The bucket name containing the object to restore. Access points - When you use this action with an access point for general purpose buckets, you must provide the alias of the access point in place of the bucket name or specify the access point ARN. When you use this action with an access point for directory buckets, you must provide the access point name in place of the bucket name. When using the access point ARN, you must direct requests to the access point hostname. The access point hostname takes the form AccessPointName-AccountId.s3-accesspoint.Region.amazonaws.com. When using this action with an access point through the Amazon Web Services SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see Using access points in the Amazon S3 User Guide. S3 on Outposts - When you use this action with S3 on Outposts, you must direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname takes the form AccessPointName-AccountId.outpostID.s3-outposts.Region.amazonaws.com. When you use this action with S3 on Outposts, the destination bucket must be the Outposts access point ARN or the access point alias. For more information about S3 on Outposts, see What is S3 on Outposts? in the Amazon S3 User Guide. /// Object key for which the action was initiated. /// VersionId used to reference a specific version of the object. - /// A property of RestoreObjectRequest used to execute the RestoreObject service method. + /// Lifetime of the active copy in days. Do not use with restores that specify OutputLocation. The Days element is required for regular restores, and must not be provided for select requests. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// diff --git a/sdk/src/Services/S3/Generated/_netstandard/IAmazonS3.cs b/sdk/src/Services/S3/Generated/_netstandard/IAmazonS3.cs index e45e3533a8c5..17120e8dfec7 100644 --- a/sdk/src/Services/S3/Generated/_netstandard/IAmazonS3.cs +++ b/sdk/src/Services/S3/Generated/_netstandard/IAmazonS3.cs @@ -15505,7 +15505,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// /// The bucket name containing the object to restore. Access points - When you use this action with an access point for general purpose buckets, you must provide the alias of the access point in place of the bucket name or specify the access point ARN. When you use this action with an access point for directory buckets, you must provide the access point name in place of the bucket name. When using the access point ARN, you must direct requests to the access point hostname. The access point hostname takes the form AccessPointName-AccountId.s3-accesspoint.Region.amazonaws.com. When using this action with an access point through the Amazon Web Services SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see Using access points in the Amazon S3 User Guide. S3 on Outposts - When you use this action with S3 on Outposts, you must direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname takes the form AccessPointName-AccountId.outpostID.s3-outposts.Region.amazonaws.com. When you use this action with S3 on Outposts, the destination bucket must be the Outposts access point ARN or the access point alias. For more information about S3 on Outposts, see What is S3 on Outposts? in the Amazon S3 User Guide. /// Object key for which the action was initiated. - /// A property of RestoreObjectRequest used to execute the RestoreObject service method. + /// Lifetime of the active copy in days. Do not use with restores that specify OutputLocation. The Days element is required for regular restores, and must not be provided for select requests. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// @@ -15962,7 +15962,7 @@ public partial interface IAmazonS3 : IAmazonService, IDisposable /// The bucket name containing the object to restore. Access points - When you use this action with an access point for general purpose buckets, you must provide the alias of the access point in place of the bucket name or specify the access point ARN. When you use this action with an access point for directory buckets, you must provide the access point name in place of the bucket name. When using the access point ARN, you must direct requests to the access point hostname. The access point hostname takes the form AccessPointName-AccountId.s3-accesspoint.Region.amazonaws.com. When using this action with an access point through the Amazon Web Services SDKs, you provide the access point ARN in place of the bucket name. For more information about access point ARNs, see Using access points in the Amazon S3 User Guide. S3 on Outposts - When you use this action with S3 on Outposts, you must direct requests to the S3 on Outposts hostname. The S3 on Outposts hostname takes the form AccessPointName-AccountId.outpostID.s3-outposts.Region.amazonaws.com. When you use this action with S3 on Outposts, the destination bucket must be the Outposts access point ARN or the access point alias. For more information about S3 on Outposts, see What is S3 on Outposts? in the Amazon S3 User Guide. /// Object key for which the action was initiated. /// VersionId used to reference a specific version of the object. - /// A property of RestoreObjectRequest used to execute the RestoreObject service method. + /// Lifetime of the active copy in days. Do not use with restores that specify OutputLocation. The Days element is required for regular restores, and must not be provided for select requests. /// /// A cancellation token that can be used by other objects or threads to receive notice of cancellation. /// diff --git a/sdk/test/Services/S3/IntegrationTests/RestoreObjectTests.cs b/sdk/test/Services/S3/IntegrationTests/RestoreObjectTests.cs new file mode 100644 index 000000000000..1c0d5065b69d --- /dev/null +++ b/sdk/test/Services/S3/IntegrationTests/RestoreObjectTests.cs @@ -0,0 +1,93 @@ +using Amazon; +using Amazon.Runtime; +using Amazon.Runtime.Internal.Util; +using Amazon.S3; +using Amazon.S3.Model; +using Amazon.S3.Util; +using Amazon.Util; +using AWSSDK_DotNet.IntegrationTests.Utils; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System; +using System.Collections.Generic; +using System.IO; +using System.IO.Compression; +using System.Linq; +using System.Net; +using System.Text; +using System.Threading; + +namespace AWSSDK_DotNet.IntegrationTests.Tests.S3 +{ + [TestClass] + public class RestoreObjectTests : TestBase + { + private static string bucketName; + private static string keyName = "test-restore-object"; + + [ClassInitialize] + public static void Initialize(TestContext context) + { + bucketName = S3TestUtils.CreateBucketWithWait(Client); + } + + [ClassCleanup] + public static void ClassCleanup() + { + AmazonS3Util.DeleteS3BucketWithObjects(Client, bucketName); + } + + [TestMethod] + public void TestRestoreObject() + { + // Put object with Glacier storage class + Client.PutObject(new PutObjectRequest + { + BucketName = bucketName, + Key = keyName, + ContentBody = "Test content for restore", + StorageClass = S3StorageClass.Glacier + }); + + // Restore the object + var restoreRequest = new RestoreObjectRequest + { + BucketName = bucketName, + Key = keyName, + Days = 1 + }; + + var response = Client.RestoreObject(restoreRequest); + Assert.IsNotNull(response); + Assert.AreEqual(HttpStatusCode.Accepted, response.HttpStatusCode); + } + + [TestMethod] + public void TestRestoreObjectWithTier() + { + // Put object with Glacier storage class + Client.PutObject(new PutObjectRequest + { + BucketName = bucketName, + Key = keyName, + ContentBody = "Test content for restore", + StorageClass = S3StorageClass.Glacier + }); + + // Restore the object + // note: S3 does not accept RetrievalTier + Days combination for some reason. S3 expects the tier that is wrapped in + // glacier job parameters when doing a barebones restore with tier and days set. + // https://github.com/aws/aws-sdk/issues/246 + var restoreRequest = new RestoreObjectRequest + { + BucketName = bucketName, + Key = keyName, + Days = 1, + Tier = GlacierJobTier.Standard + }; + + var response = Client.RestoreObject(restoreRequest); + Assert.IsNotNull(response); + Assert.AreEqual(HttpStatusCode.Accepted, response.HttpStatusCode); + } + } +}