fix: update quarkus templates

Author: matejvasek

pkged.go

@@ -0,0 +1,36 @@
+# Eclipse
+.project
+.classpath
+.settings/
+bin/
+
+# IntelliJ
+.idea
+*.ipr
+*.iml
+*.iws
+
+# NetBeans
+nb-configuration.xml
+
+# Visual Studio Code
+.vscode
+.factorypath
+
+# OSX
+.DS_Store
+
+# Vim
+*.swp
+*.swo
+
+# patch
+*.orig
+*.rej
+
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+release.properties

templates/quarkus/events/.gitignore

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2007-present the original author or authors.
+ *
+ * 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.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    private static final String WRAPPER_VERSION = "0.5.6";
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

templates/quarkus/events/.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,2 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

templates/quarkus/events/.mvn/wrapper/maven-wrapper.jar

@@ -1,70 +1,86 @@
-# Quarkus Cloud Events Function
+# Function project
 
-Welcome to your new Quarkus function project! This sample project contains three functions:
-* org.funqy.demo.GreetingFunctions.greet()
-* org.funqy.demo.PrimitiveFunctions.toLowerCase()
-* org.funqy.demo.PrimitiveFunctions.doubleIt()
+Welcome to your new Quarkus function project!
 
-Only one of the function is active at the time.
-Which one is determined by the `quarkus.funqy.export` property in `src/main/resources/application.properties`.
-
-The `greet` function demonstrates work with java beans,
-it accepts `Identity` bean (data of incoming cloud event)
-and it returns `Greeting` bean (data of outgoing cloud event). 
-
-The `toLowerCase` function accepts string and returns string.
-As its name suggests it returns input string with all characters in lowercase.
-
-The `doubleIt` function accepts integer and returns its value doubled.
-
-You can test those functions by using `curl` cmd utility.
-Parameters for `curl` can be found at [Cloud Event emulation](#cloud-event-emulation).
+This sample project contains single function: `functions.Function.echo()`,
+the function just returns its argument.
 
 ## Local execution
-Make sure that `maven 3.6.2` and `Java 11 SDK` is installed.
+Make sure that `Java 11 SDK` is installed.
 
-To start server locally run `mvn quarkus:dev`.
+To start server locally run `./mvnw quarkus:dev`.
 The command starts http server and automatically watches for changes of source code.
 If source code changes the change will be propagated to running server. It also opens debugging port `5005`
 so debugger can be attached if needed.
 
-To run test locally run `mvn test`.
+To run test locally run `./mvnw test`.
+
+## The `faas` CLI
+
+It's recommended to set `FAAS_REGISTRY` environment variable.
+```shell script
+# replace ~/.bashrc by your shell rc file
+# replace docker.io/johndoe with your registry
+export FAAS_REGISTRY=docker.io/johndoe
+echo "export FAAS_REGISTRY=docker.io/johndoe" >> ~/.bashrc 
+```
+
+### Building
+
+This command builds OCI image for the function.
+
+```shell script
+faas build                  # build jar
+faas build --builder native # build native binary
+```
+
+### Running
+
+This command runs the function locally in a container
+using the image created above.
+```shell script
+faas run
+```
+
+### Deploying
 
-## Cloud Event emulation
+This commands will build and deploy the function into cluster.
 
-sample cloud event for the `greet` function
 ```shell script
-curl -v "localhost:8080" \
-  -X POST \
-  -H "Ce-Id: 536808d3-88be-4077-9d7a-a3f162705f79" \
-  -H "Ce-specversion: 0.3" \
-  -H "Ce-Type: dev.nodeshift.samples.quarkus-funqy" \
-  -H "Ce-Source: dev.nodeshift.samples/quarkus-funqy-source" \
-  -H "Content-Type: application/json" \
-  -d "{\"name\": \"$(whoami)\"}\"";
+faas deploy # also triggers build
+```
+
+## Function invocation
+
+Do not forget to set `URL` variable to the route of your function.
 
+You get the route by following command.
+```shell script
+faas describe
 ```
 
-sample event for the `toLowerCase` function
+### cURL
+
 ```shell script
-curl -v "localhost:8080" \
-  -X POST \
-  -H "Ce-Id: 536808d3-88be-4077-9d7a-a3f162705f79" \
-  -H "Ce-specversion: 0.3" \
-  -H "Ce-Type: dev.nodeshift.samples.quarkus-funqy" \
-  -H "Ce-Source: dev.nodeshift.samples/quarkus-funqy-source" \
-  -H "Content-Type: application/json" \
-  -d '"wEiRDly CaPiTaLisEd sTrInG"'
+URL=http://localhost:8080/
+curl -v ${URL} \
+  -H "Content-Type:application/json" \
+  -H "Ce-Id:1" \
+  -H "Ce-Source:cloud-event-example" \
+  -H "Ce-Type:dev.knative.example" \
+  -H "Ce-Specversion:1.0" \
+  -d "{\"name\": \"$(whoami)\"}\""
 ```
 
-sample event for the `doubleIt` function
+### HTTPie
+
 ```shell script
-curl -v "localhost:8080" \
-  -X POST \
-  -H "Ce-Id: 536808d3-88be-4077-9d7a-a3f162705f79" \
-  -H "Ce-specversion: 0.3" \
-  -H "Ce-Type: dev.nodeshift.samples.quarkus-funqy" \
-  -H "Ce-Source: dev.nodeshift.samples/quarkus-funqy-source" \
-  -H "Content-Type: application/json" \
-  -d '21'
+URL=http://localhost:8080/
+http -v ${URL} \
+  Content-Type:application/json \
+  Ce-Id:1 \
+  Ce-Source:cloud-event-example \
+  Ce-Type:dev.knative.example \
+  Ce-Specversion:1.0 \
+  name=$(whoami)
 ```

templates/quarkus/events/.mvn/wrapper/maven-wrapper.properties

@@ -19,7 +19,7 @@
 # ----------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------------
-# Maven2 Start Up Batch script
+# Maven Start Up Batch script
 #
 # Required ENV vars:
 # ------------------
@@ -212,9 +212,9 @@ else
       echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
     fi
     if [ -n "$MVNW_REPOURL" ]; then
-      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar"
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     else
-      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.3/maven-wrapper-0.5.3.jar"
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
     fi
     while IFS="=" read key value; do
       case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
@@ -246,7 +246,7 @@ else
         else
             curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
         fi
-        
+
     else
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Falling back to using Java to download"
@@ -296,6 +296,11 @@ if $cygwin; then
     MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
 fi
 
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
 WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
 exec "$JAVACMD" \