Update VM and rules engine to work with BDD

Now the VM supports running the bytecode of a specific condition
or resolving a specific result. Control flow is owned by the
BddEvaluator, and VM condition handling is done through a
ConditionEvaluator.

Author: mtdowling

aws/client/aws-client-rulesengine/build.gradle.kts

@@ -15,6 +15,7 @@ dependencies {
 
     testImplementation(libs.smithy.aws.traits)
     testImplementation(project(":aws:client:aws-client-restxml"))
+    testImplementation(project(":aws:client:aws-client-restjson"))
     testImplementation(project(":client:dynamic-client"))
 }
 
@@ -32,10 +33,10 @@ sourceSets {
 }
 
 jmh {
-    warmupIterations = 2
+    warmupIterations = 3
     iterations = 5
     fork = 1
-     profilers.add("async:output=flamegraph")
+    profilers.add("async:output=flamegraph")
     // profilers.add("gc")
-    duplicateClassesStrategy = DuplicatesStrategy.WARN
+    duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE // don't dump a bunch of warnings.
 }

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

@@ -9,20 +9,17 @@
 import java.util.concurrent.TimeUnit;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
-import org.openjdk.jmh.annotations.Fork;
-import org.openjdk.jmh.annotations.Measurement;
 import org.openjdk.jmh.annotations.Mode;
 import org.openjdk.jmh.annotations.OutputTimeUnit;
 import org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.Setup;
 import org.openjdk.jmh.annotations.State;
-import org.openjdk.jmh.annotations.Warmup;
 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.client.core.endpoint.EndpointResolver;
 import software.amazon.smithy.java.client.core.endpoint.EndpointResolverParams;
 import software.amazon.smithy.java.client.rulesengine.EndpointRulesPlugin;
-import software.amazon.smithy.java.client.rulesengine.RulesEngine;
+import software.amazon.smithy.java.client.rulesengine.RulesEngineBuilder;
 import software.amazon.smithy.java.context.Context;
 import software.amazon.smithy.java.core.serde.document.Document;
 import software.amazon.smithy.java.dynamicclient.DynamicClient;
@@ -38,9 +35,6 @@
 @State(Scope.Benchmark)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @BenchmarkMode(Mode.AverageTime)
