Skip to content

Commit 8baad14

Browse files
committed
Generate DeleteObjects
stack-info: PR: #4240, branch: peterrsongg/petesong/phase-3-pr6/2
1 parent 1347904 commit 8baad14

File tree

18 files changed

+2932
-2419
lines changed

18 files changed

+2932
-2419
lines changed

generator/ServiceClientGeneratorLib/ServiceModel.cs

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

generator/ServiceModels/s3/s3.customizations.json

Lines changed: 60 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -101,24 +101,6 @@
101101
}
102102
]
103103
},
104-
"DeleteObjectsRequest": {
105-
"exclude": [
106-
"Delete"
107-
],
108-
"inject": [
109-
{
110-
"Objects": {
111-
"shape": "ObjectIdentifierList",
112-
"originalMember" : "Delete"
113-
}
114-
},
115-
{
116-
"Quiet": {
117-
"shape": "Quiet"
118-
}
119-
}
120-
]
121-
},
122104
"ReplicationDestination" : {
123105
"modify": [
124106
{
@@ -1397,6 +1379,50 @@
13971379
"DeleteMarker":{"injectXmlUnmarshallCode": ["DeleteMarkerCustomUnmarshall(context, response);"]}
13981380
}
13991381
]
1382+
},
1383+
"DeleteObjectsRequest":{
1384+
"modify":[
1385+
{
1386+
"MFA":{"emitPropertyName" :"MfaCodes"}
1387+
},
1388+
{
1389+
"MfaCodes":{
1390+
"injectXmlIsSet": ["return CustomMfaCodesIsSet();"],
1391+
"injectXmlMarshallCode" : ["MfaCodesCustomMarshall(request, publicRequest);"]
1392+
}
1393+
},
1394+
{
1395+
"ExpectedBucketOwner":{
1396+
"injectXmlIsSet": ["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]
1397+
}
1398+
}
1399+
]
1400+
},
1401+
"DeleteObjectsOutput":{
1402+
"modify":[
1403+
{
1404+
"Deleted":{"emitPropertyName":"DeletedObjects"}
1405+
},
1406+
{
1407+
"Errors":{"emitPropertyName":"DeleteErrors"}
1408+
}
1409+
]
1410+
},
1411+
"Delete":{
1412+
"modify":[
1413+
{
1414+
"Objects":{
1415+
"skipXmlIsSet": true
1416+
}
1417+
}
1418+
]
1419+
},
1420+
"KeyVersion" : {
1421+
"modify":[
1422+
{
1423+
"ETag":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._eTag);"]}
1424+
}
1425+
]
14001426
}
14011427
},
14021428
"operationModifiers": {
@@ -1557,6 +1583,12 @@
15571583
},
15581584
"MFA":{
15591585
"renameShape": "MfaCodes"
1586+
},
1587+
"ObjectIdentifier":{
1588+
"renameShape": "KeyVersion"
1589+
},
1590+
"Error":{
1591+
"renameShape": "DeleteError"
15601592
}
15611593
},
15621594
"overrideTreatEnumsAsString":{
@@ -1765,6 +1797,13 @@
17651797
"Marshaller": "StringUtils.FromString",
17661798
"Unmarshaller": "StringUnmarshaller"
17671799
}
1800+
},
1801+
"DeleteObjectsRequest":{
1802+
"MfaCodes":{
1803+
"Type": "MfaCodes",
1804+
"Marshaller": "StringUtils.FromString",
1805+
"Unmarshaller": "StringUnmarshaller"
1806+
}
17681807
}
17691808
},
17701809
"excludeMembers":{
@@ -1845,6 +1884,9 @@
18451884
],
18461885
"CompleteMultipartUploadRequest":[
18471886
"MultipartUpload"
1887+
],
1888+
"DeleteObjectsRequest":[
1889+
"Delete"
18481890
]
18491891
},
18501892
"excludeShapes":[

0 commit comments

Comments
 (0)