Skip to content

Commit bd7a7a6

Browse files
committed
Fixing test failures
1 parent 3d7dab8 commit bd7a7a6

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/Sigv4aBusinessMetricUserAgentTest.java

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
import software.amazon.awssdk.http.SdkHttpRequest;
3232
import software.amazon.awssdk.http.SdkHttpResponse;
3333
import software.amazon.awssdk.regions.Region;
34+
import software.amazon.awssdk.services.multiauth.MultiauthClient;
35+
import software.amazon.awssdk.services.multiauth.auth.scheme.MultiauthAuthSchemeProvider;
3436
import software.amazon.awssdk.services.sigv4aauth.auth.scheme.Sigv4AauthAuthSchemeProvider;
3537
import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
3638
import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonAsyncClient;
@@ -125,33 +127,33 @@ void when_regularServiceIsUsedAsync_sigv4aMetricIsNotAdded() {
125127

126128
@Test
127129
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()
132134
.putAdvancedOption(SdkAdvancedClientOption.SIGNER, Aws4Signer.create())
133135
.build())
134-
.httpClient(mockHttpClient)
135-
.build();
136+
.httpClient(mockHttpClient)
137+
.build();
136138

137-
client.simpleOperationWithNoEndpointParams(r -> r.stringMember("test"));
139+
client.multiAuthWithOnlySigv4aAndSigv4(r -> r.stringMember("test"));
138140
String userAgent = getUserAgentFromLastRequest();
139141

140142
assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply(BusinessMetricFeatureId.SIGV4A_SIGNING.value()));
141143
}
142144

143145
@Test
144146
void when_authSchemeProviderOverridesSigv4aOrder_sigv4IsSelected() {
145-
Sigv4AauthClient client = Sigv4AauthClient.builder()
147+
MultiauthClient client = MultiauthClient.builder()
146148
.region(Region.US_WEST_2)
147149
.credentialsProvider(CREDENTIALS_PROVIDER)
148-
.authSchemeProvider(Sigv4AauthAuthSchemeProvider.
150+
.authSchemeProvider(MultiauthAuthSchemeProvider.
149151
defaultProvider(
150152
Arrays.asList("sigv4","sigv4a")))
151153
.httpClient(mockHttpClient)
152154
.build();
153155

154-
client.simpleOperationWithNoEndpointParams(r -> r.stringMember("test"));
156+
client.multiAuthWithOnlySigv4aAndSigv4(r -> r.stringMember("test"));
155157
String userAgent = getUserAgentFromLastRequest();
156158

157159
assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply(BusinessMetricFeatureId.SIGV4A_SIGNING.value()));

0 commit comments

Comments
 (0)