55
55
public final class AddS3Config implements TypeScriptIntegration {
56
56
private static final Logger LOGGER = Logger .getLogger (AddS3Config .class .getName ());
57
57
58
- private static final Set <String > SSEC_OPERATIONS = SetUtils .of ("SSECustomerKey" , "CopySourceSSECustomerKey" );
58
+ private static final Set <String > SSEC_INPUT_KEYS = SetUtils .of ("SSECustomerKey" , "CopySourceSSECustomerKey" );
59
+
60
+ private static final Set <String > BUCKET_ENDPOINT_INPUT_KEYS = SetUtils .of ("Bucket" );
59
61
60
62
private static final Set <String > NON_BUCKET_ENDPOINT_OPERATIONS = SetUtils .of (
61
63
"CreateBucket" ,
@@ -178,14 +180,14 @@ && testServiceId(s))
178
180
.build (),
179
181
RuntimeClientPlugin .builder ()
180
182
.withConventions (AwsDependency .SSEC_MIDDLEWARE .dependency , "Ssec" , HAS_MIDDLEWARE )
181
- .operationPredicate ((m , s , o ) -> testInputContainsMember (m , o , SSEC_OPERATIONS )
183
+ .operationPredicate ((m , s , o ) -> testInputContainsMember (m , o , SSEC_INPUT_KEYS )
182
184
&& testServiceId (s ))
183
185
.build (),
184
186
RuntimeClientPlugin .builder ()
185
187
.withConventions (AwsDependency .LOCATION_CONSTRAINT .dependency , "LocationConstraint" ,
186
188
HAS_MIDDLEWARE )
187
189
.operationPredicate ((m , s , o ) -> o .getId ().getName (s ).equals ("CreateBucket" )
188
- && testServiceId (s ))
190
+ && testServiceId (s ))
189
191
.build (),
190
192
/**
191
193
* BUCKET_ENDPOINT_MIDDLEWARE needs two separate plugins. The first resolves the config in the client.
@@ -200,7 +202,8 @@ && testServiceId(s))
200
202
.withConventions (AwsDependency .BUCKET_ENDPOINT_MIDDLEWARE .dependency , "BucketEndpoint" ,
201
203
HAS_MIDDLEWARE )
202
204
.operationPredicate ((m , s , o ) -> !NON_BUCKET_ENDPOINT_OPERATIONS .contains (o .getId ().getName (s ))
203
- && testServiceId (s ))
205
+ && testServiceId (s )
206
+ && testInputContainsMember (m , o , BUCKET_ENDPOINT_INPUT_KEYS ))
204
207
.build ()
205
208
);
206
209
}
0 commit comments