Merge branch 'master' into native-image-afux

rikgibson · web-flow · commit 29f11d35fdb0 · 2018-12-03T11:36:58.000Z
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -17,6 +17,9 @@ jobs:
       - run:
           name: Install fn binary (as it is needed for the integration tests)
           command: ./.circleci/install-fn.sh
+      - run:
+          name: Workaround for https://issues.apache.org/jira/browse/SUREFIRE-1588
+          command: ./.circleci/fix-java-for-surefire.sh
       - run:
           name: Install junit-merge
           command: npm install -g junit-merge
diff --git a/.circleci/fix-java-for-surefire.sh b/.circleci/fix-java-for-surefire.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+ set -ex
+
+ cat << 'EOF' > $HOME/.m2/settings.xml
+ <settings>
+   <profiles>
+     <profile>
+       <id>SUREFIRE-1588</id>
+       <activation>
+         <activeByDefault>true</activeByDefault>
+       </activation>
+       <properties>
+         <argLine>-Djdk.net.URLClassPath.disableClassPathURLCheck=true</argLine>
+       </properties>
+     </profile>
+   </profiles>
+ </settings>
+ EOF
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,7 @@ logs/
 *.versionsBackup
 .gradle
 examples/gradle-build/build
+**/*.classpath
+**/*.project
+**/*.settings
+
diff --git a/api/pom.xml b/api/pom.xml
@@ -50,7 +50,7 @@
                 <configuration>
                     <sigfile>src/main/api/snapshot.sigfile</sigfile>
                     <action>strictcheck</action>
-                    <packages>com.fnproject.fn.api,com.fnproject.fn.api.exception,com.fnproject.fn.api.flow</packages>
+                    <packages>com.fnproject.fn.api,com.fnproject.fn.api.exception</packages>
                 </configuration>
             </plugin>
         </plugins>
diff --git a/api/src/main/api/snapshot.sigfile b/api/src/main/api/snapshot.sigfile
@@ -33,6 +33,7 @@ supr java.lang.Enum<com.fnproject.fn.api.FunctionInvoker$Phase>
 
 CLSS public final com.fnproject.fn.api.Headers
 intf java.io.Serializable
+meth public java.util.Map getAll()
 meth public !varargs com.fnproject.fn.api.Headers addHeader(java.lang.String,java.lang.String,java.lang.String[])
 meth public !varargs com.fnproject.fn.api.Headers setHeader(java.lang.String,java.lang.String,java.lang.String[])
 meth public boolean equals(java.lang.Object)
@@ -170,6 +171,17 @@ cons public init(java.lang.String)
 cons public init(java.lang.String,java.lang.Exception)
 supr java.lang.RuntimeException
 
+
+CLSS public abstract interface com.fnproject.fn.api.httpgateway.HTTPGatewayContext
+meth public abstract InvocationContext getInvocationContext()
+meth public abstract Headers getHeaders()
+meth public abstract String getRequestURL()
+meth public abstract String getMethod()
+meth public abstract QueryParameters getQueryParameters()
+meth public abstract void addResponseHeader(String key, String value)
+meth public abstract void setResponseHeader(String key, String v1, String... vs)
+meth public abstract void setStatusCode(int code)
+
 CLSS public abstract interface java.io.Closeable
 intf java.lang.AutoCloseable
 meth public abstract void close() throws java.io.IOException
diff --git a/api/src/main/java/com/fnproject/fn/api/Headers.java b/api/src/main/java/com/fnproject/fn/api/Headers.java
@@ -32,6 +32,9 @@ private Headers(Map<String, List<String>> headersIn) {
 
     private static Pattern headerName = Pattern.compile("[A-Za-z0-9!#%&'*+-.^_`|~]+");
 
+    public Map getAll() {
+        return headers;
+    }
 
     /**
      * Calculates the canonical key  (cf RFC 7230) for a header
diff --git a/flow-runtime/src/main/java/com/fnproject/fn/runtime/flow/RemoteFlowApiClient.java b/flow-runtime/src/main/java/com/fnproject/fn/runtime/flow/RemoteFlowApiClient.java
@@ -121,6 +121,9 @@ public CompletionId invokeFunction(FlowId flowId, String functionId, byte[] data
             httpReq.headers = new ArrayList<>();
 
             headers.asMap().forEach((k, vs) -> vs.forEach(v -> httpReq.headers.add(APIModel.HTTPHeader.create(k, v))));
+
+            Map<String, List<String>> headersMap = headers.asMap();
+            headersMap.forEach((key, values) -> values.forEach(value -> httpReq.headers.add(APIModel.HTTPHeader.create(key, value))));
         }
 
         httpReq.method = APIModel.HTTPMethod.fromFlow(method);
diff --git a/flow-runtime/src/test/java/com/fnproject/fn/runtime/flow/RemoteFlowApiClientTest.java b/flow-runtime/src/test/java/com/fnproject/fn/runtime/flow/RemoteFlowApiClientTest.java
@@ -22,6 +22,7 @@
 import java.io.ObjectOutputStream;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -130,7 +131,9 @@ public void invokeFunctionWithInvalidFunctionId() throws Exception {
         thrown.expectMessage("Failed to add stage");
 
         // When
-        completerClient.invokeFunction(new FlowId(testFlowId), testFunctionId, invokeBody, HttpMethod.POST, Headers.fromMap(Collections.singletonMap("Content-type", contentType)), locationFn());
+        Map headersMap = Collections.singletonMap("Content-type", contentType);
+        Headers headers = Headers.fromMap(headersMap);
+        completerClient.invokeFunction(new FlowId(testFlowId), testFunctionId, invokeBody, HttpMethod.POST, headers, locationFn());
     }
 
     @Test
diff --git a/images/build/pom.xml b/images/build/pom.xml
@@ -55,6 +55,14 @@
                     <target>1.8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.1</version>
+                <configuration>
+                    <useSystemClassLoader>false</useSystemClassLoader>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
diff --git a/images/init-native/pom.xml b/images/init-native/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <fdk.version>1.0.0-SNAPSHOT</fdk.version>
+        <fdk.version>1.0.76</fdk.version>
     </properties>
     <groupId>com.example.fn</groupId>
     <artifactId>hello</artifactId>
diff --git a/integration-tests/funcs/helloFunc/func-proto.yaml b/integration-tests/funcs/helloFunc/func-proto.yaml
@@ -0,0 +1,6 @@
+schema_version: 20180708
+name: hellofunc
+version: 0.0.1
+runtime: java8
+cmd: com.fnproject.fn.integration.hello.HelloFunction::handleRequest
+format: http-stream
diff --git a/integration-tests/funcs/helloFunc/pom.xml b/integration-tests/funcs/helloFunc/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <fdk.version>1.0.0-SNAPSHOT</fdk.version>
+    </properties>
+    <groupId>com.example.fn</groupId>
+    <artifactId>hello-func</artifactId>
+    <version>1.0.0</version>
+
+    <repositories>
+        <repository>
+            <id>fn-release-repo</id>
+            <url>https://dl.bintray.com/fnproject/fnproject</url>
+        </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fnproject.fn</groupId>
+            <artifactId>api</artifactId>
+            <version>${fdk.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fnproject.fn</groupId>
+            <artifactId>testing-core</artifactId>
+            <version>${fdk.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fnproject.fn</groupId>
+            <artifactId>testing-junit4</artifactId>
+            <version>${fdk.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.3</version>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
+            <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-surefire-plugin</artifactId>
+                 <version>2.22.1</version>
+                 <configuration>
+                     <useSystemClassLoader>false</useSystemClassLoader>
+                 </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/integration-tests/funcs/helloFunc/src-proto/main/java/com/fnproject/fn/integration/hello/HelloFunction.java b/integration-tests/funcs/helloFunc/src-proto/main/java/com/fnproject/fn/integration/hello/HelloFunction.java
@@ -0,0 +1,8 @@
+package com.fnproject.fn.integration.hello;
+
+public class HelloFunction {
+    public String handleRequest(String input) {
+        String name = (input == null || input.isEmpty()) ? "world" : input;
+        return "Hello, " + name + "!";
+    }
+}
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -3,17 +3,17 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>com.fnproject</groupId>
     <artifactId>integration-tests</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <properties>
+        <assertj-core.version>3.6.2</assertj-core.version>
+        <commons-io.version>2.5</commons-io.version>
         <jackson.version>2.9.6</jackson.version>
         <junit.version>4.12</junit.version>
-        <commons-io.version>2.5</commons-io.version>
-        <assertj-core.version>3.6.2</assertj-core.version>
+        <surefire.version>2.22.1</surefire.version>
     </properties>
     <packaging>jar</packaging>
 
@@ -28,19 +28,16 @@
             <artifactId>junit</artifactId>
             <version>${junit.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
             <version>${assertj-core.version}</version>
         </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <version>${jackson.version}</version>
         </dependency>
-
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
@@ -72,7 +69,14 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-surefire-plugin</artifactId>
+                 <version>${surefire.version}</version>
+                 <configuration>
+                     <useSystemClassLoader>false</useSystemClassLoader>
+                 </configuration>
+             </plugin>
         </plugins>
     </build>
-
 </project>
diff --git a/integration-tests/src/main/java/com/fnproject/fn/integrationtest/IntegrationTestRule.java b/integration-tests/src/main/java/com/fnproject/fn/integrationtest/IntegrationTestRule.java
@@ -112,7 +112,6 @@ private CmdResult(String cmd, boolean success, String stdout, String stderr) {
 
         boolean isSuccess() {
             return success;
-
         }
 
         public String getStdout() {
@@ -123,7 +122,9 @@ public String getStderr() {
             return stderr;
         }
 
-
+        public String toString() {
+            return "CmdResult: cmd=" + cmd + ", success=" + success + ", stdout=" + stdout + ", stderr=" + stderr;
+        }
     }
 
     public class TestContext {
@@ -151,7 +152,12 @@ public TestContext withDirFrom(String location) throws IOException {
         public CmdResult runFnWithInput(String input, String... args) throws Exception {
             CmdResult res = runFnWithInputAllowError(input, args);
 
-            Assertions.assertThat(res.isSuccess()).withFailMessage("Expected command '" + res.cmd + "' to return 0").isTrue();
+            if (res.isSuccess() == false) {
+                System.err.println("FN FAIL!");
+                System.err.println(res.toString());
+            }
+
+            Assertions.assertThat(res.isSuccess()).withFailMessage("Expected command '" + res.cmd + "' to return 0." + "FN FAIL: " + res).isTrue();
             return res;
         }
 
@@ -184,11 +190,9 @@ public CmdResult runFnWithInputAllowError(String input, String... args) throws E
 
             Process p = pb.start();
 
-
             p.getOutputStream().write(input.getBytes());
             p.getOutputStream().close();
 
-
             CompletableFuture<String> stderr = new CompletableFuture<>();
 
             new Thread(() -> {
diff --git a/integration-tests/src/test/java/com/fnproject/fn/integrationtest/FunctionsTest.java b/integration-tests/src/test/java/com/fnproject/fn/integrationtest/FunctionsTest.java
@@ -11,6 +11,8 @@
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Logger;
+import java.util.logging.Level;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
@@ -33,23 +35,21 @@ public void shouldCallExistingFn() throws Exception {
         tc.runFn("--verbose", "deploy", "--app", tc.appName(), "--local");
         tc.runFn("config", "app", tc.appName(), "GREETING", "Salutations");
 
-
         CmdResult r1 = tc.runFnWithInput("", "invoke", tc.appName(), "simplefunc");
         assertThat(r1.getStdout()).isEqualTo("Salutations, world!");
 
-
         CmdResult r2 = tc.runFnWithInput("tests", "invoke", tc.appName(), "simplefunc");
         assertThat(r2.getStdout()).isEqualTo("Salutations, tests!");
 
     }
 
     @Test()
     public void checkBoilerPlate() throws Exception {
-        for (String format : new String[]{"default", "http", "http-stream"}) {
+        for (String format : new String[]{"http-stream"}) {
             for (String runtime : new String[]{"java9", "java8"}) {
                 IntegrationTestRule.TestContext tc = testRule.newTest();
-                String fnName = "bp" + format + runtime;
 
+                String fnName = "bp" + format + runtime;
                 tc.runFn("init", "--runtime", runtime, "--name", fnName, "--format", format);
                 tc.rewritePOM();
                 tc.runFn("--verbose", "deploy", "--app", tc.appName(), "--local");
diff --git a/pom.xml b/pom.xml
@@ -21,31 +21,26 @@
         <module>flow-testing</module>
         <module>fn-spring-cloud-function</module>
         <module>examples</module>
-
     </modules>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-        <jetty.version>9.4.12.v20180830</jetty.version>
-        <!--TDD-->
+        <assertj-core.version>3.10.0</assertj-core.version>
+        <commons-io.version>2.6</commons-io.version>
+        <httpcore.version>4.4.10</httpcore.version>
+        <jackson.version>2.9.7</jackson.version>
         <jacoco.version>0.8.1</jacoco.version>
+        <jetty.version>9.4.12.v20180830</jetty.version>
         <junit.version>4.12</junit.version>
         <mockito.version>2.21.0</mockito.version>
-        <assertj-core.version>3.10.0</assertj-core.version>
         <pitest.version>1.4.0</pitest.version>
-
         <slf4j.version>1.7.25</slf4j.version>
-
-        <commons-io.version>2.6</commons-io.version>
-        <jackson.version>2.9.7</jackson.version>
-        <httpcore.version>4.4.10</httpcore.version>
-
+        <surefire.version>2.22.1</surefire.version>
         <system-rules.version>1.16.0</system-rules.version>
     </properties>
 
-
     <dependencyManagement>
         <dependencies>
 
diff --git a/release.version b/release.version
diff --git a/runtime/src/main/java/com/fnproject/fn/runtime/ntv/UnixSocketNative.java b/runtime/src/main/java/com/fnproject/fn/runtime/ntv/UnixSocketNative.java

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,9 @@ public CompletionId invokeFunction(FlowId flowId, String functionId, byte[] data`
`121`	`121`	`httpReq.headers = new ArrayList<>();`
`122`	`122`
`123`	`123`	`headers.asMap().forEach((k, vs) -> vs.forEach(v -> httpReq.headers.add(APIModel.HTTPHeader.create(k, v))));`
	`124`	`+`
	`125`	`+ Map<String, List<String>> headersMap = headers.asMap();`
	`126`	`+ headersMap.forEach((key, values) -> values.forEach(value -> httpReq.headers.add(APIModel.HTTPHeader.create(key, value))));`
`124`	`127`	`}`
`125`	`128`
`126`	`129`	`httpReq.method = APIModel.HTTPMethod.fromFlow(method);`