Skip to content

Commit bc0d5fc

Browse files
peterrsonggpeterrsongg
authored
Generate 8 more S3 operations: Put, Get, List, DeleteBucketInventoryConfiguration. Generate PutBucketAcclerateConfiguration,CreateBucketMetadataTableConfiguration, PutBucketRequestPayment, GetBucketMetadataConfiguration
* Generate PutBucketInventoryConfiguration * Generate GetBucketInventoryConfiguration * Generate ListBucketInventoryConfigurations * Geneate DeleteBucketInventoryConfiguration (#4157) * Generate PutBucketAcclerateConfiguration (#4158) * Generate PutBucketRequestPayment (#4159) * Generate CreateBucketMetadataTableConfiguration (#4160) * Generate GetBucketMetadataConfiguration (#4161)
1 parent 1b4198e commit bc0d5fc

File tree

88 files changed

+3646
-2414
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+3646
-2414
lines changed

‎generator/.DevConfigs/1a7f3123-7320-4467-b277-ef4003e31fe1.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"services": [
3+
{
4+
"serviceName": "S3",
5+
"type": "patch",
6+
"changeLogMessages": [
7+
"The following changes are a result of moving S3 from custom code to generated code based on the model provided by S3:",
8+
"[Breaking Change] The method isSetS3BucketDestination() in Amazon.S3.Model.InventoryDestination has been changed from public to internal to be consistent with all other services.",
9+
"[Breaking Change] The method isSetAccountId() in Amazon.S3.Model.InventoryS3BucketDestination has been changed from public to internal to be consistent with all other services.",
10+
"[Breaking Change] The method IsSetInventoryConfigurationList() in Amazon.S3.Model.ListBucketInventoryConfigurationsResponse has been changed from public to internal to be consistent with all other services.",
11+
"[Breaking Change] The setter for Days in Amazon.S3.Model.RecordExpiration has been changed from int to int? to be consistent with the nullability changes in V4.",
12+
"Generates Put, Get, Delete, and ListBucketInventoryConfiguration. Generate PutBucketAccelerateConfiguration, PutBucketRequestPayment, CreateBucketMetadataTableConfiguration, GetBucketMetadataConfiguration."
13+
]
14+
}
15+
]
16+
}

