backgroundFunction) {
- this.targetType = targetType;
- this.backgroundFunction = backgroundFunction;
+ /**
+ * A background function, either "raw" or "typed". A raw background function is one where the user
+ * code receives a String parameter that is the JSON payload of the triggering event. A typed
+ * background function is one where the payload is deserialized into a user-provided class whose
+ * field names correspond to the keys of the JSON object.
+ *
+ * In addition to these two flavours, events can be either "legacy events" or "CloudEvents".
+ * Legacy events are the only kind that GCF originally supported, and use proprietary encodings
+ * for the various triggers. CloudEvents are ones that follow the standards defined by
+ * cloudevents.io.
+ *
+ * @param the type to be used in the {@link Unmarshallers} call when
+ * unmarshalling this event, if it is a CloudEvent.
+ */
+ private abstract static class FunctionExecutor {
+ private final String functionName;
+
+ FunctionExecutor(String functionName) {
+ this.functionName = functionName;
+ }
+
+ final String functionName() {
+ return functionName;
+ }
+
+ abstract void serviceLegacyEvent(HttpServletRequest req)
+ throws IOException;
+
+ abstract void serviceCloudEvent(
+ HttpServletRequest req,
+ HeadersStep unmarshaller)
+ throws IOException;
+
+ abstract Class cloudEventDataType();
+ }
+
+ private static class RawFunctionExecutor extends FunctionExecutor> {
+ private final RawBackgroundFunction function;
+
+ RawFunctionExecutor(RawBackgroundFunction function) {
+ super(function.getClass().getCanonicalName());
+ this.function = function;
}
@Override
- public void accept(String json, Context context) {
- T payload;
- try {
- payload = gson.fromJson(json, targetType);
- } catch (JsonParseException e) {
- logger.log(Level.WARNING,
- "Could not convert payload to target type " + targetType.getTypeName(), e);
- return;
+ void serviceLegacyEvent(HttpServletRequest req) throws IOException {
+ Event event = parseLegacyEvent(req);
+ function.accept(new Gson().toJson(event.getData()), event.getContext());
+ }
+
+ @Override
+ void serviceCloudEvent(
+ HttpServletRequest req, HeadersStep, String> unmarshaller)
+ throws IOException {
+ Map httpHeaders = httpHeaderMap(req);
+ String body = req.getReader().lines().collect(joining("\n"));
+ CloudEvent> cloudEvent =
+ unmarshaller
+ .withHeaders(() -> httpHeaders)
+ .withPayload(() -> body)
+ .unmarshal();
+ Context context = contextFromCloudEvent(cloudEvent);
+ String jsonData = cloudEvent.getData().map(data -> new Gson().toJson(data)).orElse("{}");
+ function.accept(jsonData, context);
+ }
+
+ @Override
+ Class> cloudEventDataType() {
+ // This messing about with casts and @SuppressWarnings allows us to limit the use of the raw
+ // Map type to just here.
+ @SuppressWarnings("unchecked")
+ Class> c = (Class>) (Class) Map.class;
+ return c;
+ }
+ }
+
+ private static class TypedFunctionExecutor extends FunctionExecutor {
+ private final Type type; // T
+ private final BackgroundFunction function;
+
+ private TypedFunctionExecutor(Type type, BackgroundFunction function) {
+ super(function.getClass().getCanonicalName());
+ this.type = type;
+ this.function = function;
+ }
+
+ static TypedFunctionExecutor of(Type type, BackgroundFunction instance) {
+ @SuppressWarnings("unchecked")
+ BackgroundFunction function = (BackgroundFunction) instance;
+ return new TypedFunctionExecutor<>(type, function);
+ }
+
+ @Override
+ void serviceLegacyEvent(HttpServletRequest req) throws IOException {
+ Event event = parseLegacyEvent(req);
+ T payload = new Gson().fromJson(event.getData(), type);
+ function.accept(payload, event.getContext());
+ }
+
+ @Override
+ void serviceCloudEvent(
+ HttpServletRequest req, HeadersStep unmarshaller)
+ throws IOException {
+ Map httpHeaders = httpHeaderMap(req);
+ String body = req.getReader().lines().collect(joining("\n"));
+ CloudEvent cloudEvent =
+ unmarshaller
+ .withHeaders(() -> httpHeaders)
+ .withPayload(() -> body).unmarshal();
+ if (cloudEvent.getData().isPresent()) {
+ Context context = contextFromCloudEvent(cloudEvent);
+ function.accept(cloudEvent.getData().get(), context);
+ } else {
+ throw new IllegalStateException("Event has no \"data\" component");
}
- backgroundFunction.accept(payload, context);
+ }
+
+ @Override
+ Class cloudEventDataType() {
+ if (!(type instanceof Class)) {
+ throw new IllegalStateException(
+ "CloudEvents SDK currently does not permit deserializing types other than classes:"
+ + " cannot deserialize " + type);
+ }
+ @SuppressWarnings("unchecked")
+ Class c = (Class) type;
+ return c;
}
}
- /** Executes the user's background function, can handle all HTTP type methods. */
+ /** Executes the user's background function. This can handle all HTTP methods. */
@Override
public void service(HttpServletRequest req, HttpServletResponse res) throws IOException {
- BufferedReader body = req.getReader();
-
- // A Type Adapter is required to set the type of the JsonObject because CloudFunctionsContext
- // is abstract and Gson default behavior instantiates the type provided.
- TypeAdapter typeAdapter =
- CloudFunctionsContext.typeAdapter(new Gson());
- Gson gson = new GsonBuilder()
- .registerTypeAdapter(CloudFunctionsContext.class, typeAdapter)
- .registerTypeAdapter(Event.class, new Event.EventDeserializer())
- .create();
-
- Event event = gson.fromJson(body, Event.class);
+ String contentType = req.getContentType();
try {
- function.accept(gson.toJson(event.getData()), event.getContext());
+ if (contentType != null && contentType.startsWith("application/cloudevents+json")) {
+ serviceCloudEvent(req, CloudEventKind.STRUCTURED);
+ } else if (req.getHeader("ce-specversion") != null) {
+ serviceCloudEvent(req, CloudEventKind.BINARY);
+ } else {
+ serviceLegacyEvent(req);
+ }
res.setStatus(HttpServletResponse.SC_OK);
} catch (Throwable t) {
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
- logger.log(Level.WARNING, "Failed to execute " + function.getClass().getName(), t);
+ logger.log(Level.WARNING, "Failed to execute " + functionExecutor.functionName(), t);
+ }
+ }
+
+ private enum CloudEventKind {BINARY, STRUCTURED}
+
+ /**
+ * Service a CloudEvent.
+ *
+ * @param a fake type parameter, which corresponds to the type parameter of
+ * {@link FunctionExecutor}.
+ */
+ private void serviceCloudEvent(
+ HttpServletRequest req, CloudEventKind kind) throws IOException {
+ @SuppressWarnings("unchecked")
+ FunctionExecutor executor = (FunctionExecutor) functionExecutor;
+ Class cloudEventDataType = executor.cloudEventDataType();
+ HeadersStep unmarshaller;
+ switch (kind) {
+ case BINARY:
+ unmarshaller = Unmarshallers.binary(cloudEventDataType);
+ break;
+ case STRUCTURED:
+ unmarshaller = Unmarshallers.structured(cloudEventDataType);
+ break;
+ default:
+ throw new AssertionError(kind);
}
+ executor.serviceCloudEvent(req, unmarshaller);
+ }
+
+ private void serviceLegacyEvent(HttpServletRequest req) throws IOException {
+ functionExecutor.serviceLegacyEvent(req);
}
}
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index d9c477a1..9d744bc0 100644
--- a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -10,8 +10,14 @@
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
import com.google.common.io.Resources;
+import com.google.common.truth.Expect;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
+import io.cloudevents.format.Wire;
+import io.cloudevents.json.Json;
+import io.cloudevents.v1.CloudEventBuilder;
+import io.cloudevents.v1.CloudEventImpl;
+import io.cloudevents.v1.http.Marshallers;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -19,14 +25,18 @@
import java.io.InputStreamReader;
import java.io.UncheckedIOException;
import java.net.ServerSocket;
+import java.net.URI;
import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
@@ -40,18 +50,57 @@
import org.eclipse.jetty.http.HttpHeader;
import org.eclipse.jetty.http.HttpStatus;
import org.junit.BeforeClass;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestName;
/**
* Integration test that starts up a web server running the Function Framework and sends HTTP
* requests to it.
*/
public class IntegrationTest {
+ @Rule public final Expect expect = Expect.create();
+ @Rule public final TemporaryFolder temporaryFolder = new TemporaryFolder();
+ @Rule public final TestName testName = new TestName();
private static final String SERVER_READY_STRING = "Started ServerConnector";
private static final ExecutorService EXECUTOR = Executors.newCachedThreadPool();
+ private static String sampleLegacyEvent(File snoopFile) {
+ return "{\n"
+ + " \"data\": {\n"
+ + " \"a\": 2,\n"
+ + " \"b\": 3,\n"
+ + " \"targetFile\": \"" + snoopFile + "\""
+ + " },\n"
+ + " \"context\": {\n"
+ + " \"eventId\": \"B234-1234-1234\",\n"
+ + " \"timestamp\": \"2018-04-05T17:31:00Z\",\n"
+ + " \"eventType\": \"com.example.someevent.new\",\n"
+ + " \"resource\": {\n"
+ + " \"service\":\"test-service\",\n"
+ + " \"name\":\"test-name\",\n"
+ + " \"type\":\"test-type\"\n"
+ + " }\n"
+ + " }\n"
+ + "}";
+ }
+
+ private static CloudEventImpl> sampleCloudEvent(File snoopFile) {
+ return CloudEventBuilder.>builder()
+ .withId("B234-1234-1234")
+ .withSource(URI.create("/source"))
+ .withType("com.example.someevent.new")
+ .withDataschema(URI.create("/schema"))
+ .withDataContentType("application/json")
+ .withData(ImmutableMap.of("a", 2, "b", 3, "targetFile", snoopFile.toString()))
+ .withTime(ZonedDateTime.of(2018, 4, 5, 17, 31, 0, 0, ZoneOffset.UTC))
+ .build();
+
+ }
+
private static int serverPort;
/**
@@ -79,11 +128,21 @@ abstract static class TestCase {
abstract String expectedResponseText();
+ abstract Optional expectedJsonString();
+
+ abstract String httpContentType();
+
+ abstract ImmutableMap httpHeaders();
+
+ abstract Optional snoopFile();
+
static Builder builder() {
return new AutoValue_IntegrationTest_TestCase.Builder()
.setUrl("/")
.setRequestText("")
- .setExpectedResponseText("");
+ .setExpectedResponseText("")
+ .setHttpContentType("text/plain")
+ .setHttpHeaders(ImmutableMap.of());
}
@AutoValue.Builder
@@ -95,6 +154,14 @@ abstract static class Builder {
abstract Builder setExpectedResponseText(String x);
+ abstract Builder setExpectedJsonString(String x);
+
+ abstract Builder setHttpContentType(String x);
+
+ abstract Builder setHttpHeaders(ImmutableMap x);
+
+ abstract Builder setSnoopFile(File x);
+
abstract TestCase build();
}
}
@@ -149,17 +216,69 @@ public void newEchoUrl() throws Exception {
@Test
public void background() throws Exception {
- backgroundTest(fullTarget("BackgroundSnoop.snoop"));
+ File snoopFile = snoopFile();
+ String requestText = sampleLegacyEvent(snoopFile);
+ TestCase testCase = TestCase.builder()
+ .setRequestText(requestText)
+ .setSnoopFile(snoopFile)
+ .setExpectedJsonString(requestText)
+ .build();
+ backgroundTest(fullTarget("BackgroundSnoop.snoop"), testCase);
}
@Test
public void newBackground() throws Exception {
- backgroundTest(fullTarget("NewBackgroundSnoop"));
+ newBackgroundTest("NewBackgroundSnoop");
}
@Test
public void newTypedBackground() throws Exception {
- backgroundTest(fullTarget("NewTypedBackgroundSnoop"));
+ newBackgroundTest("NewTypedBackgroundSnoop");
+ }
+
+ private void newBackgroundTest(String target) throws Exception {
+ File snoopFile = snoopFile();
+ String gcfRequestText = sampleLegacyEvent(snoopFile);
+ TestCase gcfTestCase = TestCase.builder()
+ .setRequestText(gcfRequestText)
+ .setSnoopFile(snoopFile)
+ .setExpectedJsonString(gcfRequestText)
+ .build();
+
+ // A CloudEvent using the "structured content mode", where both the metadata and the payload
+ // are in the body of the HTTP request.
+ String cloudEventRequestText = Json.encode(sampleCloudEvent(snoopFile));
+ // For CloudEvents, we don't currently populate Context#getResource with anything interesting,
+ // so we excise that from the expected text we would have with legacy events.
+ String cloudEventExpectedJsonString =
+ gcfRequestText.replaceAll("\"resource\":\\s*\\{[^}]*\\}", "\"resource\":{}");
+ TestCase cloudEventsStructuredTestCase = TestCase.builder()
+ .setSnoopFile(snoopFile)
+ .setRequestText(cloudEventRequestText)
+ .setHttpContentType("application/cloudevents+json; charset=utf-8")
+ .setExpectedJsonString(cloudEventExpectedJsonString)
+ .build();
+
+ // A CloudEvent using the "binary content mode", where the metadata is in HTTP headers and the
+ // payload is the body of the HTTP request.
+ Wire wire = Marshallers.>binary()
+ .withEvent(() -> sampleCloudEvent(snoopFile))
+ .marshal();
+ TestCase cloudEventsBinaryTestCase = TestCase.builder()
+ .setSnoopFile(snoopFile)
+ .setRequestText(wire.getPayload().get())
+ .setHttpContentType("application/json")
+ .setHttpHeaders(ImmutableMap.copyOf(wire.getHeaders()))
+ .setExpectedJsonString(cloudEventExpectedJsonString)
+ .build();
+ // TODO(emcmanus): Update the Content-Type to "application/json; charset=utf-8" when
+ // https://github.com/cloudevents/sdk-java/issues/89 has been fixed.
+
+ backgroundTest(
+ fullTarget(target),
+ gcfTestCase,
+ cloudEventsStructuredTestCase,
+ cloudEventsBinaryTestCase);
}
@Test
@@ -175,6 +294,10 @@ public void packageless() throws Exception {
TestCase.builder().setExpectedResponseText("hello, world\n").build());
}
+ private File snoopFile() throws IOException {
+ return temporaryFolder.newFile(testName.getMethodName() + ".txt");
+ }
+
/** Any runtime class that user code shouldn't be able to see. */
private static final Class INTERNAL_CLASS = CloudFunction.class;
@@ -228,21 +351,27 @@ public void jarOptionBackground() throws Exception {
// event. We start with a fixed body and insert into its JSON an extra property that tells the
// function where to write what it received. We have to do this since background functions, by
// design, don't return a value.
- private void backgroundTest(String functionTarget) throws Exception {
- Gson gson = new Gson();
- URL resourceUrl = getClass().getResource("/adder_gcf_ga_event.json");
- assertThat(resourceUrl).isNotNull();
- File snoopFile = File.createTempFile("FunctionsIntegrationTest", ".txt");
- snoopFile.deleteOnExit();
- String originalJson = Resources.toString(resourceUrl, StandardCharsets.UTF_8);
- JsonObject json = gson.fromJson(originalJson, JsonObject.class);
- JsonObject jsonData = json.getAsJsonObject("data");
- jsonData.addProperty("targetFile", snoopFile.toString());
- testBackgroundFunction(functionTarget,
- TestCase.builder().setRequestText(json.toString()).build());
+ private void backgroundTest(String functionTarget, TestCase... testCases) throws Exception {
+ for (TestCase testCase : testCases) {
+ File snoopFile = testCase.snoopFile().get();
+ snoopFile.delete();
+ testBackgroundFunction(functionTarget, testCase);
+ String snooped = new String(Files.readAllBytes(snoopFile.toPath()), StandardCharsets.UTF_8);
+ Gson gson = new Gson();
+ JsonObject snoopedJson = gson.fromJson(snooped, JsonObject.class);
+ String expectedJsonString = testCase.expectedJsonString().get();
+ JsonObject expectedJson = gson.fromJson(expectedJsonString, JsonObject.class);
+ expect.withMessage("Testing %s with %s", functionTarget, testCase)
+ .that(snoopedJson).isEqualTo(expectedJson);
+ }
+ }
+
+ private void checkSnoopFile(File snoopFile, String expectedJsonString) throws IOException {
String snooped = new String(Files.readAllBytes(snoopFile.toPath()), StandardCharsets.UTF_8);
+ Gson gson = new Gson();
JsonObject snoopedJson = gson.fromJson(snooped, JsonObject.class);
- assertThat(snoopedJson).isEqualTo(json);
+ JsonObject expectedJson = gson.fromJson(expectedJsonString, JsonObject.class);
+ expect.that(snoopedJson).isEqualTo(expectedJson);
}
private void testHttpFunction(String target, TestCase... testCases) throws Exception {
@@ -254,14 +383,14 @@ private void testHttpFunction(
testFunction(SignatureType.HTTP, target, extraArgs, testCases);
}
- private void testBackgroundFunction(String classAndMethod, TestCase... testCases)
+ private void testBackgroundFunction(String target, TestCase... testCases)
throws Exception {
- testBackgroundFunction(classAndMethod, ImmutableList.of(), testCases);
+ testBackgroundFunction(target, ImmutableList.of(), testCases);
}
private void testBackgroundFunction(
- String classAndMethod, ImmutableList extraArgs, TestCase... testCases)
+ String target, ImmutableList extraArgs, TestCase... testCases)
throws Exception {
- testFunction(SignatureType.BACKGROUND, classAndMethod, extraArgs, testCases);
+ testFunction(SignatureType.BACKGROUND, target, extraArgs, testCases);
}
private void testFunction(
@@ -274,15 +403,20 @@ private void testFunction(
HttpClient httpClient = new HttpClient();
httpClient.start();
for (TestCase testCase : testCases) {
+ testCase.snoopFile().ifPresent(File::delete);
String uri = "http://localhost:" + serverPort + testCase.url();
Request request = httpClient.POST(uri);
- request.header(HttpHeader.CONTENT_TYPE, "text/plain");
+ request.header(HttpHeader.CONTENT_TYPE, testCase.httpContentType());
+ testCase.httpHeaders().forEach((header, value) -> request.header(header, value));
request.content(new StringContentProvider(testCase.requestText()));
ContentResponse response = request.send();
- assertWithMessage("Response to %s is %s %s", uri, response.getStatus(),
- response.getReason())
+ expect
+ .withMessage("Response to %s is %s %s", uri, response.getStatus(), response.getReason())
.that(response.getStatus()).isEqualTo(HttpStatus.OK_200);
- assertThat(response.getContentAsString()).isEqualTo(testCase.expectedResponseText());
+ expect.that(response.getContentAsString()).isEqualTo(testCase.expectedResponseText());
+ if (testCase.snoopFile().isPresent()) {
+ checkSnoopFile(testCase.snoopFile().get(), testCase.expectedJsonString().get());
+ }
}
} finally {
serverProcess.close();
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java b/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java
index 14ca67d1..b156cbb2 100644
--- a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java
+++ b/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java
@@ -18,10 +18,10 @@
*/
public class NewTypedBackgroundSnoop
implements BackgroundFunction {
- static class Payload {
- int a;
- int b;
- String targetFile;
+ public static class Payload {
+ public int a;
+ public int b;
+ public String targetFile;
}
@Override
From 5f357d1beb647b553dfe47b33e7ee56a3c402c37 Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Thu, 23 Jan 2020 14:50:09 -0800
Subject: [PATCH 024/364] Import of Cloud Functions JVM from Git-on-Borg.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 5e49217df65ac82957f37e72271b9cd8eb64bc92 Rename functionjar to testfunction. by Éamonn McManus
PiperOrigin-RevId: 291249957
---
invoker-core/core/pom.xml | 2 +-
.../com/google/cloud/functions/invoker/IntegrationTest.java | 4 ++--
invoker-core/pom.xml | 2 +-
invoker-core/{functionjar => testfunction}/pom.xml | 2 +-
.../src/main/java/com/example/functionjar/Main.java | 0
.../src/test/java/com/example/functionjar/Background.java | 0
.../src/test/java/com/example/functionjar/Checker.java | 0
.../src/test/java/com/example/functionjar/Foreground.java | 0
8 files changed, 5 insertions(+), 5 deletions(-)
rename invoker-core/{functionjar => testfunction}/pom.xml (97%)
rename invoker-core/{functionjar => testfunction}/src/main/java/com/example/functionjar/Main.java (100%)
rename invoker-core/{functionjar => testfunction}/src/test/java/com/example/functionjar/Background.java (100%)
rename invoker-core/{functionjar => testfunction}/src/test/java/com/example/functionjar/Checker.java (100%)
rename invoker-core/{functionjar => testfunction}/src/test/java/com/example/functionjar/Foreground.java (100%)
diff --git a/invoker-core/core/pom.xml b/invoker-core/core/pom.xml
index 767cd80a..35730b0e 100644
--- a/invoker-core/core/pom.xml
+++ b/invoker-core/core/pom.xml
@@ -90,7 +90,7 @@
com.google.cloud.functions.invoker
- java-function-invoker-core-functionjar
+ java-function-invoker-core-testfunction
1.0.0-alpha-1
test-jar
test
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 9d744bc0..19057279 100644
--- a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -302,9 +302,9 @@ private File snoopFile() throws IOException {
private static final Class INTERNAL_CLASS = CloudFunction.class;
private String functionJarString() throws IOException {
- Path functionJarTargetDir = Paths.get("../functionjar/target");
+ Path functionJarTargetDir = Paths.get("../testfunction/target");
Pattern functionJarPattern =
- Pattern.compile("java-function-invoker-core-functionjar-.*-tests\\.jar");
+ Pattern.compile("java-function-invoker-core-testfunction-.*-tests\\.jar");
List functionJars = Files.list(functionJarTargetDir)
.map(path -> path.getFileName().toString())
.filter(s -> functionJarPattern.matcher(s).matches())
diff --git a/invoker-core/pom.xml b/invoker-core/pom.xml
index 3a4c0716..b95cc004 100644
--- a/invoker-core/pom.xml
+++ b/invoker-core/pom.xml
@@ -12,7 +12,7 @@
core
- functionjar
+ testfunction
diff --git a/invoker-core/functionjar/pom.xml b/invoker-core/testfunction/pom.xml
similarity index 97%
rename from invoker-core/functionjar/pom.xml
rename to invoker-core/testfunction/pom.xml
index 99957e8b..6310dd4c 100644
--- a/invoker-core/functionjar/pom.xml
+++ b/invoker-core/testfunction/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
- java-function-invoker-core-functionjar
+ java-function-invoker-core-testfunction
1.0.0-alpha-1
Example GCF Function Jar
diff --git a/invoker-core/functionjar/src/main/java/com/example/functionjar/Main.java b/invoker-core/testfunction/src/main/java/com/example/functionjar/Main.java
similarity index 100%
rename from invoker-core/functionjar/src/main/java/com/example/functionjar/Main.java
rename to invoker-core/testfunction/src/main/java/com/example/functionjar/Main.java
diff --git a/invoker-core/functionjar/src/test/java/com/example/functionjar/Background.java b/invoker-core/testfunction/src/test/java/com/example/functionjar/Background.java
similarity index 100%
rename from invoker-core/functionjar/src/test/java/com/example/functionjar/Background.java
rename to invoker-core/testfunction/src/test/java/com/example/functionjar/Background.java
diff --git a/invoker-core/functionjar/src/test/java/com/example/functionjar/Checker.java b/invoker-core/testfunction/src/test/java/com/example/functionjar/Checker.java
similarity index 100%
rename from invoker-core/functionjar/src/test/java/com/example/functionjar/Checker.java
rename to invoker-core/testfunction/src/test/java/com/example/functionjar/Checker.java
diff --git a/invoker-core/functionjar/src/test/java/com/example/functionjar/Foreground.java b/invoker-core/testfunction/src/test/java/com/example/functionjar/Foreground.java
similarity index 100%
rename from invoker-core/functionjar/src/test/java/com/example/functionjar/Foreground.java
rename to invoker-core/testfunction/src/test/java/com/example/functionjar/Foreground.java
From 7c1a9a372557daa156c929db095caae565f3c431 Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Fri, 24 Jan 2020 15:31:39 -0800
Subject: [PATCH 025/364] Import of Cloud Functions JVM from Git-on-Borg.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 83f057683a0891a5faefcbf5b71e2d6fa38a0a4a Rename invoker-core to just invoker. by Éamonn McManus
- ad7ea379127556f47b5f6048b7d269d986bccdad Change Maven artifact names from java-function-invoker-co... by Éamonn McManus
PiperOrigin-RevId: 291455888
---
{invoker-core => invoker}/core/pom.xml | 6 +++---
.../cloud/functions/invoker/BackgroundCloudFunction.java | 0
.../cloud/functions/invoker/BackgroundFunctionExecutor.java | 0
.../invoker/BackgroundFunctionSignatureMatcher.java | 0
.../com/google/cloud/functions/invoker/CloudFunction.java | 0
.../cloud/functions/invoker/CloudFunctionsContext.java | 0
.../main/java/com/google/cloud/functions/invoker/Event.java | 0
.../com/google/cloud/functions/invoker/FunctionLoader.java | 0
.../cloud/functions/invoker/FunctionSignatureMatcher.java | 0
.../google/cloud/functions/invoker/HttpCloudFunction.java | 0
.../cloud/functions/invoker/HttpFunctionExecutor.java | 0
.../functions/invoker/HttpFunctionSignatureMatcher.java | 0
.../functions/invoker/NewBackgroundFunctionExecutor.java | 0
.../cloud/functions/invoker/NewHttpFunctionExecutor.java | 0
.../google/cloud/functions/invoker/URLRequestWrapper.java | 0
.../cloud/functions/invoker/http/HttpRequestImpl.java | 0
.../cloud/functions/invoker/http/HttpResponseImpl.java | 0
.../com/google/cloud/functions/invoker/runner/Invoker.java | 0
.../core/src/main/resources/logging.properties | 0
.../core/src/test/java/PackagelessHelloWorld.java | 0
.../cloud/functions/invoker/BackgroundFunctionTest.java | 0
.../google/cloud/functions/invoker/HttpFunctionTest.java | 0
.../com/google/cloud/functions/invoker/IntegrationTest.java | 2 +-
.../invoker/NewBackgroundFunctionExecutorTest.java | 0
.../com/google/cloud/functions/invoker/http/HttpTest.java | 0
.../functions/invoker/testfunctions/BackgroundSnoop.java | 0
.../google/cloud/functions/invoker/testfunctions/Echo.java | 0
.../cloud/functions/invoker/testfunctions/EchoUrl.java | 0
.../cloud/functions/invoker/testfunctions/HelloWorld.java | 0
.../cloud/functions/invoker/testfunctions/Nested.java | 0
.../functions/invoker/testfunctions/NewBackgroundSnoop.java | 0
.../cloud/functions/invoker/testfunctions/NewEcho.java | 0
.../cloud/functions/invoker/testfunctions/NewEchoUrl.java | 0
.../functions/invoker/testfunctions/NewHelloWorld.java | 0
.../invoker/testfunctions/NewTypedBackgroundSnoop.java | 0
.../core/src/test/resources/adder_gcf_beta_event.json | 0
.../test/resources/adder_gcf_beta_event_json_resource.json | 0
.../core/src/test/resources/adder_gcf_ga_event.json | 0
{invoker-core => invoker}/pom.xml | 2 +-
{invoker-core => invoker}/testfunction/pom.xml | 4 ++--
.../src/main/java/com/example/functionjar/Main.java | 0
.../src/test/java/com/example/functionjar/Background.java | 0
.../src/test/java/com/example/functionjar/Checker.java | 0
.../src/test/java/com/example/functionjar/Foreground.java | 0
44 files changed, 7 insertions(+), 7 deletions(-)
rename {invoker-core => invoker}/core/pom.xml (96%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/BackgroundCloudFunction.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionSignatureMatcher.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/CloudFunction.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/Event.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/FunctionSignatureMatcher.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/HttpCloudFunction.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionSignatureMatcher.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/URLRequestWrapper.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java (100%)
rename {invoker-core => invoker}/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java (100%)
rename {invoker-core => invoker}/core/src/main/resources/logging.properties (100%)
rename {invoker-core => invoker}/core/src/test/java/PackagelessHelloWorld.java (100%)
rename {invoker-core => invoker}/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java (100%)
rename {invoker-core => invoker}/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java (100%)
rename {invoker-core => invoker}/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java (99%)
rename {invoker-core => invoker}/core/src/test/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutorTest.java (100%)
rename {invoker-core => invoker}/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java (100%)
rename {invoker-core => invoker}/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java (100%)
rename {invoker-core => invoker}/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java (100%)
rename {invoker-core => invoker}/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/EchoUrl.java (100%)
rename {invoker-core => invoker}/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/HelloWorld.java (100%)
rename {invoker-core => invoker}/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Nested.java (100%)
rename {invoker-core => invoker}/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewBackgroundSnoop.java (100%)
rename {invoker-core => invoker}/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEcho.java (100%)
rename {invoker-core => invoker}/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEchoUrl.java (100%)
rename {invoker-core => invoker}/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewHelloWorld.java (100%)
rename {invoker-core => invoker}/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java (100%)
rename {invoker-core => invoker}/core/src/test/resources/adder_gcf_beta_event.json (100%)
rename {invoker-core => invoker}/core/src/test/resources/adder_gcf_beta_event_json_resource.json (100%)
rename {invoker-core => invoker}/core/src/test/resources/adder_gcf_ga_event.json (100%)
rename {invoker-core => invoker}/pom.xml (94%)
rename {invoker-core => invoker}/testfunction/pom.xml (95%)
rename {invoker-core => invoker}/testfunction/src/main/java/com/example/functionjar/Main.java (100%)
rename {invoker-core => invoker}/testfunction/src/test/java/com/example/functionjar/Background.java (100%)
rename {invoker-core => invoker}/testfunction/src/test/java/com/example/functionjar/Checker.java (100%)
rename {invoker-core => invoker}/testfunction/src/test/java/com/example/functionjar/Foreground.java (100%)
diff --git a/invoker-core/core/pom.xml b/invoker/core/pom.xml
similarity index 96%
rename from invoker-core/core/pom.xml
rename to invoker/core/pom.xml
index 35730b0e..6b955068 100644
--- a/invoker-core/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -3,12 +3,12 @@
com.google.cloud.functions.invoker
- java-function-invoker-core-parent
+ java-function-invoker-parent
1.0.0-alpha-1
com.google.cloud.functions.invoker
- java-function-invoker-core
+ java-function-invoker
1.0.0-alpha-1
GCF Java Invoker
@@ -90,7 +90,7 @@
com.google.cloud.functions.invoker
- java-function-invoker-core-testfunction
+ java-function-invoker-testfunction
1.0.0-alpha-1
test-jar
test
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/BackgroundCloudFunction.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundCloudFunction.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/BackgroundCloudFunction.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundCloudFunction.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionSignatureMatcher.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionSignatureMatcher.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionSignatureMatcher.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionSignatureMatcher.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/CloudFunction.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunction.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/CloudFunction.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunction.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/Event.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/Event.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/FunctionSignatureMatcher.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionSignatureMatcher.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/FunctionSignatureMatcher.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionSignatureMatcher.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/HttpCloudFunction.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpCloudFunction.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/HttpCloudFunction.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpCloudFunction.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionSignatureMatcher.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionSignatureMatcher.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionSignatureMatcher.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionSignatureMatcher.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/URLRequestWrapper.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/URLRequestWrapper.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/URLRequestWrapper.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/URLRequestWrapper.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java
diff --git a/invoker-core/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
similarity index 100%
rename from invoker-core/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
rename to invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
diff --git a/invoker-core/core/src/main/resources/logging.properties b/invoker/core/src/main/resources/logging.properties
similarity index 100%
rename from invoker-core/core/src/main/resources/logging.properties
rename to invoker/core/src/main/resources/logging.properties
diff --git a/invoker-core/core/src/test/java/PackagelessHelloWorld.java b/invoker/core/src/test/java/PackagelessHelloWorld.java
similarity index 100%
rename from invoker-core/core/src/test/java/PackagelessHelloWorld.java
rename to invoker/core/src/test/java/PackagelessHelloWorld.java
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java
similarity index 100%
rename from invoker-core/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java
similarity index 100%
rename from invoker-core/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
similarity index 99%
rename from invoker-core/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 19057279..77ada939 100644
--- a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -304,7 +304,7 @@ private File snoopFile() throws IOException {
private String functionJarString() throws IOException {
Path functionJarTargetDir = Paths.get("../testfunction/target");
Pattern functionJarPattern =
- Pattern.compile("java-function-invoker-core-testfunction-.*-tests\\.jar");
+ Pattern.compile("java-function-invoker-testfunction-.*-tests\\.jar");
List functionJars = Files.list(functionJarTargetDir)
.map(path -> path.getFileName().toString())
.filter(s -> functionJarPattern.matcher(s).matches())
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutorTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutorTest.java
similarity index 100%
rename from invoker-core/core/src/test/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutorTest.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutorTest.java
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
similarity index 100%
rename from invoker-core/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java
similarity index 100%
rename from invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java
similarity index 100%
rename from invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/EchoUrl.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/EchoUrl.java
similarity index 100%
rename from invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/EchoUrl.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/EchoUrl.java
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/HelloWorld.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/HelloWorld.java
similarity index 100%
rename from invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/HelloWorld.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/HelloWorld.java
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Nested.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Nested.java
similarity index 100%
rename from invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Nested.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Nested.java
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewBackgroundSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewBackgroundSnoop.java
similarity index 100%
rename from invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewBackgroundSnoop.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewBackgroundSnoop.java
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEcho.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEcho.java
similarity index 100%
rename from invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEcho.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEcho.java
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEchoUrl.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEchoUrl.java
similarity index 100%
rename from invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEchoUrl.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEchoUrl.java
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewHelloWorld.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewHelloWorld.java
similarity index 100%
rename from invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewHelloWorld.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewHelloWorld.java
diff --git a/invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java
similarity index 100%
rename from invoker-core/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java
rename to invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewTypedBackgroundSnoop.java
diff --git a/invoker-core/core/src/test/resources/adder_gcf_beta_event.json b/invoker/core/src/test/resources/adder_gcf_beta_event.json
similarity index 100%
rename from invoker-core/core/src/test/resources/adder_gcf_beta_event.json
rename to invoker/core/src/test/resources/adder_gcf_beta_event.json
diff --git a/invoker-core/core/src/test/resources/adder_gcf_beta_event_json_resource.json b/invoker/core/src/test/resources/adder_gcf_beta_event_json_resource.json
similarity index 100%
rename from invoker-core/core/src/test/resources/adder_gcf_beta_event_json_resource.json
rename to invoker/core/src/test/resources/adder_gcf_beta_event_json_resource.json
diff --git a/invoker-core/core/src/test/resources/adder_gcf_ga_event.json b/invoker/core/src/test/resources/adder_gcf_ga_event.json
similarity index 100%
rename from invoker-core/core/src/test/resources/adder_gcf_ga_event.json
rename to invoker/core/src/test/resources/adder_gcf_ga_event.json
diff --git a/invoker-core/pom.xml b/invoker/pom.xml
similarity index 94%
rename from invoker-core/pom.xml
rename to invoker/pom.xml
index b95cc004..9d43438b 100644
--- a/invoker-core/pom.xml
+++ b/invoker/pom.xml
@@ -1,7 +1,7 @@
4.0.0
com.google.cloud.functions.invoker
- java-function-invoker-core-parent
+ java-function-invoker-parent
1.0.0-alpha-1
pom
GCF Java Invoker Parent
diff --git a/invoker-core/testfunction/pom.xml b/invoker/testfunction/pom.xml
similarity index 95%
rename from invoker-core/testfunction/pom.xml
rename to invoker/testfunction/pom.xml
index 6310dd4c..32839a1a 100644
--- a/invoker-core/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -3,12 +3,12 @@
com.google.cloud.functions.invoker
- java-function-invoker-core-parent
+ java-function-invoker-parent
1.0.0-alpha-1
com.google.cloud.functions.invoker
- java-function-invoker-core-testfunction
+ java-function-invoker-testfunction
1.0.0-alpha-1
Example GCF Function Jar
diff --git a/invoker-core/testfunction/src/main/java/com/example/functionjar/Main.java b/invoker/testfunction/src/main/java/com/example/functionjar/Main.java
similarity index 100%
rename from invoker-core/testfunction/src/main/java/com/example/functionjar/Main.java
rename to invoker/testfunction/src/main/java/com/example/functionjar/Main.java
diff --git a/invoker-core/testfunction/src/test/java/com/example/functionjar/Background.java b/invoker/testfunction/src/test/java/com/example/functionjar/Background.java
similarity index 100%
rename from invoker-core/testfunction/src/test/java/com/example/functionjar/Background.java
rename to invoker/testfunction/src/test/java/com/example/functionjar/Background.java
diff --git a/invoker-core/testfunction/src/test/java/com/example/functionjar/Checker.java b/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java
similarity index 100%
rename from invoker-core/testfunction/src/test/java/com/example/functionjar/Checker.java
rename to invoker/testfunction/src/test/java/com/example/functionjar/Checker.java
diff --git a/invoker-core/testfunction/src/test/java/com/example/functionjar/Foreground.java b/invoker/testfunction/src/test/java/com/example/functionjar/Foreground.java
similarity index 100%
rename from invoker-core/testfunction/src/test/java/com/example/functionjar/Foreground.java
rename to invoker/testfunction/src/test/java/com/example/functionjar/Foreground.java
From 2cf2699f01faed3aa9898191c38841c307b1c10d Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Fri, 24 Jan 2020 17:05:34 -0800
Subject: [PATCH 026/364] Import of Cloud Functions JVM from Git-on-Borg.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 9a2f4c9ed5debcb5304f7e94baa5003a8eb02df1 Remove some unnecessary differences between our internal ... by Éamonn McManus
PiperOrigin-RevId: 291471753
---
README.md | 5 +++++
functions-framework-api/pom.xml | 1 +
2 files changed, 6 insertions(+)
create mode 100644 README.md
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..1a1ef5fb
--- /dev/null
+++ b/README.md
@@ -0,0 +1,5 @@
+# Functions Framework API for Java [](https://travis-ci.org/GoogleCloudPlatform/functions-framework-java)
+
+
+**This is a placeholder for the Functions Framework for Java. Stay tuned for
+updates.**
diff --git a/functions-framework-api/pom.xml b/functions-framework-api/pom.xml
index 36d7db1b..396c6a3f 100644
--- a/functions-framework-api/pom.xml
+++ b/functions-framework-api/pom.xml
@@ -45,6 +45,7 @@
scm:git:https://github.com/GoogleCloudPlatform/functions-framework-java.git
scm:git:git@github.com:GoogleCloudPlatform/functions-framework-java.git
https://github.com/GoogleCloudPlatform/functions-framework-java
+ HEAD
From 4d4f309e1c86a2a82634885528b31e896f8c0641 Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Thu, 30 Jan 2020 17:35:01 -0800
Subject: [PATCH 027/364] Update the artifact id for the Java Function
Framework and add some clauses for Maven Central..
PiperOrigin-RevId: 292458605
---
invoker/core/pom.xml | 21 ++++++++++++++++++---
invoker/pom.xml | 16 +++++++++++++++-
invoker/testfunction/pom.xml | 2 +-
3 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 6b955068..0656a5ad 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -1,15 +1,15 @@
-
+
4.0.0
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-1
+ 1.0.0-alpha-2-rc1-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-1
+ 1.0.0-alpha-2-rc1-SNAPSHOT
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
@@ -22,6 +22,21 @@
5.3.2
+
+
+ Apache License, Version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+ repo
+
+
+
+
+ scm:git:https://github.com/GoogleCloudPlatform/functions-framework-java.git
+ scm:git:git@github.com:GoogleCloudPlatform/functions-framework-java.git
+ https://github.com/GoogleCloudPlatform/functions-framework-java
+ HEAD
+
+
com.google.cloud.functions
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 9d43438b..84f90514 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -1,14 +1,28 @@
4.0.0
+
+ org.sonatype.oss
+ oss-parent
+ 9
+
+
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-1
+ 1.0.0-alpha-2-rc1-SNAPSHOT
pom
GCF Java Invoker Parent
Parent POM for the GCF Java Invoker. The project is structured like this so
that we can have modules that build jar files for use in tests.
+ https://github.com/GoogleCloudPlatform/functions-framework-java/tree/master/invoker
+
+
+ http://github.com/GoogleCloudPlatform/functions-framework-java
+ scm:git:git://github.com/GoogleCloudPlatform/functions-framework-java.git
+ scm:git:ssh://git@github.com/GoogleCloudPlatform/functions-framework-java.git
+ HEAD
+
core
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 32839a1a..e63d661c 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-1
+ 1.0.0-alpha-2-rc1-SNAPSHOT
com.google.cloud.functions.invoker
From 83e90e550ccefa0b29cdda32ec77ebfc3aaf3160 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?=
Date: Fri, 31 Jan 2020 12:53:14 -0800
Subject: [PATCH 028/364] [maven-release-plugin] prepare release
java-function-invoker-parent-1.0.0-alpha-2-rc1
---
invoker/core/pom.xml | 4 ++--
invoker/pom.xml | 4 ++--
invoker/testfunction/pom.xml | 12 ++++++++++--
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 0656a5ad..0d7db140 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1-SNAPSHOT
+ 1.0.0-alpha-2-rc1
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc1-SNAPSHOT
+ 1.0.0-alpha-2-rc1
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 84f90514..ff2f0330 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -1,4 +1,4 @@
-
+
4.0.0
org.sonatype.oss
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1-SNAPSHOT
+ 1.0.0-alpha-2-rc1
pom
GCF Java Invoker Parent
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index e63d661c..deacadaa 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -1,10 +1,10 @@
-
+
4.0.0
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1-SNAPSHOT
+ 1.0.0-alpha-2-rc1
com.google.cloud.functions.invoker
@@ -82,6 +82,14 @@
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+ 3.0.0-M1
+
+ true
+
+
From 1e6497200dec938d889baf85f23f48e94cbe3cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?=
Date: Fri, 31 Jan 2020 12:53:22 -0800
Subject: [PATCH 029/364] [maven-release-plugin] prepare for next development
iteration
---
invoker/core/pom.xml | 6 +++---
invoker/pom.xml | 2 +-
invoker/testfunction/pom.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 0d7db140..5b6e116b 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1
+ 1.0.0-alpha-2-rc2-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc1
+ 1.0.0-alpha-2-rc2-SNAPSHOT
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
@@ -106,7 +106,7 @@
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-1
+ 1.0.0-alpha-2-SNAPSHOT
test-jar
test
diff --git a/invoker/pom.xml b/invoker/pom.xml
index ff2f0330..3ba349e5 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1
+ 1.0.0-alpha-2-rc2-SNAPSHOT
pom
GCF Java Invoker Parent
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index deacadaa..5ca369dc 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1
+ 1.0.0-alpha-2-rc2-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-1
+ 1.0.0-alpha-2-SNAPSHOT
Example GCF Function Jar
An example of a GCF function packaged into a jar. We use this in tests.
From 6df2045ddaa6719806a77bd1bcebd8ed27d5eb00 Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Fri, 31 Jan 2020 13:12:16 -0800
Subject: [PATCH 030/364] Exclude the testfunction module from deployment. Also
remove an unused, empty Java source file that caused the javadoc plugin to
fall over.
PiperOrigin-RevId: 292602429
---
invoker/core/pom.xml | 6 +++---
invoker/pom.xml | 4 ++--
invoker/testfunction/pom.xml | 7 +++----
.../src/main/java/com/example/functionjar/Main.java | 0
4 files changed, 8 insertions(+), 9 deletions(-)
delete mode 100644 invoker/testfunction/src/main/java/com/example/functionjar/Main.java
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 5b6e116b..0656a5ad 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc2-SNAPSHOT
+ 1.0.0-alpha-2-rc1-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc2-SNAPSHOT
+ 1.0.0-alpha-2-rc1-SNAPSHOT
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
@@ -106,7 +106,7 @@
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-2-SNAPSHOT
+ 1.0.0-alpha-1
test-jar
test
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 3ba349e5..84f90514 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -1,4 +1,4 @@
-
+
4.0.0
org.sonatype.oss
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc2-SNAPSHOT
+ 1.0.0-alpha-2-rc1-SNAPSHOT
pom
GCF Java Invoker Parent
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 5ca369dc..e54bca4b 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -1,15 +1,15 @@
-
+
4.0.0
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc2-SNAPSHOT
+ 1.0.0-alpha-2-rc1-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-2-SNAPSHOT
+ 1.0.0-alpha-1
Example GCF Function Jar
An example of a GCF function packaged into a jar. We use this in tests.
@@ -85,7 +85,6 @@
org.apache.maven.plugins
maven-deploy-plugin
- 3.0.0-M1
true
diff --git a/invoker/testfunction/src/main/java/com/example/functionjar/Main.java b/invoker/testfunction/src/main/java/com/example/functionjar/Main.java
deleted file mode 100644
index e69de29b..00000000
From 0dfe552cfd466dbb9ada9422c15a48e55c1d498b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?=
Date: Fri, 31 Jan 2020 13:52:33 -0800
Subject: [PATCH 031/364] [maven-release-plugin] prepare release
java-function-invoker-parent-1.0.0-alpha-2-rc1
---
invoker/core/pom.xml | 4 ++--
invoker/pom.xml | 4 ++--
invoker/testfunction/pom.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 0656a5ad..0d7db140 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1-SNAPSHOT
+ 1.0.0-alpha-2-rc1
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc1-SNAPSHOT
+ 1.0.0-alpha-2-rc1
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 84f90514..ff2f0330 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -1,4 +1,4 @@
-
+
4.0.0
org.sonatype.oss
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1-SNAPSHOT
+ 1.0.0-alpha-2-rc1
pom
GCF Java Invoker Parent
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index e54bca4b..d1352b5e 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -1,10 +1,10 @@
-
+
4.0.0
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1-SNAPSHOT
+ 1.0.0-alpha-2-rc1
com.google.cloud.functions.invoker
From df3a8c6f3b82ea6a22928f94ccafc614743748d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?=
Date: Fri, 31 Jan 2020 14:06:55 -0800
Subject: [PATCH 032/364] Revert "[maven-release-plugin] prepare release
java-function-invoker-parent-1.0.0-alpha-2-rc1"
This reverts commit 0dfe552cfd466dbb9ada9422c15a48e55c1d498b.
---
invoker/core/pom.xml | 4 ++--
invoker/pom.xml | 4 ++--
invoker/testfunction/pom.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 0d7db140..0656a5ad 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1
+ 1.0.0-alpha-2-rc1-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc1
+ 1.0.0-alpha-2-rc1-SNAPSHOT
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
diff --git a/invoker/pom.xml b/invoker/pom.xml
index ff2f0330..84f90514 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -1,4 +1,4 @@
-
+
4.0.0
org.sonatype.oss
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1
+ 1.0.0-alpha-2-rc1-SNAPSHOT
pom
GCF Java Invoker Parent
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index d1352b5e..e54bca4b 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -1,10 +1,10 @@
-
+
4.0.0
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1
+ 1.0.0-alpha-2-rc1-SNAPSHOT
com.google.cloud.functions.invoker
From 4d5c37f40c4f6a40cd161b565a48b0251b40dd30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?=
Date: Fri, 31 Jan 2020 14:09:25 -0800
Subject: [PATCH 033/364] [maven-release-plugin] prepare release
java-function-invoker-parent-1.0.0-alpha-2-rc1
---
invoker/core/pom.xml | 4 ++--
invoker/pom.xml | 4 ++--
invoker/testfunction/pom.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 0656a5ad..0d7db140 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1-SNAPSHOT
+ 1.0.0-alpha-2-rc1
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc1-SNAPSHOT
+ 1.0.0-alpha-2-rc1
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 84f90514..ff2f0330 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -1,4 +1,4 @@
-
+
4.0.0
org.sonatype.oss
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1-SNAPSHOT
+ 1.0.0-alpha-2-rc1
pom
GCF Java Invoker Parent
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index e54bca4b..d1352b5e 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -1,10 +1,10 @@
-
+
4.0.0
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1-SNAPSHOT
+ 1.0.0-alpha-2-rc1
com.google.cloud.functions.invoker
From 6544edc703ca5d07c5cbfa9849dbc5ced4e7ce03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?=
Date: Fri, 31 Jan 2020 14:09:34 -0800
Subject: [PATCH 034/364] [maven-release-plugin] prepare for next development
iteration
---
invoker/core/pom.xml | 6 +++---
invoker/pom.xml | 2 +-
invoker/testfunction/pom.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 0d7db140..5b6e116b 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1
+ 1.0.0-alpha-2-rc2-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc1
+ 1.0.0-alpha-2-rc2-SNAPSHOT
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
@@ -106,7 +106,7 @@
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-1
+ 1.0.0-alpha-2-SNAPSHOT
test-jar
test
diff --git a/invoker/pom.xml b/invoker/pom.xml
index ff2f0330..3ba349e5 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1
+ 1.0.0-alpha-2-rc2-SNAPSHOT
pom
GCF Java Invoker Parent
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index d1352b5e..04ecb807 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc1
+ 1.0.0-alpha-2-rc2-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-1
+ 1.0.0-alpha-2-SNAPSHOT
Example GCF Function Jar
An example of a GCF function packaged into a jar. We use this in tests.
From 149b0794be6ad8b46506647325529a93c68cf7fb Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Fri, 31 Jan 2020 19:02:44 -0800
Subject: [PATCH 035/364] Reinstate maven-shade-plugin for building the
invoker. This makes it much easier to run the invoker standalone, as a
Functions Framework implementation.
Also add logic to guess a function signature type. This is only invoked if the environment variable FUNCTION_SIGNATURE_TYPE is not set. It always will be in GCF, but might not be when invoking the standalone Functions Framework.
PiperOrigin-RevId: 292656253
---
invoker/core/pom.xml | 15 +++++++--
.../functions/invoker/runner/Invoker.java | 31 ++++++++++++++++---
2 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 5b6e116b..887e3412 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -157,12 +157,23 @@
com.google.cloud.functions.invoker.runner.Invoker
- true
- lib
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.2.1
+
+
+ package
+
+ shade
+
+
+
+
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index 5ad439a9..71c63076 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -161,8 +161,8 @@ public void startServer() throws Exception {
classLoader = runtimeLoader;
}
+ HttpServlet servlet;
if ("http".equals(functionSignatureType)) {
- HttpServlet servlet;
Optional newExecutor =
NewHttpFunctionExecutor.forTarget(functionTarget, classLoader);
if (newExecutor.isPresent()) {
@@ -173,9 +173,7 @@ public void startServer() throws Exception {
HttpCloudFunction function = loader.loadUserFunction();
servlet = new HttpFunctionExecutor(function);
}
- context.addServlet(new ServletHolder(servlet), "/*");
} else if ("event".equals(functionSignatureType)) {
- HttpServlet servlet;
Optional newExecutor =
NewBackgroundFunctionExecutor.forTarget(functionTarget, classLoader);
if (newExecutor.isPresent()) {
@@ -187,10 +185,33 @@ public void startServer() throws Exception {
BackgroundCloudFunction function = loader.loadUserFunction();
servlet = new BackgroundFunctionExecutor(function);
}
- context.addServlet(new ServletHolder(servlet), "/*");
+ } else if (functionSignatureType == null) {
+ Optional httpExecutor =
+ NewHttpFunctionExecutor.forTarget(functionTarget, classLoader);
+ if (httpExecutor.isPresent()) {
+ servlet = httpExecutor.get();
+ } else {
+ Optional backgroundExecutor =
+ NewBackgroundFunctionExecutor.forTarget(functionTarget, classLoader);
+ if (backgroundExecutor.isPresent()) {
+ servlet = backgroundExecutor.get();
+ } else {
+ String error = String.format(
+ "Could not determine function signature type from target %s. Either this should be"
+ + " a class implementing one of the interfaces in com.google.cloud.functions, or the"
+ + " environment variable FUNCTION_SIGNATURE_TYPE should be set to \"http\" or"
+ + " \"event\".",
+ functionTarget);
+ throw new RuntimeException(error);
+ }
+ }
} else {
- throw new RuntimeException("Unknown function signature type: " + functionSignatureType);
+ String error = String.format(
+ "Function signature type %s is unknown; should be \"http\" or \"event\"",
+ functionSignatureType);
+ throw new RuntimeException(error);
}
+ context.addServlet(new ServletHolder(servlet), "/*");
server.start();
logServerInfo();
From 5e02d3ad3a6d259c75373f8e55a2fa84773f3cc3 Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Mon, 3 Feb 2020 18:33:21 -0800
Subject: [PATCH 036/364] Switch from Commons CLI to JCommander.
JCommander has a simpler API and better documentation. It is slightly more code
(this change adds about 37K to the invoker jar).
Also reorganize the Invoker class with a more usual structure.
As a consequence of this change, command line options are spelled e.g. --port
rather than -port. JCommander would support either (or indeed both) but this
is more in line with what people expect.
PiperOrigin-RevId: 293053482
---
invoker/core/pom.xml | 6 +-
.../functions/invoker/runner/Invoker.java | 118 ++++++++++--------
.../functions/invoker/IntegrationTest.java | 6 +-
3 files changed, 75 insertions(+), 55 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 887e3412..1fb199a9 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -97,9 +97,9 @@
9.4.11.v20180605
- commons-cli
- commons-cli
- 1.4
+ com.beust
+ jcommander
+ 1.78
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index 71c63076..b6249a05 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -1,5 +1,8 @@
package com.google.cloud.functions.invoker.runner;
+import com.beust.jcommander.JCommander;
+import com.beust.jcommander.Parameter;
+import com.beust.jcommander.ParameterException;
import com.google.cloud.functions.invoker.BackgroundCloudFunction;
import com.google.cloud.functions.invoker.BackgroundFunctionExecutor;
import com.google.cloud.functions.invoker.BackgroundFunctionSignatureMatcher;
@@ -24,12 +27,6 @@
import java.util.logging.LogManager;
import java.util.logging.Logger;
import javax.servlet.http.HttpServlet;
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
@@ -62,38 +59,69 @@ public class Invoker {
logger = Logger.getLogger(Invoker.class.getName());
}
- public Invoker(
- Integer port,
- String functionTarget,
- String functionSignatureType,
- Optional functionJarPath) {
- this.port = port;
- this.functionTarget = functionTarget;
- this.functionSignatureType = functionSignatureType;
- this.functionJarPath = functionJarPath;
+ private static class Options {
+ @Parameter(
+ description = "Port on which to listen for HTTP requests.",
+ names = "--port"
+ )
+ private String port = System.getenv().getOrDefault("PORT", "8080");
+
+ // TODO(emcmanus): the default value here no longer makes sense and should be changed to a
+ // class name once we have finished retiring the java8 runtime.
+ @Parameter(
+ description = "Name of function class to execute when servicing incoming requests.",
+ names = "--target"
+ )
+ private String target =
+ System.getenv().getOrDefault("FUNCTION_TARGET", "TestFunction.function");
+
+ @Parameter(
+ description = "Name of a jar file that contains the function to execute. This must be"
+ + " self-contained: either it must be a \"fat jar\" which bundles the dependencies"
+ + " of all of the function code, or it must use the Class-Path attribute in the jar"
+ + " manifest to point to those dependencies.",
+ names = "--jar"
+ )
+ private String jar = null;
+
+ @Parameter(
+ names = "--help", help = true
+ )
+ private boolean help = false;
}
public static void main(String[] args) throws Exception {
+ Options options = new Options();
+ JCommander jCommander = JCommander.newBuilder()
+ .addObject(options)
+ .build();
+ try {
+ jCommander.parse(args);
+ } catch (ParameterException e) {
+ jCommander.usage();
+ throw e;
+ }
- CommandLine line = parseCommandLineOptions(args);
+ if (options.help) {
+ jCommander.usage();
+ return;
+ }
- int port =
- Arrays.asList(line.getOptionValue("port"), System.getenv("PORT")).stream()
- .filter(Objects::nonNull)
- .findFirst()
- .map(Integer::parseInt)
- .orElse(8080);
- String functionTarget =
- Arrays.asList(line.getOptionValue("target"), System.getenv("FUNCTION_TARGET")).stream()
- .filter(Objects::nonNull)
- .findFirst()
- .orElse("TestFunction.function");
+ int port;
+ try {
+ port = Integer.parseInt(options.port);
+ } catch (NumberFormatException e) {
+ System.err.println("--port value should be an integer: " + options.port);
+ jCommander.usage();
+ throw e;
+ }
+ String functionTarget = options.target;
Path standardFunctionJarPath = Paths.get("function/function.jar");
Optional functionJarPath =
Arrays.asList(
- line.getOptionValue("jar"),
- System.getenv("FUNCTION_JAR"),
- Files.exists(standardFunctionJarPath) ? standardFunctionJarPath.toString() : null)
+ options.jar,
+ System.getenv("FUNCTION_JAR"),
+ Files.exists(standardFunctionJarPath) ? standardFunctionJarPath.toString() : null)
.stream()
.filter(Objects::nonNull)
.findFirst();
@@ -111,30 +139,22 @@ private static boolean isLocalRun() {
return System.getenv("K_SERVICE") == null;
}
- private static CommandLine parseCommandLineOptions(String[] args) {
- CommandLineParser parser = new DefaultParser();
- Options options = new Options();
- options.addOption("port", true, "the port on which server listens to HTTP requests");
- options.addOption("target", true, "fully qualified name of the target method to execute");
- options.addOption("jar", true, "path to function jar");
-
- try {
- CommandLine line = parser.parse(options, args);
- return line;
- } catch (ParseException e) {
- logger.log(Level.SEVERE, "Failed to parse command line options", e);
- HelpFormatter formatter = new HelpFormatter();
- formatter.printHelp("Invoker", options);
- System.exit(1);
- }
- return null;
- }
-
private final Integer port;
private final String functionTarget;
private final String functionSignatureType;
private final Optional functionJarPath;
+ public Invoker(
+ Integer port,
+ String functionTarget,
+ String functionSignatureType,
+ Optional functionJarPath) {
+ this.port = port;
+ this.functionTarget = functionTarget;
+ this.functionSignatureType = functionSignatureType;
+ this.functionJarPath = functionJarPath;
+ }
+
public void startServer() throws Exception {
Server server = new Server(port);
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 77ada939..4e5ada9d 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -316,7 +316,7 @@ private String functionJarString() throws IOException {
}
/**
- * Tests that if we launch an HTTP function with {@code -jar}, then the function code cannot
+ * Tests that if we launch an HTTP function with {@code --jar}, then the function code cannot
* see the classes from the runtime. This is allows us to avoid conflicts between versions of
* libraries that we use in the runtime and different versions of the same libraries that the
* function might use.
@@ -324,7 +324,7 @@ private String functionJarString() throws IOException {
@Test
public void jarOptionHttp() throws Exception {
testHttpFunction("com.example.functionjar.Foreground",
- ImmutableList.of("-jar", functionJarString()),
+ ImmutableList.of("--jar", functionJarString()),
TestCase.builder()
.setUrl("/?class=" + INTERNAL_CLASS.getName())
.setExpectedResponseText("OK")
@@ -342,7 +342,7 @@ public void jarOptionBackground() throws Exception {
JsonObject jsonData = json.getAsJsonObject("data");
jsonData.addProperty("class", INTERNAL_CLASS.getName());
testBackgroundFunction("com.example.functionjar.Background",
- ImmutableList.of("-jar", functionJarString()),
+ ImmutableList.of("--jar", functionJarString()),
TestCase.builder().setRequestText(json.toString()).build());
}
From a21369a8041cafa88d6f123671e51d03a7643451 Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Tue, 4 Feb 2020 13:07:34 -0800
Subject: [PATCH 037/364] Update Maven dependencies for Java FF.
This is the latest version of each dependency, as reported by `mvn versions:display-dependency-updates`, except for `javax.servlet:javax.servlet-api` where we don't want to go past 3.1 and `org.eclipse.jetty:jetty-*`, where we can go to a later 9.4 but not to 10. In both cases it is because the Servlet API has moved packages in ways that we don't want to have to deal with right now.
Also change some assertEquals calls from JUnit 5, where we are using JUnit 4 everywhere else. These assertEquals calls had their parameters in the wrong order, which is a problem we can avoid by switching to Truth.
PiperOrigin-RevId: 293211216
---
invoker/core/pom.xml | 78 +++++++++----------
.../invoker/BackgroundFunctionTest.java | 6 +-
.../functions/invoker/HttpFunctionTest.java | 4 +-
3 files changed, 41 insertions(+), 47 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 1fb199a9..93c93799 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -43,9 +43,9 @@
functions-framework-api
- javax.servlet
- javax.servlet-api
- 3.1.0
+ javax.servlet
+ javax.servlet-api
+ 3.1.0
io.cloudevents
@@ -53,48 +53,48 @@
1.2.0
- javax.annotation
- javax.annotation-api
- 1.3.2
+ javax.annotation
+ javax.annotation-api
+ 1.3.2
- com.google.code.gson
- gson
- 2.8.6
+ com.google.code.gson
+ gson
+ 2.8.6
- com.ryanharter.auto.value
- auto-value-gson
- 0.8.0
- provided
+ com.ryanharter.auto.value
+ auto-value-gson
+ 1.3.0
+ provided
- com.ryanharter.auto.value
- auto-value-gson-annotations
- 0.8.0
- provided
+ com.ryanharter.auto.value
+ auto-value-gson-annotations
+ 0.8.0
+ provided
- com.google.auto.value
- auto-value
- 1.6.2
- provided
+ com.google.auto.value
+ auto-value
+ 1.7
+ provided
- com.google.auto.value
- auto-value-annotations
- 1.6.2
- provided
+ com.google.auto.value
+ auto-value-annotations
+ 1.7
+ provided
- org.eclipse.jetty
- jetty-servlet
- 9.4.11.v20180605
+ org.eclipse.jetty
+ jetty-servlet
+ 9.4.26.v20200117
- org.eclipse.jetty
- jetty-server
- 9.4.11.v20180605
+ org.eclipse.jetty
+ jetty-server
+ 9.4.26.v20200117
com.beust
@@ -113,37 +113,31 @@
org.mockito
mockito-core
- 2.21.0
- test
-
-
- org.mockito
- mockito-junit-jupiter
- 2.23.0
+ 3.2.4
test
junit
junit
- 4.12
+ 4.13
test
com.google.truth
truth
- 1.0
+ 1.0.1
test
com.google.truth.extensions
truth-java8-extension
- 1.0
+ 1.0.1
test
org.eclipse.jetty
jetty-client
- 9.4.11.v20180605
+ 9.4.26.v20200117
test
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java
index b75cc538..db16cfb4 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java
@@ -1,6 +1,6 @@
package com.google.cloud.functions.invoker;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static com.google.common.truth.Truth.assertThat;
import com.google.cloud.functions.Context;
import com.google.gson.JsonElement;
@@ -81,7 +81,7 @@ public void adder() throws Exception {
executor.service(req, res);
- assertEquals(lastSum, 5);
- assertEquals(lastEventType, "com.example.someevent.new");
+ assertThat(lastSum).isEqualTo(5);
+ assertThat(lastEventType).isEqualTo("com.example.someevent.new");
}
}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java
index 1f149ccf..5e4d41ae 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java
@@ -1,6 +1,6 @@
package com.google.cloud.functions.invoker;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static com.google.common.truth.Truth.assertThat;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -40,7 +40,7 @@ public void adder() throws Exception {
executor.service(req, res);
- assertEquals(lastResponse, requestData);
+ assertThat(lastResponse).isEqualTo(requestData);
}
private class MockPrintWriter extends java.io.PrintWriter {
From bd6f80b1b3c84edabdcafeb37ce7a5e152f02825 Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Tue, 4 Feb 2020 16:34:09 -0800
Subject: [PATCH 038/364] Remove the use of javax.annotation.Nullable.
It's only used for AutoValue, which is perfectly happy with a locally-defined @Nullable annotation. Without this change, a clean Maven build fails, because we were previously getting javax.annotation.Nullable through an indirect dependency which was removed.
PiperOrigin-RevId: 293256408
---
invoker/core/pom.xml | 5 -----
.../cloud/functions/invoker/CloudFunctionsContext.java | 7 ++++++-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 93c93799..23e8ea68 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -52,11 +52,6 @@
cloudevents-api
1.2.0
-
- javax.annotation
- javax.annotation-api
- 1.3.2
-
com.google.code.gson
gson
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
index f51b5203..fc305988 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
@@ -4,11 +4,16 @@
import com.google.cloud.functions.Context;
import com.google.gson.Gson;
import com.google.gson.TypeAdapter;
-import javax.annotation.Nullable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
/** Event context (metadata) for events handled by Cloud Functions. */
@AutoValue
abstract class CloudFunctionsContext implements Context {
+ // AutoValue recognizes any annotation called @Nullable, so no need to import this from anywhere.
+ @Retention(RetentionPolicy.SOURCE)
+ @interface Nullable {}
+
@Nullable
public abstract String eventId();
From 3fd6f0011f189767aa7c3e405907edc378db1356 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?=
Date: Tue, 4 Feb 2020 16:46:17 -0800
Subject: [PATCH 039/364] [maven-release-plugin] prepare release
java-function-invoker-parent-1.0.0-alpha-2-rc2
---
invoker/core/pom.xml | 6 +++---
invoker/pom.xml | 2 +-
invoker/testfunction/pom.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 23e8ea68..31fb6134 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc2-SNAPSHOT
+ 1.0.0-alpha-2-rc2
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc2-SNAPSHOT
+ 1.0.0-alpha-2-rc2
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
@@ -101,7 +101,7 @@
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-2-SNAPSHOT
+ 1.0.0-alpha-2
test-jar
test
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 3ba349e5..3dc3a53e 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc2-SNAPSHOT
+ 1.0.0-alpha-2-rc2
pom
GCF Java Invoker Parent
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 04ecb807..84e36520 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc2-SNAPSHOT
+ 1.0.0-alpha-2-rc2
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-2-SNAPSHOT
+ 1.0.0-alpha-2
Example GCF Function Jar
An example of a GCF function packaged into a jar. We use this in tests.
From 00317e845f6a9840b2980aee66f98bbb3cff6982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?=
Date: Tue, 4 Feb 2020 16:46:25 -0800
Subject: [PATCH 040/364] [maven-release-plugin] prepare for next development
iteration
---
invoker/core/pom.xml | 6 +++---
invoker/pom.xml | 2 +-
invoker/testfunction/pom.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 31fb6134..2572e4bd 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc2
+ 1.0.0-alpha-2-rc3-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc2
+ 1.0.0-alpha-2-rc3-SNAPSHOT
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
@@ -101,7 +101,7 @@
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-2
+ 1.0.0-alpha-3-SNAPSHOT
test-jar
test
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 3dc3a53e..d659d27e 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc2
+ 1.0.0-alpha-2-rc3-SNAPSHOT
pom
GCF Java Invoker Parent
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 84e36520..c295b99c 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc2
+ 1.0.0-alpha-2-rc3-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-2
+ 1.0.0-alpha-3-SNAPSHOT
Example GCF Function Jar
An example of a GCF function packaged into a jar. We use this in tests.
From 394d65b0dde731a8ac5372774ea0f63b69c4fa1b Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Wed, 5 Feb 2020 14:42:04 -0800
Subject: [PATCH 041/364] Add copyright notices to open-sourced files that
lacked them.
PiperOrigin-RevId: 293455231
---
invoker/core/pom.xml | 6 +++---
.../invoker/BackgroundCloudFunction.java | 14 ++++++++++++++
.../invoker/BackgroundFunctionExecutor.java | 14 ++++++++++++++
.../BackgroundFunctionSignatureMatcher.java | 14 ++++++++++++++
.../cloud/functions/invoker/CloudFunction.java | 14 ++++++++++++++
.../functions/invoker/CloudFunctionsContext.java | 14 ++++++++++++++
.../com/google/cloud/functions/invoker/Event.java | 14 ++++++++++++++
.../cloud/functions/invoker/FunctionLoader.java | 14 ++++++++++++++
.../invoker/FunctionSignatureMatcher.java | 15 ++++++++++++++-
.../functions/invoker/HttpCloudFunction.java | 14 ++++++++++++++
.../functions/invoker/HttpFunctionExecutor.java | 14 ++++++++++++++
.../invoker/HttpFunctionSignatureMatcher.java | 14 ++++++++++++++
.../invoker/NewBackgroundFunctionExecutor.java | 14 ++++++++++++++
.../invoker/NewHttpFunctionExecutor.java | 14 ++++++++++++++
.../functions/invoker/URLRequestWrapper.java | 14 ++++++++++++++
.../functions/invoker/http/HttpRequestImpl.java | 14 ++++++++++++++
.../functions/invoker/http/HttpResponseImpl.java | 14 ++++++++++++++
.../cloud/functions/invoker/runner/Invoker.java | 14 ++++++++++++++
.../core/src/test/java/PackagelessHelloWorld.java | 14 ++++++++++++++
.../functions/invoker/BackgroundFunctionTest.java | 14 ++++++++++++++
.../cloud/functions/invoker/HttpFunctionTest.java | 14 ++++++++++++++
.../cloud/functions/invoker/IntegrationTest.java | 14 ++++++++++++++
.../cloud/functions/invoker/http/HttpTest.java | 14 ++++++++++++++
.../functions/invoker/testfunctions/Echo.java | 14 ++++++++++++++
invoker/pom.xml | 2 +-
invoker/testfunction/pom.xml | 4 ++--
.../java/com/example/functionjar/Background.java | 14 ++++++++++++++
.../java/com/example/functionjar/Checker.java | 14 ++++++++++++++
.../java/com/example/functionjar/Foreground.java | 14 ++++++++++++++
29 files changed, 370 insertions(+), 7 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 2572e4bd..23e8ea68 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc3-SNAPSHOT
+ 1.0.0-alpha-2-rc2-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc3-SNAPSHOT
+ 1.0.0-alpha-2-rc2-SNAPSHOT
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
@@ -101,7 +101,7 @@
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-3-SNAPSHOT
+ 1.0.0-alpha-2-SNAPSHOT
test-jar
test
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundCloudFunction.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundCloudFunction.java
index 12e1c92f..1e5189b4 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundCloudFunction.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundCloudFunction.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
import com.google.cloud.functions.Context;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
index 7aa1cf6a..e18934e7 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionExecutor.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
import com.google.gson.Gson;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionSignatureMatcher.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionSignatureMatcher.java
index 1b7089b7..54180966 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionSignatureMatcher.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/BackgroundFunctionSignatureMatcher.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
import com.google.cloud.functions.Context;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunction.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunction.java
index 29bd62a8..ec73d26c 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunction.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunction.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
import java.lang.reflect.InvocationTargetException;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
index fc305988..867efb74 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/CloudFunctionsContext.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
import com.google.auto.value.AutoValue;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java
index c6fb7a7a..8007bf6a 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/Event.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
import com.google.gson.JsonDeserializationContext;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java
index 4e657878..c5b2dc08 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionLoader.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
/**
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionSignatureMatcher.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionSignatureMatcher.java
index fd1b5477..bd2259c3 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionSignatureMatcher.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/FunctionSignatureMatcher.java
@@ -1,5 +1,18 @@
-package com.google.cloud.functions.invoker;
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.cloud.functions.invoker;
/**
* An interface for classes that contain logic for matching user function method signature with
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpCloudFunction.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpCloudFunction.java
index 85b0808e..95717fd6 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpCloudFunction.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpCloudFunction.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
import java.lang.reflect.InvocationTargetException;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
index 8c4ab8b5..84ded47f 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
import java.lang.reflect.InvocationTargetException;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionSignatureMatcher.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionSignatureMatcher.java
index ca55b1b0..2d4d9490 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionSignatureMatcher.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionSignatureMatcher.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
import java.lang.reflect.Method;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
index 08d55c09..a460ddda 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
import static java.util.stream.Collectors.joining;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
index 59561f7d..0b2fb8e1 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
import com.google.cloud.functions.HttpFunction;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/URLRequestWrapper.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/URLRequestWrapper.java
index 6a0299d1..ac74947e 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/URLRequestWrapper.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/URLRequestWrapper.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
import javax.servlet.http.HttpServletRequest;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java
index 4eacb7f2..db53936e 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpRequestImpl.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker.http;
import static java.util.stream.Collectors.toMap;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java
index 75fb95d6..41a96e36 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/http/HttpResponseImpl.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker.http;
import static java.util.stream.Collectors.toMap;
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index b6249a05..4d7e0863 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker.runner;
import com.beust.jcommander.JCommander;
diff --git a/invoker/core/src/test/java/PackagelessHelloWorld.java b/invoker/core/src/test/java/PackagelessHelloWorld.java
index 5a41bc5f..e590fef1 100644
--- a/invoker/core/src/test/java/PackagelessHelloWorld.java
+++ b/invoker/core/src/test/java/PackagelessHelloWorld.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
// A function in the default package.
import com.google.cloud.functions.HttpFunction;
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java
index db16cfb4..f52071d6 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/BackgroundFunctionTest.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
import static com.google.common.truth.Truth.assertThat;
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java
index 5e4d41ae..4f51315e 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/HttpFunctionTest.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
import static com.google.common.truth.Truth.assertThat;
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 4e5ada9d..863496cc 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker;
import static com.google.common.truth.Truth.assertThat;
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
index 548d56b5..12d98090 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/http/HttpTest.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker.http;
import static com.google.common.truth.Truth.assertThat;
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java
index dac82632..16eb03a8 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Echo.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.google.cloud.functions.invoker.testfunctions;
import java.io.IOException;
diff --git a/invoker/pom.xml b/invoker/pom.xml
index d659d27e..3ba349e5 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc3-SNAPSHOT
+ 1.0.0-alpha-2-rc2-SNAPSHOT
pom
GCF Java Invoker Parent
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index c295b99c..04ecb807 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc3-SNAPSHOT
+ 1.0.0-alpha-2-rc2-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-3-SNAPSHOT
+ 1.0.0-alpha-2-SNAPSHOT
Example GCF Function Jar
An example of a GCF function packaged into a jar. We use this in tests.
diff --git a/invoker/testfunction/src/test/java/com/example/functionjar/Background.java b/invoker/testfunction/src/test/java/com/example/functionjar/Background.java
index 1e0d9154..6b18b54c 100644
--- a/invoker/testfunction/src/test/java/com/example/functionjar/Background.java
+++ b/invoker/testfunction/src/test/java/com/example/functionjar/Background.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.example.functionjar;
import com.google.cloud.functions.Context;
diff --git a/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java b/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java
index 8a0c1c3a..cc750b82 100644
--- a/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java
+++ b/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.example.functionjar;
import com.google.escapevelocity.Template;
diff --git a/invoker/testfunction/src/test/java/com/example/functionjar/Foreground.java b/invoker/testfunction/src/test/java/com/example/functionjar/Foreground.java
index c81c9107..82edf1c9 100644
--- a/invoker/testfunction/src/test/java/com/example/functionjar/Foreground.java
+++ b/invoker/testfunction/src/test/java/com/example/functionjar/Foreground.java
@@ -1,3 +1,17 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
package com.example.functionjar;
import com.google.cloud.functions.HttpFunction;
From 5c1997c723b9ca3a7b1deea97014ac6a1e83f93d Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Wed, 5 Feb 2020 18:17:08 -0800
Subject: [PATCH 042/364] Add a simple test for the Invoker main class.
This currently just command-line arguments and environment variables.
PiperOrigin-RevId: 293497402
---
.../functions/invoker/runner/Invoker.java | 37 ++++++-
.../functions/invoker/runner/InvokerTest.java | 99 +++++++++++++++++++
2 files changed, 131 insertions(+), 5 deletions(-)
create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index 4d7e0863..4fd2b4a7 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -35,6 +35,7 @@
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.Arrays;
+import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.logging.Level;
@@ -105,6 +106,17 @@ private static class Options {
}
public static void main(String[] args) throws Exception {
+ Optional invoker = makeInvoker(args);
+ if (invoker.isPresent()) {
+ invoker.get().startServer();
+ }
+ }
+
+ static Optional makeInvoker(String... args) {
+ return makeInvoker(System.getenv(), args);
+ }
+
+ static Optional makeInvoker(Map environment, String... args) {
Options options = new Options();
JCommander jCommander = JCommander.newBuilder()
.addObject(options)
@@ -118,7 +130,7 @@ public static void main(String[] args) throws Exception {
if (options.help) {
jCommander.usage();
- return;
+ return Optional.empty();
}
int port;
@@ -134,7 +146,7 @@ public static void main(String[] args) throws Exception {
Optional functionJarPath =
Arrays.asList(
options.jar,
- System.getenv("FUNCTION_JAR"),
+ environment.get("FUNCTION_JAR"),
Files.exists(standardFunctionJarPath) ? standardFunctionJarPath.toString() : null)
.stream()
.filter(Objects::nonNull)
@@ -143,10 +155,9 @@ public static void main(String[] args) throws Exception {
new Invoker(
port,
functionTarget,
- // TODO: remove once function signature type is inferred from the method signature.
- System.getenv("FUNCTION_SIGNATURE_TYPE"),
+ environment.get("FUNCTION_SIGNATURE_TYPE"),
functionJarPath);
- invoker.startServer();
+ return Optional.of(invoker);
}
private static boolean isLocalRun() {
@@ -169,6 +180,22 @@ public Invoker(
this.functionJarPath = functionJarPath;
}
+ Integer getPort() {
+ return port;
+ }
+
+ String getFunctionTarget() {
+ return functionTarget;
+ }
+
+ String getFunctionSignatureType() {
+ return functionSignatureType;
+ }
+
+ Optional getFunctionJarPath() {
+ return functionJarPath;
+ }
+
public void startServer() throws Exception {
Server server = new Server(port);
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
new file mode 100644
index 00000000..f1c3e3b6
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
@@ -0,0 +1,99 @@
+package com.google.cloud.functions.invoker.runner;
+
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth8.assertThat;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Optional;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class InvokerTest {
+ @Test
+ public void help() throws IOException {
+ String help = captureOutput(() -> {
+ Optional invoker = Invoker.makeInvoker("--help");
+ assertThat(invoker).isEmpty();
+ });
+ assertThat(help).contains("Usage:");
+ assertThat(help).contains("--target");
+ }
+
+ @Test
+ public void defaultPort() {
+ Optional invoker = Invoker.makeInvoker();
+ assertThat(invoker.get().getPort()).isEqualTo(8080);
+ }
+
+ @Test
+ public void explicitPort() {
+ Optional invoker = Invoker.makeInvoker("--port", "1234");
+ assertThat(invoker.get().getPort()).isEqualTo(1234);
+ }
+
+ @Test
+ public void defaultTarget() {
+ Optional invoker = Invoker.makeInvoker();
+ assertThat(invoker.get().getFunctionTarget()).isEqualTo("TestFunction.function");
+ }
+
+ @Test
+ public void explicitTarget() {
+ Optional invoker = Invoker.makeInvoker("--target", "com.example.MyFunction");
+ assertThat(invoker.get().getFunctionTarget()).isEqualTo("com.example.MyFunction");
+ }
+
+ @Test
+ public void defaultSignatureType() {
+ Optional invoker = Invoker.makeInvoker();
+ assertThat(invoker.get().getFunctionSignatureType()).isNull();
+ }
+
+ @Test
+ public void explicitSignatureType() {
+ Map env = Collections.singletonMap("FUNCTION_SIGNATURE_TYPE", "http");
+ Optional invoker = Invoker.makeInvoker(env);
+ assertThat(invoker.get().getFunctionSignatureType()).isEqualTo("http");
+ }
+
+ @Test
+ public void defaultJar() {
+ Optional invoker = Invoker.makeInvoker();
+ assertThat(invoker.get().getFunctionJarPath()).isEmpty();
+ }
+
+ @Test
+ public void explicitJarViaEnvironment() {
+ Map env = Collections.singletonMap("FUNCTION_JAR", "/foo/bar/baz.jar");
+ Optional invoker = Invoker.makeInvoker(env);
+ assertThat(invoker.get().getFunctionJarPath()).hasValue("/foo/bar/baz.jar");
+ }
+
+ @Test
+ public void explicitJarViaOption() {
+ Optional invoker = Invoker.makeInvoker("--jar", "/foo/bar/baz.jar");
+ assertThat(invoker.get().getFunctionJarPath()).hasValue("/foo/bar/baz.jar");
+ }
+
+ private static String captureOutput(Runnable operation) throws IOException {
+ PrintStream originalOut = System.out;
+ PrintStream originalErr = System.err;
+ ByteArrayOutputStream byteCapture = new ByteArrayOutputStream();
+ try (PrintStream capture = new PrintStream(byteCapture)) {
+ System.setOut(capture);
+ System.setErr(capture);
+ operation.run();
+ } finally {
+ System.setOut(originalOut);
+ System.setErr(originalErr);
+ }
+ return new String(byteCapture.toByteArray(), StandardCharsets.UTF_8);
+ }
+}
From 9a85ed0ff24f0df11106c84bd3730e091999b61a Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Thu, 6 Feb 2020 16:29:13 -0800
Subject: [PATCH 043/364] Change the FF --jar option into --classpath.
Instead of requiring the caller to provide a single self-contained jar,
we can allow a general classpath. That means for example that we could
provide the jar-file or classes directory from the compilation of a user's
function, plus the jars containing the function's dependencies.
PiperOrigin-RevId: 293704294
---
.../functions/invoker/runner/Invoker.java | 104 +++++++++++++-----
.../functions/invoker/IntegrationTest.java | 16 +--
.../functions/invoker/runner/InvokerTest.java | 39 +++++--
3 files changed, 113 insertions(+), 46 deletions(-)
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index 4fd2b4a7..1f032f9e 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -14,6 +14,8 @@
package com.google.cloud.functions.invoker.runner;
+import static java.util.stream.Collectors.toList;
+
import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
@@ -28,13 +30,18 @@
import com.google.cloud.functions.invoker.NewHttpFunctionExecutor;
import java.io.File;
import java.io.IOException;
+import java.io.UncheckedIOException;
import java.lang.reflect.Method;
+import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLClassLoader;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
@@ -91,13 +98,18 @@ private static class Options {
System.getenv().getOrDefault("FUNCTION_TARGET", "TestFunction.function");
@Parameter(
- description = "Name of a jar file that contains the function to execute. This must be"
- + " self-contained: either it must be a \"fat jar\" which bundles the dependencies"
- + " of all of the function code, or it must use the Class-Path attribute in the jar"
- + " manifest to point to those dependencies.",
- names = "--jar"
+ description = "List of files or directories where the compiled Java classes making up"
+ + " the function will be found. This functions like the -classpath option to the"
+ + " java command. It is a list of filenames separated by '${path.separator}'."
+ + " If an entry in the list names a directory then the class foo.bar.Baz will be looked"
+ + " for in foo${file.separator}bar${file.separator}Baz.class under that"
+ + " directory. If an entry in the list names a file and that file is a jar file then"
+ + " class foo.bar.Baz will be looked for in an entry foo/bar/Baz.class in that jar"
+ + " file. If an entry is a directory followed by '${file.separator}*' then every file"
+ + " in the directory whose name ends with '.jar' will be searched for classes.",
+ names = "--classpath"
)
- private String jar = null;
+ private String classPath = null;
@Parameter(
names = "--help", help = true
@@ -124,12 +136,12 @@ static Optional makeInvoker(Map environment, String...
try {
jCommander.parse(args);
} catch (ParameterException e) {
- jCommander.usage();
+ usage(jCommander);
throw e;
}
if (options.help) {
- jCommander.usage();
+ usage(jCommander);
return Optional.empty();
}
@@ -138,15 +150,15 @@ static Optional makeInvoker(Map environment, String...
port = Integer.parseInt(options.port);
} catch (NumberFormatException e) {
System.err.println("--port value should be an integer: " + options.port);
- jCommander.usage();
+ usage(jCommander);
throw e;
}
String functionTarget = options.target;
Path standardFunctionJarPath = Paths.get("function/function.jar");
- Optional functionJarPath =
+ Optional functionClasspath =
Arrays.asList(
- options.jar,
- environment.get("FUNCTION_JAR"),
+ options.classPath,
+ environment.get("FUNCTION_CLASSPATH"),
Files.exists(standardFunctionJarPath) ? standardFunctionJarPath.toString() : null)
.stream()
.filter(Objects::nonNull)
@@ -156,10 +168,19 @@ static Optional makeInvoker(Map environment, String...
port,
functionTarget,
environment.get("FUNCTION_SIGNATURE_TYPE"),
- functionJarPath);
+ functionClasspath);
return Optional.of(invoker);
}
+ private static void usage(JCommander jCommander) {
+ StringBuilder usageBuilder = new StringBuilder();
+ jCommander.getUsageFormatter().usage(usageBuilder);
+ String usage = usageBuilder.toString()
+ .replace("${file.separator}", File.separator)
+ .replace("${path.separator}", File.pathSeparator);
+ jCommander.getConsole().println(usage);
+ }
+
private static boolean isLocalRun() {
return System.getenv("K_SERVICE") == null;
}
@@ -167,17 +188,17 @@ private static boolean isLocalRun() {
private final Integer port;
private final String functionTarget;
private final String functionSignatureType;
- private final Optional functionJarPath;
+ private final Optional functionClasspath;
public Invoker(
Integer port,
String functionTarget,
String functionSignatureType,
- Optional functionJarPath) {
+ Optional functionClasspath) {
this.port = port;
this.functionTarget = functionTarget;
this.functionSignatureType = functionSignatureType;
- this.functionJarPath = functionJarPath;
+ this.functionClasspath = functionClasspath;
}
Integer getPort() {
@@ -192,8 +213,8 @@ String getFunctionSignatureType() {
return functionSignatureType;
}
- Optional getFunctionJarPath() {
- return functionJarPath;
+ Optional getFunctionClasspath() {
+ return functionClasspath;
}
public void startServer() throws Exception {
@@ -203,21 +224,11 @@ public void startServer() throws Exception {
context.setContextPath("/");
server.setHandler(context);
- Optional functionJarFile =
- functionJarPath.isPresent()
- ? Optional.of(new File(functionJarPath.get()))
- : Optional.empty();
- if (functionJarFile.isPresent() && !functionJarFile.get().exists()) {
- throw new IllegalArgumentException(
- "functionJarPath points to an non-existent file: "
- + functionJarFile.get().getAbsolutePath());
- }
-
ClassLoader runtimeLoader = getClass().getClassLoader();
ClassLoader classLoader;
- if (functionJarFile.isPresent()) {
+ if (functionClasspath.isPresent()) {
ClassLoader parent = new OnlyApiClassLoader(runtimeLoader);
- classLoader = new URLClassLoader(new URL[]{functionJarFile.get().toURI().toURL()}, parent);
+ classLoader = new URLClassLoader(classpathToUrls(functionClasspath.get()), parent);
} else {
classLoader = runtimeLoader;
}
@@ -279,6 +290,39 @@ public void startServer() throws Exception {
server.join();
}
+ static URL[] classpathToUrls(String classpath) throws IOException {
+ String[] components = classpath.split(File.pathSeparator);
+ List urls = new ArrayList<>();
+ for (String component : components) {
+ if (component.endsWith(File.separator + "*")) {
+ urls.addAll(jarsIn(component.substring(0, component.length() - 2)));
+ } else {
+ Path path = Paths.get(component);
+ if (Files.exists(path)) {
+ urls.add(path.toUri().toURL());
+ }
+ }
+ }
+ return urls.toArray(new URL[0]);
+ }
+
+ private static List jarsIn(String dir) throws IOException {
+ Path path = Paths.get(dir);
+ if (!Files.isDirectory(path)) {
+ return Collections.emptyList();
+ }
+ return Files.list(path)
+ .filter(p -> p.getFileName().toString().endsWith(".jar"))
+ .map(p -> {
+ try {
+ return p.toUri().toURL();
+ } catch (MalformedURLException e) {
+ throw new UncheckedIOException(e);
+ }
+ })
+ .collect(toList());
+ }
+
private void logServerInfo() {
if (isLocalRun()) {
logger.log(Level.INFO, "Serving function...");
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 863496cc..8c82f32e 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -330,24 +330,24 @@ private String functionJarString() throws IOException {
}
/**
- * Tests that if we launch an HTTP function with {@code --jar}, then the function code cannot
- * see the classes from the runtime. This is allows us to avoid conflicts between versions of
- * libraries that we use in the runtime and different versions of the same libraries that the
+ * Tests that if we launch an HTTP function with {@code --classpath}, then the function code
+ * cannot see the classes from the runtime. This is allows us to avoid conflicts between versions
+ * of libraries that we use in the runtime and different versions of the same libraries that the
* function might use.
*/
@Test
- public void jarOptionHttp() throws Exception {
+ public void classpathOptionHttp() throws Exception {
testHttpFunction("com.example.functionjar.Foreground",
- ImmutableList.of("--jar", functionJarString()),
+ ImmutableList.of("--classpath", functionJarString()),
TestCase.builder()
.setUrl("/?class=" + INTERNAL_CLASS.getName())
.setExpectedResponseText("OK")
.build());
}
- /** Like {@link #jarOptionHttp} but for background functions. */
+ /** Like {@link #classpathOptionHttp} but for background functions. */
@Test
- public void jarOptionBackground() throws Exception {
+ public void classpathOptionBackground() throws Exception {
Gson gson = new Gson();
URL resourceUrl = getClass().getResource("/adder_gcf_ga_event.json");
assertThat(resourceUrl).isNotNull();
@@ -356,7 +356,7 @@ public void jarOptionBackground() throws Exception {
JsonObject jsonData = json.getAsJsonObject("data");
jsonData.addProperty("class", INTERNAL_CLASS.getName());
testBackgroundFunction("com.example.functionjar.Background",
- ImmutableList.of("--jar", functionJarString()),
+ ImmutableList.of("--classpath", functionJarString()),
TestCase.builder().setRequestText(json.toString()).build());
}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
index f1c3e3b6..04c62dc2 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
@@ -1,12 +1,16 @@
package com.google.cloud.functions.invoker.runner;
import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
import static com.google.common.truth.Truth8.assertThat;
import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
+import java.net.URL;
import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Map;
import java.util.Optional;
@@ -24,6 +28,7 @@ public void help() throws IOException {
});
assertThat(help).contains("Usage:");
assertThat(help).contains("--target");
+ assertThat(help).containsMatch("separated\\s+by\\s+'" + File.pathSeparator + "'");
}
@Test
@@ -64,22 +69,40 @@ public void explicitSignatureType() {
}
@Test
- public void defaultJar() {
+ public void defaultClasspath() {
Optional invoker = Invoker.makeInvoker();
- assertThat(invoker.get().getFunctionJarPath()).isEmpty();
+ assertThat(invoker.get().getFunctionClasspath()).isEmpty();
}
+ private static final String FAKE_CLASSPATH =
+ "/foo/bar/baz.jar" + File.pathSeparator + "/some/directory";
+
@Test
- public void explicitJarViaEnvironment() {
- Map env = Collections.singletonMap("FUNCTION_JAR", "/foo/bar/baz.jar");
+ public void explicitClasspathViaEnvironment() {
+ Map env = Collections.singletonMap("FUNCTION_CLASSPATH", FAKE_CLASSPATH);
Optional invoker = Invoker.makeInvoker(env);
- assertThat(invoker.get().getFunctionJarPath()).hasValue("/foo/bar/baz.jar");
+ assertThat(invoker.get().getFunctionClasspath()).hasValue(FAKE_CLASSPATH);
}
@Test
- public void explicitJarViaOption() {
- Optional invoker = Invoker.makeInvoker("--jar", "/foo/bar/baz.jar");
- assertThat(invoker.get().getFunctionJarPath()).hasValue("/foo/bar/baz.jar");
+ public void explicitClasspathViaOption() {
+ Optional invoker = Invoker.makeInvoker("--classpath", FAKE_CLASSPATH);
+ assertThat(invoker.get().getFunctionClasspath()).hasValue(FAKE_CLASSPATH);
+ }
+
+ @Test
+ public void classpathToUrls() throws Exception {
+ String classpath =
+ "../testfunction/target/test-classes" + File.pathSeparator + "../testfunction/target/lib/*";
+ URL[] urls = Invoker.classpathToUrls(classpath);
+ assertWithMessage(Arrays.toString(urls)).that(urls.length).isGreaterThan(2);
+ File classesDir = new File(urls[0].toURI());
+ assertWithMessage(classesDir.toString()).that(classesDir.isDirectory()).isTrue();
+ for (int i = 1; i < urls.length; i++) {
+ URL url = urls[i];
+ assertThat(url.toString()).endsWith(".jar");
+ assertWithMessage(url.toString()).that(new File(url.toURI()).isFile()).isTrue();
+ }
}
private static String captureOutput(Runnable operation) throws IOException {
From b627f2888adc3ff8565222527a12191dff6a20ee Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Thu, 6 Feb 2020 17:32:20 -0800
Subject: [PATCH 044/364] Update the snapshot versions in pom.xml files.
PiperOrigin-RevId: 293715219
---
invoker/core/pom.xml | 4 ++--
invoker/pom.xml | 2 +-
invoker/testfunction/pom.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 23e8ea68..c84ed2be 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc2-SNAPSHOT
+ 1.0.0-alpha-2-rc3-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc2-SNAPSHOT
+ 1.0.0-alpha-2-rc3-SNAPSHOT
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 3ba349e5..d659d27e 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc2-SNAPSHOT
+ 1.0.0-alpha-2-rc3-SNAPSHOT
pom
GCF Java Invoker Parent
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 04ecb807..cbcbd5d3 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,7 +4,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc2-SNAPSHOT
+ 1.0.0-alpha-2-rc3-SNAPSHOT
com.google.cloud.functions.invoker
From f17c2230276e231926c4bbebf214c619550ac0af Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Fri, 7 Feb 2020 16:52:53 -0800
Subject: [PATCH 045/364] Restructure the way new-style functions are loaded.
This shares more code between the HTTP and Background flavours,
and improves the logic for guessing the flavour when it is not specified.
It also gives a better exception when the named target class does not exist.
Also replace some uses of deprecated methods in one of the test functions.
PiperOrigin-RevId: 293924171
---
.../NewBackgroundFunctionExecutor.java | 33 ++---
.../invoker/NewHttpFunctionExecutor.java | 41 ++----
.../functions/invoker/runner/Invoker.java | 125 +++++++++++-------
.../functions/invoker/runner/InvokerTest.java | 17 ++-
.../testfunctions/BackgroundSnoop.java | 2 +-
5 files changed, 117 insertions(+), 101 deletions(-)
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
index a460ddda..f70c46eb 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
@@ -53,34 +53,25 @@ private NewBackgroundFunctionExecutor(FunctionExecutor functionExecutor) {
}
/**
- * Make a {@link NewBackgroundFunctionExecutor} for the class named by the given {@code target}.
- * If the class cannot be loaded, we currently assume that this is an old-style function
- * (specified as package.Class.method instead of package.Class) and return
- * {@code Optional.empty()}.
+ * Makes a {@link NewHttpFunctionExecutor} for the given class.
*
- * @throws RuntimeException if we succeed in loading the class named by {@code target} but then
- * either the class does not implement {@link RawBackgroundFunction} or we are unable to
- * construct an instance using its no-arg constructor.
+ * @throws RuntimeException if either the class does not implement one of
+ * {@link BackgroundFunction} or {@link RawBackgroundFunction},
+ * or we are unable to construct an instance using its no-arg constructor.
*/
- public static Optional forTarget(
- String target, ClassLoader loader) {
- Class c;
- try {
- c = loader.loadClass(target);
- } catch (ClassNotFoundException e) {
- return Optional.empty();
- }
- if (!BackgroundFunction.class.isAssignableFrom(c)
- && !RawBackgroundFunction.class.isAssignableFrom(c)) {
+ public static NewBackgroundFunctionExecutor forClass(Class functionClass) {
+ if (!BackgroundFunction.class.isAssignableFrom(functionClass)
+ && !RawBackgroundFunction.class.isAssignableFrom(functionClass)) {
throw new RuntimeException(
- "Class " + c.getName() + " implements neither " + BackgroundFunction.class
+ "Class " + functionClass.getName() + " implements neither " + BackgroundFunction.class
.getName() + " nor " + RawBackgroundFunction.class.getName());
}
Object instance;
try {
- instance = c.getConstructor().newInstance();
+ instance = functionClass.getConstructor().newInstance();
} catch (ReflectiveOperationException e) {
- throw new RuntimeException("Could not construct an instance of " + target + ": " + e, e);
+ throw new RuntimeException(
+ "Could not construct an instance of " + functionClass.getName() + ": " + e, e);
}
FunctionExecutor executor;
if (instance instanceof RawBackgroundFunction) {
@@ -99,7 +90,7 @@ public static Optional forTarget(
}
executor = new TypedFunctionExecutor<>(maybeTargetType.get(), backgroundFunction);
}
- return Optional.of(new NewBackgroundFunctionExecutor(executor));
+ return new NewBackgroundFunctionExecutor(executor);
}
/**
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
index 0b2fb8e1..e3f36958 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
@@ -18,7 +18,6 @@
import com.google.cloud.functions.invoker.http.HttpRequestImpl;
import com.google.cloud.functions.invoker.http.HttpResponseImpl;
import java.io.IOException;
-import java.util.Optional;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.servlet.http.HttpServlet;
@@ -36,42 +35,24 @@ private NewHttpFunctionExecutor(HttpFunction function) {
}
/**
- * Make a {@link NewHttpFunctionExecutor} for the class named by the given {@code target}.
- * If the class cannot be loaded, we currently assume that this is an old-style function
- * (specified as package.Class.method instead of package.Class) and return
- * {@code Optional.empty()}.
+ * Makes a {@link NewHttpFunctionExecutor} for the given class.
*
- * @throws RuntimeException if we succeed in loading the class named by {@code target} but then
- * either the class does not implement {@link HttpFunction} or we are unable to construct an
- * instance using its no-arg constructor.
+ * @throws RuntimeException if either the given class does not implement {@link HttpFunction}
+ * or we are unable to construct an instance using its no-arg constructor.
*/
- public static Optional forTarget(String target, ClassLoader loader) {
- Class c;
- while (true) {
- try {
- c = loader.loadClass(target);
- break;
- } catch (ClassNotFoundException e) {
- // This might be a nested class like com.example.Foo.Bar. That will actually appear as
- // com.example.Foo$Bar as far as Class.forName is concerned. So we try to replace every dot
- // from the last to the first with a $ in the hope of finding a class we can load.
- int lastDot = target.lastIndexOf('.');
- if (lastDot < 0) {
- return Optional.empty();
- }
- target = target.substring(0, lastDot) + '$' + target.substring(lastDot + 1);
- }
- }
- if (!HttpFunction.class.isAssignableFrom(c)) {
+ public static NewHttpFunctionExecutor forClass(Class functionClass) {
+ if (!HttpFunction.class.isAssignableFrom(functionClass)) {
throw new RuntimeException(
- "Class " + c.getName() + " does not implement " + HttpFunction.class.getName());
+ "Class " + functionClass.getName() + " does not implement "
+ + HttpFunction.class.getName());
}
- Class httpFunctionClass = c.asSubclass(HttpFunction.class);
+ Class httpFunctionClass = functionClass.asSubclass(HttpFunction.class);
try {
HttpFunction httpFunction = httpFunctionClass.getConstructor().newInstance();
- return Optional.of(new NewHttpFunctionExecutor(httpFunction));
+ return new NewHttpFunctionExecutor(httpFunction);
} catch (ReflectiveOperationException e) {
- throw new RuntimeException("Could not construct an instance of " + target + ": " + e, e);
+ throw new RuntimeException(
+ "Could not construct an instance of " + functionClass.getName() + ": " + e, e);
}
}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index 1f032f9e..21a6b682 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -19,6 +19,9 @@
import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
+import com.google.cloud.functions.BackgroundFunction;
+import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.RawBackgroundFunction;
import com.google.cloud.functions.invoker.BackgroundCloudFunction;
import com.google.cloud.functions.invoker.BackgroundFunctionExecutor;
import com.google.cloud.functions.invoker.BackgroundFunctionSignatureMatcher;
@@ -48,6 +51,7 @@
import java.util.logging.Level;
import java.util.logging.LogManager;
import java.util.logging.Logger;
+import java.util.stream.Stream;
import javax.servlet.http.HttpServlet;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.servlet.ServletContextHandler;
@@ -163,12 +167,13 @@ static Optional makeInvoker(Map environment, String...
.stream()
.filter(Objects::nonNull)
.findFirst();
+ ClassLoader functionClassLoader = makeClassLoader(functionClasspath);
Invoker invoker =
new Invoker(
port,
functionTarget,
environment.get("FUNCTION_SIGNATURE_TYPE"),
- functionClasspath);
+ functionClassLoader);
return Optional.of(invoker);
}
@@ -185,20 +190,29 @@ private static boolean isLocalRun() {
return System.getenv("K_SERVICE") == null;
}
+ private static ClassLoader makeClassLoader(Optional functionClasspath) {
+ ClassLoader runtimeLoader = Invoker.class.getClassLoader();
+ if (functionClasspath.isPresent()) {
+ ClassLoader parent = new OnlyApiClassLoader(runtimeLoader);
+ return new URLClassLoader(classpathToUrls(functionClasspath.get()), parent);
+ }
+ return runtimeLoader;
+ }
+
private final Integer port;
private final String functionTarget;
private final String functionSignatureType;
- private final Optional functionClasspath;
+ private final ClassLoader functionClassLoader;
public Invoker(
Integer port,
String functionTarget,
String functionSignatureType,
- Optional functionClasspath) {
+ ClassLoader functionClassLoader) {
this.port = port;
this.functionTarget = functionTarget;
this.functionSignatureType = functionSignatureType;
- this.functionClasspath = functionClasspath;
+ this.functionClassLoader = functionClassLoader;
}
Integer getPort() {
@@ -213,8 +227,8 @@ String getFunctionSignatureType() {
return functionSignatureType;
}
- Optional getFunctionClasspath() {
- return functionClasspath;
+ ClassLoader getFunctionClassLoader() {
+ return functionClassLoader;
}
public void startServer() throws Exception {
@@ -224,58 +238,34 @@ public void startServer() throws Exception {
context.setContextPath("/");
server.setHandler(context);
- ClassLoader runtimeLoader = getClass().getClassLoader();
- ClassLoader classLoader;
- if (functionClasspath.isPresent()) {
- ClassLoader parent = new OnlyApiClassLoader(runtimeLoader);
- classLoader = new URLClassLoader(classpathToUrls(functionClasspath.get()), parent);
- } else {
- classLoader = runtimeLoader;
- }
+ Optional> functionClass = loadFunctionClass();
HttpServlet servlet;
if ("http".equals(functionSignatureType)) {
- Optional newExecutor =
- NewHttpFunctionExecutor.forTarget(functionTarget, classLoader);
- if (newExecutor.isPresent()) {
- servlet = newExecutor.get();
+ if (functionClass.isPresent()) {
+ servlet = NewHttpFunctionExecutor.forClass(functionClass.get());
} else {
- FunctionLoader loader =
- new FunctionLoader<>(functionTarget, classLoader, new HttpFunctionSignatureMatcher());
+ FunctionLoader loader = new FunctionLoader<>(
+ functionTarget, functionClassLoader, new HttpFunctionSignatureMatcher());
HttpCloudFunction function = loader.loadUserFunction();
servlet = new HttpFunctionExecutor(function);
}
} else if ("event".equals(functionSignatureType)) {
- Optional newExecutor =
- NewBackgroundFunctionExecutor.forTarget(functionTarget, classLoader);
- if (newExecutor.isPresent()) {
- servlet = newExecutor.get();
+ if (functionClass.isPresent()) {
+ servlet = NewBackgroundFunctionExecutor.forClass(functionClass.get());
} else {
FunctionLoader loader =
new FunctionLoader<>(
- functionTarget, classLoader, new BackgroundFunctionSignatureMatcher());
+ functionTarget, functionClassLoader, new BackgroundFunctionSignatureMatcher());
BackgroundCloudFunction function = loader.loadUserFunction();
servlet = new BackgroundFunctionExecutor(function);
}
} else if (functionSignatureType == null) {
- Optional httpExecutor =
- NewHttpFunctionExecutor.forTarget(functionTarget, classLoader);
- if (httpExecutor.isPresent()) {
- servlet = httpExecutor.get();
+ if (functionClass.isPresent()) {
+ servlet = servletForDeducedSignatureType(functionClass.get());
} else {
- Optional backgroundExecutor =
- NewBackgroundFunctionExecutor.forTarget(functionTarget, classLoader);
- if (backgroundExecutor.isPresent()) {
- servlet = backgroundExecutor.get();
- } else {
- String error = String.format(
- "Could not determine function signature type from target %s. Either this should be"
- + " a class implementing one of the interfaces in com.google.cloud.functions, or the"
- + " environment variable FUNCTION_SIGNATURE_TYPE should be set to \"http\" or"
- + " \"event\".",
- functionTarget);
- throw new RuntimeException(error);
- }
+ throw new RuntimeException(
+ "Class " + functionTarget + " does not exist or could not be loaded");
}
} else {
String error = String.format(
@@ -290,7 +280,42 @@ public void startServer() throws Exception {
server.join();
}
- static URL[] classpathToUrls(String classpath) throws IOException {
+ private Optional> loadFunctionClass() {
+ String target = functionTarget;
+ while (true) {
+ try {
+ return Optional.of(functionClassLoader.loadClass(target));
+ } catch (ClassNotFoundException e) {
+ // This might be a nested class like com.example.Foo.Bar. That will actually appear as
+ // com.example.Foo$Bar as far as Class.forName is concerned. So we try to replace every dot
+ // from the last to the first with a $ in the hope of finding a class we can load.
+ int lastDot = target.lastIndexOf('.');
+ if (lastDot < 0) {
+ return Optional.empty();
+ }
+ target = target.substring(0, lastDot) + '$' + target.substring(lastDot + 1);
+ }
+ }
+ }
+
+ private HttpServlet servletForDeducedSignatureType(Class functionClass) {
+ if (HttpFunction.class.isAssignableFrom(functionClass)) {
+ return NewHttpFunctionExecutor.forClass(functionClass);
+ }
+ if (BackgroundFunction.class.isAssignableFrom(functionClass)
+ || RawBackgroundFunction.class.isAssignableFrom(functionClass)) {
+ return NewBackgroundFunctionExecutor.forClass(functionClass);
+ }
+ String error = String.format(
+ "Could not determine function signature type from target %s. Either this should be"
+ + " a class implementing one of the interfaces in com.google.cloud.functions, or the"
+ + " environment variable FUNCTION_SIGNATURE_TYPE should be set to \"http\" or"
+ + " \"event\".",
+ functionTarget);
+ throw new RuntimeException(error);
+ }
+
+ static URL[] classpathToUrls(String classpath) {
String[] components = classpath.split(File.pathSeparator);
List urls = new ArrayList<>();
for (String component : components) {
@@ -298,20 +323,28 @@ static URL[] classpathToUrls(String classpath) throws IOException {
urls.addAll(jarsIn(component.substring(0, component.length() - 2)));
} else {
Path path = Paths.get(component);
- if (Files.exists(path)) {
+ try {
urls.add(path.toUri().toURL());
+ } catch (MalformedURLException e) {
+ throw new UncheckedIOException(e);
}
}
}
return urls.toArray(new URL[0]);
}
- private static List jarsIn(String dir) throws IOException {
+ private static List jarsIn(String dir) {
Path path = Paths.get(dir);
if (!Files.isDirectory(path)) {
return Collections.emptyList();
}
- return Files.list(path)
+ Stream stream;
+ try {
+ stream = Files.list(path);
+ } catch (IOException e) {
+ throw new UncheckedIOException(e);
+ }
+ return stream
.filter(p -> p.getFileName().toString().endsWith(".jar"))
.map(p -> {
try {
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
index 04c62dc2..b2e86900 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/runner/InvokerTest.java
@@ -3,17 +3,20 @@
import static com.google.common.truth.Truth.assertThat;
import static com.google.common.truth.Truth.assertWithMessage;
import static com.google.common.truth.Truth8.assertThat;
+import static java.util.stream.Collectors.joining;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
import java.net.URL;
+import java.net.URLClassLoader;
import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.Collections;
import java.util.Map;
import java.util.Optional;
+import java.util.stream.Collectors;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -71,7 +74,8 @@ public void explicitSignatureType() {
@Test
public void defaultClasspath() {
Optional invoker = Invoker.makeInvoker();
- assertThat(invoker.get().getFunctionClasspath()).isEmpty();
+ assertThat(invoker.get().getClass().getClassLoader())
+ .isSameInstanceAs(Invoker.class.getClassLoader());
}
private static final String FAKE_CLASSPATH =
@@ -81,13 +85,20 @@ public void defaultClasspath() {
public void explicitClasspathViaEnvironment() {
Map env = Collections.singletonMap("FUNCTION_CLASSPATH", FAKE_CLASSPATH);
Optional invoker = Invoker.makeInvoker(env);
- assertThat(invoker.get().getFunctionClasspath()).hasValue(FAKE_CLASSPATH);
+ assertThat(invokerClasspath(invoker.get())).isEqualTo(FAKE_CLASSPATH);
}
@Test
public void explicitClasspathViaOption() {
Optional invoker = Invoker.makeInvoker("--classpath", FAKE_CLASSPATH);
- assertThat(invoker.get().getFunctionClasspath()).hasValue(FAKE_CLASSPATH);
+ assertThat(invokerClasspath(invoker.get())).isEqualTo(FAKE_CLASSPATH);
+ }
+
+ private static String invokerClasspath(Invoker invoker) {
+ URLClassLoader urlClassLoader = (URLClassLoader) invoker.getFunctionClassLoader();
+ return Arrays.stream(urlClassLoader.getURLs())
+ .map(URL::getPath)
+ .collect(joining(File.pathSeparator));
}
@Test
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java
index 59d22636..baf96da7 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/BackgroundSnoop.java
@@ -21,7 +21,7 @@ public void snoop(JsonElement jsonElement, Context context) throws IOException {
if (targetFile == null) {
throw new IllegalArgumentException("Expected targetFile in JSON payload");
}
- JsonObject resourceJson = new JsonParser().parse(context.resource()).getAsJsonObject();
+ JsonObject resourceJson = JsonParser.parseString(context.resource()).getAsJsonObject();
JsonObject contextJson = new JsonObject();
contextJson.addProperty("eventId", context.eventId());
contextJson.addProperty("timestamp", context.timestamp());
From 97025cb7ec6bd1271369d66a31c8cc2791e9ee1e Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Mon, 10 Feb 2020 13:39:28 -0800
Subject: [PATCH 046/364] Initial version of a Maven plugin to run functions.
When appropriately configured in pom.xml, you can use `mvn function:run` to
compile your function and start a web server that serves it.
The version of the plugin artifact will track the version of the Invoker (aka Functions Framework). Since the plugin depends on and runs the Invoker, any time we change the latter we need to change the former.
Further documentation to follow.
PiperOrigin-RevId: 294293170
---
invoker/function-maven-plugin/pom.xml | 68 +++++++++++++++++++
.../cloud/functions/plugin/RunFunction.java | 58 ++++++++++++++++
invoker/pom.xml | 1 +
invoker/testfunction/pom.xml | 1 +
4 files changed, 128 insertions(+)
create mode 100644 invoker/function-maven-plugin/pom.xml
create mode 100644 invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
new file mode 100644
index 00000000..d5017528
--- /dev/null
+++ b/invoker/function-maven-plugin/pom.xml
@@ -0,0 +1,68 @@
+
+ 4.0.0
+
+
+ com.google.cloud.functions.invoker
+ java-function-invoker-parent
+ 1.0.0-alpha-2-rc3-SNAPSHOT
+
+
+ com.google.cloud.functions
+ function-maven-plugin
+ maven-plugin
+ 1.0.0-alpha-2-rc3-SNAPSHOT
+ Functions Framework Plugin
+ A Maven plugin that allows functions to be run locally
+ using the Java Functions Framework.
+ http://maven.apache.org
+
+
+ 8
+ 8
+ 8
+
+
+
+
+
+ org.apache.maven
+ maven-plugin-api
+ 3.6.3
+
+
+ org.apache.maven
+ maven-core
+ 3.6.3
+
+
+ org.apache.maven.plugin-tools
+ maven-plugin-annotations
+ 3.6.0
+ provided
+
+
+
+ com.google.cloud.functions.invoker
+ java-function-invoker
+ 1.0.0-alpha-2-rc3-SNAPSHOT
+
+
+
+ junit
+ junit
+ 4.13
+ test
+
+
+
+
+
+
+ org.apache.maven.plugins
+ maven-plugin-plugin
+ 3.6.0
+
+
+
+
diff --git a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
new file mode 100644
index 00000000..a54b80a8
--- /dev/null
+++ b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
@@ -0,0 +1,58 @@
+package com.google.cloud.functions.plugin;
+
+import com.google.cloud.functions.invoker.runner.Invoker;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
+@Mojo(name = "run",
+ defaultPhase = LifecyclePhase.GENERATE_RESOURCES,
+ requiresDependencyResolution = ResolutionScope.COMPILE,
+ requiresDependencyCollection = ResolutionScope.COMPILE)
+@Execute(phase = LifecyclePhase.COMPILE)
+public class RunFunction extends AbstractMojo {
+
+ /**
+ * The name of the function to run. This is the name of a class that implements one of the
+ * interfaces in {@code com.google.cloud.functions}.
+ */
+ @Parameter(property = "run.functionTarget")
+ private String functionTarget;
+
+ /**
+ * The port on which the HTTP server wrapping the function should listen.
+ */
+ @Parameter(property = "run.port", defaultValue = "8080")
+ private Integer port;
+
+ /**
+ * Used to determine what classpath needs to be used to load the function. This parameter is
+ * injected by Maven and can't be set explicitly in a pom.xml file.
+ */
+ @Parameter(defaultValue = "${project.compileClasspathElements}", readonly = true, required = true)
+ private List compilePath;
+
+ public void execute() throws MojoExecutionException {
+ String classpath = String.join(File.pathSeparator, compilePath);
+ List args = new ArrayList<>();
+ args.addAll(Arrays.asList("--classpath", classpath));
+ if (functionTarget != null) {
+ args.addAll(Arrays.asList("--target", functionTarget));
+ }
+ try {
+ getLog().info("Calling Invoker with " + args);
+ Invoker.main(args.toArray(new String[0]));
+ } catch (Exception e) {
+ getLog().error("Could not invoke function: " + e, e);
+ throw new MojoExecutionException("Could not invoke function", e);
+ }
+ }
+}
diff --git a/invoker/pom.xml b/invoker/pom.xml
index d659d27e..3a781b58 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -27,6 +27,7 @@
core
testfunction
+ function-maven-plugin
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index cbcbd5d3..33238c8c 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -85,6 +85,7 @@
org.apache.maven.plugins
maven-deploy-plugin
+ 3.0.0-M1
true
From 7dbd2f42e8e63cb7dcc7fe05e051218e98670c38 Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Mon, 10 Feb 2020 18:00:21 -0800
Subject: [PATCH 047/364] Add a javadoc description for RunFunction.
Also add the pom.xml incantation to make this text appear when
the user does mvn function:help.
PiperOrigin-RevId: 294347457
---
invoker/function-maven-plugin/pom.xml | 8 +++++++
.../cloud/functions/plugin/RunFunction.java | 24 +++++++++++++++++++
2 files changed, 32 insertions(+)
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index d5017528..8d8da321 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -62,6 +62,14 @@
org.apache.maven.plugins
maven-plugin-plugin
3.6.0
+
+
+ help-goal
+
+ helpmojo
+
+
+
diff --git a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
index a54b80a8..dd5cb83c 100644
--- a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
+++ b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/RunFunction.java
@@ -13,6 +13,30 @@
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
+/**
+ * Runs a function using the Java Functions Framework. Typically this plugin is configured in one
+ * of two ways. Either in the pom.xml file, like this...
+ *
+ * {@code
+ *
+ * com.google.cloud.functions
+ * function-maven-plugin
+ * 1.0.0-alpha-2-rc3
+ *
+ * com.example.function.Echo
+ *
+ *
+ * }
+ *
+ * ...and then run using {@code mvn function:run}. Or using properties on the command line, like
+ * this...
+ *
+ * {@code
+ * mvn com.google.cloud.functions:function:1.0.0-alpha-2-rc3:run \
+ * -Drun.functionTarget=com.example.function.Echo}
+ *
+ *
+ */
@Mojo(name = "run",
defaultPhase = LifecyclePhase.GENERATE_RESOURCES,
requiresDependencyResolution = ResolutionScope.COMPILE,
From 5e82f1c715e18ebcb42bb9bfbcc1299c197cfe0f Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Wed, 12 Feb 2020 11:51:11 -0800
Subject: [PATCH 048/364] Change the version number for function-maven-plugin
so it is not tied to the version for the Functions Framework. Although every
release of the Functions Framework will require a release of
function-maven-plugin that can use it, there can also be several releases of
function-maven-plugin without the Functions Framework changing.
PiperOrigin-RevId: 294719014
---
invoker/function-maven-plugin/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 8d8da321..3553f95c 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -11,7 +11,7 @@
com.google.cloud.functions
function-maven-plugin
maven-plugin
- 1.0.0-alpha-2-rc3-SNAPSHOT
+ 0.9-SNAPSHOT
Functions Framework Plugin
A Maven plugin that allows functions to be run locally
using the Java Functions Framework.
From 12dba0d0866e3cb16adc826c3dd572d6ac04cbc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?=
Date: Wed, 12 Feb 2020 15:12:07 -0800
Subject: [PATCH 049/364] [maven-release-plugin] prepare release
java-function-invoker-parent-1.0.0-alpha-2-rc3
---
invoker/core/pom.xml | 6 +++---
invoker/function-maven-plugin/pom.xml | 9 ++++-----
invoker/pom.xml | 2 +-
invoker/testfunction/pom.xml | 4 ++--
4 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index c84ed2be..12605fc7 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc3-SNAPSHOT
+ 1.0.0-alpha-2-rc3
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc3-SNAPSHOT
+ 1.0.0-alpha-2-rc3
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
@@ -101,7 +101,7 @@
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-2-SNAPSHOT
+ 1.0.0-alpha-2
test-jar
test
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 3553f95c..dfb94659 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -1,17 +1,16 @@
-
+
4.0.0
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc3-SNAPSHOT
+ 1.0.0-alpha-2-rc3
com.google.cloud.functions
function-maven-plugin
maven-plugin
- 0.9-SNAPSHOT
+ 0.9
Functions Framework Plugin
A Maven plugin that allows functions to be run locally
using the Java Functions Framework.
@@ -45,7 +44,7 @@
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc3-SNAPSHOT
+ 1.0.0-alpha-2-rc3
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 3a781b58..0dfaaf41 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc3-SNAPSHOT
+ 1.0.0-alpha-2-rc3
pom
GCF Java Invoker Parent
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index 33238c8c..ae285845 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc3-SNAPSHOT
+ 1.0.0-alpha-2-rc3
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-2-SNAPSHOT
+ 1.0.0-alpha-2
Example GCF Function Jar
An example of a GCF function packaged into a jar. We use this in tests.
From c53281605ccb7eda3200990abda5d6360fd28710 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?=
Date: Wed, 12 Feb 2020 15:12:16 -0800
Subject: [PATCH 050/364] [maven-release-plugin] prepare for next development
iteration
---
invoker/core/pom.xml | 6 +++---
invoker/function-maven-plugin/pom.xml | 6 +++---
invoker/pom.xml | 2 +-
invoker/testfunction/pom.xml | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 12605fc7..1c543968 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc3
+ 1.0.0-alpha-2-rc4-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc3
+ 1.0.0-alpha-2-rc4-SNAPSHOT
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
@@ -101,7 +101,7 @@
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-2
+ 1.0.0-alpha-3-SNAPSHOT
test-jar
test
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index dfb94659..af9c5667 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc3
+ 1.0.0-alpha-2-rc4-SNAPSHOT
com.google.cloud.functions
function-maven-plugin
maven-plugin
- 0.9
+ 0.9.1-SNAPSHOT
Functions Framework Plugin
A Maven plugin that allows functions to be run locally
using the Java Functions Framework.
@@ -44,7 +44,7 @@
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc3
+ 1.0.0-alpha-2-rc4-SNAPSHOT
diff --git a/invoker/pom.xml b/invoker/pom.xml
index 0dfaaf41..b09fdbd5 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc3
+ 1.0.0-alpha-2-rc4-SNAPSHOT
pom
GCF Java Invoker Parent
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index ae285845..d9659932 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc3
+ 1.0.0-alpha-2-rc4-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-2
+ 1.0.0-alpha-3-SNAPSHOT
Example GCF Function Jar
An example of a GCF function packaged into a jar. We use this in tests.
From 5bde734b7155eff7a141b80894244d295dab7fd2 Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Fri, 14 Feb 2020 08:18:45 -0800
Subject: [PATCH 051/364] Add some content to the Functions Framework README,
explaining how to write a function and how to run one with the Maven Plugin.
PiperOrigin-RevId: 295150234
---
README.md | 254 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 251 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 1a1ef5fb..15173130 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,253 @@
-# Functions Framework API for Java [](https://travis-ci.org/GoogleCloudPlatform/functions-framework-java)
+# Functions Framework for Java [](https://travis-ci.org/GoogleCloudPlatform/functions-framework-java)
+An open source FaaS (Function as a service) framework for writing portable
+Java functions -- brought to you by the Google Cloud Functions team.
-**This is a placeholder for the Functions Framework for Java. Stay tuned for
-updates.**
+The Functions Framework lets you write lightweight functions that run in many
+different environments, including:
+
+* [Google Cloud Functions](https://cloud.google.com/functions/)
+* Your local development machine
+* [Cloud Run and Cloud Run on GKE](https://cloud.google.com/run/)
+* [Knative](https://github.com/knative/)-based environments
+
+## Installation
+
+The Functions Framework for Java requires
+[Java](https://java.com/en/download/help/download_options.xml) and
+[Maven](http://maven.apache.org/install.html) (the `mvn` command).
+
+## Quickstart: Hello, World on your local machine
+
+A function is typically structured as a Maven project. We recommend using an IDE
+that supports Maven to create the Maven project. Add this dependency in the
+`pom.xml` file of your project:
+
+```xml
+
+ com.google.cloud.functions
+ functions-framework-api
+ 1.0.0-alpha-2-rc3
+ provided
+
+```
+
+### Writing an HTTP function
+
+Create a file `src/main/java/com/example/HelloWorld.java` with the following
+contents:
+
+```java
+package com.example;
+
+import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.HttpRequest;
+import com.google.cloud.functions.HttpResponse;
+
+public class HelloWorld implements HttpFunction {
+ @Override
+ public void service(HttpRequest request, HttpResponse response)
+ throws Exception {
+ response.getWriter().write("Hello, World\n");
+ }
+}
+```
+
+
+## Quickstart: Create a Background Function
+
+There are two ways to write a Background function, which differ in how the
+payload of the incoming event is represented. In a "raw" background function
+this payload is presented as a JSON-encoded Java string. In a "typed" background
+function the Functions Framework deserializes the JSON payload into a Plain Old
+Java Object (POJO).
+
+### Writing a Raw Background Function
+
+Create a file `src/main/java/com/example/Background.java` with the following
+contents:
+
+```java
+package com.example;
+
+import com.google.cloud.functions.Context;
+import com.google.cloud.functions.RawBackgroundFunction;
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import java.util.logging.Logger;
+
+public class Background implements RawBackgroundFunction {
+ private static final Logger logger =
+ Logger.getLogger(Background.class.getName());
+
+ @Override
+ public void accept(String json, Context context) {
+ Gson gson = new Gson();
+ JsonObject jsonObject = gson.fromJson(json, JsonObject.class);
+ logger.info("Received JSON object: " + jsonObject);
+ }
+}
+```
+
+### Writing a Typed Background Function
+
+Create a file `src/main/java/com/example/PubSubBackground` with the following
+contents:
+
+```java
+package com.example;
+
+import com.example.PubSubBackground.PubSubMessage;
+import com.google.cloud.functions.BackgroundFunction;
+import com.google.cloud.functions.Context;
+import java.util.Map;
+import java.util.logging.Logger;
+
+public class PubSubBackground implements BackgroundFunction {
+ private static final Logger logger =
+ Logger.getLogger(PubSubBackground.class.getName());
+
+ @Override
+ public void accept(PubSubMessage pubSubMessage, Context context) {
+ logger.info("Received message with id " + pubSubMessage.messageId);
+ }
+
+ public static class PubSubMessage {
+ public String data;
+ public Map attributes;
+ public String messageId;
+ public String publishTime;
+ }
+}
+```
+
+
+## Running a function with the Maven plugin
+
+The Maven plugin called `function-maven-plugin` allows you to run functions
+on your development machine.
+
+### Configuration in `pom.xml`
+
+You can configure the plugin in `pom.xml`:
+
+```xml
+
+ com.google.cloud.functions
+ function-maven-plugin
+ 0.9
+
+ com.example.function.Echo
+
+
+```
+
+Then run it from the command line:
+
+```sh
+mvn function:run
+```
+
+### Configuration on the command line
+
+You can alternatively configure the plugin with properties on the command line:
+
+```sh
+ mvn com.google.cloud.functions:function:0.9:run \
+ -Drun.functionTarget=com.example.function.Echo
+```
+
+### Running the Functions Framework directly
+
+You can also run a function by using the Functions Framework jar directly.
+Copy the Functions Framework jar to a local location like this:
+
+```sh
+mvn dependency:copy \
+ -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.0.0-alpha-2-rc3' \
+ -DoutputDirectory=.
+```
+
+In this example we use the current directory `.` but you can specify any other
+directory to copy to. Then run your function:
+
+```sh
+java -jar java-function-invoker-1.0.0-alpha-2-rc3.jar \
+ --classpath myfunction.jar \
+ --target com.example.HelloWorld
+```
+
+
+## Functions Framework configuration
+
+There are a number of options that can be used to configure the Functions
+Framework, whether run directly or on the command line. This table summarizes
+them, and the following sections explain them in detail.
+
+| Command-line | `pom.xml` | Maven system property |
+|---------------|--------------------|-----------------------|
+| `--target` | `` | `run.functionTarget` |
+| `--port` | `` | `run.port` |
+| `--classpath` | - | - |
+
+### Which function to run
+
+A function is a Java class. You must specify the name of that class when running
+the Functions Framework:
+
+```
+--target com.example.HelloWorld
+com.example.HelloWorld
+-Drun.functionTarget=com.example.HelloWorld
+```
+
+### Which port to listen on
+
+The Functions Framework is an HTTP server that directs incoming HTTP requests to
+the function code. By default this server listens on port 8080. Specify an
+alternative value like this:
+
+```
+--port 12345
+12345
+-Drun.port=12345
+```
+
+### Function classpath
+
+Function code runs with a classpath that includes the function code itself and
+its dependencies. The Maven plugin automatically computes the classpath based
+on the dependencies expressed in `pom.xml`. When invoking the Functions
+Framework directly, you must use `--classpath` to indicate how to find the code
+and its dependencies. For example:
+
+```
+java -jar java-function-invoker-1.0.0-alpha-2-rc3.jar \
+ --classpath 'myfunction.jar:/some/directory:/some/library/*' \
+ --target com.example.HelloWorld
+```
+
+The `--classpath` option works like
+[`java -classpath`](https://docs.oracle.com/en/java/javase/13/docs/specs/man/java.html#standard-options-for-java).
+It is a list of entries separated by `:` (`;` on Windows), where each entry is:
+
+* a directory, in which case class `com.example.Foo` is looked for in a file
+ `com/example/Foo.class` under that directory;
+* a jar file, in which case class `com.example.Foo` is looked for in a file
+ `com/example/Foo.class` in that jar file;
+* a directory followed by `/*` (`\*` on Windows), in which case each jar file
+ in that directory (file called `foo.jar`) is treated the same way as if it
+ had been named explicitly.
+
+#### Simplifying the claspath
+
+Specifying the right classpath can be tricky. A simpler alternative is to
+build the function as a "fat jar", where the function code and all its
+dependencies are in a single jar file. Then `--classpath myfatfunction.jar`
+is enough. An example of how this is done is the Functions Framework jar itself,
+as seen
+[here](https://github.com/GoogleCloudPlatform/functions-framework-java/blob/b627f28/invoker/core/pom.xml#L153).
+
+Alternatively, you can arrange for your jar to have its own classpath, as
+described
+[here](https://maven.apache.org/shared/maven-archiver/examples/classpath.html).
From 68dddf0ec3e0d67b150074c525164a2cd6976aca Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Thu, 20 Feb 2020 12:58:07 -0800
Subject: [PATCH 052/364] Remove useless URL-rewriting logic from the Java FF.
The code seems to be based on the idea that the function servlet is
registered with a servlet path that is the name of the function (/myfunction)
but actually the servlet path is always empty. So the existing logic has no
effect.
PiperOrigin-RevId: 296277143
---
.../invoker/HttpFunctionExecutor.java | 3 +-
.../invoker/NewHttpFunctionExecutor.java | 3 +-
.../functions/invoker/URLRequestWrapper.java | 40 -------------------
3 files changed, 2 insertions(+), 44 deletions(-)
delete mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/URLRequestWrapper.java
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
index 84ded47f..08d339de 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/HttpFunctionExecutor.java
@@ -30,9 +30,8 @@ public HttpFunctionExecutor(HttpCloudFunction function) {
/** Executes the user's method, can handle all HTTP type methods. */
@Override
public void service(HttpServletRequest req, HttpServletResponse res) {
- URLRequestWrapper wrapper = new URLRequestWrapper(req);
try {
- function.execute(wrapper, res);
+ function.execute(req, res);
} catch (InvocationTargetException e) {
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
e.getCause().printStackTrace();
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
index e3f36958..0ed8649e 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
@@ -59,8 +59,7 @@ public static NewHttpFunctionExecutor forClass(Class functionClass) {
/** Executes the user's method, can handle all HTTP type methods. */
@Override
public void service(HttpServletRequest req, HttpServletResponse res) {
- URLRequestWrapper wrapper = new URLRequestWrapper(req);
- HttpRequestImpl reqImpl = new HttpRequestImpl(wrapper);
+ HttpRequestImpl reqImpl = new HttpRequestImpl(req);
HttpResponseImpl respImpl = new HttpResponseImpl(res);
try {
function.service(reqImpl, respImpl);
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/URLRequestWrapper.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/URLRequestWrapper.java
deleted file mode 100644
index ac74947e..00000000
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/URLRequestWrapper.java
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2020 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.cloud.functions.invoker;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-
-/** Removes the servlet path from the request URL seen by the client. */
-class URLRequestWrapper extends HttpServletRequestWrapper {
- private final String newValue;
-
- URLRequestWrapper(HttpServletRequest req) {
- super(req);
- if (req.getRequestURL() != null && req.getServletPath() != null) {
- this.newValue = req.getRequestURL().toString().replaceFirst(req.getServletPath(), "");
- } else {
- this.newValue = null;
- }
- }
-
- @Override
- public StringBuffer getRequestURL() {
- if (newValue == null) {
- return super.getRequestURL();
- }
- return new StringBuffer(newValue);
- }
-}
From 00f59ac288348b864af4848ea3d5a888617674d6 Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Thu, 20 Feb 2020 16:47:56 -0800
Subject: [PATCH 053/364] Intercept requests for /favicon.ico and /robots.txt
and return a 404.
Also rewrite IntegrationTest to eliminate varargs parameters, which are more trouble than they're worth.
PiperOrigin-RevId: 296327650
---
.../functions/invoker/runner/Invoker.java | 42 +++++++-
.../functions/invoker/IntegrationTest.java | 98 +++++++++++++------
2 files changed, 104 insertions(+), 36 deletions(-)
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index 21a6b682..dbb19a24 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -44,16 +44,24 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
+import java.util.Set;
import java.util.logging.Level;
import java.util.logging.LogManager;
import java.util.logging.Logger;
import java.util.stream.Stream;
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.http.HttpStatus;
+import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.server.handler.HandlerWrapper;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
@@ -234,9 +242,9 @@ ClassLoader getFunctionClassLoader() {
public void startServer() throws Exception {
Server server = new Server(port);
- ServletContextHandler context = new ServletContextHandler();
- context.setContextPath("/");
- server.setHandler(context);
+ ServletContextHandler servletContextHandler = new ServletContextHandler();
+ servletContextHandler.setContextPath("/");
+ server.setHandler(NotFoundHandler.forServlet(servletContextHandler));
Optional> functionClass = loadFunctionClass();
@@ -273,7 +281,7 @@ public void startServer() throws Exception {
functionSignatureType);
throw new RuntimeException(error);
}
- context.addServlet(new ServletHolder(servlet), "/*");
+ servletContextHandler.addServlet(new ServletHolder(servlet), "/*");
server.start();
logServerInfo();
@@ -364,6 +372,32 @@ private void logServerInfo() {
}
}
+ /**
+ * Wrapper that intercepts requests for {@code /favicon.ico} and {@code /robots.txt} and causes
+ * them to produce a 404 status. Otherwise they would be sent to the function code, like any
+ * other URL, meaning that someone testing their function by using a browser as an HTTP client
+ * can see two requests, one for {@code /favicon.ico} and one for {@code /} (or whatever).
+ */
+ private static class NotFoundHandler extends HandlerWrapper {
+ static NotFoundHandler forServlet(ServletContextHandler servletHandler) {
+ NotFoundHandler handler = new NotFoundHandler();
+ handler.setHandler(servletHandler);
+ return handler;
+ }
+
+ private static final Set NOT_FOUND_PATHS =
+ new HashSet<>(Arrays.asList("/favicon.ico", "/robots.txt"));
+
+ @Override
+ public void handle(String target, Request baseRequest, HttpServletRequest request,
+ HttpServletResponse response) throws IOException, ServletException {
+ if (NOT_FOUND_PATHS.contains(request.getRequestURI())) {
+ response.sendError(HttpStatus.NOT_FOUND_404, "Not Found");
+ }
+ super.handle(target, baseRequest, request, response);
+ }
+ }
+
/**
* A loader that only loads GCF API classes. Those are classes whose package is exactly
* {@code com.google.cloud.functions}. The package can't be a subpackage, such as
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 8c82f32e..96ff6e4d 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -140,7 +140,9 @@ abstract static class TestCase {
abstract String requestText();
- abstract String expectedResponseText();
+ abstract int expectedResponseCode();
+
+ abstract Optional expectedResponseText();
abstract Optional expectedJsonString();
@@ -154,6 +156,7 @@ static Builder builder() {
return new AutoValue_IntegrationTest_TestCase.Builder()
.setUrl("/")
.setRequestText("")
+ .setExpectedResponseCode(HttpStatus.OK_200)
.setExpectedResponseText("")
.setHttpContentType("text/plain")
.setHttpHeaders(ImmutableMap.of());
@@ -166,8 +169,12 @@ abstract static class Builder {
abstract Builder setRequestText(String x);
+ abstract Builder setExpectedResponseCode(int x);
+
abstract Builder setExpectedResponseText(String x);
+ abstract Builder setExpectedResponseText(Optional x);
+
abstract Builder setExpectedJsonString(String x);
abstract Builder setHttpContentType(String x);
@@ -184,47 +191,71 @@ private static String fullTarget(String nameWithoutPackage) {
return "com.google.cloud.functions.invoker.testfunctions." + nameWithoutPackage;
}
+ private static final TestCase FAVICON_TEST_CASE =
+ TestCase.builder()
+ .setUrl("/favicon.ico?foo=bar")
+ .setExpectedResponseCode(HttpStatus.NOT_FOUND_404)
+ .setExpectedResponseText(Optional.empty())
+ .build();
+
+ private static final TestCase ROBOTS_TXT_TEST_CASE =
+ TestCase.builder()
+ .setUrl("/robots.txt?foo=bar")
+ .setExpectedResponseCode(HttpStatus.NOT_FOUND_404)
+ .setExpectedResponseText(Optional.empty())
+ .build();
+
@Test
public void helloWorld() throws Exception {
testHttpFunction(fullTarget("HelloWorld.helloWorld"),
- TestCase.builder().setExpectedResponseText("hello\n").build());
+ ImmutableList.of(
+ TestCase.builder().setExpectedResponseText("hello\n").build(),
+ FAVICON_TEST_CASE,
+ ROBOTS_TXT_TEST_CASE));
}
@Test
public void newHelloWorld() throws Exception {
testHttpFunction(fullTarget("NewHelloWorld"),
- TestCase.builder().setExpectedResponseText("hello\n").build());
+ ImmutableList.of(
+ TestCase.builder().setExpectedResponseText("hello\n").build(),
+ FAVICON_TEST_CASE,
+ ROBOTS_TXT_TEST_CASE));
}
@Test
public void echo() throws Exception {
String testText = "hello\nworld\n";
- testHttpFunction(fullTarget("Echo.echo"),
- TestCase.builder().setRequestText(testText).setExpectedResponseText(testText).build());
+ testHttpFunction(
+ fullTarget("Echo.echo"),
+ ImmutableList.of(
+ TestCase.builder().setRequestText(testText).setExpectedResponseText(testText).build()));
}
@Test
public void newEcho() throws Exception {
String testText = "hello\nworld\n";
- testHttpFunction(fullTarget("NewEcho"),
- TestCase.builder().setRequestText(testText).setExpectedResponseText(testText).build());
+ testHttpFunction(
+ fullTarget("NewEcho"),
+ ImmutableList.of(
+ TestCase.builder().setRequestText(testText).setExpectedResponseText(testText).build()));
}
@Test
public void echoUrl() throws Exception {
String[] testUrls = {"/", "/foo/bar", "/?foo=bar&baz=buh", "/foo?bar=baz"};
- TestCase[] testCases = Arrays.stream(testUrls)
+ List testCases = Arrays.stream(testUrls)
.map(url -> TestCase.builder().setUrl(url).setExpectedResponseText(url + "\n").build())
- .toArray(TestCase[]::new);
+ .collect(toList());
testHttpFunction(fullTarget("EchoUrl.echoUrl"), testCases);
}
@Test
public void newEchoUrl() throws Exception {
String[] testUrls = {"/", "/foo/bar", "/?foo=bar&baz=buh", "/foo?bar=baz"};
- TestCase[] testCases = Arrays.stream(testUrls)
+ List testCases = Arrays.stream(testUrls)
.map(url -> TestCase.builder().setUrl(url).setExpectedResponseText(url + "\n").build())
- .toArray(TestCase[]::new);
+ .collect(toList());
testHttpFunction(fullTarget("NewEchoUrl"), testCases);
}
@@ -237,7 +268,7 @@ public void background() throws Exception {
.setSnoopFile(snoopFile)
.setExpectedJsonString(requestText)
.build();
- backgroundTest(fullTarget("BackgroundSnoop.snoop"), testCase);
+ backgroundTest(fullTarget("BackgroundSnoop.snoop"), ImmutableList.of(testCase));
}
@Test
@@ -290,22 +321,22 @@ private void newBackgroundTest(String target) throws Exception {
backgroundTest(
fullTarget(target),
- gcfTestCase,
- cloudEventsStructuredTestCase,
- cloudEventsBinaryTestCase);
+ ImmutableList.of(gcfTestCase, cloudEventsStructuredTestCase, cloudEventsBinaryTestCase));
}
@Test
public void nested() throws Exception {
String testText = "sic transit gloria mundi";
- testHttpFunction(fullTarget("Nested.Echo"),
- TestCase.builder().setRequestText(testText).setExpectedResponseText(testText).build());
+ testHttpFunction(
+ fullTarget("Nested.Echo"),
+ ImmutableList.of(
+ TestCase.builder().setRequestText(testText).setExpectedResponseText(testText).build()));
}
@Test
public void packageless() throws Exception {
testHttpFunction("PackagelessHelloWorld",
- TestCase.builder().setExpectedResponseText("hello, world\n").build());
+ ImmutableList.of(TestCase.builder().setExpectedResponseText("hello, world\n").build()));
}
private File snoopFile() throws IOException {
@@ -337,12 +368,13 @@ private String functionJarString() throws IOException {
*/
@Test
public void classpathOptionHttp() throws Exception {
+ TestCase testCase = TestCase.builder()
+ .setUrl("/?class=" + INTERNAL_CLASS.getName())
+ .setExpectedResponseText("OK")
+ .build();
testHttpFunction("com.example.functionjar.Foreground",
ImmutableList.of("--classpath", functionJarString()),
- TestCase.builder()
- .setUrl("/?class=" + INTERNAL_CLASS.getName())
- .setExpectedResponseText("OK")
- .build());
+ ImmutableList.of(testCase));
}
/** Like {@link #classpathOptionHttp} but for background functions. */
@@ -357,7 +389,7 @@ public void classpathOptionBackground() throws Exception {
jsonData.addProperty("class", INTERNAL_CLASS.getName());
testBackgroundFunction("com.example.functionjar.Background",
ImmutableList.of("--classpath", functionJarString()),
- TestCase.builder().setRequestText(json.toString()).build());
+ ImmutableList.of(TestCase.builder().setRequestText(json.toString()).build()));
}
// In these tests, we test a number of different functions that express the same functionality
@@ -365,11 +397,11 @@ public void classpathOptionBackground() throws Exception {
// event. We start with a fixed body and insert into its JSON an extra property that tells the
// function where to write what it received. We have to do this since background functions, by
// design, don't return a value.
- private void backgroundTest(String functionTarget, TestCase... testCases) throws Exception {
+ private void backgroundTest(String functionTarget, List testCases) throws Exception {
for (TestCase testCase : testCases) {
File snoopFile = testCase.snoopFile().get();
snoopFile.delete();
- testBackgroundFunction(functionTarget, testCase);
+ testBackgroundFunction(functionTarget, ImmutableList.of(testCase));
String snooped = new String(Files.readAllBytes(snoopFile.toPath()), StandardCharsets.UTF_8);
Gson gson = new Gson();
JsonObject snoopedJson = gson.fromJson(snooped, JsonObject.class);
@@ -388,21 +420,22 @@ private void checkSnoopFile(File snoopFile, String expectedJsonString) throws IO
expect.that(snoopedJson).isEqualTo(expectedJson);
}
- private void testHttpFunction(String target, TestCase... testCases) throws Exception {
+ private void testHttpFunction(String target, List testCases) throws Exception {
testHttpFunction(target, ImmutableList.of(), testCases);
}
private void testHttpFunction(
- String target, ImmutableList extraArgs, TestCase... testCases) throws Exception {
+ String target, ImmutableList extraArgs, List testCases) throws Exception {
testFunction(SignatureType.HTTP, target, extraArgs, testCases);
}
- private void testBackgroundFunction(String target, TestCase... testCases)
+ private void testBackgroundFunction(String target, List testCases)
throws Exception {
testBackgroundFunction(target, ImmutableList.of(), testCases);
}
+
private void testBackgroundFunction(
- String target, ImmutableList extraArgs, TestCase... testCases)
+ String target, ImmutableList extraArgs, List testCases)
throws Exception {
testFunction(SignatureType.BACKGROUND, target, extraArgs, testCases);
}
@@ -411,7 +444,7 @@ private void testFunction(
SignatureType signatureType,
String target,
ImmutableList extraArgs,
- TestCase... testCases) throws Exception {
+ List testCases) throws Exception {
ServerProcess serverProcess = startServer(signatureType, target, extraArgs);
try {
HttpClient httpClient = new HttpClient();
@@ -426,8 +459,9 @@ private void testFunction(
ContentResponse response = request.send();
expect
.withMessage("Response to %s is %s %s", uri, response.getStatus(), response.getReason())
- .that(response.getStatus()).isEqualTo(HttpStatus.OK_200);
- expect.that(response.getContentAsString()).isEqualTo(testCase.expectedResponseText());
+ .that(response.getStatus()).isEqualTo(testCase.expectedResponseCode());
+ testCase.expectedResponseText()
+ .ifPresent(text -> expect.that(response.getContentAsString()).isEqualTo(text));
if (testCase.snoopFile().isPresent()) {
checkSnoopFile(testCase.snoopFile().get(), testCase.expectedJsonString().get());
}
From e4b06982c5c6ae6e5240e63719bcf126fff99198 Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Mon, 24 Feb 2020 08:39:33 -0800
Subject: [PATCH 054/364] After calling the user function, flush either the
OutputStream or the Writer as appropriate. Calling `getWriter().flush()` will
fail if `getOutputStream()` has previously been called. The method
`ServletResponse.flushBuffer()` might be expected to work here but it did
not.
Fixes https://github.com/GoogleCloudPlatform/functions-framework-java/issues/15.
PiperOrigin-RevId: 296899120
---
.../invoker/NewHttpFunctionExecutor.java | 8 ++++++-
.../functions/invoker/IntegrationTest.java | 19 +++++++++++++++--
.../invoker/testfunctions/NewEcho.java | 21 +++++++++++++++----
3 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
index 0ed8649e..31cfc3c4 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
@@ -72,7 +72,13 @@ public void service(HttpServletRequest req, HttpServletResponse res) {
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
} finally {
try {
- respImpl.getWriter().flush();
+ // Shouldn't HttpServletResponse.flushBuffer() work here? But it doesn't. So we have to
+ // flush whichever of getWriter() or getOutputStream() works.
+ try {
+ respImpl.getWriter().flush();
+ } catch (IllegalStateException e) {
+ respImpl.getOutputStream().flush();
+ }
} catch (IOException e) {
// Too bad, can't flush.
}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index 96ff6e4d..c62d2630 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -112,7 +112,6 @@ private static CloudEventImpl> sampleCloudEvent(File snoopFi
.withData(ImmutableMap.of("a", 2, "b", 3, "targetFile", snoopFile.toString()))
.withTime(ZonedDateTime.of(2018, 4, 5, 17, 31, 0, 0, ZoneOffset.UTC))
.build();
-
}
private static int serverPort;
@@ -146,6 +145,8 @@ abstract static class TestCase {
abstract Optional expectedJsonString();
+ abstract Optional expectedContentType();
+
abstract String httpContentType();
abstract ImmutableMap httpHeaders();
@@ -175,6 +176,8 @@ abstract static class Builder {
abstract Builder setExpectedResponseText(Optional x);
+ abstract Builder setExpectedContentType(String x);
+
abstract Builder setExpectedJsonString(String x);
abstract Builder setHttpContentType(String x);
@@ -238,7 +241,17 @@ public void newEcho() throws Exception {
testHttpFunction(
fullTarget("NewEcho"),
ImmutableList.of(
- TestCase.builder().setRequestText(testText).setExpectedResponseText(testText).build()));
+ TestCase.builder()
+ .setRequestText(testText)
+ .setExpectedResponseText(testText)
+ .setExpectedContentType("text/plain")
+ .build(),
+ TestCase.builder()
+ .setHttpContentType("application/octet-stream")
+ .setRequestText(testText)
+ .setExpectedResponseText(testText)
+ .setExpectedContentType("application/octet-stream")
+ .build()));
}
@Test
@@ -462,6 +475,8 @@ private void testFunction(
.that(response.getStatus()).isEqualTo(testCase.expectedResponseCode());
testCase.expectedResponseText()
.ifPresent(text -> expect.that(response.getContentAsString()).isEqualTo(text));
+ testCase.expectedContentType()
+ .ifPresent(type -> expect.that(response.getMediaType()).isEqualTo(type));
if (testCase.snoopFile().isPresent()) {
checkSnoopFile(testCase.snoopFile().get(), testCase.expectedJsonString().get());
}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEcho.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEcho.java
index 3808877e..ef087d7a 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEcho.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/NewEcho.java
@@ -3,14 +3,27 @@
import com.google.cloud.functions.HttpFunction;
import com.google.cloud.functions.HttpRequest;
import com.google.cloud.functions.HttpResponse;
+import java.io.InputStream;
+import java.io.OutputStream;
import java.util.stream.Collectors;
public class NewEcho implements HttpFunction {
@Override
public void service(HttpRequest request, HttpResponse response) throws Exception {
- String body = request.getReader().lines().collect(Collectors.joining("\n")) + "\n";
- response.setContentType("text/plain");
- response.getWriter().write(body);
- response.getWriter().flush();
+ boolean binary = "application/octet-stream".equals(request.getContentType().orElse(null));
+ if (binary) {
+ response.setContentType("application/octet-stream");
+ byte[] buf = new byte[1024];
+ InputStream in = request.getInputStream();
+ OutputStream out = response.getOutputStream();
+ int n;
+ while ((n = in.read(buf)) > 0) {
+ out.write(buf, 0, n);
+ }
+ } else {
+ String body = request.getReader().lines().collect(Collectors.joining("\n")) + "\n";
+ response.setContentType("text/plain");
+ response.getWriter().write(body);
+ }
}
}
From 33a43dd76016cbaf2aac14aa7d00d727313c0914 Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Tue, 25 Feb 2020 12:33:26 -0800
Subject: [PATCH 055/364] Explain why we can't use Response.flushBuffer(), and
invert the order of getOutputStream()/getWriter() to avoid creating a Writer
if neither has been called before.
PiperOrigin-RevId: 297177511
---
.../cloud/functions/invoker/NewHttpFunctionExecutor.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
index 31cfc3c4..65d102fb 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
@@ -72,12 +72,13 @@ public void service(HttpServletRequest req, HttpServletResponse res) {
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
} finally {
try {
- // Shouldn't HttpServletResponse.flushBuffer() work here? But it doesn't. So we have to
- // flush whichever of getWriter() or getOutputStream() works.
+ // We can't use HttpServletResponse.flushBuffer() because we wrap the PrintWriter
+ // returned by HttpServletResponse in our own BufferedWriter to match our API.
+ // So we have to flush whichever of getWriter() or getOutputStream() works.
try {
- respImpl.getWriter().flush();
- } catch (IllegalStateException e) {
respImpl.getOutputStream().flush();
+ } catch (IllegalStateException e) {
+ respImpl.getWriter().flush();
}
} catch (IOException e) {
// Too bad, can't flush.
From 9644a41184daddc2009316567a73e63f842307c1 Mon Sep 17 00:00:00 2001
From: ludo
Date: Thu, 27 Feb 2020 09:48:51 -0800
Subject: [PATCH 056/364] Add a mvn function:deploy goal to deploy a Java
function.
We are reusing the Cloud SDK logic already available in the new App Engine Maven plugin to get a Cloud SDK and update it automatically when needed.
PiperOrigin-RevId: 297620209
---
invoker/function-maven-plugin/pom.xml | 13 +
.../functions/plugin/DeployFunction.java | 353 ++++++++++++++++++
.../functions/plugin/DeployFunctionTest.java | 55 +++
3 files changed, 421 insertions(+)
create mode 100644 invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
create mode 100644 invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index af9c5667..c98d65e7 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -47,6 +47,19 @@
1.0.0-alpha-2-rc4-SNAPSHOT
+
+ com.google.cloud.tools
+ appengine-maven-plugin
+ 2.2.0
+ jar
+
+
+
+ com.google.truth
+ truth
+ 1.0.1
+ test
+
junit
junit
diff --git a/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
new file mode 100644
index 00000000..6afe2456
--- /dev/null
+++ b/invoker/function-maven-plugin/src/main/java/com/google/cloud/functions/plugin/DeployFunction.java
@@ -0,0 +1,353 @@
+package com.google.cloud.functions.plugin;
+
+import com.google.cloud.tools.appengine.operations.CloudSdk;
+import com.google.cloud.tools.appengine.operations.Gcloud;
+import com.google.cloud.tools.appengine.operations.cloudsdk.CloudSdkNotFoundException;
+import com.google.cloud.tools.appengine.operations.cloudsdk.CloudSdkOutOfDateException;
+import com.google.cloud.tools.appengine.operations.cloudsdk.CloudSdkVersionFileException;
+import com.google.cloud.tools.appengine.operations.cloudsdk.process.ProcessHandlerException;
+import com.google.cloud.tools.managedcloudsdk.BadCloudSdkVersionException;
+import com.google.cloud.tools.managedcloudsdk.ManagedCloudSdk;
+import com.google.cloud.tools.managedcloudsdk.UnsupportedOsException;
+import com.google.cloud.tools.managedcloudsdk.Version;
+import com.google.cloud.tools.maven.cloudsdk.CloudSdkChecker;
+import com.google.cloud.tools.maven.cloudsdk.CloudSdkDownloader;
+import com.google.cloud.tools.maven.cloudsdk.CloudSdkMojo;
+import com.google.common.base.Joiner;
+import com.google.common.base.Strings;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugins.annotations.Execute;
+import org.apache.maven.plugins.annotations.LifecyclePhase;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.annotations.ResolutionScope;
+
+/** Deploy a Java function via mvn functions:deploy with optional flags. */
+@Mojo(
+ name = "deploy",
+ defaultPhase = LifecyclePhase.GENERATE_RESOURCES,
+ requiresDependencyResolution = ResolutionScope.NONE,
+ requiresDependencyCollection = ResolutionScope.NONE)
+@Execute(phase = LifecyclePhase.NONE)
+public class DeployFunction extends CloudSdkMojo {
+
+ /** The Google Cloud Platform project Id to use for this invocation. */
+ @Parameter(alias = "deploy.projectId", property = "function.deploy.projectId")
+ protected String projectId;
+
+ /**
+ * ID of the function or fully qualified identifier for the function. This property must be
+ * specified if any of the other arguments in this group are specified.
+ */
+ @Parameter(alias = "deploy.name", property = "function.deploy.name", required = true)
+ String name;
+
+ /**
+ * The Cloud region for the function. Overrides the default functions/region property value for
+ * this command invocation.
+ */
+ @Parameter(alias = "deploy.region", property = "function.deploy.region")
+ String region;
+
+ /**
+ * If set, makes this a public function. This will allow all callers, without checking
+ * authentication.
+ */
+ @Parameter(
+ alias = "deploy.allowunauthenticated",
+ property = "function.deploy.allowunauthenticated",
+ defaultValue = "false")
+ boolean allowUnauthenticated;
+
+ /**
+ * Name of a Google Cloud Function (as defined in source code) that will be executed. Defaults to
+ * the resource name suffix, if not specified.
+ *
+ * For Java this is fully qualified class name implementing the function, for example
+ * `com.google.testfunction.HelloWorld`.
+ */
+ @Parameter(alias = "deploy.functiontarget", property = "function.deploy.functiontarget")
+ String functionTarget;
+
+ /** Override the .gcloudignore file and use the specified file instead. */
+ @Parameter(alias = "deploy.ignorefile", property = "function.deploy.ignorefile")
+ String ignoreFile;
+
+ /**
+ * Limit on the amount of memory the function can use.
+ *
+ *
Allowed values are: 128MB, 256MB, 512MB, 1024MB, and 2048MB. By default, a new function is
+ * limited to 256MB of memory. When deploying an update to an existing function, the function will
+ * keep its old memory limit unless you specify this flag.
+ */
+ @Parameter(alias = "deploy.memory", property = "function.deploy.memory")
+ String memory;
+
+ /** If specified, then the function will be retried in case of a failure. */
+ @Parameter(alias = "deploy.retry", property = "function.deploy.retry")
+ String retry;
+
+ /**
+ * Runtime in which to run the function.
+ *
+ *
Required when deploying a new function; optional when updating an existing function. Default
+ * to Java11.
+ */
+ @Parameter(
+ alias = "deploy.runtime",
+ defaultValue = "java11",
+ property = "function.deploy.runtime")
+ String runtime = "java11";
+
+ /**
+ * The email address of the IAM service account associated with the function at runtime. The
+ * service account represents the identity of the running function, and determines what
+ * permissions the function has.
+ *
+ *
If not provided, the function will use the project's default service account.
+ */
+ @Parameter(alias = "deploy.serviceaccount", property = "function.deploy.serviceaccount")
+ String serviceAccount;
+
+ /** Location of source code to deploy. */
+ @Parameter(alias = "deploy.source", property = "function.deploy.source")
+ String source;
+
+ /**
+ * This flag's value is the name of the Google Cloud Storage bucket in which source code will be
+ * stored.
+ */
+ @Parameter(alias = "deploy.stagebucket", property = "function.deploy.stagebucket")
+ String stageBucket;
+
+ /**
+ * The function execution timeout, e.g. 30s for 30 seconds. Defaults to original value for
+ * existing function or 60 seconds for new functions. Cannot be more than 540s.
+ */
+ @Parameter(alias = "deploy.timeout", property = "function.deploy.timeout")
+ String timeout;
+
+ /**
+ * List of label KEY=VALUE pairs to update. If a label exists its value is modified, otherwise a
+ * new label is created.
+ */
+ @Parameter(alias = "deploy.updatelabels", property = "function.deploy.updatelabels")
+ List updateLabels;
+
+ /**
+ * Function will be assigned an endpoint, which you can view by using the describe command. Any
+ * HTTP request (of a supported type) to the endpoint will trigger function execution. Supported
+ * HTTP request types are: POST, PUT, GET, DELETE, and OPTIONS.
+ */
+ @Parameter(alias = "deploy.triggerhttp", property = "function.deploy.triggerhttp")
+ Boolean triggerHttp;
+
+ /**
+ * Name of Pub/Sub topic. Every message published in this topic will trigger function execution
+ * with message contents passed as input data.
+ */
+ @Parameter(alias = "deploy.triggertopic", property = "function.deploy.triggertopic")
+ String triggerTopic;
+
+ /**
+ * Specifies which action should trigger the function. For a list of acceptable values, call
+ * gcloud functions event-types list.
+ */
+ @Parameter(alias = "deploy.triggerevent", property = "function.deploy.triggerevent")
+ String triggerEvent;
+
+ /**
+ * Specifies which resource from {@link #triggerEvent} is being observed. E.g. if {@link
+ * #triggerEvent} is providers/cloud.storage/eventTypes/object.change, {@link #triggerResource}
+ * must be a bucket name. For a list of expected resources, run {@code gcloud functions
+ * event-types list}.
+ */
+ @Parameter(alias = "deploy.triggerresource", property = "function.deploy.triggerresource")
+ String triggerResource;
+
+ /**
+ * The VPC Access connector that the function can connect to. It can be either the fully-qualified
+ * URI, or the short name of the VPC Access connector resource. If the short name is used, the
+ * connector must belong to the same project. The format of this field is either
+ * projects/${PROJECT}/locations/${LOCATION}/connectors/${CONNECTOR} or ${CONNECTOR}, where
+ * ${CONNECTOR} is the short name of the VPC Access connector.
+ */
+ @Parameter(alias = "deploy.vpcconnector", property = "function.deploy.vpcconnector")
+ String vpcConnector;
+ /**
+ * Sets the maximum number of instances for the function. A function execution that would exceed
+ * max-instances times out.
+ */
+ @Parameter(alias = "deploy.maxinstances", property = "function.deploy.maxinstances")
+ Integer maxInstances;
+ /**
+ * List of key-value pairs to set as environment variables. All existing environment variables
+ * will be removed first.
+ */
+ @Parameter(alias = "deploy.setenvvars", property = "function.deploy.setenvvars")
+ Map environmentVariables;
+ /**
+ * Path to a local YAML file with definitions for all environment variables. All existing
+ * environment variables will be removed before the new environment variables are added.
+ */
+ @Parameter(alias = "deploy.envvarsfile", property = "function.deploy.envvarsfile")
+ String envVarsFile;
+
+ boolean hasEnvVariables() {
+ return (this.environmentVariables != null && !this.environmentVariables.isEmpty());
+ }
+
+ // Select a downloaded Cloud SDK or a user defined Cloud SDK version.
+ static Function newManagedSdkFactory() {
+ return version -> {
+ try {
+ if (Strings.isNullOrEmpty(version)) {
+ return ManagedCloudSdk.newManagedSdk();
+ } else {
+ return ManagedCloudSdk.newManagedSdk(new Version(version));
+ }
+ } catch (UnsupportedOsException | BadCloudSdkVersionException ex) {
+ throw new RuntimeException(ex);
+ }
+ };
+ }
+
+ CloudSdk buildCloudSdkMinimal() {
+ return buildCloudSdk(
+ (CloudSdkMojo) this, new CloudSdkChecker(), new CloudSdkDownloader(newManagedSdkFactory()));
+ }
+
+ static CloudSdk buildCloudSdk(
+ CloudSdkMojo mojo, CloudSdkChecker cloudSdkChecker, CloudSdkDownloader cloudSdkDownloader) {
+
+ try {
+ if (mojo.getCloudSdkHome() != null) {
+ // Check if the user has defined a specific Cloud SDK.
+ CloudSdk cloudSdk = new CloudSdk.Builder().sdkPath(mojo.getCloudSdkHome()).build();
+
+ if (mojo.getCloudSdkVersion() != null) {
+ cloudSdkChecker.checkCloudSdk(cloudSdk, mojo.getCloudSdkVersion());
+ }
+
+ return cloudSdk;
+ } else {
+
+ return new CloudSdk.Builder()
+ .sdkPath(
+ cloudSdkDownloader.downloadIfNecessary(
+ mojo.getCloudSdkVersion(),
+ mojo.getLog(),
+ Collections.emptyList(),
+ mojo.getMavenSession().isOffline()))
+ .build();
+ }
+ } catch (CloudSdkNotFoundException
+ | CloudSdkOutOfDateException
+ | CloudSdkVersionFileException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+ /** Return a Gcloud instance using global configuration. */
+ public Gcloud getGcloud() {
+ return Gcloud.builder(buildCloudSdkMinimal())
+ .setMetricsEnvironment(this.getArtifactId(), this.getArtifactVersion())
+ .setCredentialFile(this.getServiceAccountKeyFile())
+ .build();
+ }
+
+ /** Return the list of command parameters to give to the Cloud SDK for execution */
+ public List getCommands() {
+ List commands = new ArrayList<>();
+
+ commands.add("functions");
+ commands.add("deploy");
+ commands.add(name);
+ if (region != null) {
+ commands.add("--region=" + region);
+ }
+ if (triggerResource == null && triggerTopic == null && triggerEvent == null) {
+ commands.add("--trigger-http");
+ }
+ if (triggerResource != null) {
+ commands.add("--trigger-resource=" + triggerResource);
+ }
+ if (triggerTopic != null) {
+ commands.add("--trigger-topic=" + triggerTopic);
+ }
+ if (triggerEvent != null) {
+ commands.add("--trigger-event=" + triggerEvent);
+ }
+ if (allowUnauthenticated) {
+ commands.add("--allow-unauthenticated");
+ }
+ if (functionTarget != null) {
+ commands.add("--entry-point=" + functionTarget);
+ }
+ if (ignoreFile != null) {
+ commands.add("--ignore-file=" + ignoreFile);
+ }
+ if (memory != null) {
+ commands.add("--memory=" + memory);
+ }
+ if (retry != null) {
+ commands.add("--retry=" + retry);
+ }
+ if (serviceAccount != null) {
+ commands.add("--service-account=" + serviceAccount);
+ }
+ if (source != null) {
+ commands.add("--source=" + source);
+ }
+ if (stageBucket != null) {
+ commands.add("--stage-bucket=" + stageBucket);
+ }
+ if (timeout != null) {
+ commands.add("--timeout=" + timeout);
+ }
+ if (updateLabels != null && !updateLabels.isEmpty()) {
+ commands.add("--update-labels=" + String.join(",", updateLabels));
+ }
+
+ if (vpcConnector != null) {
+ commands.add("--vpc-connector=" + vpcConnector);
+ }
+ if (maxInstances != null) {
+ commands.add("--max-instances=" + maxInstances);
+ }
+
+ if (hasEnvVariables()) {
+ Joiner.MapJoiner mapJoiner = Joiner.on(",").withKeyValueSeparator("=");
+ commands.add("--set-env-vars=" + mapJoiner.join(environmentVariables));
+ }
+ if (envVarsFile != null) {
+ commands.add("--env-var-file=" + envVarsFile);
+ }
+ commands.add("--runtime=" + runtime);
+
+ if (projectId != null) {
+ commands.add("--project=" + projectId);
+ }
+ return Collections.unmodifiableList(commands);
+ }
+
+ @Override
+ public void execute() throws MojoExecutionException {
+ try {
+ Gcloud gcloud = getGcloud();
+ List params = getCommands();
+ System.out.println("Executing Cloud SDK command: gcloud " + String.join(" ", params));
+ gcloud.runCommand(params);
+ } catch (CloudSdkNotFoundException | IOException | ProcessHandlerException ex) {
+ Logger.getLogger(DeployFunction.class.getName()).log(Level.SEVERE, null, ex);
+ }
+ }
+}
diff --git a/invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java b/invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
new file mode 100644
index 00000000..3b8b4503
--- /dev/null
+++ b/invoker/function-maven-plugin/src/test/java/com/google/cloud/functions/plugin/DeployFunctionTest.java
@@ -0,0 +1,55 @@
+package com.google.cloud.functions.plugin;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import java.util.List;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+@RunWith(JUnit4.class)
+public class DeployFunctionTest {
+
+ @Test
+ public void testDeployFunctionCommandLine() {
+ DeployFunction mojo = new DeployFunction();
+ mojo.envVarsFile = "myfile";
+ mojo.functionTarget = "function";
+ mojo.ignoreFile = "ff";
+ mojo.maxInstances = new Integer(3);
+ mojo.memory = "234";
+ mojo.name = "a name";
+ mojo.region = "a region";
+ mojo.retry = "44";
+ mojo.source = "a source";
+ mojo.stageBucket = "a bucket";
+ mojo.timeout = "timeout";
+ mojo.vpcConnector = "a connector";
+ mojo.triggerHttp = true;
+ mojo.allowUnauthenticated = true;
+ mojo.environmentVariables = ImmutableMap.of("env1", "a", "env2", "b");
+ List expected =
+ ImmutableList.of(
+ "functions",
+ "deploy",
+ "a name",
+ "--region=a region",
+ "--trigger-http",
+ "--allow-unauthenticated",
+ "--entry-point=function",
+ "--ignore-file=ff",
+ "--memory=234",
+ "--retry=44",
+ "--source=a source",
+ "--stage-bucket=a bucket",
+ "--timeout=timeout",
+ "--vpc-connector=a connector",
+ "--max-instances=3",
+ "--set-env-vars=env1=a,env2=b",
+ "--env-var-file=myfile",
+ "--runtime=java11");
+ assertThat(mojo.getCommands()).isEqualTo(expected);
+ }
+}
From 4276e3035aa883d6b1025b399529902816cafd43 Mon Sep 17 00:00:00 2001
From: ludo
Date: Mon, 9 Mar 2020 13:19:11 -0700
Subject: [PATCH 057/364] Update plugin description to mention the function
deploy capability.
PiperOrigin-RevId: 299917488
---
invoker/function-maven-plugin/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index c98d65e7..7c6b5c2b 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -12,7 +12,7 @@
maven-plugin
0.9.1-SNAPSHOT
Functions Framework Plugin
- A Maven plugin that allows functions to be run locally
+ A Maven plugin that allows functions to be deployed, and to be run locally
using the Java Functions Framework.
http://maven.apache.org
From 6f12d068e6ba645d6e12cbe4b828f48cba54c3f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?=
Date: Wed, 11 Mar 2020 15:22:20 -0700
Subject: [PATCH 058/364] [maven-release-plugin] prepare release
java-function-invoker-parent-1.0.0-alpha-2-rc4
---
invoker/core/pom.xml | 6 +++---
invoker/function-maven-plugin/pom.xml | 6 +++---
invoker/pom.xml | 2 +-
invoker/testfunction/pom.xml | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index 1c543968..ff21acef 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc4-SNAPSHOT
+ 1.0.0-alpha-2-rc4
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc4-SNAPSHOT
+ 1.0.0-alpha-2-rc4
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
@@ -101,7 +101,7 @@
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-3-SNAPSHOT
+ 1.0.0-alpha-3
test-jar
test
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index 7c6b5c2b..d748cd5f 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc4-SNAPSHOT
+ 1.0.0-alpha-2-rc4
com.google.cloud.functions
function-maven-plugin
maven-plugin
- 0.9.1-SNAPSHOT
+ 0.9.1
Functions Framework Plugin
A Maven plugin that allows functions to be deployed, and to be run locally
using the Java Functions Framework.
@@ -44,7 +44,7 @@
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc4-SNAPSHOT
+ 1.0.0-alpha-2-rc4
diff --git a/invoker/pom.xml b/invoker/pom.xml
index b09fdbd5..b5608bf6 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc4-SNAPSHOT
+ 1.0.0-alpha-2-rc4
pom
GCF Java Invoker Parent
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index d9659932..de5a2dbe 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc4-SNAPSHOT
+ 1.0.0-alpha-2-rc4
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-3-SNAPSHOT
+ 1.0.0-alpha-3
Example GCF Function Jar
An example of a GCF function packaged into a jar. We use this in tests.
From 0862d452dac438b04ae73d2c944ad5c6c51f639b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89amonn=20McManus?=
Date: Wed, 11 Mar 2020 15:22:29 -0700
Subject: [PATCH 059/364] [maven-release-plugin] prepare for next development
iteration
---
invoker/core/pom.xml | 6 +++---
invoker/function-maven-plugin/pom.xml | 6 +++---
invoker/pom.xml | 2 +-
invoker/testfunction/pom.xml | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/invoker/core/pom.xml b/invoker/core/pom.xml
index ff21acef..26efdd7f 100644
--- a/invoker/core/pom.xml
+++ b/invoker/core/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc4
+ 1.0.0-alpha-2-rc5-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc4
+ 1.0.0-alpha-2-rc5-SNAPSHOT
GCF Java Invoker
Application that invokes a GCF Java function. This application is a
@@ -101,7 +101,7 @@
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-3
+ 1.0.0-alpha-4-SNAPSHOT
test-jar
test
diff --git a/invoker/function-maven-plugin/pom.xml b/invoker/function-maven-plugin/pom.xml
index d748cd5f..94bb6280 100644
--- a/invoker/function-maven-plugin/pom.xml
+++ b/invoker/function-maven-plugin/pom.xml
@@ -4,13 +4,13 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc4
+ 1.0.0-alpha-2-rc5-SNAPSHOT
com.google.cloud.functions
function-maven-plugin
maven-plugin
- 0.9.1
+ 0.9.2-SNAPSHOT
Functions Framework Plugin
A Maven plugin that allows functions to be deployed, and to be run locally
using the Java Functions Framework.
@@ -44,7 +44,7 @@
com.google.cloud.functions.invoker
java-function-invoker
- 1.0.0-alpha-2-rc4
+ 1.0.0-alpha-2-rc5-SNAPSHOT
diff --git a/invoker/pom.xml b/invoker/pom.xml
index b5608bf6..01af5b92 100644
--- a/invoker/pom.xml
+++ b/invoker/pom.xml
@@ -8,7 +8,7 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc4
+ 1.0.0-alpha-2-rc5-SNAPSHOT
pom
GCF Java Invoker Parent
diff --git a/invoker/testfunction/pom.xml b/invoker/testfunction/pom.xml
index de5a2dbe..b7b9d820 100644
--- a/invoker/testfunction/pom.xml
+++ b/invoker/testfunction/pom.xml
@@ -4,12 +4,12 @@
com.google.cloud.functions.invoker
java-function-invoker-parent
- 1.0.0-alpha-2-rc4
+ 1.0.0-alpha-2-rc5-SNAPSHOT
com.google.cloud.functions.invoker
java-function-invoker-testfunction
- 1.0.0-alpha-3
+ 1.0.0-alpha-4-SNAPSHOT
Example GCF Function Jar
An example of a GCF function packaged into a jar. We use this in tests.
From 9f350c66e3f18d974dd60b9bc418b6966b810633 Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Wed, 11 Mar 2020 17:48:10 -0700
Subject: [PATCH 060/364] Import the modified pom.xml files from the latest
release, and update the README to reflect the new version numbers.
PiperOrigin-RevId: 300445429
---
README.md | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 15173130..15a9d87a 100644
--- a/README.md
+++ b/README.md
@@ -135,7 +135,7 @@ You can configure the plugin in `pom.xml`:
com.google.cloud.functions
function-maven-plugin
- 0.9
+ 0.9.1
com.example.function.Echo
@@ -153,7 +153,7 @@ mvn function:run
You can alternatively configure the plugin with properties on the command line:
```sh
- mvn com.google.cloud.functions:function:0.9:run \
+ mvn com.google.cloud.functions:function:0.9.1:run \
-Drun.functionTarget=com.example.function.Echo
```
@@ -164,7 +164,7 @@ Copy the Functions Framework jar to a local location like this:
```sh
mvn dependency:copy \
- -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.0.0-alpha-2-rc3' \
+ -Dartifact='com.google.cloud.functions.invoker:java-function-invoker:1.0.0-alpha-2-rc4' \
-DoutputDirectory=.
```
@@ -172,7 +172,7 @@ In this example we use the current directory `.` but you can specify any other
directory to copy to. Then run your function:
```sh
-java -jar java-function-invoker-1.0.0-alpha-2-rc3.jar \
+java -jar java-function-invoker-1.0.0-alpha-2-rc4.jar \
--classpath myfunction.jar \
--target com.example.HelloWorld
```
@@ -222,7 +222,7 @@ Framework directly, you must use `--classpath` to indicate how to find the code
and its dependencies. For example:
```
-java -jar java-function-invoker-1.0.0-alpha-2-rc3.jar \
+java -jar java-function-invoker-1.0.0-alpha-2-rc4.jar \
--classpath 'myfunction.jar:/some/directory:/some/library/*' \
--target com.example.HelloWorld
```
From a3d23cc12df52cb10ee0102e50cd54eb943527e6 Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Thu, 19 Mar 2020 08:54:51 -0700
Subject: [PATCH 061/364] Set the Thread Context ClassLoader while executing
function code.
Users justifiably expect that the TCCL will be the loader of their code, and lots of things fail to work if that is not true.
PiperOrigin-RevId: 301824288
---
.../NewBackgroundFunctionExecutor.java | 20 +++++++++++++------
.../invoker/NewHttpFunctionExecutor.java | 3 +++
.../java/com/example/functionjar/Checker.java | 9 +++++++++
3 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
index f70c46eb..5dbb89c9 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
@@ -168,14 +168,18 @@ private static Map httpHeaderMap(HttpServletRequest req) {
* unmarshalling this event, if it is a CloudEvent.
*/
private abstract static class FunctionExecutor {
- private final String functionName;
+ private final Class functionClass;
- FunctionExecutor(String functionName) {
- this.functionName = functionName;
+ FunctionExecutor(Class functionClass) {
+ this.functionClass = functionClass;
}
final String functionName() {
- return functionName;
+ return functionClass.getCanonicalName();
+ }
+
+ final ClassLoader functionClassLoader() {
+ return functionClass.getClassLoader();
}
abstract void serviceLegacyEvent(HttpServletRequest req)
@@ -193,7 +197,7 @@ private static class RawFunctionExecutor extends FunctionExecutor> {
private final RawBackgroundFunction function;
RawFunctionExecutor(RawBackgroundFunction function) {
- super(function.getClass().getCanonicalName());
+ super(function.getClass());
this.function = function;
}
@@ -234,7 +238,7 @@ private static class TypedFunctionExecutor extends FunctionExecutor {
private final BackgroundFunction function;
private TypedFunctionExecutor(Type type, BackgroundFunction function) {
- super(function.getClass().getCanonicalName());
+ super(function.getClass());
this.type = type;
this.function = function;
}
@@ -287,7 +291,9 @@ Class cloudEventDataType() {
@Override
public void service(HttpServletRequest req, HttpServletResponse res) throws IOException {
String contentType = req.getContentType();
+ ClassLoader oldContextLoader = Thread.currentThread().getContextClassLoader();
try {
+ Thread.currentThread().setContextClassLoader(functionExecutor.functionClassLoader());
if (contentType != null && contentType.startsWith("application/cloudevents+json")) {
serviceCloudEvent(req, CloudEventKind.STRUCTURED);
} else if (req.getHeader("ce-specversion") != null) {
@@ -299,6 +305,8 @@ public void service(HttpServletRequest req, HttpServletResponse res) throws IOEx
} catch (Throwable t) {
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
logger.log(Level.WARNING, "Failed to execute " + functionExecutor.functionName(), t);
+ } finally {
+ Thread.currentThread().setContextClassLoader(oldContextLoader);
}
}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
index 65d102fb..29782301 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewHttpFunctionExecutor.java
@@ -61,7 +61,9 @@ public static NewHttpFunctionExecutor forClass(Class functionClass) {
public void service(HttpServletRequest req, HttpServletResponse res) {
HttpRequestImpl reqImpl = new HttpRequestImpl(req);
HttpResponseImpl respImpl = new HttpResponseImpl(res);
+ ClassLoader oldContextLoader = Thread.currentThread().getContextClassLoader();
try {
+ Thread.currentThread().setContextClassLoader(function.getClass().getClassLoader());
function.service(reqImpl, respImpl);
} catch (Throwable t) {
// TODO(b/146510646): this should be logged properly as an exception, but that currently
@@ -71,6 +73,7 @@ public void service(HttpServletRequest req, HttpServletResponse res) {
t.printStackTrace();
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
} finally {
+ Thread.currentThread().setContextClassLoader(oldContextLoader);
try {
// We can't use HttpServletResponse.flushBuffer() because we wrap the PrintWriter
// returned by HttpServletResponse in our own BufferedWriter to match our API.
diff --git a/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java b/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java
index cc750b82..19c78cd2 100644
--- a/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java
+++ b/invoker/testfunction/src/test/java/com/example/functionjar/Checker.java
@@ -18,6 +18,15 @@
class Checker {
void serviceOrAssert(String runtimeClassName) {
+ // Check that the context class loader is the loader that loaded this class.
+ if (getClass().getClassLoader() != Thread.currentThread().getContextClassLoader()) {
+ throw new AssertionError(
+ String.format(
+ "ClassLoader mismatch: mine %s; context %s",
+ getClass().getClassLoader(),
+ Thread.currentThread().getContextClassLoader()));
+ }
+
ClassLoader myLoader = getClass().getClassLoader();
Class templateClass = Template.class;
ClassLoader templateLoader = templateClass.getClassLoader();
From 45b13eaa87d7f4e83803b810b894817a0d436f08 Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Tue, 24 Mar 2020 11:29:25 -0700
Subject: [PATCH 062/364] Make Functions Framework use StackDriver-compatible
logging when on GCF.
In this environment, outputting a particular JSON-formatted string will produce a log entry with fields parsed from that string.
Remove the special logging.properties file. The intent was to omit information like the timestamp that would be duplicated by the StackDriver logging framework. But we are now replacing the logger completely, so this logging.properties is no longer consulted.
The logging.properties that was deleted also didn't include the
[`%6$s` field](https://docs.oracle.com/en/java/javase/11/docs/api/java.logging/java/util/logging/SimpleFormatter.html#format(java.util.logging.LogRecord))
which meant that if there was an exception associated with the log message it did not appear.
PiperOrigin-RevId: 302709439
---
.../functions/invoker/gcf/JsonLogHandler.java | 122 ++++++++++++++++++
.../functions/invoker/runner/Invoker.java | 29 +++--
.../src/main/resources/logging.properties | 4 -
.../functions/invoker/IntegrationTest.java | 81 ++++++++++--
.../functions/invoker/testfunctions/Log.java | 28 ++++
5 files changed, 241 insertions(+), 23 deletions(-)
create mode 100644 invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java
delete mode 100644 invoker/core/src/main/resources/logging.properties
create mode 100644 invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Log.java
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java
new file mode 100644
index 00000000..181354c1
--- /dev/null
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/gcf/JsonLogHandler.java
@@ -0,0 +1,122 @@
+package com.google.cloud.functions.invoker.gcf;
+
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.Handler;
+import java.util.logging.Level;
+import java.util.logging.LogRecord;
+
+/**
+ * A log handler that publishes log messages in a json format. This is StackDriver's
+ * "structured
+ * logging" format.
+ */
+public final class JsonLogHandler extends Handler {
+ private static final String SOURCE_LOCATION_KEY = "\"logging.googleapis.com/sourceLocation\": ";
+
+ private static final String DEBUG = "DEBUG";
+ private static final String INFO = "INFO";
+ private static final String WARNING = "WARNING";
+ private static final String ERROR = "ERROR";
+ private static final String DEFAULT = "DEFAULT";
+
+ private final PrintStream out;
+ private final boolean closePrintStreamOnClose;
+
+ public JsonLogHandler(PrintStream out, boolean closePrintStreamOnClose) {
+ this.out = out;
+ this.closePrintStreamOnClose = closePrintStreamOnClose;
+ }
+
+ @Override
+ public void publish(LogRecord record) {
+ // We avoid String.format and String.join even though they would simplify the code.
+ // Logging code often shows up in profiling so we want to make this fast and StringBuilder is
+ // more performant.
+ StringBuilder json = new StringBuilder("{");
+ appendSeverity(json, record);
+ appendSourceLocation(json, record);
+ appendMessage(json, record); // must be last, see appendMessage
+ json.append("}");
+ // We must output the log all at once (should only call println once per call to publish)
+ out.println(json);
+ }
+
+ private static void appendMessage(StringBuilder json, LogRecord record) {
+ // This must be the last item in the JSON object, because it has no trailing comma. JSON is
+ // unforgiving about commas and you can't have one just before }.
+ json.append("\"message\": \"").append(escapeString(record.getMessage()));
+ if (record.getThrown() != null) {
+ json.append("\\n")
+ .append(escapeString(getStackTraceAsString(record.getThrown())));
+ }
+ json.append("\"");
+ }
+
+ private static void appendSeverity(StringBuilder json, LogRecord record) {
+ json.append("\"severity\": \"").append(levelToSeverity(record.getLevel())).append("\", ");
+ }
+
+ private static String levelToSeverity(Level level) {
+ int intLevel = (level == null) ? 0 : level.intValue();
+ switch (intLevel) {
+ case 300: // FINEST
+ case 400: // FINER
+ case 500: // FINE
+ return DEBUG;
+ case 700: // CONFIG
+ case 800: // INFO
+ // Java's CONFIG is lower than its INFO, while Stackdriver's NOTICE is greater than its
+ // INFO. So despite the similarity, we don't try to use NOTICE for CONFIG.
+ return INFO;
+ case 900: // WARNING
+ return WARNING;
+ case 1000: // SEVERE
+ return ERROR;
+ default:
+ return DEFAULT;
+ }
+ }
+
+ private static void appendSourceLocation(StringBuilder json, LogRecord record) {
+ if (record.getSourceClassName() == null && record.getSourceMethodName() == null) {
+ return;
+ }
+ List entries = new ArrayList<>();
+ if (record.getSourceClassName() != null) {
+ // TODO: Handle nested classes. If the source class name is com.example.Foo$Bar then the
+ // source file is com/example/Foo.java, not com/example/Foo$Bar.java.
+ String fileName = record.getSourceClassName().replace('.', '/') + ".java";
+ entries.add("\"file\": \"" + escapeString(fileName) + "\"");
+ }
+ if (record.getSourceMethodName() != null) {
+ entries.add("\"method\": \"" + escapeString(record.getSourceMethodName()) + "\"");
+ }
+ json.append(SOURCE_LOCATION_KEY).append("{").append(String.join(", ", entries)).append("}, ");
+ }
+
+ private static String escapeString(String s) {
+ return s.replace("\\", "\\\\").replace("\"", "\\\"").replace("\n", "\\n").replace("\r", "\\r");
+ }
+
+ private static String getStackTraceAsString(Throwable t) {
+ StringWriter stringWriter = new StringWriter();
+ t.printStackTrace(new PrintWriter(stringWriter));
+ return stringWriter.toString();
+ }
+
+ @Override
+ public void flush() {
+ out.flush();
+ }
+
+ @Override
+ public void close() throws SecurityException {
+ if (closePrintStreamOnClose) {
+ out.close();
+ }
+ }
+}
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
index dbb19a24..3bcd4ba4 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/runner/Invoker.java
@@ -31,6 +31,7 @@
import com.google.cloud.functions.invoker.HttpFunctionSignatureMatcher;
import com.google.cloud.functions.invoker.NewBackgroundFunctionExecutor;
import com.google.cloud.functions.invoker.NewHttpFunctionExecutor;
+import com.google.cloud.functions.invoker.gcf.JsonLogHandler;
import java.io.File;
import java.io.IOException;
import java.io.UncheckedIOException;
@@ -50,8 +51,8 @@
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
+import java.util.logging.Handler;
import java.util.logging.Level;
-import java.util.logging.LogManager;
import java.util.logging.Logger;
import java.util.stream.Stream;
import javax.servlet.ServletException;
@@ -80,17 +81,19 @@
*
*/
public class Invoker {
-
- private static final Logger logger;
+ private static final Logger rootLogger = Logger.getLogger("");
+ private static final Logger logger = Logger.getLogger(Invoker.class.getName());
static {
- try {
- LogManager.getLogManager()
- .readConfiguration(Invoker.class.getResourceAsStream("/logging.properties"));
- } catch (IOException e) {
- System.out.println("Failed to read logging configuration file, error: " + e.getMessage());
+ if (isGcf()) {
+ // If we're running with Google Cloud Functions, we'll get better-looking logs if we arrange
+ // for them to be formatted using StackDriver's "structured logging" JSON format. Remove the
+ // JDK's standard logger and replace it with the JSON one.
+ for (Handler handler : rootLogger.getHandlers()) {
+ rootLogger.removeHandler(handler);
+ }
+ rootLogger.addHandler(new JsonLogHandler(System.out, false));
}
- logger = Logger.getLogger(Invoker.class.getName());
}
private static class Options {
@@ -365,13 +368,19 @@ private static List jarsIn(String dir) {
}
private void logServerInfo() {
- if (isLocalRun()) {
+ if (!isGcf()) {
logger.log(Level.INFO, "Serving function...");
logger.log(Level.INFO, "Function: {0}", functionTarget);
logger.log(Level.INFO, "URL: http://localhost:{0,number,#}/", port);
}
}
+ private static boolean isGcf() {
+ // This environment variable is set in the GCF environment but won't be set when invoking
+ // the Functions Framework directly. We don't use its value, just whether it is set.
+ return System.getenv("K_SERVICE") != null;
+ }
+
/**
* Wrapper that intercepts requests for {@code /favicon.ico} and {@code /robots.txt} and causes
* them to produce a 404 status. Otherwise they would be sent to the function code, like any
diff --git a/invoker/core/src/main/resources/logging.properties b/invoker/core/src/main/resources/logging.properties
deleted file mode 100644
index 2f2ea883..00000000
--- a/invoker/core/src/main/resources/logging.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-handlers = java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-java.util.logging.ConsoleHandler.level = ALL
-java.util.logging.SimpleFormatter.format = %4$s: %5$s%n
\ No newline at end of file
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
index c62d2630..3f4a6de0 100644
--- a/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/IntegrationTest.java
@@ -41,6 +41,7 @@
import java.net.ServerSocket;
import java.net.URI;
import java.net.URL;
+import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
@@ -147,6 +148,8 @@ abstract static class TestCase {
abstract Optional expectedContentType();
+ abstract Optional expectedOutput();
+
abstract String httpContentType();
abstract ImmutableMap httpHeaders();
@@ -178,6 +181,8 @@ abstract static class Builder {
abstract Builder setExpectedContentType(String x);
+ abstract Builder setExpectedOutput(String x);
+
abstract Builder setExpectedJsonString(String x);
abstract Builder setHttpContentType(String x);
@@ -272,6 +277,41 @@ public void newEchoUrl() throws Exception {
testHttpFunction(fullTarget("NewEchoUrl"), testCases);
}
+ @Test
+ public void stackDriverLogging() throws Exception {
+ String simpleExpectedOutput =
+ "{\"severity\": \"INFO\", "
+ + "\"logging.googleapis.com/sourceLocation\": "
+ + "{\"file\": \"com/google/cloud/functions/invoker/testfunctions/Log.java\","
+ + " \"method\": \"service\"},"
+ + " \"message\": \"blim\"}";
+ TestCase simpleTestCase =
+ TestCase.builder()
+ .setUrl("/?message=blim")
+ .setExpectedOutput(simpleExpectedOutput)
+ .build();
+ String quotingExpectedOutput = "\"message\": \"foo\\nbar\\\"";
+ TestCase quotingTestCase =
+ TestCase.builder()
+ .setUrl("/?message=" + URLEncoder.encode("foo\nbar\"", "UTF-8"))
+ .setExpectedOutput(quotingExpectedOutput)
+ .build();
+ String exceptionExpectedOutput =
+ "{\"severity\": \"ERROR\", "
+ + "\"logging.googleapis.com/sourceLocation\": "
+ + "{\"file\": \"com/google/cloud/functions/invoker/testfunctions/Log.java\", "
+ + "\"method\": \"service\"}, "
+ + "\"message\": \"oops\\njava.lang.Exception: disaster\\n"
+ + " at com.google.cloud.functions.invoker.testfunctions.Log.service(Log.java:";
+ TestCase exceptionTestCase =
+ TestCase.builder()
+ .setUrl("/?message=oops&level=severe&exception=disaster")
+ .setExpectedOutput(exceptionExpectedOutput)
+ .build();
+ testHttpFunction(
+ fullTarget("Log"), ImmutableList.of(simpleTestCase, quotingTestCase, exceptionTestCase));
+ }
+
@Test
public void background() throws Exception {
File snoopFile = snoopFile();
@@ -480,6 +520,8 @@ private void testFunction(
if (testCase.snoopFile().isPresent()) {
checkSnoopFile(testCase.snoopFile().get(), testCase.expectedJsonString().get());
}
+ testCase.expectedOutput()
+ .ifPresent(output -> expect.that(serverProcess.output().toString()).contains(output));
}
} finally {
serverProcess.close();
@@ -505,13 +547,29 @@ public String toString() {
}
}
- @AutoValue
- abstract static class ServerProcess implements AutoCloseable {
- abstract Process process();
- abstract Future outputMonitorResult();
+ private static class ServerProcess implements AutoCloseable {
+ private final Process process;
+ private final Future outputMonitorResult;
+ private final StringBuilder output;
- static ServerProcess of(Process process, Future outputMonitorResult) {
- return new AutoValue_IntegrationTest_ServerProcess(process, outputMonitorResult);
+ ServerProcess(Process process, Future outputMonitorResult, StringBuilder output) {
+ this.process = process;
+ this.outputMonitorResult = outputMonitorResult;
+ this.output = output;
+ }
+
+ Process process() {
+ return process;
+ }
+
+ Future outputMonitorResult() {
+ return outputMonitorResult;
+ }
+
+ String output() {
+ synchronized (output) {
+ return output.toString();
+ }
}
@Override
@@ -544,17 +602,19 @@ private ServerProcess startServer(
processBuilder.environment().putAll(environment);
Process serverProcess = processBuilder.start();
CountDownLatch ready = new CountDownLatch(1);
+ StringBuilder output = new StringBuilder();
Future outputMonitorResult = EXECUTOR.submit(
- () -> monitorOutput(serverProcess.getInputStream(), ready));
+ () -> monitorOutput(serverProcess.getInputStream(), ready, output));
boolean serverReady = ready.await(5, TimeUnit.SECONDS);
if (!serverReady) {
serverProcess.destroy();
throw new AssertionError("Server never became ready");
}
- return ServerProcess.of(serverProcess, outputMonitorResult);
+ return new ServerProcess(serverProcess, outputMonitorResult, output);
}
- private void monitorOutput(InputStream processOutput, CountDownLatch ready) {
+ private void monitorOutput(
+ InputStream processOutput, CountDownLatch ready, StringBuilder output) {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(processOutput))) {
String line;
while ((line = reader.readLine()) != null) {
@@ -562,6 +622,9 @@ private void monitorOutput(InputStream processOutput, CountDownLatch ready) {
ready.countDown();
}
System.out.println(line);
+ synchronized (output) {
+ output.append(line).append('\n');
+ }
if (line.contains("WARNING")) {
throw new AssertionError("Found warning in server output:\n" + line);
}
diff --git a/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Log.java b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Log.java
new file mode 100644
index 00000000..4b1e94fe
--- /dev/null
+++ b/invoker/core/src/test/java/com/google/cloud/functions/invoker/testfunctions/Log.java
@@ -0,0 +1,28 @@
+package com.google.cloud.functions.invoker.testfunctions;
+
+import com.google.cloud.functions.HttpFunction;
+import com.google.cloud.functions.HttpRequest;
+import com.google.cloud.functions.HttpResponse;
+import java.lang.reflect.Field;
+import java.util.Optional;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/** Emit log messages with configurable level, message, and exception. */
+public class Log implements HttpFunction {
+ private static final Logger logger = Logger.getLogger(Log.class.getName());
+
+ @Override
+ public void service(HttpRequest request, HttpResponse response) throws Exception {
+ String message = request.getFirstQueryParameter("message").orElse("Default message");
+ String levelString = request.getFirstQueryParameter("level").orElse("info");
+ Optional exceptionString = request.getFirstQueryParameter("exception");
+ Field levelField = Level.class.getField(levelString.toUpperCase());
+ Level level = (Level) levelField.get(null);
+ if (exceptionString.isPresent()) {
+ logger.log(level, message, new Exception(exceptionString.get()));
+ } else {
+ logger.log(level, message);
+ }
+ }
+}
From 52382d2a4fb8812bf3cd60ac99b646b4ebe04e1f Mon Sep 17 00:00:00 2001
From: Ace Nassri
Date: Mon, 30 Mar 2020 15:36:38 -0700
Subject: [PATCH 063/364] Fix typo (#19)
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 15a9d87a..7ff94f0f 100644
--- a/README.md
+++ b/README.md
@@ -153,7 +153,7 @@ mvn function:run
You can alternatively configure the plugin with properties on the command line:
```sh
- mvn com.google.cloud.functions:function:0.9.1:run \
+ mvn com.google.cloud.functions:function-maven-plugin:0.9.1:run \
-Drun.functionTarget=com.example.function.Echo
```
From fb4bae2f4232997bce28a4cb5323b25a6649f68c Mon Sep 17 00:00:00 2001
From: emcmanus
Date: Thu, 2 Apr 2020 15:44:16 -0700
Subject: [PATCH 064/364] Prepare the Java Functions Framework for a coming
change to the API, whereby background functions can throw checked exceptions
(`throws Exception`).
PiperOrigin-RevId: 304493044
---
README.md | 2 +-
.../invoker/NewBackgroundFunctionExecutor.java | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/README.md b/README.md
index 7ff94f0f..15a9d87a 100644
--- a/README.md
+++ b/README.md
@@ -153,7 +153,7 @@ mvn function:run
You can alternatively configure the plugin with properties on the command line:
```sh
- mvn com.google.cloud.functions:function-maven-plugin:0.9.1:run \
+ mvn com.google.cloud.functions:function:0.9.1:run \
-Drun.functionTarget=com.example.function.Echo
```
diff --git a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
index 5dbb89c9..596ffb3d 100644
--- a/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
+++ b/invoker/core/src/main/java/com/google/cloud/functions/invoker/NewBackgroundFunctionExecutor.java
@@ -183,12 +183,12 @@ final ClassLoader functionClassLoader() {
}
abstract void serviceLegacyEvent(HttpServletRequest req)
- throws IOException;
+ throws Exception;
abstract void serviceCloudEvent(
HttpServletRequest req,
HeadersStep unmarshaller)
- throws IOException;
+ throws Exception;
abstract Class cloudEventDataType();
}
@@ -202,7 +202,7 @@ private static class RawFunctionExecutor extends FunctionExecutor> {
}
@Override
- void serviceLegacyEvent(HttpServletRequest req) throws IOException {
+ void serviceLegacyEvent(HttpServletRequest req) throws Exception {
Event event = parseLegacyEvent(req);
function.accept(new Gson().toJson(event.getData()), event.getContext());
}
@@ -210,7 +210,7 @@ void serviceLegacyEvent(HttpServletRequest req) throws IOException {
@Override
void serviceCloudEvent(
HttpServletRequest req, HeadersStep, String> unmarshaller)
- throws IOException {
+ throws Exception {
Map httpHeaders = httpHeaderMap(req);
String body = req.getReader().lines().collect(joining("\n"));
CloudEvent> cloudEvent =
@@ -250,7 +250,7 @@ static TypedFunctionExecutor of(Type type, BackgroundFunction instance
}
@Override
- void serviceLegacyEvent(HttpServletRequest req) throws IOException {
+ void serviceLegacyEvent(HttpServletRequest req) throws Exception {
Event event = parseLegacyEvent(req);
T payload = new Gson().fromJson(event.getData(), type);
function.accept(payload, event.getContext());
@@ -259,7 +259,7 @@ void serviceLegacyEvent(HttpServletRequest req) throws IOException {
@Override
void serviceCloudEvent(
HttpServletRequest req, HeadersStep unmarshaller)
- throws IOException {
+ throws Exception {
Map httpHeaders = httpHeaderMap(req);
String body = req.getReader().lines().collect(joining("\n"));
CloudEvent