Additional changes in test:

Removing print statements
Renaming few files

Author: S-Saranya1

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

@@ -74,7 +74,6 @@ void when_sigv4aServiceIsUsed_correctMetricIsAdded() {
         client.simpleOperationWithNoEndpointParams(r -> r.stringMember("test"));
 
         String userAgent = getUserAgentFromLastRequest();
-        System.out.println("SigV4a service User-Agent: " + userAgent);
         assertThat(userAgent).matches(METRIC_SEARCH_PATTERN.apply("S"));
     }
 
@@ -89,7 +88,6 @@ void when_sigv4aServiceIsUsedAsync_correctMetricIsAdded() {
         asyncClient.simpleOperationWithNoEndpointParams(r -> r.stringMember("test")).join();
 
         String userAgent = getUserAgentFromLastAsyncRequest();
-        System.out.println("SigV4a async service User-Agent: " + userAgent);
         assertThat(userAgent).matches(METRIC_SEARCH_PATTERN.apply("S"));
     }
 
@@ -104,7 +102,6 @@ void when_regularServiceIsUsed_sigv4aMetricIsNotAdded() {
         client.allTypes(r -> {});
 
         String userAgent = getUserAgentFromLastRequest();
-        System.out.println("Regular service User-Agent: " + userAgent);
         assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply("S"));
     }
 
@@ -119,7 +116,6 @@ void when_regularServiceIsUsedAsync_sigv4aMetricIsNotAdded() {
         asyncClient.allTypes(r -> {}).join();
 
         String userAgent = getUserAgentFromLastAsyncRequest();
-        System.out.println("Regular async service User-Agent: " + userAgent);
         assertThat(userAgent).doesNotMatch(METRIC_SEARCH_PATTERN.apply("S"));
     }
 

…egen-resources/sigv4aonly/service-2.json …degen-resources/multiauth/service-2.jsontest/crt-unavailable-tests/src/main/resources/codegen-resources/sigv4aonly/service-2.json renamed to test/crt-unavailable-tests/src/main/resources/codegen-resources/multiauth/service-2.json test/crt-unavailable-tests/src/main/resources/codegen-resources/sigv4aonly/service-2.json renamed to test/crt-unavailable-tests/src/main/resources/codegen-resources/multiauth/service-2.json

@@ -5,10 +5,10 @@
     "endpointPrefix":"internalconfig",
     "jsonVersion":"1.1",
     "protocol":"rest-json",
-    "serviceAbbreviation":"AwsSigv4aMultiAuthService",
+    "serviceAbbreviation":"AwsMultiAuthService",
     "serviceFullName":"AWS Multi Auth Service",
-    "serviceId":"Sigv4aauth",
-    "targetPrefix":"Sigv4aauth",
+    "serviceId":"Multiauth",
+    "targetPrefix":"MultiAuth",
     "auth":["aws.auth#sigv4a","aws.auth#sigv4"],
     "timestampFormat":"unixTimestamp",
     "uid":"restjson-2016-03-11"

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

@@ -28,7 +28,7 @@
 import software.amazon.awssdk.http.SdkHttpRequest;
 import software.amazon.awssdk.http.SdkHttpResponse;
 import software.amazon.awssdk.regions.Region;
-import software.amazon.awssdk.services.sigv4aauth.Sigv4AauthClient;
+import software.amazon.awssdk.services.multiauth.MultiauthClient;
 import software.amazon.awssdk.testutils.service.http.MockSyncHttpClient;
 import software.amazon.awssdk.utils.StringInputStream;
 
@@ -51,12 +51,12 @@ public void setup() {
 
     @Test
     void when_crtUnavailable_sigv4aFallsBackToSigv4_noSigv4aMetric() {
-        
-        Sigv4AauthClient client = Sigv4AauthClient.builder()
-                                                  .region(Region.US_WEST_2)
-                                                  .credentialsProvider(CREDENTIALS_PROVIDER)
-                                                  .httpClient(mockHttpClient)
-                                                  .build();
+
+        MultiauthClient client = MultiauthClient.builder()
+                                                .region(Region.US_WEST_2)
+                                                .credentialsProvider(CREDENTIALS_PROVIDER)
+                                                .httpClient(mockHttpClient)
+                                                .build();
 
         client.simpleOperationWithNoEndpointParams(r -> r.stringMember("test"));