‎generator/ServiceClientGeneratorLib/ServiceModel.cs‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -552,26 +552,29 @@ public List<Operation> S3AllowListOperations
552552
new Operation(this, "CreateSession", DocumentRoot[OperationsKey]["CreateSession"]),
553553
new Operation(this, "GetBucketAnalyticsConfiguration", DocumentRoot[OperationsKey]["GetBucketAnalyticsConfiguration"]),
554554
new Operation(this, "GetBucketIntelligentTieringConfiguration", DocumentRoot[OperationsKey]["GetBucketIntelligentTieringConfiguration"]),
555-
//new Operation(this, "GetBucketInventoryConfiguration", DocumentRoot[OperationsKey]["GetBucketInventoryConfiguration"]),
555+
new Operation(this, "GetBucketInventoryConfiguration", DocumentRoot[OperationsKey]["GetBucketInventoryConfiguration"]),
556556
//new Operation(this, "GetBucketLogging", DocumentRoot[OperationsKey]["GetBucketLogging"]),
557557
new Operation(this, "GetBucketMetricsConfiguration", DocumentRoot[OperationsKey]["GetBucketMetricsConfiguration"]),
558558
//new Operation(this, "GetBucketVersioning", DocumentRoot[OperationsKey]["GetBucketVersioning"]),
559559
//new Operation(this, "GetBucketWebsite", DocumentRoot[OperationsKey]["GetBucketWebsite"]),
560560
new Operation(this, "ListBucketAnalyticsConfigurations", DocumentRoot[OperationsKey]["ListBucketAnalyticsConfigurations"]),
561561
new Operation(this, "ListBucketIntelligentTieringConfigurations", DocumentRoot[OperationsKey]["ListBucketIntelligentTieringConfigurations"]),
562-
//new Operation(this, "ListBucketInventoryConfigurations", DocumentRoot[OperationsKey]["ListBucketInventoryConfigurations"]),
562+
new Operation(this, "ListBucketInventoryConfigurations", DocumentRoot[OperationsKey]["ListBucketInventoryConfigurations"]),
563563
new Operation(this, "ListBucketMetricsConfigurations", DocumentRoot[OperationsKey]["ListBucketMetricsConfigurations"]),
564-
//new Operation(this, "PutBucketAccelerateConfiguration", DocumentRoot[OperationsKey]["PutBucketAccelerateConfiguration"]),
564+
new Operation(this, "PutBucketAccelerateConfiguration", DocumentRoot[OperationsKey]["PutBucketAccelerateConfiguration"]),
565565
//new Operation(this, "RestoreObject", DocumentRoot[OperationsKey]["RestoreObject"]),
566566
//new Operation(this, "SelectObjectContent", DocumentRoot[OperationsKey]["SelectObjectContent"]),
567567
new Operation(this, "PutBucketAnalyticsConfiguration" , DocumentRoot[OperationsKey]["PutBucketAnalyticsConfiguration"]),
568568
new Operation(this, "PutBucketIntelligentTieringConfiguration", DocumentRoot[OperationsKey]["PutBucketIntelligentTieringConfiguration"]),
569-
//new Operation(this, "PutBucketInventoryConfiguration", DocumentRoot[OperationsKey]["PutBucketInventoryConfiguration"]),
569+
new Operation(this, "PutBucketInventoryConfiguration", DocumentRoot[OperationsKey]["PutBucketInventoryConfiguration"]),
570570
new Operation(this, "PutBucketMetricsConfiguration", DocumentRoot[OperationsKey]["PutBucketMetricsConfiguration"]),
571571
new Operation(this, "DeleteBucketMetricsConfiguration", DocumentRoot[OperationsKey]["DeleteBucketMetricsConfiguration"]),
572572
new Operation(this, "DeleteBucketAnalyticsConfiguration", DocumentRoot[OperationsKey]["DeleteBucketAnalyticsConfiguration"]),
573573
new Operation(this, "DeleteBucketIntelligentTieringConfiguration", DocumentRoot[OperationsKey]["DeleteBucketIntelligentTieringConfiguration"]),
574-
//new Operation(this, "DeleteBucketInventoryConfiguration", DocumentRoot[OperationsKey]["DeleteBucketInventoryConfiguration"]),
574+
new Operation(this, "DeleteBucketInventoryConfiguration", DocumentRoot[OperationsKey]["DeleteBucketInventoryConfiguration"]),
575+
new Operation(this,"PutBucketRequestPayment", DocumentRoot[OperationsKey]["PutBucketRequestPayment"]),
576+
new Operation(this, "CreateBucketMetadataConfiguration",DocumentRoot[OperationsKey]["CreateBucketMetadataConfiguration"]),
577+
new Operation(this, "GetBucketMetadataConfiguration", DocumentRoot[OperationsKey]["GetBucketMetadataConfiguration"])
575578

576579
};
577580
}
@@ -601,7 +604,9 @@ public List<string> S3RequestMarshallerThrowGenericExceptionList
601604
"GetBucketAcl",
602605
"PutObjectAcl",
603606
"GetObjectAcl",
604-
"PutBucketAcl"
607+
"PutBucketAcl",
608+
"CreateBucketMetadataConfiguration",
609+
"GetBucketMetadataConfiguration"
605610
};
606611
}
607612
return _s3RequestMarshallerThrowAmazonS3ExceptionList;

‎generator/ServiceModels/s3/s3.customizations.json‎

