Skip to content

generate RestoreObject #4208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
peterrsongg wants to merge 1 commit into
base: peterrsongg/petesong/phase-3-pr5-rebased-2/4
Choose a base branch
from
Open

generate RestoreObject #4208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions generator/ServiceClientGeneratorLib/GeneratorDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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 }
Copy link
Contributor Author

@peterrsongg peterrsongg Dec 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GlacierParameters is a structure with only 1 member Tier. In our custom implementation we just moved the Tier member up two levels to the RestoreObjectRequest and also changed the type to be an enum. This means that if something is ever added to GlacierParameters we will miss it. This ensures that if any member is added to GlacierParameters we don't miss it and do the manual work necessary.

Copy link
Member

@muhammad-othman muhammad-othman Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we should keep this TODO here, either add what needs to be done as a comment or add the runbook entry to avoid forgetting it.

};
if (customUpdateShapes.TryGetValue(shape.Name, out int membersCount))
{
Expand Down
40 changes: 20 additions & 20 deletions generator/ServiceClientGeneratorLib/Generators/SourceFiles/ServiceEnumerations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace ServiceClientGenerator.Generators.SourceFiles
/// Class to produce the template output
Copy link
Member

@muhammad-othman muhammad-othman Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess you made some changes then reverted them, maybe remove this file from the PR to avoid confusion.

/// </summary>

#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
{
Expand All @@ -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();

Expand All @@ -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))
{
Expand All @@ -55,21 +55,21 @@ public override string TransformText()
#line hidden
this.Write("\r\n /// <summary>\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 /// </summary>\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)
{
Expand All @@ -80,56 +80,56 @@ public override string TransformText()
#line hidden
this.Write(" /// <summary>\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 /// </summary>\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"

}

Expand All @@ -147,7 +147,7 @@ public override string TransformText()
/// </summary>
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
Expand All @@ -164,14 +164,14 @@ public override string TransformText()
/// <returns>The constant for the unique value</returns>
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
Expand All @@ -186,15 +186,15 @@ public override string TransformText()
/// <returns></returns>
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
#line hidden
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"

}

Expand Down
Loading