-@Warmup(iterations = 2, time = 3)
-@Measurement(iterations = 3, time = 3)
-@Fork(1)
 public class Bench {
     private DynamicClient client;
     private EndpointResolver endpointResolver;
@@ -57,7 +51,7 @@ public void setup() {
         model = customizeS3Model(model);
         var service = model.expectShape(ShapeId.from("com.amazonaws.s3#AmazonS3"), ServiceShape.class);
 
-        var engine = new RulesEngine();
+        var engine = new RulesEngineBuilder();
         var plugin = EndpointRulesPlugin.create(engine);
 
         client = DynamicClient.builder()
@@ -69,11 +63,13 @@ public void setup() {
         endpointResolver = client.config().endpointResolver();
         var ctx = Context.create();
         ctx.put(EndpointSettings.REGION, "us-east-1");
+//        ctx.put(EndpointRulesPlugin.ADDITIONAL_ENDPOINT_PARAMS, Map.of("ForcePathStyle", true));
 
         var inputValue = client.createStruct(ShapeId.from("com.amazonaws.s3#GetObjectRequest"),
                 Document.of(Map.of(
                         "Bucket",
-                        Document.of("foo"),
+                        Document.of("miked"),
+                        //, Document.of("foo"),
                         "Key",
                         Document.of("bar"))));
         endpointParams = EndpointResolverParams.builder()

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

@@ -7,7 +7,6 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.function.BiFunction;
 import java.util.function.Function;
 import software.amazon.smithy.java.aws.auth.api.identity.AwsCredentialsIdentity;
 import software.amazon.smithy.java.aws.client.core.settings.AccountIdSetting;
@@ -123,21 +122,12 @@ public Object apply(Context context) {
         }
     };
 
-    static final BiFunction<String, Context, Object> BUILTIN_PROVIDER = new BuiltinProvider();
-
-    private static final class BuiltinProvider implements BiFunction<String, Context, Object> {
-        private final Map<String, Function<Context, Object>> providers = new HashMap<>();
-
-        private BuiltinProvider() {
-            for (var e : values()) {
-                providers.put(e.name, e);
-            }
-        }
-
-        @Override
-        public Object apply(String name, Context context) {
-            var match = providers.get(name);
-            return match == null ? null : match.apply(context);
+    static final Map<String, Function<Context, Object>> BUILTINS;
+    static {
+        var values = values();
+        BUILTINS = new HashMap<>(values.length);
+        for (var e : values) {
+            BUILTINS.put(e.name, e);
         }
     }
 

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

@@ -6,8 +6,8 @@
 package software.amazon.smithy.java.aws.client.rulesengine;
 
 import java.util.Arrays;
-import java.util.List;
-import java.util.function.BiFunction;
+import java.util.Map;
+import java.util.function.Function;
 import software.amazon.smithy.java.client.rulesengine.RulesExtension;
 import software.amazon.smithy.java.client.rulesengine.RulesFunction;
 import software.amazon.smithy.java.context.Context;
@@ -21,12 +21,12 @@
 @SmithyUnstableApi
 public class AwsRulesExtension implements RulesExtension {
     @Override
-    public BiFunction<String, Context, Object> getBuiltinProvider() {
-        return AwsRulesBuiltin.BUILTIN_PROVIDER;
+    public void putBuiltinProviders(Map<String, Function<Context, Object>> providers) {
+        providers.putAll(AwsRulesBuiltin.BUILTINS);
     }
 
     @Override
-    public List<RulesFunction> getFunctions() {
+    public Iterable<RulesFunction> getFunctions() {
         return Arrays.asList(AwsRulesFunction.values());
     }
 }

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

@@ -128,7 +128,7 @@ public String toString() {
     }
 
     @Override
-    public int getOperandCount() {
+    public int getArgumentCount() {
         return operands;
     }
 

aws/client/aws-client-rulesengine/src/shared-resources/software/amazon/smithy/java/aws/client/rulesengine/s3.json

@@ -27,6 +27,7 @@
 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.RulesEvaluationError;
 import software.amazon.smithy.java.core.serde.document.Document;
 import software.amazon.smithy.java.dynamicclient.DynamicClient;
@@ -49,6 +50,9 @@ public class ResolverTest {
     private static EndpointRulesPlugin plugin;
     private static DynamicClient client;
 
+    private Map<String, Object> overrideMap = null;
+    private Object inputParams = null;
+
     // S3 requires a customization to remove buckets from the path :(
     private static Model customizeS3Model(Model m) {
         return ModelTransformer.create().mapShapes(m, s -> {
@@ -77,7 +81,8 @@ public static void before() throws Exception {
                 .unwrap();
         model = customizeS3Model(model);
         service = model.expectShape(ShapeId.from("com.amazonaws.s3#AmazonS3"), ServiceShape.class);
-        plugin = EndpointRulesPlugin.create();
+        var engine = new RulesEngineBuilder();
+        plugin = EndpointRulesPlugin.create(engine);
         client = DynamicClient.builder()
                 .model(model)
                 .service(service.getId())
@@ -95,7 +100,8 @@ public void caseRunner(EndpointTestCase test) {
         try {
             var result = resolveEndpoint(test, client);
             if (expectedError != null) {
-                Assertions.fail("Expected ruleset to fail: " + test.getDocumentation() + " : " + expectedError);
+                Assertions.fail("Expected ruleset to fail: " + test.getDocumentation()
+                        + " : " + expectedError + " : but got " + result[0]);
             }
 
             Endpoint ep = (Endpoint) result[0];
@@ -109,7 +115,10 @@ public void caseRunner(EndpointTestCase test) {
             // TODO: validate properties too.
         } catch (RulesEvaluationError e) {
             if (expectedError == null) {
-                Assertions.fail("Expected ruleset to succeed: " + test.getDocumentation() + " : " + e, e);
+                String msg = "Expected ruleset to succeed: " + test.getDocumentation();
+                msg += " Input: " + inputParams + "\n";
+                msg += " Overrides: " + overrideMap;
+                Assertions.fail(msg, e);
             }
         }
     }
@@ -144,7 +153,7 @@ public void readBeforeTransmit(RequestHook<?, ?, ?> hook) {
 
         var inputs = test.getOperationInputs().get(0);
         var name = inputs.getOperationName();
-        var inputParams = EndpointUtils.convertNode(inputs.getOperationParams(), true);
+        inputParams = EndpointUtils.convertNode(inputs.getOperationParams(), true);
 
         if (!inputs.getBuiltInParams().isEmpty()) {
             inputs.getBuiltInParams().getStringMember("SDK::Endpoint").ifPresent(value -> {
@@ -179,8 +188,8 @@ public void readBeforeTransmit(RequestHook<?, ?, ?> hook) {
             override.putConfig(S3EndpointSettings.S3_FORCE_PATH_STYLE, value.getValue());
         });
 
-        override.putConfig(EndpointRulesPlugin.ADDITIONAL_ENDPOINT_PARAMS,
-                (Map<String, Object>) EndpointUtils.convertNode(test.getParams(), true));
+        overrideMap = (Map<String, Object>) EndpointUtils.convertNode(test.getParams(), true);
+        override.putConfig(EndpointRulesPlugin.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

@@ -1,6 +1,5 @@
 plugins {
     id("smithy-java.module-conventions")
-    id("me.champeau.jmh") version "0.7.3"
 }
 
 description = "Implements the rules engine traits used to resolve endpoints"
@@ -16,13 +15,5 @@ dependencies {
 
     testImplementation(project(":aws:client:aws-client-awsjson"))
     testImplementation(project(":client:dynamic-client"))
-}
-
-jmh {
-    warmupIterations = 2
-    iterations = 5
-    fork = 1
-    // profilers.add("async:output=flamegraph")
-    // profilers.add("gc")
-    duplicateClassesStrategy = DuplicatesStrategy.WARN
+    testImplementation(project(":aws:client:aws-client-rulesengine"))
 }