|
31 | 31 | import software.amazon.awssdk.http.SdkHttpRequest; |
32 | 32 | import software.amazon.awssdk.http.SdkHttpResponse; |
33 | 33 | import software.amazon.awssdk.regions.Region; |
| 34 | +import software.amazon.awssdk.services.multiauth.MultiauthClient; |
| 35 | +import software.amazon.awssdk.services.multiauth.auth.scheme.MultiauthAuthSchemeProvider; |
34 | 36 | import software.amazon.awssdk.services.sigv4aauth.auth.scheme.Sigv4AauthAuthSchemeProvider; |
35 | 37 | import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId; |
36 | 38 | import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonAsyncClient; |
@@ -125,33 +127,33 @@ void when_regularServiceIsUsedAsync_sigv4aMetricIsNotAdded() { |
125 | 127 |
|
126 | 128 | @Test |
127 | 129 | void when_signerIsOverridden_sigv4aMetricIsNotAdded() { |
128 | | - Sigv4AauthClient client = Sigv4AauthClient.builder() |
129 | | - .region(Region.US_WEST_2) |
130 | | - .credentialsProvider(CREDENTIALS_PROVIDER) |
131 | | - .overrideConfiguration(ClientOverrideConfiguration.builder() |
| 130 | + MultiauthClient client = MultiauthClient.builder() |
| 131 | + .region(Region.US_WEST_2) |
| 132 | + .credentialsProvider(CREDENTIALS_PROVIDER) |
| 133 | + .overrideConfiguration(ClientOverrideConfiguration.builder() |
132 | 134 | .putAdvancedOption(SdkAdvancedClientOption.SIGNER, Aws4Signer.create()) |
133 | 135 | .build()) |
134 | | - .httpClient(mockHttpClient) |
135 | | - .build(); |
| 136 | + .httpClient(mockHttpClient) |
| 137 | + .build(); |
136 | 138 |
|
137 | | - client.simpleOperationWithNoEndpointParams(r -> r.stringMember("test")); |
| 139 | + client.multiAuthWithOnlySigv4aAndSigv4(r -> r.stringMember("test")); |
138 | 140 | String userAgent = getUserAgentFromLastRequest(); |
139 | 141 |
|
140 | 142 | assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply(BusinessMetricFeatureId.SIGV4A_SIGNING.value())); |
141 | 143 | } |
142 | 144 |
|
143 | 145 | @Test |
144 | 146 | void when_authSchemeProviderOverridesSigv4aOrder_sigv4IsSelected() { |
145 | | - Sigv4AauthClient client = Sigv4AauthClient.builder() |
| 147 | + MultiauthClient client = MultiauthClient.builder() |
146 | 148 | .region(Region.US_WEST_2) |
147 | 149 | .credentialsProvider(CREDENTIALS_PROVIDER) |
148 | | - .authSchemeProvider(Sigv4AauthAuthSchemeProvider. |
| 150 | + .authSchemeProvider(MultiauthAuthSchemeProvider. |
149 | 151 | defaultProvider( |
150 | 152 | Arrays.asList("sigv4","sigv4a"))) |
151 | 153 | .httpClient(mockHttpClient) |
152 | 154 | .build(); |
153 | 155 |
|
154 | | - client.simpleOperationWithNoEndpointParams(r -> r.stringMember("test")); |
| 156 | + client.multiAuthWithOnlySigv4aAndSigv4(r -> r.stringMember("test")); |
155 | 157 | String userAgent = getUserAgentFromLastRequest(); |
156 | 158 |
|
157 | 159 | assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply(BusinessMetricFeatureId.SIGV4A_SIGNING.value())); |
|
0 commit comments