Make rulesengine independent of client

And added client-rulesengine to hook the rulesengine up to the client
using an AutoClientPlugin.

Author: mtdowling

.github/workflows/fuzz-testing.yml

@@ -57,7 +57,7 @@ jobs:
         env:
           JAZZER_FUZZ: "1"
         run: |
-          ./gradlew :client:client-rulesengine:test --tests "*FuzzTest*" -Djazzer.max_duration=1h --stacktrace
+          ./gradlew :rulesengine:test --tests "*FuzzTest*" -Djazzer.max_duration=1h --stacktrace
 
       - name: Save fuzz corpus cache
         uses: actions/cache/save@v5

aws/client/aws-client-http/src/test/java/software/amazon/smithy/java/aws/client/http/AmzSdkRequestPluginTest.java

@@ -13,10 +13,10 @@
 import org.junit.jupiter.api.Test;
 import software.amazon.smithy.java.aws.client.awsjson.AwsJson1Protocol;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.client.http.mock.MockPlugin;
 import software.amazon.smithy.java.client.http.mock.MockQueue;
 import software.amazon.smithy.java.dynamicclient.DynamicClient;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.http.api.HttpResponse;
 import software.amazon.smithy.java.io.datastream.DataStream;
 import software.amazon.smithy.java.retries.api.AcquireInitialTokenRequest;

aws/client/aws-client-http/src/test/java/software/amazon/smithy/java/aws/client/http/RecursionDetectionPluginTest.java

@@ -14,12 +14,12 @@
 import software.amazon.smithy.java.aws.client.awsjson.AwsJson1Protocol;
 import software.amazon.smithy.java.client.core.ClientPlugin;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.client.core.interceptors.ClientInterceptor;
 import software.amazon.smithy.java.client.core.interceptors.RequestHook;
 import software.amazon.smithy.java.client.http.mock.MockPlugin;
 import software.amazon.smithy.java.client.http.mock.MockQueue;
 import software.amazon.smithy.java.dynamicclient.DynamicClient;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.http.api.HttpHeaders;
 import software.amazon.smithy.java.http.api.HttpRequest;
 import software.amazon.smithy.java.http.api.HttpResponse;

aws/client/aws-client-rulesengine/src/jmh/java/software/amazon/smithy/java/aws/client/rulesengine/Bench.java

@@ -16,14 +16,14 @@
 import org.openjdk.jmh.annotations.State;
 import software.amazon.smithy.java.aws.client.core.settings.EndpointSettings;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.endpoints.EndpointResolver;
-import software.amazon.smithy.java.endpoints.EndpointResolverParams;
 import software.amazon.smithy.java.client.rulesengine.EndpointRulesPlugin;
-import software.amazon.smithy.java.client.rulesengine.RulesEngineBuilder;
-import software.amazon.smithy.java.client.rulesengine.RulesEngineSettings;
 import software.amazon.smithy.java.context.Context;
 import software.amazon.smithy.java.core.serde.document.Document;
 import software.amazon.smithy.java.dynamicclient.DynamicClient;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
+import software.amazon.smithy.java.endpoints.EndpointResolverParams;
+import software.amazon.smithy.java.rulesengine.RulesEngineBuilder;
+import software.amazon.smithy.java.rulesengine.RulesEngineSettings;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.loader.ModelAssembler;
 import software.amazon.smithy.model.pattern.UriPattern;
