From 398222c2df28d84ff7510ac6adc23212e270e9b2 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Tue, 5 Sep 2023 17:38:05 +0200
Subject: [PATCH] Add Support for Topic in Servicebus Kamelets

Signed-off-by: Andrea Cosentino <ancosen@gmail.com>
---
 kamelets/azure-servicebus-sink.kamelet.yaml                | 7 +++++++
 kamelets/azure-servicebus-source.kamelet.yaml              | 7 +++++++
 .../resources/kamelets/azure-servicebus-sink.kamelet.yaml  | 7 +++++++
 .../kamelets/azure-servicebus-source.kamelet.yaml          | 7 +++++++
 4 files changed, 28 insertions(+)

diff --git a/kamelets/azure-servicebus-sink.kamelet.yaml b/kamelets/azure-servicebus-sink.kamelet.yaml
index 37bb8dd13..28cba2a19 100644
--- a/kamelets/azure-servicebus-sink.kamelet.yaml
+++ b/kamelets/azure-servicebus-sink.kamelet.yaml
@@ -50,6 +50,12 @@ spec:
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:password
         - urn:camel:group:credentials
+      serviceBusType:
+        title: Servicebus Type
+        description: The service bus type of connection to execute. Queue is for typical queue option and topic for subscription based model.
+        type: string
+        default: queue
+        enum: ["queue", "topic"]
   types:
     in:
       mediaType: application/octet-stream
@@ -65,4 +71,5 @@ spec:
           uri: "azure-servicebus:{{topicOrQueueName}}"
           parameters:
             connectionString: "{{connectionString}}"
+            serviceBusType: "{{serviceBusType}}"
             producerOperation: "sendMessages"
diff --git a/kamelets/azure-servicebus-source.kamelet.yaml b/kamelets/azure-servicebus-source.kamelet.yaml
index 29e0ea52d..3cb6a35cd 100644
--- a/kamelets/azure-servicebus-source.kamelet.yaml
+++ b/kamelets/azure-servicebus-source.kamelet.yaml
@@ -62,6 +62,12 @@ spec:
         title: Subscription Name
         description: Sets the name of the subscription in the topic to listen to. This parameter is mandatory in case of topic.
         type: string
+      serviceBusType:
+        title: Servicebus Type
+        description: The service bus type of connection to execute. Queue is for typical queue option and topic for subscription based model.
+        type: string
+        default: queue
+        enum: ["queue", "topic"]
   types:
     out:
       mediaType: application/octet-stream
@@ -76,6 +82,7 @@ spec:
         connectionString: "{{connectionString}}"
         serviceBusReceiveMode: "{{serviceBusReceiveMode}}"
         subscriptionName: "{{?subscriptionName}}"
+        serviceBusType: "{{serviceBusType}}"
       steps:
       - set-body:
           simple: "${body.toBytes()}"
diff --git a/library/camel-kamelets/src/main/resources/kamelets/azure-servicebus-sink.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/azure-servicebus-sink.kamelet.yaml
index 37bb8dd13..28cba2a19 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/azure-servicebus-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/azure-servicebus-sink.kamelet.yaml
@@ -50,6 +50,12 @@ spec:
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:password
         - urn:camel:group:credentials
+      serviceBusType:
+        title: Servicebus Type
+        description: The service bus type of connection to execute. Queue is for typical queue option and topic for subscription based model.
+        type: string
+        default: queue
+        enum: ["queue", "topic"]
   types:
     in:
       mediaType: application/octet-stream
@@ -65,4 +71,5 @@ spec:
           uri: "azure-servicebus:{{topicOrQueueName}}"
           parameters:
             connectionString: "{{connectionString}}"
+            serviceBusType: "{{serviceBusType}}"
             producerOperation: "sendMessages"
diff --git a/library/camel-kamelets/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml b/library/camel-kamelets/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml
index 29e0ea52d..3cb6a35cd 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/azure-servicebus-source.kamelet.yaml
@@ -62,6 +62,12 @@ spec:
         title: Subscription Name
         description: Sets the name of the subscription in the topic to listen to. This parameter is mandatory in case of topic.
         type: string
+      serviceBusType:
+        title: Servicebus Type
+        description: The service bus type of connection to execute. Queue is for typical queue option and topic for subscription based model.
+        type: string
+        default: queue
+        enum: ["queue", "topic"]
   types:
     out:
       mediaType: application/octet-stream
@@ -76,6 +82,7 @@ spec:
         connectionString: "{{connectionString}}"
         serviceBusReceiveMode: "{{serviceBusReceiveMode}}"
         subscriptionName: "{{?subscriptionName}}"
+        serviceBusType: "{{serviceBusType}}"
       steps:
       - set-body:
           simple: "${body.toBytes()}"