Plugins can now be configured to be shared, added tests to validate.

If shared, 1 instance will be shared between request invocations.  
If not shared a new plugin instance is created for each request.

Signed-off-by: Hiram Chirino <hiram@hiramchirino.com>

Author: chirino

proxy-wasm-java-host/src/test/go-examples/http_headers/main.go

@@ -50,14 +50,16 @@ type pluginContext struct {
 	// plugin configuration during OnPluginStart.
 	headerName  string
 	headerValue string
+	counter     int
 }
 
 // NewHttpContext implements types.PluginContext.
 func (p *pluginContext) NewHttpContext(contextID uint32) types.HttpContext {
 	return &httpHeaders{
-		contextID:   contextID,
-		headerName:  p.headerName,
-		headerValue: p.headerValue,
+		contextID:     contextID,
+		pluginContext: p,
+		headerName:    p.headerName,
+		headerValue:   p.headerValue,
 	}
 }
 
@@ -97,10 +99,10 @@ type httpHeaders struct {
 	// Embed the default http context here,
 	// so that we don't need to reimplement all the methods.
 	types.DefaultHttpContext
-	contextID   uint32
-	headerName  string
-	headerValue string
-	counter     int
+	contextID     uint32
+	headerName    string
+	headerValue   string
+	pluginContext *pluginContext
 }
 
 // OnHttpRequestHeaders implements types.HttpContext.
@@ -130,8 +132,8 @@ func (ctx *httpHeaders) OnHttpResponseHeaders(_ int, _ bool) types.Action {
 		proxywasm.LogCriticalf("failed to set response constant header: %v", err)
 	}
 
-	ctx.counter++
-	if err := proxywasm.AddHttpResponseHeader("x-proxy-wasm-counter", fmt.Sprintf("%d", ctx.counter)); err != nil {
+	ctx.pluginContext.counter++
+	if err := proxywasm.AddHttpResponseHeader("x-proxy-wasm-counter", fmt.Sprintf("%d", ctx.pluginContext.counter)); err != nil {
 		proxywasm.LogCriticalf("failed to set response counter header: %v", err)
 	}
 

proxy-wasm-java-host/src/test/go-examples/http_headers/main.wasm

@@ -60,14 +60,14 @@ public static class Builder implements Cloneable {
 
         private PluginHandler handler = new PluginHandler();
         private ProxyWasm.Builder proxyWasmBuilder = ProxyWasm.builder().withPluginHandler(handler);
-        private boolean shared;
+        private boolean shared = true;
 
         public WasmPlugin.Builder withName(String name) {
             this.handler.name = name;
             return this;
         }
 
-        public WasmPlugin.Builder withVmConfig(boolean shared) {
+        public WasmPlugin.Builder withShared(boolean shared) {
             this.shared = shared;
             return this;
         }

proxy-wasm-jaxrs/src/main/java/io/roastedroot/proxywasm/jaxrs/WasmPlugin.java

@@ -0,0 +1,47 @@
+package io.roastedroot.proxywasm.jaxrs;
+
+import static io.restassured.RestAssured.given;
+import static io.roastedroot.proxywasm.jaxrs.TestHelpers.EXAMPLES_DIR;
+
+import com.dylibso.chicory.wasm.Parser;
+import io.quarkus.test.junit.QuarkusTest;
+import io.roastedroot.proxywasm.StartException;
+import jakarta.enterprise.inject.Produces;
+import java.nio.file.Path;
+import org.junit.jupiter.api.Test;
+
+@QuarkusTest
+public class HttpHeadersNotSharedTest {
+
+    @Produces
+    public WasmPluginFactory create() throws StartException {
+        return () ->
+                WasmPlugin.builder()
+                        .withName("notSharedHttpHeaders")
+                        .withShared(false)
+                        .withPluginConfig("{\"header\": \"x-wasm-header\", \"value\": \"foo\"}")
+                        .build(
+                                Parser.parse(
+                                        Path.of(
+                                                EXAMPLES_DIR
+                                                        + "/go-examples/http_headers/main.wasm")));
+    }
+
+    @Test
+    public void testRequest() {
+
+        // since the plugin is not shared, the counter should not increment since each request gets
+        // a new plugin instance.
+        given().when()
+                .get("/test/notSharedHttpHeaders")
+                .then()
+                .statusCode(200)
+                .header("x-proxy-wasm-counter", "1");
+
+        given().when()
+                .get("/test/notSharedHttpHeaders")
+                .then()
+                .statusCode(200)
+                .header("x-proxy-wasm-counter", "1");
+    }
+}

proxy-wasm-jaxrs/src/test/java/io/roastedroot/proxywasm/jaxrs/HttpHeadersNotSharedTest.java

@@ -18,7 +18,8 @@ public class HttpHeadersTest {
     public WasmPluginFactory create() throws StartException {
         return () ->
                 WasmPlugin.builder()
-                        .withName("http_headers")
+                        .withName("httpHeaders")
+                        .withShared(true)
                         .withPluginConfig("{\"header\": \"x-wasm-header\", \"value\": \"foo\"}")
                         .build(
                                 Parser.parse(
@@ -30,11 +31,21 @@ public WasmPluginFactory create() throws StartException {
     @Test
     public void testRequest() {
         given().when()
-                .get("/http_headers")
+                .get("/test/httpHeaders")
                 .then()
                 .statusCode(200)
                 .header("x-proxy-wasm-go-sdk-example", "http_headers")
                 .header("x-wasm-header", "foo")
+                .header("x-proxy-wasm-counter", "1")
+                .body(equalTo("hello world"));
+
+        given().when()
+                .get("/test/httpHeaders")
+                .then()
+                .statusCode(200)
+                .header("x-proxy-wasm-go-sdk-example", "http_headers")
+                .header("x-wasm-header", "foo")
+                .header("x-proxy-wasm-counter", "2")
                 .body(equalTo("hello world"));
     }
 }

proxy-wasm-jaxrs/src/test/java/io/roastedroot/proxywasm/jaxrs/HttpHeadersResource.java

@@ -0,0 +1,22 @@
+package io.roastedroot.proxywasm.jaxrs;
+
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+
+@Path("/test")
+public class Resources {
+
+    @Path("/httpHeaders")
+    @GET
+    @NamedWasmPlugin("httpHeaders")
+    public String httpHeaders() {
+        return "hello world";
+    }
+
+    @Path("/notSharedHttpHeaders")
+    @GET
+    @NamedWasmPlugin("notSharedHttpHeaders")
+    public String notSharedHttpHeaders() {
+        return "hello world";
+    }
+}