Skip to content

Generate S3 CopyObject operation #4234

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
muhammad-othman wants to merge 1 commit into
base: muhamoth/S3-generate-PutBucketTagging-operation
Choose a base branch
from
Open

Generate S3 CopyObject operation #4234

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
938 changes: 489 additions & 449 deletions generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseMarshaller.cs
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 17 additions & 1 deletion generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseMarshaller.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,24 @@ using Amazon.Runtime.Internal.Util;
{
if (structure != null && this.Config.ServiceModel.Customizations.ShapeModifiers.TryGetValue(structure.Name, out var modifier) && modifier.ExcludedMarshallingProperties.Contains(member.ModeledName))
continue;
bool skipXmlIsSet = this.Config.ServiceModel.Customizations.TryGetPropertyModifier(member.OwningShape.Name, member.ModeledName, out var propModifier) && propModifier.SkipXmlIsSet;
if (!skipXmlIsSet)
{
#>
if (<#=variableName#>.IsSet<#=member.PropertyName#>())
{
<#+
if (member.CustomMarshallerTransformation != null)
}
Copy link
Contributor

@peterrsongg peterrsongg Dec 17, 2025

Choose a reason for hiding this comment

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

https://github.com/aws/aws-sdk-net/blob/main/generator/ServiceClientGeneratorLib/Generators/BaseGenerator.tt#L625-L636

you can use this method instead of looping through yourself

Copy link
Member Author

@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've found this being used in various places, for example https://github.com/aws/aws-sdk-net/blob/development/generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt#L217, should we refactor all of them?

if(this.Config.ServiceModel.Customizations.TryGetPropertyModifier(member.OwningShape.Name, member.ModeledName, out var injectPropModifier ) && injectPropModifier.InjectXmlMarshallCode.Count > 0)
{
foreach (var codeSnippet in injectPropModifier.InjectXmlMarshallCode)
{
#>
<#=codeSnippet#>
<#+
}
}
else if (member.CustomMarshallerTransformation != null)
{
#>
request.Headers["<#=member.MarshallLocationName#>"] = <#=member.CustomMarshallerTransformation#>(<#=variableName#>.<#=member.PropertyName#>);
Expand Down Expand Up @@ -118,9 +131,12 @@ using Amazon.Runtime.Internal.Util;
<#+
}
}
if (!skipXmlIsSet)
{
#>
}
<#+
}
}
}
protected void ProcessHeaderMembers(string variableName, IEnumerable<Member> members)
Expand Down
723 changes: 379 additions & 344 deletions generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.cs
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions generator/ServiceClientGeneratorLib/Generators/Marshallers/BaseResponseUnmarshaller.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,16 @@ using Amazon.Runtime.Internal.Util;
{
if (this.Config.ServiceModel.Customizations.ShapeModifiers.TryGetValue(member.OwningShape.Name, out var modifier) && modifier.ExcludedUnmarshallingProperties.Contains(member.ModeledName))
continue;
if (this.Config.ServiceModel.Customizations.TryGetPropertyModifier(member.OwningShape.Name, member.ModeledName, out var propertyModifier) && propertyModifier.InjectXmlUnmarshallCode.Count > 0)
{
foreach (var code in propertyModifier.InjectXmlUnmarshallCode)
{
#>
<#=code#>
Copy link
Contributor

@peterrsongg peterrsongg Dec 17, 2025

Choose a reason for hiding this comment

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

same comment as above( there is also a method above the one i linked for exactly this scenario)

<#+
}
continue;
}
if (member.Shape.IsMap)
{
#>
Expand Down
310 changes: 156 additions & 154 deletions generator/ServiceClientGeneratorLib/Generators/SourceFiles/StructureGenerator.cs
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions generator/ServiceClientGeneratorLib/Generators/SourceFiles/StructureGenerator.tt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,8 @@ namespace <#=this.Config.Namespace#>.Model

<#
}
if (this.Config.ServiceModel.Customizations.TryGetPropertyModifier(member.OwningShape.Name, member.ModeledName, out var propertyModifier) && propertyModifier.SkipXmlIsSet)
Copy link
Contributor

@peterrsongg peterrsongg Dec 17, 2025

Choose a reason for hiding this comment

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

curious, what did you need this for?

Copy link
Member Author

@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 think for skipping the headers isSet, since it isn't used in the marshaller.

continue;
#>
// Check to see if <#=member.PropertyName#> property is set
internal bool IsSet<#=member.PropertyName#>()
Expand Down
3 changes: 3 additions & 0 deletions generator/ServiceClientGeneratorLib/Operation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,9 +598,12 @@ public IList<Member> RequestBodyMembers
if (this.RequestStructure == null)
return new List<Member>();

this.model.Customizations.ShapeModifiers.TryGetValue(this.RequestStructure.Name, out var modifiers);

var payloadName = this.RequestStructure.PayloadMemberName;
return this.RequestStructure.Members.Where(
m =>
!(modifiers != null && modifiers.ExcludedMarshallingProperties.Contains(m.ModeledName)) &&
m.MarshallLocation == MarshallLocation.Body &&
!string.Equals(m.MarshallName, payloadName, StringComparison.Ordinal)).ToList();
}
Expand Down
1 change: 1 addition & 0 deletions generator/ServiceClientGeneratorLib/ServiceModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,6 +578,7 @@ public List<Operation> S3AllowListOperations
new Operation(this, "RenameObject", DocumentRoot[OperationsKey]["RenameObject"]),
new Operation(this, "PutBucketOwnershipControls", DocumentRoot[OperationsKey]["PutBucketOwnershipControls"]),
new Operation(this, "PutBucketTagging", DocumentRoot[OperationsKey]["PutBucketTagging"]),
new Operation(this, "CopyObject", DocumentRoot[OperationsKey]["CopyObject"]),
};
}
return _s3AllowListOperations.Where(operation => operation.data != null).ToList();
Expand Down
Loading