You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/10/26 07:55:43 UTC

[camel-kamelets] 03/03: Backport Regen

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch backport-0.9.2
in repository https://gitbox.apache.org/repos/asf/camel-kamelets.git

commit b587e2929f6eb0c82877bd1b5270b4a914db3cee
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Oct 26 09:55:25 2022 +0200

    Backport Regen
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 .../main/resources/kamelets/azure-eventhubs-source.kamelet.yaml  | 9 +--------
 .../main/resources/kamelets/google-functions-sink.kamelet.yaml   | 6 +++---
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml
index e665c9cf..08132515 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/azure-eventhubs-source.kamelet.yaml
@@ -82,13 +82,8 @@ spec:
         - urn:camel:group:credentials
   types:
     out:
-      mediaType: application/json
+      mediaType: application/octet-stream
   dependencies:
-  #TODO: these mvn:* dependencies must be removed after upgrading to camel 3.10
-  - "mvn:com.fasterxml.jackson.core:jackson-core:2.11.3"
-  - "mvn:com.fasterxml.jackson.core:jackson-annotations:2.11.3"
-  - "mvn:com.fasterxml.jackson.core:jackson-databind:2.11.3"
-  - "mvn:com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.11.3"
   - "camel:azure-eventhubs"
   - "camel:kamelet"
   - "camel:jackson"
@@ -102,6 +97,4 @@ spec:
         blobAccessKey: "{{blobAccessKey}}"
         blobContainerName: "{{blobContainerName}}"
       steps:
-      - marshal:
-          json: {}
       - to: "kamelet:sink"
diff --git a/library/camel-kamelets/src/main/resources/kamelets/google-functions-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/google-functions-sink.kamelet.yaml
index 08e6bb9e..89d45988 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/google-functions-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/google-functions-sink.kamelet.yaml
@@ -52,8 +52,8 @@ spec:
         type: string
       serviceAccountKey:
         title: Service Account Key
-        description: The path to the service account key file that provides credentials for the Google Cloud Functions platform.
-        type: string
+        description: The path to the service account key file that provides credentials for the Google Cloud Functions platform. You must encode this value in base64.
+        type: binary
         x-descriptors:
         - urn:camel:group:credentials
   dependencies:
@@ -67,6 +67,6 @@ spec:
       - to:
           uri: "google-functions://{{functionName}}"
           parameters:
-            serviceAccountKey: "{{serviceAccountKey}}"
+            serviceAccountKey: "base64:{{serviceAccountKey}}"
             project: "{{projectId}}"
             location: "{{region}}"