@@ -75,7 +75,7 @@ public void setup() {
 
         var ctx = Context.create();
         ctx.put(EndpointSettings.REGION, "us-east-1");
-        //ctx.put(EndpointRulesPlugin.ADDITIONAL_ENDPOINT_PARAMS, Map.of("UseFIPS", true, "UseDualStack", true));
+        //ctx.put(RulesEngineSettings.ADDITIONAL_ENDPOINT_PARAMS, Map.of("UseFIPS", true, "UseDualStack", true));
 
         endpointParams = EndpointResolverParams.builder()
                 .context(ctx)

aws/client/aws-client-rulesengine/src/main/java/software/amazon/smithy/java/aws/client/rulesengine/AwsRulesExtension.java

@@ -12,9 +12,9 @@
 import software.amazon.smithy.java.aws.client.core.settings.RegionSetting;
 import software.amazon.smithy.java.aws.client.core.settings.S3EndpointSettings;
 import software.amazon.smithy.java.aws.client.core.settings.StsEndpointSettings;
-import software.amazon.smithy.java.client.rulesengine.RulesExtension;
-import software.amazon.smithy.java.client.rulesengine.RulesFunction;
 import software.amazon.smithy.java.context.Context;
+import software.amazon.smithy.java.rulesengine.RulesExtension;
+import software.amazon.smithy.java.rulesengine.RulesFunction;
 import software.amazon.smithy.utils.SmithyUnstableApi;
 
 /**

aws/client/aws-client-rulesengine/src/main/java/software/amazon/smithy/java/aws/client/rulesengine/AwsRulesFunction.java

@@ -8,7 +8,7 @@
 import java.util.AbstractMap;
 import java.util.Map;
 import java.util.Set;
-import software.amazon.smithy.java.client.rulesengine.RulesFunction;
+import software.amazon.smithy.java.rulesengine.RulesFunction;
 import software.amazon.smithy.rulesengine.aws.language.functions.AwsArn;
 import software.amazon.smithy.rulesengine.aws.language.functions.AwsPartition;
 import software.amazon.smithy.rulesengine.aws.language.functions.IsVirtualHostableS3Bucket;

…y.java.client.rulesengine.RulesExtension …n.smithy.java.rulesengine.RulesExtensionaws/client/aws-client-rulesengine/src/main/resources/META-INF/services/software.amazon.smithy.java.client.rulesengine.RulesExtension renamed to aws/client/aws-client-rulesengine/src/main/resources/META-INF/services/software.amazon.smithy.java.rulesengine.RulesExtension aws/client/aws-client-rulesengine/src/main/resources/META-INF/services/software.amazon.smithy.java.client.rulesengine.RulesExtension renamed to aws/client/aws-client-rulesengine/src/main/resources/META-INF/services/software.amazon.smithy.java.rulesengine.RulesExtension

@@ -21,18 +21,18 @@
 import software.amazon.smithy.java.client.core.CallContext;
 import software.amazon.smithy.java.client.core.RequestOverrideConfig;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.endpoints.Endpoint;
-import software.amazon.smithy.java.endpoints.EndpointContext;
 import software.amazon.smithy.java.client.core.interceptors.ClientInterceptor;
 import software.amazon.smithy.java.client.core.interceptors.RequestHook;
 import software.amazon.smithy.java.client.rulesengine.EndpointRulesPlugin;
-import software.amazon.smithy.java.client.rulesengine.EndpointUtils;
-import software.amazon.smithy.java.client.rulesengine.RulesEngineBuilder;
-import software.amazon.smithy.java.client.rulesengine.RulesEngineSettings;
-import software.amazon.smithy.java.client.rulesengine.RulesEvaluationError;
 import software.amazon.smithy.java.core.serde.document.Document;
 import software.amazon.smithy.java.dynamicclient.DynamicClient;
+import software.amazon.smithy.java.endpoints.Endpoint;
+import software.amazon.smithy.java.endpoints.EndpointContext;
 import software.amazon.smithy.java.http.api.HttpRequest;
+import software.amazon.smithy.java.rulesengine.EndpointUtils;
+import software.amazon.smithy.java.rulesengine.RulesEngineBuilder;
+import software.amazon.smithy.java.rulesengine.RulesEngineSettings;
+import software.amazon.smithy.java.rulesengine.RulesEvaluationError;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.loader.ModelAssembler;
 import software.amazon.smithy.model.pattern.UriPattern;
@@ -197,7 +197,7 @@ public void readBeforeTransmit(RequestHook<?, ?, ?> hook) {
         });
 
         overrideMap = (Map<String, Object>) EndpointUtils.convertNode(test.getParams(), true);
-        override.putConfig(EndpointRulesPlugin.ADDITIONAL_ENDPOINT_PARAMS, overrideMap);
+        override.putConfig(RulesEngineSettings.ADDITIONAL_ENDPOINT_PARAMS, overrideMap);
 
         try {
             var document = Document.ofObject(inputParams);

aws/client/aws-client-rulesengine/src/test/java/software/amazon/smithy/java/aws/client/rulesengine/ResolverTest.java

@@ -22,10 +22,10 @@
 import software.amazon.smithy.aws.traits.protocols.RestJson1Trait;
 import software.amazon.smithy.java.aws.client.restjson.RestJsonClientProtocol;
 import software.amazon.smithy.java.client.core.auth.scheme.AuthSchemeResolver;
-import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.core.schema.SerializableStruct;
 import software.amazon.smithy.java.core.serde.document.Document;
 import software.amazon.smithy.java.dynamicclient.DynamicClient;
+import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.io.ByteBufferUtils;
 import software.amazon.smithy.model.Model;
 import software.amazon.smithy.model.shapes.ShapeId;

aws/sdkv2/aws-sdkv2-shapes/src/test/java/software/amazon/smithy/java/aws/sdkv2/shapes/SdkDocumentWriterTest.java

@@ -25,6 +25,7 @@
 import software.amazon.smithy.java.core.serde.event.Frame;
 import software.amazon.smithy.java.core.serde.event.ProtocolEventStreamWriter;
 import software.amazon.smithy.java.endpoints.Endpoint;
+import software.amazon.smithy.java.endpoints.EndpointContext;
 import software.amazon.smithy.java.endpoints.EndpointResolver;
 import software.amazon.smithy.java.retries.api.RetryStrategy;
 import software.amazon.smithy.utils.SmithyInternalApi;
@@ -249,7 +250,7 @@ public B endpointResolver(EndpointResolver endpointResolver) {
          */
         @SuppressWarnings("unchecked")
         public B endpoint(Endpoint customEndpoint) {
-            putConfig(ClientContext.CUSTOM_ENDPOINT, customEndpoint);
+            putConfig(EndpointContext.CUSTOM_ENDPOINT, customEndpoint);
             return (B) this;
         }
 
@@ -262,7 +263,7 @@ public B endpoint(Endpoint customEndpoint) {
          */
         @SuppressWarnings("unchecked")
         public B endpoint(String customEndpoint) {
-            putConfig(ClientContext.CUSTOM_ENDPOINT, Endpoint.builder().uri(customEndpoint).build());
+            putConfig(EndpointContext.CUSTOM_ENDPOINT, Endpoint.builder().uri(customEndpoint).build());
             return (B) this;
         }