Skip to content

Commit e3669ed

Browse files
committed
Generate PutBucketTagging
stack-info: PR: #4210, branch: peterrsongg/petesong/phase-3-pr5-rebased-2/7
1 parent 749a49d commit e3669ed

File tree

16 files changed

+808
-659
lines changed

16 files changed

+808
-659
lines changed

generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.cs

Lines changed: 425 additions & 411 deletions
Large diffs are not rendered by default.

generator/ServiceClientGeneratorLib/Generators/Marshallers/RestXmlRequestMarshaller.tt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,10 +496,14 @@ WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operat
496496
var marshallName = member.Shape.IsList ? member.Shape.ListMarshallName ?? "member" : member.MarshallName;
497497
if(member.Shape.IsFlattened || member.IsFlattened)
498498
marshallName = member.LocationName ?? member.ModeledName;
499+
bool skipXmlIsSet = this.Config.ServiceModel.Customizations.TryGetPropertyModifier(member.OwningShape.Name, member.ModeledName, out var propModifier) && propModifier.SkipXmlIsSet;
500+
if (!skipXmlIsSet)
501+
{
499502
#>
500503
<#=new string(' ', level * 4)#> if (<#=variableName#> != null)
501504
<#=new string(' ', level * 4)#> {
502505
<#+
506+
}
503507
if (!string.IsNullOrEmpty(member.Shape.XmlNamespace))
504508
{
505509
if (!string.IsNullOrEmpty(member.Shape.XmlNamespacePrefix))
@@ -524,8 +528,13 @@ WriteXmlAttributeString(level + 1, member, variableName, isPayload: true, operat
524528
ProcessMembers(level + 1, variableName, shape.Members);
525529
#>
526530
<#=new string(' ', level * 4)#> xmlWriter.WriteEndElement();
531+
<#+
532+
if (!skipXmlIsSet)
533+
{
534+
#>
527535
<#=new string(' ', level * 4)#> }
528-
<#+
536+
<#+
537+
}
529538
}
530539
void ProcessList(int level, string variableName, Member member)
531540
{

generator/ServiceClientGeneratorLib/ServiceModel.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,8 @@ public List<Operation> S3AllowListOperations
579579
new Operation(this, "ListObjects", DocumentRoot[OperationsKey]["ListObjects"]),
580580
new Operation(this,"UpdateBucketMetadataJournalTableConfiguration", DocumentRoot[OperationsKey]["UpdateBucketMetadataJournalTableConfiguration"]),
581581
new Operation(this, "ListMultipartUploads", DocumentRoot[OperationsKey]["ListMultipartUploads"]),
582-
new Operation(this, "CompleteMultipartUpload", DocumentRoot[OperationsKey]["CompleteMultipartUpload"])
582+
new Operation(this, "CompleteMultipartUpload", DocumentRoot[OperationsKey]["CompleteMultipartUpload"]),
583+
new Operation(this,"PutBucketTagging", DocumentRoot[OperationsKey]["PutBucketTagging"])
583584
};
584585
}
585586
return _s3AllowListOperations.Where(operation => operation.data != null).ToList();

generator/ServiceModels/s3/s3.customizations.json

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,13 +199,9 @@
199199
]
200200
},
201201
"PutBucketTaggingRequest": {
202-
"exclude": [ "Tagging" ],
203-
"inject": [
202+
"modify":[
204203
{
205-
"TagSet": {
206-
"shape": "TagSet",
207-
"originalMember": "Tagging"
208-
}
204+
"ExpectedBucketOwner": {"injectXmlIsSet":["return !string.IsNullOrEmpty(this._expectedBucketOwner);"]}
209205
}
210206
]
211207
},
@@ -1371,8 +1367,13 @@
13711367
"Parts": {"emitPropertyName":"PartETags"}
13721368
}
13731369
]
1370+
},
1371+
"Tagging":
1372+
{
1373+
"modify":[
1374+
{"TagSet": {"skipXmlIsSet": true}}
1375+
]
13741376
}
1375-
13761377
},
13771378
"operationModifiers": {
13781379
"CreateBucket": {
@@ -1723,6 +1724,13 @@
17231724
"Marshaller":"blah",
17241725
"Unmarshaller":"StringUnmarshaller"
17251726
}
1727+
},
1728+
"PutBucketTaggingRequest":{
1729+
"TagSet":{
1730+
"Type": "List<Tag>",
1731+
"Marshaller": "StringUtils.FromString",
1732+
"Unmarshaller": "StringUnmarshaller"
1733+
}
17261734
}
17271735
},
17281736
"excludeMembers":{
@@ -1803,6 +1811,9 @@
18031811
],
18041812
"CompleteMultipartUploadRequest":[
18051813
"MultipartUpload"
1814+
],
1815+
"PutBucketTaggingRequest":[
1816+
"Tagging"
18061817
]
18071818
},
18081819
"excludeShapes":[

sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutBucketTaggingRequestMarshaller.cs

Lines changed: 0 additions & 117 deletions
This file was deleted.

sdk/src/Services/S3/Custom/Model/Internal/MarshallTransformations/PutBucketTaggingResponseUnmarshaller.cs

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)