Lines changed: 146 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1076,7 +1076,149 @@
10761076
"Id":{"emitPropertyName": "IntelligentTieringId"}
10771077
}
10781078
]
1079+
},
1080+
"PutBucketInventoryConfigurationRequest":{
1081+
"modify":[
1082+
{
1083+
"Id" :{"emitPropertyName":"InventoryId"}
1084+
},
1085+
{
1086+
"ExpectedBucketOwner":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]}
1087+
}
1088+
]
1089+
},
1090+
"InventoryConfiguration":{
1091+
"modify":[
1092+
{
1093+
"Filter":{"emitPropertyName":"InventoryFilter"}
1094+
},
1095+
{
1096+
"Id":{"emitPropertyName":"InventoryId"}
1097+
},
1098+
{
1099+
"InventoryId":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._inventoryId);"]}
1100+
},
1101+
{
1102+
"OptionalFields":{"emitPropertyName": "InventoryOptionalFields"}
1103+
},
1104+
{
1105+
"InventoryFilter":{"injectXmlMarshallCode":["InventoryFilterCustomMarshall(publicRequest, xmlWriter);"]}
1106+
},
1107+
{
1108+
"IsEnabled":{"injectXmlMarshallCode":["CustomIsEnabledMarshall(publicRequest, xmlWriter);"]}
1109+
}
1110+
]
1111+
},
1112+
"InventoryS3BucketDestination":{
1113+
"modify":[
1114+
{
1115+
"AccountId":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._accountId);"]}
1116+
},
1117+
{
1118+
"BucketName":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._bucketName);"]}
1119+
},
1120+
{
1121+
"Encryption":{"emitPropertyName": "InventoryEncryption"}
1122+
},
1123+
{
1124+
"Prefix":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._prefix);"]}
1125+
},
1126+
{
1127+
"Format":{"emitPropertyName":"InventoryFormat"}
1128+
}
1129+
]
1130+
},
1131+
"GetBucketInventoryConfigurationRequest":{
1132+
"modify":[
1133+
{
1134+
"Id":{"emitPropertyName":"InventoryId"}
1135+
},
1136+
{
1137+
"ExpectedBucketOwner":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]}
1138+
}
1139+
]
1140+
},
1141+
"ListBucketInventoryConfigurationsRequest":{
1142+
"modify":[
1143+
{
1144+
"ContinuationToken":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._continuationToken);"]}
1145+
},
1146+
{
1147+
"ExpectedBucketOwner":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]}
1148+
}
1149+
]
1150+
},
1151+
"ListBucketInventoryConfigurationsOutput":{
1152+
"modify":[
1153+
{
1154+
"ContinuationToken":{"emitPropertyName":"Token"}
1155+
},
1156+
{
1157+
"NextContinuationToken":{"emitPropertyName":"NextToken"}
1158+
},
1159+
{
1160+
"Token":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._token);"]}
1161+
},
1162+
{
1163+
"NextToken":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._nextToken);"]}
1164+
}
1165+
]
1166+
},
1167+
"DeleteBucketInventoryConfigurationRequest":{
1168+
"modify":[
1169+
{
1170+
"Id":{"emitPropertyName":"InventoryId"}
1171+
},
1172+
{
1173+
"ExpectedBucketOwner":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]}
1174+
}
1175+
]
1176+
},
1177+
"PutBucketAccelerateConfigurationRequest":{
1178+
"modify":[
1179+
{
1180+
"ExpectedBucketOwner": {"injectXmlIsSet":["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]}
1181+
}
1182+
]
1183+
},
1184+
"PutBucketRequestPaymentRequest":{
1185+
"modify":[
1186+
{
1187+
"ExpectedBucketOwner":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]}
1188+
}
1189+
]
1190+
},
1191+
"CreateBucketMetadataConfigurationRequest":{
1192+
"modify":[
1193+
{
1194+
"ExpectedBucketOwner":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]}
1195+
},
1196+
{
1197+
"ContentMD5":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._contentMD5);"]}
1198+
},
1199+
{
1200+
"BucketName":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._bucketName);"]}
1201+
}
1202+
]
1203+
},
1204+
"MetadataTableEncryptionConfiguration":{
1205+
"modify":[
1206+
{
1207+
"KmsKeyArn":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._kmsKeyArn);"]}
1208+
}
1209+
]
1210+
},
1211+
"GetBucketMetadataConfigurationRequest":{
1212+
"modify":[
1213+
{
1214+
"BucketName":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._bucketName);"]}
1215+
},
1216+
{
1217+
"ExpectedBucketOwner":{"injectXmlIsSet":["return !String.IsNullOrEmpty(this._expectedBucketOwner);"]}
1218+
}
1219+
]
10791220
}
1221+
10801222
},
10811223
"operationModifiers": {
10821224
"CreateBucket": {
@@ -1221,7 +1363,8 @@
12211363
}
12221364
},
12231365
"overrideTreatEnumsAsString":{
1224-
"ObjectAttributesList": false
1366+
"ObjectAttributesList": false,
1367+
"InventoryOptionalFields": false
12251368
},
12261369
"dataTypeSwap":{
12271370
"ListPartsRequest":{
@@ -1452,6 +1595,7 @@
14521595
"AnalyticsFilter",
14531596
"AnalyticsAndOperator",
14541597
"IntelligentTieringFilter",
1455-
"IntelligentTieringAndOperator"
1598+
"IntelligentTieringAndOperator",
1599+
"InventoryFilter"
14561600
]
14571601
}

‎sdk/src/Services/S3/Custom/Model/CreateBucketMetadataConfigurationRequest.cs‎

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

0 commit comments

Comments
 (0)