Create request-id to be set as a header on the request for oracle pro…

…vider requests.
fnproject · Aug 17, 2018 · 735b2eb · 735b2eb
1 parent 687df96
commit 735b2eb
Show file tree

Hide file tree

Showing 12 changed files with 232 additions and 2 deletions.
diff --git a/main.go b/main.go
@@ -2,8 +2,11 @@ package main
 
 import (
 	"bytes"
+	"crypto/rand"
+	"encoding/base32"
 	"fmt"
 	"io"
+	"log"
 	"os"
 	"sort"
 	"strings"
@@ -17,6 +20,16 @@ import (
 	"github.com/urfave/cli"
 )
 
+func getRequestID() string {
+	byteArr := make([]byte, 16)
+	_, err := rand.Read(byteArr)
+	if err != nil {
+		log.Fatalf("failed to generate random number for requestID")
+	}
+
+	return base32.StdEncoding.WithPadding(base32.NoPadding).EncodeToString(byteArr)
+}
+
 func newFn() *cli.App {
 	app := cli.NewApp()
 	app.Name = "fn"
@@ -29,6 +42,8 @@ func newFn() *cli.App {
 		if err != nil {
 			return err
 		}
+
+		viper.Set("request-id", getRequestID())
 		commandArgOverrides(c)
 		return nil
 	}

diff --git a/new-func/Dockerfile b/new-func/Dockerfile
@@ -0,0 +1,3 @@
+FROM alpine
+COPY java-init.tar /
+CMD ["cat", "/java-init.tar"]
diff --git a/new-func/func.init.yaml b/new-func/func.init.yaml
@@ -0,0 +1,5 @@
+runtime: java
+cmd: com.example.fn.HelloFunction::handleRequest
+build_image: fnproject/fn-java-fdk-build:jdk9-1.0.64
+run_image: fnproject/fn-java-fdk:jdk9-1.0.64
+format: http
diff --git a/new-func/func.yaml b/new-func/func.yaml
@@ -0,0 +1,7 @@
+name: new-func
+version: 0.0.1
+runtime: java
+cmd: com.example.fn.HelloFunction::handleRequest
+build_image: fnproject/fn-java-fdk-build:jdk9-1.0.64
+run_image: fnproject/fn-java-fdk:jdk9-1.0.64
+format: http
diff --git a/new-func/java-init.tar b/new-func/java-init.tar
diff --git a/new-func/pom.xml b/new-func/pom.xml
@@ -0,0 +1,66 @@
+<?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.64</fdk.version>
+    </properties>
+    <groupId>com.example.fn</groupId>
+    <artifactId>hello</artifactId>
+    <version>1.0.0</version>
+
+    <repositories>
+        <repository>
+            <id>fn-release-repo</id>
+            <url>https://dl.bintray.com/fnproject/fnproject</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </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>9</source>
+                    <target>9</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/new-func/src/main/java/com/example/fn/HelloFunction.java b/new-func/src/main/java/com/example/fn/HelloFunction.java
@@ -0,0 +1,11 @@
+package com.example.fn;
+
+public class HelloFunction {
+
+    public String handleRequest(String input) {
+        String name = (input == null || input.isEmpty()) ? "world"  : input;
+
+        return "Hello, " + name + "!";
+    }
+
+}
diff --git a/new-func/src/test/java/com/example/fn/HelloFunctionTest.java b/new-func/src/test/java/com/example/fn/HelloFunctionTest.java
@@ -0,0 +1,22 @@
+package com.example.fn;
+
+import com.fnproject.fn.testing.*;
+import org.junit.*;
+
+import static org.junit.Assert.*;
+
+public class HelloFunctionTest {
+
+    @Rule
+    public final FnTestingRule testing = FnTestingRule.createDefault();
+
+    @Test
+    public void shouldReturnGreeting() {
+        testing.givenEvent().enqueue();
+        testing.thenRun(HelloFunction.class, "handleRequest");
+
+        FnResult result = testing.getOnlyResult();
+        assertEquals("Hello, world!", result.getBodyAsString());
+    }
+
+}
diff --git a/objects/app/apps.go b/objects/app/apps.go
@@ -12,11 +12,12 @@ import (
 
 	"github.com/fnproject/cli/client"
 	"github.com/fnproject/cli/common"
-	fnclient "github.com/fnproject/fn_go/client"
+	fnclient "github.com/fnproject/fn_go/client"	
 	apiapps "github.com/fnproject/fn_go/client/apps"
 	"github.com/fnproject/fn_go/models"
 	"github.com/fnproject/fn_go/provider"
 	"github.com/jmoiron/jsonq"
+	"github.com/spf13/viper"
 	"github.com/urfave/cli"
 )
 
@@ -26,7 +27,8 @@ type appsCmd struct {
 }
 
 func (a *appsCmd) list(c *cli.Context) error {
-	params := &apiapps.GetAppsParams{Context: context.Background()}
+	ctx :=  provider.WithRequestID(context.Background(), viper.GetString("request-id"))
+	params := &apiapps.GetAppsParams{Context: ctx}
 	var resApps []*models.App
 	for {
 		resp, err := a.client.Apps.GetApps(params)

diff --git a/pom.xml b/pom.xml
@@ -0,0 +1,66 @@
+<?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.64</fdk.version>
+    </properties>
+    <groupId>com.example.fn</groupId>
+    <artifactId>hello</artifactId>
+    <version>1.0.0</version>
+
+    <repositories>
+        <repository>
+            <id>fn-release-repo</id>
+            <url>https://dl.bintray.com/fnproject/fnproject</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </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>9</source>
+                    <target>9</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/main/java/com/example/fn/HelloFunction.java b/src/main/java/com/example/fn/HelloFunction.java
@@ -0,0 +1,11 @@
+package com.example.fn;
+
+public class HelloFunction {
+
+    public String handleRequest(String input) {
+        String name = (input == null || input.isEmpty()) ? "world"  : input;
+
+        return "Hello, " + name + "!";
+    }
+
+}
diff --git a/src/test/java/com/example/fn/HelloFunctionTest.java b/src/test/java/com/example/fn/HelloFunctionTest.java
@@ -0,0 +1,22 @@
+package com.example.fn;
+
+import com.fnproject.fn.testing.*;
+import org.junit.*;
+
+import static org.junit.Assert.*;
+
+public class HelloFunctionTest {
+
+    @Rule
+    public final FnTestingRule testing = FnTestingRule.createDefault();
+
+    @Test
+    public void shouldReturnGreeting() {
+        testing.givenEvent().enqueue();
+        testing.thenRun(HelloFunction.class, "handleRequest");
+
+        FnResult result = testing.getOnlyResult();
+        assertEquals("Hello, world!", result.getBodyAsString());
+    }
+
+}