Checkpoint

incubator/binding-openapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/openapi/config/server.yaml

@@ -16,16 +16,20 @@
 
 ---
 name: test
+vaults:
+  server:
+    type: test
 bindings:
   composite0:
     type: openapi
     kind: server
+    vault: server
     options:
       tls:
         keys:
           - localhost
         alpn:
-          - localhost
+          - protocol2
       http:
         authorization:
           test0:

incubator/binding-openapi.spec/src/main/scripts/io/aklivity/zilla/specs/binding/openapi/schema/openapi.schema.patch.json

@@ -31,7 +31,6 @@
                     {
                         "enum": [ "client", "server" ]
                     },
-                    "vault": false,
                     "options":
                     {
                         "properties":

incubator/binding-openapi.spec/src/test/java/io/aklivity/zilla/specs/binding/openapi/config/SchemaTest.java

@@ -31,6 +31,7 @@ public class SchemaTest
     @Rule
     public final ConfigSchemaRule schema = new ConfigSchemaRule()
         .schemaPatch("io/aklivity/zilla/specs/binding/openapi/schema/openapi.schema.patch.json")
+        .schemaPatch("io/aklivity/zilla/specs/engine/schema/vault/test.schema.patch.json")
         .configurationRoot("io/aklivity/zilla/specs/binding/openapi/config");
 
     @Test

incubator/binding-openapi/src/main/java/io/aklivity/zilla/runtime/binding/openapi/config/OpenapiOptionsConfig.java

@@ -17,14 +17,14 @@
 import java.util.List;
 import java.util.function.Function;
 
-import io.aklivity.zilla.runtime.binding.http.config.HttpAuthorizationConfig;
+import io.aklivity.zilla.runtime.binding.http.config.HttpOptionsConfig;
 import io.aklivity.zilla.runtime.binding.tls.config.TlsOptionsConfig;
 import io.aklivity.zilla.runtime.engine.config.OptionsConfig;
 
 public final class OpenapiOptionsConfig extends OptionsConfig
 {
     public final TlsOptionsConfig tls;
-    public final HttpAuthorizationConfig authorization;
+    public final HttpOptionsConfig http;
     public final List<OpenapiConfig> openapis;
 
     public static OpenpaiOptionsConfigBuilder<OpenapiOptionsConfig> builder()
@@ -40,11 +40,11 @@ public static <T> OpenpaiOptionsConfigBuilder<T> builder(
 
     public OpenapiOptionsConfig(
         TlsOptionsConfig tls,
-        HttpAuthorizationConfig authorization,
+        HttpOptionsConfig http,
         List<OpenapiConfig> openapis)
     {
         this.tls = tls;
-        this.authorization = authorization;
+        this.http = http;
         this.openapis = openapis;
     }
 }

incubator/binding-openapi/src/main/java/io/aklivity/zilla/runtime/binding/openapi/config/OpenpaiOptionsConfigBuilder.java

@@ -18,8 +18,7 @@
 import java.util.List;
 import java.util.function.Function;
 
-import io.aklivity.zilla.runtime.binding.http.config.HttpAuthorizationConfig;
-import io.aklivity.zilla.runtime.binding.http.config.HttpAuthorizationConfigBuilder;
+import io.aklivity.zilla.runtime.binding.http.config.HttpOptionsConfig;
 import io.aklivity.zilla.runtime.binding.tls.config.TlsOptionsConfig;
 import io.aklivity.zilla.runtime.engine.config.ConfigBuilder;
 import io.aklivity.zilla.runtime.engine.config.OptionsConfig;
@@ -28,9 +27,9 @@ public final class OpenpaiOptionsConfigBuilder<T> extends ConfigBuilder<T, Openp
 {
     private final Function<OptionsConfig, T> mapper;
 
-    private HttpAuthorizationConfig authorization;
-    private List<OpenapiConfig> openapis;
     private TlsOptionsConfig tls;
+    private HttpOptionsConfig http;
+    private List<OpenapiConfig> openapis;
 
     OpenpaiOptionsConfigBuilder(
         Function<OptionsConfig, T> mapper)
@@ -52,6 +51,13 @@ public OpenpaiOptionsConfigBuilder<T> tls(
         return this;
     }
 
+    public OpenpaiOptionsConfigBuilder<T> http(
+        HttpOptionsConfig http)
+    {
+        this.http = http;
+        return this;
+    }
+
     public OpenpaiOptionsConfigBuilder<T> openapi(
         OpenapiConfig openapi)
     {
@@ -63,21 +69,9 @@ public OpenpaiOptionsConfigBuilder<T> openapi(
         return this;
     }
 
-    public HttpAuthorizationConfigBuilder<OpenpaiOptionsConfigBuilder<T>> authorization()
-    {
-        return HttpAuthorizationConfig.builder(this::authorization);
-    }
-
     @Override
     public T build()
     {
-        return mapper.apply(new OpenapiOptionsConfig(tls, authorization, openapis));
-    }
-
-    private OpenpaiOptionsConfigBuilder<T> authorization(
-        HttpAuthorizationConfig authorization)
-    {
-        this.authorization = authorization;
-        return this;
+        return mapper.apply(new OpenapiOptionsConfig(tls, http, openapis));
     }
 }

incubator/binding-openapi/src/main/java/io/aklivity/zilla/runtime/binding/openapi/internal/config/OpenapiBindingConfig.java

@@ -14,6 +14,7 @@
  */
 package io.aklivity.zilla.runtime.binding.openapi.internal.config;
 
+import static java.util.Collections.unmodifiableMap;
 import static java.util.stream.Collector.of;
 import static java.util.stream.Collector.Characteristics.IDENTITY_FINISH;
 import static java.util.stream.Collectors.toCollection;
@@ -107,7 +108,7 @@ public OpenapiBindingConfig(
         resolversByMethod.put("HEAD", o -> o.head != null ? o.head.operationId : null);
         resolversByMethod.put("PATCH", o -> o.patch != null ? o.patch.operationId : null);
         resolversByMethod.put("TRACE", o -> o.post != null ? o.trace.operationId : null);
-        this.resolversByMethod = Collections.unmodifiableMap(resolversByMethod);
+        this.resolversByMethod = unmodifiableMap(resolversByMethod);
     }
 
     public boolean isCompositeNamespace(

incubator/binding-openapi/src/main/java/io/aklivity/zilla/runtime/binding/openapi/internal/config/OpenapiOptionsConfigAdapter.java

@@ -28,26 +28,24 @@
 import jakarta.json.bind.JsonbBuilder;
 import jakarta.json.bind.adapter.JsonbAdapter;
 
-import io.aklivity.zilla.runtime.binding.http.config.HttpAuthorizationConfig;
-import io.aklivity.zilla.runtime.binding.http.config.HttpAuthorizationConfigBuilder;
+import io.aklivity.zilla.runtime.binding.http.config.HttpOptionsConfig;
 import io.aklivity.zilla.runtime.binding.openapi.config.OpenapiConfig;
 import io.aklivity.zilla.runtime.binding.openapi.config.OpenapiOptionsConfig;
 import io.aklivity.zilla.runtime.binding.openapi.config.OpenpaiOptionsConfigBuilder;
 import io.aklivity.zilla.runtime.binding.openapi.internal.OpenapiBinding;
 import io.aklivity.zilla.runtime.binding.openapi.internal.model.OpenApi;
 import io.aklivity.zilla.runtime.binding.tls.config.TlsOptionsConfig;
-import io.aklivity.zilla.runtime.binding.tls.internal.config.TlsOptionsConfigAdapter;
 import io.aklivity.zilla.runtime.engine.config.ConfigAdapterContext;
 import io.aklivity.zilla.runtime.engine.config.OptionsConfig;
+import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapter;
 import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi;
 
 public final class OpenapiOptionsConfigAdapter implements OptionsConfigAdapterSpi, JsonbAdapter<OptionsConfig, JsonObject>
 {
     private static final String TLS_NAME = "tls";
     private static final String HTTP_NAME = "http";
-    private static final String AUTHORIZATION_NAME = "authorization";
     private static final String SPECS_NAME = "specs";
-    private final TlsOptionsConfigAdapter tlsOptionsConfigAdapter = new TlsOptionsConfigAdapter();
+    private OptionsConfigAdapter optionsAdapter;
     private Function<String, String> readURL;
 
     @Override
@@ -72,20 +70,16 @@ public JsonObject adaptToJson(
 
         if (openOptions.tls != null)
         {
-            object.add(SPECS_NAME, tlsOptionsConfigAdapter
-                .adaptToJson(((OpenapiOptionsConfig) options).tls));
+            optionsAdapter.adaptType("tls");
+            final TlsOptionsConfig tls = ((OpenapiOptionsConfig) options).tls;
+            object.add(SPECS_NAME, optionsAdapter.adaptToJson(tls));
         }
 
-        HttpAuthorizationConfig httpAuthorization = openOptions.authorization;
-        if (httpAuthorization != null)
+        HttpOptionsConfig http = openOptions.http;
+        if (http != null)
         {
-            JsonObjectBuilder http = Json.createObjectBuilder();
-            JsonObjectBuilder authorization = Json.createObjectBuilder();
-
-            adaptAuthorizationFromObject(httpAuthorization, authorization);
-
-            http.add(AUTHORIZATION_NAME, authorization.build());
-            object.add(HTTP_NAME, http.build());
+            optionsAdapter.adaptType("http");
+            object.add(HTTP_NAME, optionsAdapter.adaptToJson(http));
         }
 
         if (openOptions.openapis != null)
@@ -106,19 +100,19 @@ public OptionsConfig adaptFromJson(
 
         if (object.containsKey(TLS_NAME))
         {
-            openapiOptions.tls((TlsOptionsConfig) tlsOptionsConfigAdapter
-                .adaptFromJson(object.getJsonObject(TLS_NAME)));
+            optionsAdapter.adaptType("tls");
+            final JsonObject tls = object.getJsonObject(TLS_NAME);
+            final TlsOptionsConfig tlsOptions = (TlsOptionsConfig) optionsAdapter.adaptFromJson(tls);
+            openapiOptions.tls(tlsOptions);
         }
 
         if (object.containsKey(HTTP_NAME))
         {
-            HttpAuthorizationConfigBuilder<?> httpAuthorization = openapiOptions.authorization();
             JsonObject http = object.getJsonObject(HTTP_NAME);
-            JsonObject authorizations = http.getJsonObject(AUTHORIZATION_NAME);
-
-            adaptAuthorization(authorizations, httpAuthorization);
 
-            httpAuthorization.build();
+            optionsAdapter.adaptType("http");
+            final HttpOptionsConfig httpOptions = (HttpOptionsConfig) optionsAdapter.adaptFromJson(http);
+            openapiOptions.http(httpOptions);
         }
 
         if (object.containsKey(SPECS_NAME))
@@ -134,6 +128,7 @@ public void adaptContext(
         ConfigAdapterContext context)
     {
         this.readURL = context::readURL;
+        this.optionsAdapter = new OptionsConfigAdapter(Kind.BINDING, context);
     }
 
     private OpenapiConfig asOpenapi(

incubator/binding-openapi/src/main/java/io/aklivity/zilla/runtime/binding/openapi/internal/config/OpenapiServerCompositeBindingAdapter.java

@@ -91,7 +91,7 @@ public BindingConfig adapt(
         OpenapiConfig openapiConfig = options.openapis.get(0);
 
         final OpenApi openApi = openapiConfig.openapi;
-        final String guardName = options.authorization.name;
+        final String guardName = options.http.authorization.name;
         final int[] allPorts = resolveAllPorts(openApi);
         final int[] httpPorts = resolvePortsForScheme(openApi, "http");
         final int[] httpsPorts = resolvePortsForScheme(openApi, "https");
@@ -123,7 +123,7 @@ public BindingConfig adapt(
                         .access()
                             .policy(CROSS_ORIGIN)
                             .build()
-                        .inject(o -> this.injectHttpServerOptions(o, options.authorization, hasJwt))
+                        .inject(o -> this.injectHttpServerOptions(o, options.http.authorization, hasJwt))
                         .inject(r -> this.injectHttpServerRequests(r, openApi))
                         .build()
                     .inject(b -> this.injectHttpServerRoutes(b, openApi, guardName, securitySchemes))

incubator/binding-openapi/src/test/java/io/aklivity/zilla/runtime/binding/openapi/internal/config/OpenapiOptionsConfigAdapterTest.java

@@ -41,8 +41,8 @@
 import io.aklivity.zilla.runtime.binding.openapi.internal.model.OpenApi;
 import io.aklivity.zilla.runtime.binding.openapi.internal.model.PathItem;
 import io.aklivity.zilla.runtime.engine.config.ConfigAdapterContext;
+import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapter;
 import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi;
-import io.aklivity.zilla.runtime.engine.internal.config.OptionsAdapter;
 import io.aklivity.zilla.specs.binding.openapi.OpenapiSpecs;
 
 public class OpenapiOptionsConfigAdapterTest
@@ -61,7 +61,7 @@ public void initJson() throws IOException
         {
             String content = new String(resource.readAllBytes(), UTF_8);
             Mockito.doReturn(content).when(context).readURL("openapi/petstore.yaml");
-            OptionsAdapter adapter = new OptionsAdapter(OptionsConfigAdapterSpi.Kind.BINDING, context);
+            OptionsConfigAdapter adapter = new OptionsConfigAdapter(OptionsConfigAdapterSpi.Kind.BINDING, context);
             adapter.adaptType("openapi");
             JsonbConfig config = new JsonbConfig()
                 .withAdapters(adapter);
@@ -111,7 +111,7 @@ public void shouldReadOptions()
         assertThat(options, not(nullValue()));
         assertThat(path.post, not(nullValue()));
         assertThat(options.tls, not(nullValue()));
-        assertThat(options.authorization, not(nullValue()));
+        assertThat(options.http, not(nullValue()));
     }
 
     @Test

runtime/binding-grpc/src/test/java/io/aklivity/zilla/runtime/binding/grpc/internal/config/GrpcOptionsConfigAdapterTest.java

@@ -43,7 +43,7 @@
 import io.aklivity.zilla.runtime.binding.grpc.config.GrpcServiceConfig;
 import io.aklivity.zilla.runtime.engine.config.ConfigAdapterContext;
 import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi;
-import io.aklivity.zilla.runtime.engine.internal.config.OptionsAdapter;
+import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapter;
 
 public class GrpcOptionsConfigAdapterTest
 {
@@ -52,7 +52,7 @@ public class GrpcOptionsConfigAdapterTest
     @Mock
     private ConfigAdapterContext context;
 
-    private OptionsAdapter adapter;
+    private OptionsConfigAdapter adapter;
 
     private Jsonb jsonb;
 
@@ -67,7 +67,7 @@ public void initJson() throws IOException
             content = new String(resource.readAllBytes(), UTF_8);
         }
         Mockito.doReturn(content).when(context).readURL("protobuf/echo.proto");
-        adapter = new OptionsAdapter(OptionsConfigAdapterSpi.Kind.BINDING, context);
+        adapter = new OptionsConfigAdapter(OptionsConfigAdapterSpi.Kind.BINDING, context);
         adapter.adaptType("grpc");
         JsonbConfig config = new JsonbConfig()
             .withAdapters(adapter);

runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/config/OptionsAdapter.java → runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/config/OptionsConfigAdapter.java

@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
-package io.aklivity.zilla.runtime.engine.internal.config;
+package io.aklivity.zilla.runtime.engine.config;
 
 import static java.util.function.Function.identity;
 import static java.util.stream.Collectors.toMap;
@@ -25,18 +25,14 @@
 import jakarta.json.JsonObject;
 import jakarta.json.bind.adapter.JsonbAdapter;
 
-import io.aklivity.zilla.runtime.engine.config.ConfigAdapterContext;
-import io.aklivity.zilla.runtime.engine.config.OptionsConfig;
-import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi;
-
-public class OptionsAdapter implements JsonbAdapter<OptionsConfig, JsonObject>
+public class OptionsConfigAdapter implements JsonbAdapter<OptionsConfig, JsonObject>
 {
     private final Map<String, OptionsConfigAdapterSpi> delegatesByName;
     private ConfigAdapterContext context;
 
     private OptionsConfigAdapterSpi delegate;
 
-    public OptionsAdapter(
+    public OptionsConfigAdapter(
         OptionsConfigAdapterSpi.Kind kind,
         ConfigAdapterContext context)
     {

runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/config/BindingConfigsAdapter.java

@@ -40,6 +40,7 @@
 import io.aklivity.zilla.runtime.engine.config.BindingConfigBuilder;
 import io.aklivity.zilla.runtime.engine.config.CompositeBindingAdapterSpi;
 import io.aklivity.zilla.runtime.engine.config.ConfigAdapterContext;
+import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapter;
 import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi;
 import io.aklivity.zilla.runtime.engine.config.RouteConfig;
 
@@ -57,7 +58,7 @@ public class BindingConfigsAdapter implements JsonbAdapter<BindingConfig[], Json
 
     private final KindAdapter kind;
     private final RouteAdapter route;
-    private final OptionsAdapter options;
+    private final OptionsConfigAdapter options;
     private final CatalogedAdapter cataloged;
     private final TelemetryRefAdapter telemetryRef;
 
@@ -70,7 +71,7 @@ public BindingConfigsAdapter(
     {
         this.kind = new KindAdapter(context);
         this.route = new RouteAdapter(context);
-        this.options = new OptionsAdapter(OptionsConfigAdapterSpi.Kind.BINDING, context);
+        this.options = new OptionsConfigAdapter(OptionsConfigAdapterSpi.Kind.BINDING, context);
         this.cataloged = new CatalogedAdapter();
         this.telemetryRef = new TelemetryRefAdapter();
 

runtime/engine/src/main/java/io/aklivity/zilla/runtime/engine/internal/config/CatalogAdapter.java

@@ -22,21 +22,22 @@
 import io.aklivity.zilla.runtime.engine.config.CatalogConfig;
 import io.aklivity.zilla.runtime.engine.config.ConfigAdapterContext;
 import io.aklivity.zilla.runtime.engine.config.OptionsConfig;
+import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapter;
 import io.aklivity.zilla.runtime.engine.config.OptionsConfigAdapterSpi;
 
 public class CatalogAdapter
 {
     private static final String TYPE_NAME = "type";
     private static final String OPTIONS_NAME = "options";
 
-    private final OptionsAdapter options;
+    private final OptionsConfigAdapter options;
 
     private String namespace;
 
     public CatalogAdapter(
         ConfigAdapterContext context)
     {
-        this.options = new OptionsAdapter(OptionsConfigAdapterSpi.Kind.CATALOG, context);
+        this.options = new OptionsConfigAdapter(OptionsConfigAdapterSpi.Kind.CATALOG, context);
     }
 
     public void adaptNamespace(