Skip to content

Commit 3d7dab8

Browse files
S-Saranya1S-Saranya1
committed
Fixing test failures
1 parent cd2136b commit 3d7dab8

File tree

7 files changed

+21
-24
lines changed

7 files changed

+21
-24
lines changed

‎codegen/src/main/java/software/amazon/awssdk/codegen/poet/auth/scheme/AuthSchemeInterceptorSpec.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
import software.amazon.awssdk.core.metrics.CoreMetric;
5252
import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
5353
import software.amazon.awssdk.endpoints.EndpointProvider;
54+
import software.amazon.awssdk.http.auth.aws.scheme.AwsV4aAuthScheme;
5455
import software.amazon.awssdk.http.auth.aws.signer.RegionSet;
5556
import software.amazon.awssdk.http.auth.scheme.BearerAuthScheme;
5657
import software.amazon.awssdk.http.auth.spi.scheme.AuthScheme;
@@ -161,9 +162,9 @@ private MethodSpec generateBeforeExecution() {
161162

162163
if (authSchemeSpecUtils.hasSigV4aSupport()) {
163164
builder.beginControlFlow("if (selectedAuthScheme != null && "
164-
+ "selectedAuthScheme.authSchemeOption().schemeId().equals($S) && "
165+
+ "selectedAuthScheme.authSchemeOption().schemeId().equals($T.SCHEME_ID) && "
165166
+ "!$T.isSignerOverridden(context.request(), executionAttributes))",
166-
"aws.auth#sigv4a",
167+
AwsV4aAuthScheme.class,
167168
ClassName.get("software.amazon.awssdk.awscore.util", "SignerOverrideUtils"))
168169
.addStatement("$T businessMetrics = executionAttributes.getAttribute($T.BUSINESS_METRICS)",
169170
ClassName.get("software.amazon.awssdk.core.useragent", "BusinessMetricCollection"),

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/auth/scheme/ops-auth-sigv4a-value-auth-scheme-interceptor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import software.amazon.awssdk.core.metrics.CoreMetric;
2424
import software.amazon.awssdk.core.useragent.BusinessMetricCollection;
2525
import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
26+
import software.amazon.awssdk.http.auth.aws.scheme.AwsV4aAuthScheme;
2627
import software.amazon.awssdk.http.auth.aws.signer.RegionSet;
2728
import software.amazon.awssdk.http.auth.spi.scheme.AuthScheme;
2829
import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeOption;
@@ -52,7 +53,7 @@ public void beforeExecution(Context.BeforeExecution context, ExecutionAttributes
5253
List<AuthSchemeOption> authOptions = resolveAuthOptions(context, executionAttributes);
5354
SelectedAuthScheme<? extends Identity> selectedAuthScheme = selectAuthScheme(authOptions, executionAttributes);
5455
putSelectedAuthScheme(executionAttributes, selectedAuthScheme);
55-
if (selectedAuthScheme != null && selectedAuthScheme.authSchemeOption().schemeId().equals("aws.auth#sigv4a")
56+
if (selectedAuthScheme != null && selectedAuthScheme.authSchemeOption().schemeId().equals(AwsV4aAuthScheme.SCHEME_ID)
5657
&& !SignerOverrideUtils.isSignerOverridden(context.request(), executionAttributes)) {
5758
BusinessMetricCollection businessMetrics = executionAttributes
5859
.getAttribute(SdkInternalExecutionAttribute.BUSINESS_METRICS);

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/auth/scheme/query-endpoint-auth-params-with-allowlist-auth-scheme-interceptor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import software.amazon.awssdk.core.useragent.BusinessMetricCollection;
2525
import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
2626
import software.amazon.awssdk.endpoints.EndpointProvider;
27+
import software.amazon.awssdk.http.auth.aws.scheme.AwsV4aAuthScheme;
2728
import software.amazon.awssdk.http.auth.aws.signer.RegionSet;
2829
import software.amazon.awssdk.http.auth.spi.scheme.AuthScheme;
2930
import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeOption;
@@ -55,7 +56,7 @@ public void beforeExecution(Context.BeforeExecution context, ExecutionAttributes
5556
List<AuthSchemeOption> authOptions = resolveAuthOptions(context, executionAttributes);
5657
SelectedAuthScheme<? extends Identity> selectedAuthScheme = selectAuthScheme(authOptions, executionAttributes);
5758
putSelectedAuthScheme(executionAttributes, selectedAuthScheme);
58-
if (selectedAuthScheme != null && selectedAuthScheme.authSchemeOption().schemeId().equals("aws.auth#sigv4a")
59+
if (selectedAuthScheme != null && selectedAuthScheme.authSchemeOption().schemeId().equals(AwsV4aAuthScheme.SCHEME_ID)
5960
&& !SignerOverrideUtils.isSignerOverridden(context.request(), executionAttributes)) {
6061
BusinessMetricCollection businessMetrics = executionAttributes
6162
.getAttribute(SdkInternalExecutionAttribute.BUSINESS_METRICS);

‎codegen/src/test/resources/software/amazon/awssdk/codegen/poet/auth/scheme/query-endpoint-auth-params-without-allowlist-auth-scheme-interceptor.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import software.amazon.awssdk.core.useragent.BusinessMetricCollection;
2525
import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
2626
import software.amazon.awssdk.endpoints.EndpointProvider;
27+
import software.amazon.awssdk.http.auth.aws.scheme.AwsV4aAuthScheme;
2728
import software.amazon.awssdk.http.auth.aws.signer.RegionSet;
2829
import software.amazon.awssdk.http.auth.spi.scheme.AuthScheme;
2930
import software.amazon.awssdk.http.auth.spi.scheme.AuthSchemeOption;
@@ -55,7 +56,7 @@ public void beforeExecution(Context.BeforeExecution context, ExecutionAttributes
5556
List<AuthSchemeOption> authOptions = resolveAuthOptions(context, executionAttributes);
5657
SelectedAuthScheme<? extends Identity> selectedAuthScheme = selectAuthScheme(authOptions, executionAttributes);
5758
putSelectedAuthScheme(executionAttributes, selectedAuthScheme);
58-
if (selectedAuthScheme != null && selectedAuthScheme.authSchemeOption().schemeId().equals("aws.auth#sigv4a")
59+
if (selectedAuthScheme != null && selectedAuthScheme.authSchemeOption().schemeId().equals(AwsV4aAuthScheme.SCHEME_ID)
5960
&& !SignerOverrideUtils.isSignerOverridden(context.request(), executionAttributes)) {
6061
BusinessMetricCollection businessMetrics = executionAttributes
6162
.getAttribute(SdkInternalExecutionAttribute.BUSINESS_METRICS);

‎test/codegen-generated-classes-test/src/main/resources/codegen-resources/sigv4aonly/service-2.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"serviceFullName":"AWS Multi Auth Service",
1010
"serviceId":"Sigv4aauth",
1111
"targetPrefix":"Sigv4aauth",
12-
"auth":["aws.auth#sigv4a","aws.auth#sigv4"],
12+
"auth":["aws.auth#sigv4a"],
1313
"timestampFormat":"unixTimestamp",
1414
"uid":"restjson-2016-03-11"
1515
},

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

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
import software.amazon.awssdk.auth.signer.Aws4Signer;
2727
import software.amazon.awssdk.core.client.config.ClientOverrideConfiguration;
2828
import software.amazon.awssdk.core.client.config.SdkAdvancedClientOption;
29-
import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
3029
import software.amazon.awssdk.http.AbortableInputStream;
3130
import software.amazon.awssdk.http.HttpExecuteResponse;
3231
import software.amazon.awssdk.http.SdkHttpRequest;
3332
import software.amazon.awssdk.http.SdkHttpResponse;
3433
import software.amazon.awssdk.regions.Region;
34+
import software.amazon.awssdk.services.sigv4aauth.auth.scheme.Sigv4AauthAuthSchemeProvider;
35+
import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
3536
import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonAsyncClient;
3637
import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonClient;
3738
import software.amazon.awssdk.services.sigv4aauth.Sigv4AauthAsyncClient;
3839
import software.amazon.awssdk.services.sigv4aauth.Sigv4AauthClient;
39-
import software.amazon.awssdk.services.sigv4aauth.auth.scheme.Sigv4AauthAuthSchemeProvider;
4040
import software.amazon.awssdk.testutils.service.http.MockAsyncHttpClient;
4141
import software.amazon.awssdk.testutils.service.http.MockSyncHttpClient;
4242
import software.amazon.awssdk.utils.StringInputStream;
@@ -75,22 +75,22 @@ void when_sigv4aServiceIsUsed_correctMetricIsAdded() {
7575

7676
String userAgent = getUserAgentFromLastRequest();
7777
System.out.println("SigV4a service User-Agent: " + userAgent);
78-
assertThat(userAgent).matches(METRIC_SEARCH_PATTERN.apply(BusinessMetricFeatureId.SIGV4A_SIGNING.value()));
78+
assertThat(userAgent).matches(METRIC_SEARCH_PATTERN.apply("S"));
7979
}
8080

8181
@Test
8282
void when_sigv4aServiceIsUsedAsync_correctMetricIsAdded() {
8383
Sigv4AauthAsyncClient asyncClient = Sigv4AauthAsyncClient.builder()
84-
.region(Region.US_WEST_2)
85-
.credentialsProvider(CREDENTIALS_PROVIDER)
86-
.httpClient(mockAsyncHttpClient)
87-
.build();
84+
.region(Region.US_WEST_2)
85+
.credentialsProvider(CREDENTIALS_PROVIDER)
86+
.httpClient(mockAsyncHttpClient)
87+
.build();
8888

8989
asyncClient.simpleOperationWithNoEndpointParams(r -> r.stringMember("test")).join();
9090

9191
String userAgent = getUserAgentFromLastAsyncRequest();
9292
System.out.println("SigV4a async service User-Agent: " + userAgent);
93-
assertThat(userAgent).matches(METRIC_SEARCH_PATTERN.apply(BusinessMetricFeatureId.SIGV4A_SIGNING.value()));
93+
assertThat(userAgent).matches(METRIC_SEARCH_PATTERN.apply("S"));
9494
}
9595

9696
@Test
@@ -105,7 +105,7 @@ void when_regularServiceIsUsed_sigv4aMetricIsNotAdded() {
105105

106106
String userAgent = getUserAgentFromLastRequest();
107107
System.out.println("Regular service User-Agent: " + userAgent);
108-
assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply(BusinessMetricFeatureId.SIGV4A_SIGNING.value()));
108+
assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply("S"));
109109
}
110110

111111
@Test
@@ -120,7 +120,7 @@ void when_regularServiceIsUsedAsync_sigv4aMetricIsNotAdded() {
120120

121121
String userAgent = getUserAgentFromLastAsyncRequest();
122122
System.out.println("Regular async service User-Agent: " + userAgent);
123-
assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply(BusinessMetricFeatureId.SIGV4A_SIGNING.value()));
123+
assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply("S"));
124124
}
125125

126126
@Test
@@ -135,14 +135,11 @@ void when_signerIsOverridden_sigv4aMetricIsNotAdded() {
135135
.build();
136136

137137
client.simpleOperationWithNoEndpointParams(r -> r.stringMember("test"));
138-
139138
String userAgent = getUserAgentFromLastRequest();
140-
System.out.println("Signer override User-Agent: " + userAgent);
141139

142140
assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply(BusinessMetricFeatureId.SIGV4A_SIGNING.value()));
143141
}
144142

145-
146143
@Test
147144
void when_authSchemeProviderOverridesSigv4aOrder_sigv4IsSelected() {
148145
Sigv4AauthClient client = Sigv4AauthClient.builder()
@@ -155,9 +152,7 @@ void when_authSchemeProviderOverridesSigv4aOrder_sigv4IsSelected() {
155152
.build();
156153

157154
client.simpleOperationWithNoEndpointParams(r -> r.stringMember("test"));
158-
159155
String userAgent = getUserAgentFromLastRequest();
160-
System.out.println("User-Agent: " + userAgent);
161156

162157
assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply(BusinessMetricFeatureId.SIGV4A_SIGNING.value()));
163158
}

‎test/crt-unavailable-tests/src/test/java/software/amazon/awssdk/services/Sigv4aCrtUnavailableBusinessMetricTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.junit.jupiter.api.Test;
2424
import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
2525
import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
26-
import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
2726
import software.amazon.awssdk.http.AbortableInputStream;
2827
import software.amazon.awssdk.http.HttpExecuteResponse;
2928
import software.amazon.awssdk.http.SdkHttpRequest;
@@ -62,9 +61,8 @@ void when_crtUnavailable_sigv4aFallsBackToSigv4_noSigv4aMetric() {
6261
client.simpleOperationWithNoEndpointParams(r -> r.stringMember("test"));
6362

6463
String userAgent = getUserAgentFromLastRequest();
65-
System.out.println("CRT unavailable User-Agent: " + userAgent);
6664

67-
assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply(BusinessMetricFeatureId.SIGV4A_SIGNING.value()));
65+
assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply("S"));
6866
}
6967

7068
private String getUserAgentFromLastRequest() {

0 commit comments

Comments
 (0)