Migrate STS from Arn to RuleArn, remove S3EndpointAuthSchemeStrategyFactory, and delete old rule engine tests (#7270)

* Migrate STS from Arn to RuleArn, remove S3EndpointAuthSchemeStrategyFactory, and delete old rule engine tests

* Remove unused supplier naming suppression

Author: S-Saranya1

services/s3/src/main/java/software/amazon/awssdk/services/s3/endpoints/internal/KnownS3ExpressEndpointProperty.java

@@ -15,12 +15,7 @@
 
 package software.amazon.awssdk.services.s3.endpoints.internal;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 import software.amazon.awssdk.annotations.SdkInternalApi;
-import software.amazon.awssdk.awscore.endpoints.AwsEndpointAttribute;
-import software.amazon.awssdk.awscore.endpoints.authscheme.EndpointAuthScheme;
 import software.amazon.awssdk.endpoints.EndpointAttributeKey;
 
 @SdkInternalApi
@@ -32,49 +27,6 @@ public final class KnownS3ExpressEndpointProperty {
     public static final EndpointAttributeKey<String> BACKEND =
         new EndpointAttributeKey<>("Backend", String.class);
 
-    public static final List<EndpointAttributeProvider<?>> KNOWN_S3_ENDPOINT_PROPERTIES = Collections.unmodifiableList(
-        Arrays.asList(
-            new AuthSchemesProperty(),
-            new BackendProperty()
-        )
-    );
-
     private KnownS3ExpressEndpointProperty() {
     }
-
-    private static class AuthSchemesProperty implements EndpointAttributeProvider<List<EndpointAuthScheme>> {
-        @Override
-        public String propertyName() {
-            return "authSchemes";
-        }
-
-        @Override
-        public EndpointAttributeKey<List<EndpointAuthScheme>> attributeKey() {
-            return AwsEndpointAttribute.AUTH_SCHEMES;
-        }
-
-        @Override
-        public List<EndpointAuthScheme> attributeValue(Value value) {
-            EndpointAuthSchemeStrategyFactory endpointAuthSchemeStrategyFactory = new S3EndpointAuthSchemeStrategyFactory();
-            EndpointAuthSchemeStrategy strategy = endpointAuthSchemeStrategyFactory.endpointAuthSchemeStrategy();
-            return strategy.createAuthSchemes(value);
-        }
-    }
-
-    private static class BackendProperty implements EndpointAttributeProvider<String> {
-        @Override
-        public String propertyName() {
-            return "backend";
-        }
-
-        @Override
-        public EndpointAttributeKey<String> attributeKey() {
-            return BACKEND;
-        }
-
-        @Override
-        public String attributeValue(Value value) {
-            return value.expectString();
-        }
-    }
 }

services/s3/src/main/java/software/amazon/awssdk/services/s3/endpoints/internal/S3EndpointAuthSchemeStrategyFactory.java

@@ -43,7 +43,6 @@
 import org.junit.jupiter.params.provider.ValueSource;
 import org.mockito.ArgumentCaptor;
 import org.mockito.ArgumentMatchers;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 import software.amazon.awssdk.core.interceptor.Context;
 import software.amazon.awssdk.core.interceptor.ExecutionAttributes;

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/crossregion/S3CrossRegionSyncClientTest.java

@@ -25,7 +25,7 @@
 import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
 import software.amazon.awssdk.core.useragent.BusinessMetricFeatureId;
 import software.amazon.awssdk.services.sts.StsClient;
-import software.amazon.awssdk.services.sts.endpoints.internal.Arn;
+import software.amazon.awssdk.services.sts.endpoints.internal.RuleArn;
 import software.amazon.awssdk.services.sts.model.FederatedUser;
 import software.amazon.awssdk.services.sts.model.GetFederationTokenRequest;
 import software.amazon.awssdk.services.sts.model.GetFederationTokenResponse;
@@ -89,9 +89,11 @@ private String accountIdFromArn(FederatedUser federatedUser) {
         if (federatedUser == null) {
             return null;
         }
-        return Arn.parse(federatedUser.arn())
-                  .map(Arn::accountId)
-                  .orElse(null);
+        RuleArn arn = RuleArn.parse(federatedUser.arn());
+        if (arn == null) {
+            return null;
+        }
+        return arn.accountId();
     }
 
     @Override

services/sts/src/main/java/software/amazon/awssdk/services/sts/auth/StsGetFederationTokenCredentialsProvider.java

@@ -17,7 +17,7 @@
 
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
-import software.amazon.awssdk.services.sts.endpoints.internal.Arn;
+import software.amazon.awssdk.services.sts.endpoints.internal.RuleArn;
 import software.amazon.awssdk.services.sts.model.AssumedRoleUser;
 import software.amazon.awssdk.services.sts.model.Credentials;
 
@@ -31,9 +31,11 @@ public static String accountIdFromArn(AssumedRoleUser assumedRoleUser) {
         if (assumedRoleUser == null) {
             return null;
         }
-        return Arn.parse(assumedRoleUser.arn())
-                  .map(Arn::accountId)
-                  .orElse(null);
+        RuleArn arn = RuleArn.parse(assumedRoleUser.arn());
+        if (arn == null) {
+            return null;
+        }
+        return arn.accountId();
     }
 
     public static AwsSessionCredentials fromStsCredentials(Credentials credentials, String provider) {

services/sts/src/main/java/software/amazon/awssdk/services/sts/internal/StsAuthUtils.java

@@ -29,7 +29,6 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import software.amazon.awssdk.auth.credentials.AwsSessionCredentials;
 import software.amazon.awssdk.services.sts.StsClient;
-import software.amazon.awssdk.services.sts.endpoints.internal.Arn;
 import software.amazon.awssdk.services.sts.model.Credentials;
 
 /**

services/sts/src/test/java/software/amazon/awssdk/services/sts/auth/StsCredentialsProviderTestBase.java

@@ -23,12 +23,11 @@
 import com.tngtech.archunit.junit.ArchTest;
 import com.tngtech.archunit.lang.ArchRule;
 import java.util.Arrays;
-import java.util.HashSet;
+import java.util.Collections;
 import java.util.Set;
 import java.util.function.Supplier;
 import java.util.regex.Pattern;
 import org.junit.jupiter.api.Test;
-import software.amazon.awssdk.services.s3.endpoints.internal.S3EndpointAuthSchemeStrategyFactory;
 
 /**
  * This test class diffs from {@link NamingConventionTest}; it doesn't use archunit annotations such as {@link ArchTest}
@@ -44,9 +43,7 @@ public class NamingConventionWithSuppressionTest {
      * <p>
      * DO NOT ADD NEW EXCEPTIONS
      */
-    private static final Set<Pattern> ALLOWED_SUPPLIER_SUPPRESSION = new HashSet<>(
-        Arrays.asList(Pattern.compile(".*/DefaultEndpointAuthSchemeStrategyFactory.class"),
-                      ArchUtils.classNameToPattern(S3EndpointAuthSchemeStrategyFactory.class)));
+    private static final Set<Pattern> ALLOWED_SUPPLIER_SUPPRESSION = Collections.emptySet();
 
     @Test
     void supplierImpl_shouldHaveSupplierSuffix() {