Add Unix Stream codec, Split flow from FDK, update integration tests

examples/async-thumbnails/pom.xml

@@ -74,7 +74,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.8.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>

examples/qr-code/pom.xml

@@ -45,7 +45,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.8.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>

examples/regex-query/pom.xml

@@ -58,7 +58,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.8.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>

examples/string-reverse/pom.xml

@@ -28,7 +28,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <version>3.8.0</version>
                 <configuration>
                     <source>1.8</source>
                     <target>1.8</target>

integration-tests/README.md

@@ -19,7 +19,7 @@ They should _not_ be used for:
 ```bash
 export REPOSITORY_LOCATION=/tmp/staging-repository
 # on OSX: 
-export DOCKER_LOCALHOST=docker.for.mac.localhost 
+export DOCKER_LOCALHOST=docker.for.mac.host.internal
 
 mvn deploy -DaltDeploymentRepository=localStagingDir::default::file://"$REPOSITORY_LOCATION"
 ```

integration-tests/funcs/flowAllFeatures/func.yaml

@@ -1,5 +1,5 @@
 schema_version: 20180708
-name: test
+name: flowallfeatures
 version: 0.0.15
 runtime: java
 cmd: com.fnproject.fn.integration.ExerciseEverything::handleRequest

integration-tests/funcs/flowBasic/func.yaml

@@ -1,5 +1,5 @@
 schema_version: 20180708
-name: test
+name: flowbasic
 version: 0.0.7
 runtime: java
 cmd: com.fnproject.fn.integration.test_1.CompleterFunction::handleRequest

integration-tests/funcs/flowBasicJDK8/func.yaml

@@ -1,5 +1,5 @@
 schema_version: 20180708
-name: test
+name: flowbasicj8
 version: 0.0.3
 runtime: java8
 cmd: com.fnproject.fn.integration.test_1.CompleterFunction::handleRequest

integration-tests/funcs/flowExitHooks/func.yaml

@@ -1,5 +1,5 @@
 schema_version: 20180708
-name: test
+name: flowexithooks
 version: 0.0.3
 runtime: java9
 cmd: com.fnproject.fn.integration.test_5.CompleterFunction::handleRequest

integration-tests/funcs/flowTimeouts/func.yaml

@@ -1,5 +1,5 @@
 schema_version: 20180708
-name: test
+name: flowtimeouts
 version: 0.0.3
 runtime: java9
 cmd: com.fnproject.fn.integration.test_6.CompleterFunction::handleRequest

integration-tests/funcs/simpleFunc/func.yaml

@@ -1,5 +1,5 @@
 schema_version: 20180708
-name: test
+name: simplefunc
 version: 0.0.3
 runtime: java9
 cmd: com.fnproject.fn.integration.test2.PlainFunction::handleRequest

integration-tests/pom.xml

@@ -16,20 +16,17 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>2.5</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.12</version>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <version>3.6.2</version>
-            <scope>test</scope>
         </dependency>
     </dependencies>
     <build>

integration-tests/run_tests_ci.sh

