Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -496,10 +496,14 @@ WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operat
var marshallName = member.Shape.IsList ? member.Shape.ListMarshallName ?? "member" : member.MarshallName;
if(member.Shape.IsFlattened || member.IsFlattened)
marshallName = member.LocationName ?? member.ModeledName;
bool skipXmlIsSet = this.Config.ServiceModel.Customizations.TryGetPropertyModifier(member.OwningShape.Name, member.ModeledName, out var propModifier) && propModifier.SkipXmlIsSet;
if (!skipXmlIsSet)
{
#>
<#=new string(' ', level * 4)#> if (<#=variableName#> != null)
<#=new string(' ', level * 4)#> {
<#+
}
if (!string.IsNullOrEmpty(member.Shape.XmlNamespace))
{
if (!string.IsNullOrEmpty(member.Shape.XmlNamespacePrefix))
Expand All @@ -524,8 +528,13 @@ WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operat
ProcessMembers(level + 1, variableName, shape.Members);
#>
<#=new string(' ', level * 4)#> xmlWriter.WriteEndElement();
<#+
if (!skipXmlIsSet)
{
#>
<#=new string(' ', level * 4)#> }
<#+
<#+
}
}
void ProcessList(int level, string variableName, Member member)
{
Expand Down
3 changes: 2 additions & 1 deletion generator/ServiceClientGeneratorLib/ServiceModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,8 @@ public List<Operation> S3AllowListOperations
new Operation(this, "ListObjects", DocumentRoot[OperationsKey]["ListObjects"]),
new Operation(this,"UpdateBucketMetadataJournalTableConfiguration", DocumentRoot[OperationsKey]["UpdateBucketMetadataJournalTableConfiguration"]),
new Operation(this, "ListMultipartUploads", DocumentRoot[OperationsKey]["ListMultipartUploads"]),
new Operation(this, "CompleteMultipartUpload", DocumentRoot[OperationsKey]["CompleteMultipartUpload"])
new Operation(this, "CompleteMultipartUpload", DocumentRoot[OperationsKey]["CompleteMultipartUpload"]),
new Operation(this,"PutBucketTagging", DocumentRoot[OperationsKey]["PutBucketTagging"])
};
}
return _s3AllowListOperations.Where(operation => operation.data != null).ToList();
Expand Down
25 changes: 18 additions & 7 deletions generator/ServiceModels/s3/s3.customizations.json
Original file line number Diff line number Diff line change
Expand Up @@ -199,13 +199,9 @@
]
},
"PutBucketTaggingRequest": {
"exclude": [ "Tagging" ],
"inject": [
"modify":[
{
"TagSet": {
"shape": "TagSet",
"originalMember": "Tagging"
}
"ExpectedBucketOwner": {"injectXmlIsSet":["return !string.IsNullOrEmpty(this._expectedBucketOwner);"]}
}
]
},
Expand Down Expand Up @@ -1371,8 +1367,13 @@
"Parts": {"emitPropertyName":"PartETags"}
}
]
},
"Tagging":
{
"modify":[
{"TagSet": {"skipXmlIsSet": true}}
]
}

},
"operationModifiers": {
"CreateBucket": {
Expand Down Expand Up @@ -1723,6 +1724,13 @@
"Marshaller":"blah",
"Unmarshaller":"StringUnmarshaller"
}
},
"PutBucketTaggingRequest":{
"TagSet":{
"Type": "List<Tag>",
"Marshaller": "StringUtils.FromString",
"Unmarshaller": "StringUnmarshaller"
}
}
},
"excludeMembers":{
Expand Down Expand Up @@ -1803,6 +1811,9 @@
],
"CompleteMultipartUploadRequest":[
"MultipartUpload"
],
"PutBucketTaggingRequest":[
"Tagging"
]
},
"excludeShapes":[
Expand Down

This file was deleted.

This file was deleted.

Loading