@@ -25,8 +25,6 @@ until $(curl --output /dev/null --silent  --fail http://localhost:18080); do
     sleep 1
 done
 
-MAVEN_REPOSITORY="http://$(docker inspect --type container -f '{{.NetworkSettings.IPAddress}}' fn_mvn_repo):18080"
-export MAVEN_REPOSITORY
 
 # Start Fn
 fn stop || true
@@ -41,8 +39,6 @@ done
 export FN_LOG_FILE=/tmp/fn.log
 docker logs -f fnserver >& ${FN_LOG_FILE} &
 
-DOCKER_LOCALHOST=$(docker inspect --type container -f '{{.NetworkSettings.IPAddress}}' fnserver)
-export DOCKER_LOCALHOST
 
 docker rm -f flowserver || true
 docker run --rm -d \
@@ -61,6 +57,21 @@ export FLOW_LOG_FILE=/tmp/flow.log
 docker logs -f flowserver >& ${FLOW_LOG_FILE} &
 set +e
 
+
+DOCKER_LOCALHOST= docker.for.mac.host.internal # $(docker inspect --type container -f '{{.NetworkSettings.IPAddress}}' fnserver)
+export DOCKER_LOCALHOST
+
+REPO_IP=$(docker inspect --type container -f '{{.NetworkSettings.IPAddress}}' fn_mvn_repo)
+MAVEN_REPOSITORY="http://${REPO_IP}:18080"
+export MAVEN_REPOSITORY
+COMPLETER_IP=$(docker inspect --type container -f '{{.NetworkSettings.IPAddress}}' flowserver)
+COMPLETER_BASE_URL="http://${COMPLETER_IP}:8081"
+export COMPLETER_BASE_URL
+
+export no_proxy=$no_proxy,$DOCKER_LOCALHOST,$COMPLETER_IP,$REPO_IP
+
+
+
 echo "ENV: "
 env
 echo "Running tests"

integration-tests/src/test/java/com/fnproject/fn/integrationtest/IntegrationTestRule.java → integration-tests/src/main/java/com/fnproject/fn/integrationtest/IntegrationTestRule.java

@@ -15,10 +15,7 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
 
@@ -58,7 +55,7 @@ public String getDockerLocalhost() {
             String osName = System.getProperty("os.name", "generic").toLowerCase(Locale.ENGLISH);
 
             if (osName.contains("darwin") || osName.contains("mac")) {
-                return "docker.for.mac.localhost";
+                return "docker.for.mac.host.internal";
             } else
                 throw new RuntimeException("Unable to determine docker localhost address - set 'DOCKER_LOCALHOST' env variable to the docker host network address ");
         }
@@ -152,7 +149,7 @@ public TestContext withDirFrom(String location) throws IOException {
         }
 
         public CmdResult runFnWithInput(String input, String... args) throws Exception {
-            CmdResult res =  runFnWithInputAllowError(input,args);
+            CmdResult res = runFnWithInputAllowError(input, args);
 
             Assertions.assertThat(res.isSuccess()).withFailMessage("Expected command '" + res.cmd + "' to return 0").isTrue();
             return res;
@@ -179,8 +176,10 @@ public CmdResult runFnWithInputAllowError(String input, String... args) throws E
                 // this means that FN init will pick up the local version not the latest.
                 pb.environment().put("FN_JAVA_FDK_VERSION", "1.0.0-SNAPSHOT");
             }
-            pb.environment().put("no_proxy", getDockerLocalhost());
-            pb.environment().put("NO_PROXY", getDockerLocalhost());
+
+            // Sort of a hack for local mac running  with a prioxy
+            String noProxy = Optional.ofNullable(System.getenv("no_proxy")).map((f) -> f + ",").orElse("") + getDockerLocalhost();
+            pb.environment().put("no_proxy", noProxy);
 
             Process p = pb.start();
 

integration-tests/src/test/java/com/fnproject/fn/integrationtest/FlowTest.java

@@ -28,7 +28,7 @@ public void shouldInvokeBasicFlow() throws Exception {
         tc.withDirFrom("funcs/flowBasic").rewritePOM();
         tc.runFn("--verbose", "deploy", "--app", tc.appName(), "--local");
         tc.runFn("config", "app", tc.appName(), "COMPLETER_BASE_URL", testRule.getFlowURL());
-        CmdResult r = tc.runFnWithInput("1", "invoke", tc.appName(), "test");
+        CmdResult r = tc.runFnWithInput("1", "invoke", tc.appName(), "flowbasic");
         assertThat(r.getStdout()).isEqualTo("4");
     }
 
@@ -39,7 +39,7 @@ public void shouldInvokeBasicFlowJDK8() throws Exception {
         tc.withDirFrom("funcs/flowBasicJDK8").rewritePOM();
         tc.runFn("--verbose", "deploy", "--app", tc.appName(), "--local");
         tc.runFn("config", "app", tc.appName(), "COMPLETER_BASE_URL", testRule.getFlowURL());
-        CmdResult r = tc.runFnWithInput("1", "invoke", tc.appName(), "test");
+        CmdResult r = tc.runFnWithInput("1", "invoke", tc.appName(), "flowbasicj8");
         assertThat(r.getStdout()).isEqualTo("4");
     }
 
@@ -50,7 +50,7 @@ public void shouldExerciseAllFlow() throws Exception {
         tc.withDirFrom("funcs/flowAllFeatures").rewritePOM();
         tc.runFn("--verbose", "deploy", "--app", tc.appName(), "--local");
         tc.runFn("config", "app", tc.appName(), "COMPLETER_BASE_URL", testRule.getFlowURL());
-        CmdResult r = tc.runFnWithInput("1", "invoke", tc.appName(), "test");
+        CmdResult r = tc.runFnWithInput("1", "invoke", tc.appName(), "flowallfeatures");
         assertThat(r.getStdout()).contains("Everything worked");
     }
 
@@ -72,10 +72,12 @@ public void shouldCallExitHooks() throws Exception {
         try {
             IntegrationTestRule.TestContext tc = testRule.newTest();
             tc.withDirFrom("funcs/flowExitHooks").rewritePOM();
+            tc.runFn("--verbose", "build", "--no-cache");
+
             tc.runFn("--verbose", "deploy", "--app", tc.appName(), "--local");
             tc.runFn("config", "app", tc.appName(), "COMPLETER_BASE_URL", testRule.getFlowURL());
             tc.runFn("config", "app", tc.appName(), "TERMINATION_HOOK_URL", "http://" + testRule.getDockerLocalhost() + ":" + 8000 + "/exited");
-            CmdResult r = tc.runFnWithInput("1", "invoke", tc.appName(), "test");
+            CmdResult r = tc.runFnWithInput("1", "invoke", tc.appName(), "flowexithooks");
             assertThat(r.getStdout()).contains("42");
 
             assertThat(done.get(10, TimeUnit.SECONDS)).withFailMessage("Expected callback within 10 seconds").isTrue();
@@ -92,7 +94,7 @@ public void shouldHandleTimeouts() throws Exception {
         tc.withDirFrom("funcs/flowTimeouts").rewritePOM();
         tc.runFn("--verbose", "deploy", "--app", tc.appName(), "--local");
         tc.runFn("config", "app", tc.appName(), "COMPLETER_BASE_URL", testRule.getFlowURL());
-        CmdResult r = tc.runFn("invoke", tc.appName(), "test");
+        CmdResult r = tc.runFn("invoke", tc.appName(), "flowtimeouts");
         assertThat(r.getStdout()).contains("timeout");
     }
 

integration-tests/src/test/java/com/fnproject/fn/integrationtest/FunctionsTest.java

@@ -26,11 +26,11 @@ public void shouldCallExistingFn() throws Exception {
         tc.runFn("config", "app", tc.appName(), "GREETING", "Salutations");
 
 
-        CmdResult r1 = tc.runFnWithInput("", "invoke", tc.appName(), "test");
+        CmdResult r1 = tc.runFnWithInput("", "invoke", tc.appName(), "simplefunc");
         assertThat(r1.getStdout()).isEqualTo("Salutations, world!");
 
 
-        CmdResult r2 = tc.runFnWithInput("tests", "invoke", tc.appName(), "test");
+        CmdResult r2 = tc.runFnWithInput("tests", "invoke", tc.appName(), "simplefunc");
         assertThat(r2.getStdout()).isEqualTo("Salutations, tests!");
 
     }
@@ -40,10 +40,12 @@ public void checkBoilerPlate() throws Exception {
         for (String format : new String[]{"default", "http", "http-stream"}) {
             for (String runtime : new String[]{"java9", "java8"}) {
                 IntegrationTestRule.TestContext tc = testRule.newTest();
-                tc.runFn("init", "--runtime", runtime, "--name", "test", "--trigger", "none", "--format", format);
+                String fnName = "bp" + format + runtime;
+
+                tc.runFn("init", "--runtime", runtime, "--name", fnName,"--format", format);
                 tc.rewritePOM();
                 tc.runFn("--verbose", "deploy", "--app", tc.appName(), "--local");
-                CmdResult rs = tc.runFnWithInput("wibble", "invoke", tc.appName(), "test");
+                CmdResult rs = tc.runFnWithInput("wibble", "invoke", tc.appName(), fnName);
                 assertThat(rs.getStdout()).contains("Hello, wibble!");
             }
         }

runtime/src/main/java/com/fnproject/fn/runtime/HTTPStreamCodec.java

@@ -103,7 +103,7 @@ public HTTPStreamCodec(Map<String, String> env) {
         String listenerAddress = getRequiredEnv("FN_LISTENER");
 
         if (!listenerAddress.startsWith("unix:/")) {
-            throw new FunctionInitializationException("Invalid listener address - it should start with unix:/" + listenerAddress);
+            throw new FunctionInitializationException("Invalid listener address - it should start with unix:/ :'" + listenerAddress +"'");
         }
         String listenerFile = listenerAddress.substring("unix:".length());