From d465c10483b0ec2d763226a05ed316bf74c6d4e9 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 5 May 2021 13:13:23 +0200
Subject: [PATCH 1/9] Generalize the idea for checking the body in action like
 replace field etc.

---
 .../apache/camel/kamelets/utils/transform/ReplaceField.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/transform/ReplaceField.java b/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/transform/ReplaceField.java
index 9ec117c09..2ea2ed5d8 100644
--- a/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/transform/ReplaceField.java
+++ b/library/camel-kamelets-utils/src/main/java/org/apache/camel/kamelets/utils/transform/ReplaceField.java
@@ -61,7 +61,11 @@ public class ReplaceField {
                 updatedBody.put(renameOptional(fieldName, renamingMap), fieldValue);
             }
         }
-        return updatedBody;
+        if (!updatedBody.isEmpty()) {
+            return updatedBody;
+        } else {
+            return body;
+        }
     }
 
     boolean filterNames(String fieldName, List<String> enabledFields, List<String> disabledFields) {

From 2dc7c70489a90be008ea7e2fd32e810e0fcaa983 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 5 May 2021 13:36:53 +0200
Subject: [PATCH 2/9] Add group label to all kamelets - AWS DDB Streams

---
 aws-ddb-streams-source.kamelet.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aws-ddb-streams-source.kamelet.yaml b/aws-ddb-streams-source.kamelet.yaml
index 637de34a8..3fbab7e8e 100644
--- a/aws-ddb-streams-source.kamelet.yaml
+++ b/aws-ddb-streams-source.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: "source"
+    camel.apache.org/kamelet.group: "AWS DynamoDB Streams"
 spec:
   definition:
     title: "AWS DynamoDB Streams Source"

From 7cc4afed1890506178514cf5b58df463c2fa5af6 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 5 May 2021 13:38:24 +0200
Subject: [PATCH 3/9] Add group label to all kamelets - AWS Kinesis Firehose

---
 aws-kinesis-firehose-sink.kamelet.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aws-kinesis-firehose-sink.kamelet.yaml b/aws-kinesis-firehose-sink.kamelet.yaml
index 9b0479a12..00019cb9e 100644
--- a/aws-kinesis-firehose-sink.kamelet.yaml
+++ b/aws-kinesis-firehose-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS Kinesis Firehose"
 spec:
   definition:
     title: AWS Kinesis Firehose Sink

From 26e8a949bfe415be4ac669f4f3c862ef522f7f2a Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 5 May 2021 13:56:40 +0200
Subject: [PATCH 4/9] Add group label to all kamelets - AWS Kinesis

---
 aws-kinesis-sink.kamelet.yaml   | 1 +
 aws-kinesis-source.kamelet.yaml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/aws-kinesis-sink.kamelet.yaml b/aws-kinesis-sink.kamelet.yaml
index cbe0da454..2d5f3d3b0 100644
--- a/aws-kinesis-sink.kamelet.yaml
+++ b/aws-kinesis-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS Kinesis"
 spec:
   definition:
     title: "AWS Kinesis Sink"
diff --git a/aws-kinesis-source.kamelet.yaml b/aws-kinesis-source.kamelet.yaml
index d4d656d10..3e95c98dc 100644
--- a/aws-kinesis-source.kamelet.yaml
+++ b/aws-kinesis-source.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: "source"
+    camel.apache.org/kamelet.group: "AWS Kinesis"
 spec:
   definition:
     title: "AWS Kinesis Source"

From 694fe363336b30e43007f40afe1cc2cb1eda8fe0 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 5 May 2021 13:57:35 +0200
Subject: [PATCH 5/9] Add group label to all kamelets - AWS Lambda

---
 aws-lambda-sink.kamelet.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aws-lambda-sink.kamelet.yaml b/aws-lambda-sink.kamelet.yaml
index e4676981d..893c2b1cf 100644
--- a/aws-lambda-sink.kamelet.yaml
+++ b/aws-lambda-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS Lambda"
 spec:
   definition:
     title: AWS Lambda Sink

From 40c47b85172776f2269a3797739a7ba8ad1b051e Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 5 May 2021 14:00:16 +0200
Subject: [PATCH 6/9] Add group label to all kamelets - AWS S3

---
 aws-s3-sink.kamelet.yaml   | 1 +
 aws-s3-source.kamelet.yaml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/aws-s3-sink.kamelet.yaml b/aws-s3-sink.kamelet.yaml
index c4330f946..a9449c7f6 100644
--- a/aws-s3-sink.kamelet.yaml
+++ b/aws-s3-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: "sink"
+    camel.apache.org/kamelet.group: "AWS S3"
 spec:
   definition:
     title: "AWS S3 Sink"
diff --git a/aws-s3-source.kamelet.yaml b/aws-s3-source.kamelet.yaml
index 71a219532..618c71f3e 100644
--- a/aws-s3-source.kamelet.yaml
+++ b/aws-s3-source.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: "source"
+    camel.apache.org/kamelet.group: "AWS S3"
 spec:
   definition:
     title: "AWS S3 Source"

From 5f3b55cddbd134409e362dfa2121c47fa71a2a4e Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 5 May 2021 14:01:33 +0200
Subject: [PATCH 7/9] Add group label to all kamelets - AWS SNS

---
 aws-sns-fifo-sink.kamelet.yaml | 1 +
 aws-sns-sink.kamelet.yaml      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/aws-sns-fifo-sink.kamelet.yaml b/aws-sns-fifo-sink.kamelet.yaml
index 251cbe9ff..bfa0ec898 100644
--- a/aws-sns-fifo-sink.kamelet.yaml
+++ b/aws-sns-fifo-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS SNS"
 spec:
   definition:
     title: AWS SNS FIFO Sink
diff --git a/aws-sns-sink.kamelet.yaml b/aws-sns-sink.kamelet.yaml
index 88c3b81fa..2cc0e9f2f 100644
--- a/aws-sns-sink.kamelet.yaml
+++ b/aws-sns-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS SNS"
 spec:
   definition:
     title: AWS SNS Sink

From 58f2dc92e64767496b5425990e3b0d8d4c6701e5 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 5 May 2021 14:02:24 +0200
Subject: [PATCH 8/9] Add group label to all kamelets - AWS SQS

---
 aws-sqs-batch-sink.kamelet.yaml | 1 +
 aws-sqs-fifo-sink.kamelet.yaml  | 1 +
 aws-sqs-sink.kamelet.yaml       | 1 +
 aws-sqs-source.kamelet.yaml     | 1 +
 4 files changed, 4 insertions(+)

diff --git a/aws-sqs-batch-sink.kamelet.yaml b/aws-sqs-batch-sink.kamelet.yaml
index a1100a894..938946641 100644
--- a/aws-sqs-batch-sink.kamelet.yaml
+++ b/aws-sqs-batch-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS SQS"
 spec:
   definition:
     title: AWS SQS Batch Sink
diff --git a/aws-sqs-fifo-sink.kamelet.yaml b/aws-sqs-fifo-sink.kamelet.yaml
index 0417d29f9..33ab8345a 100644
--- a/aws-sqs-fifo-sink.kamelet.yaml
+++ b/aws-sqs-fifo-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS SQS"
 spec:
   definition:
     title: AWS SQS FIFO Sink
diff --git a/aws-sqs-sink.kamelet.yaml b/aws-sqs-sink.kamelet.yaml
index 94e7b8921..0715edddc 100644
--- a/aws-sqs-sink.kamelet.yaml
+++ b/aws-sqs-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS SQS"
 spec:
   definition:
     title: AWS SQS Sink
diff --git a/aws-sqs-source.kamelet.yaml b/aws-sqs-source.kamelet.yaml
index df46b6dea..1402ae8bc 100644
--- a/aws-sqs-source.kamelet.yaml
+++ b/aws-sqs-source.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: "source"
+    camel.apache.org/kamelet.group: "AWS SQS"
 spec:
   definition:
     title: "AWS SQS Source"

From 747a5ab6a0cdc46bedbf6d5cf75887c9fa29f269 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 5 May 2021 14:04:19 +0200
Subject: [PATCH 9/9] Add group label to all kamelets - Regen catalog for AWS
 Groups

---
 .../main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml  | 1 +
 .../resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml    | 1 +
 .../src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml    | 1 +
 .../src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml  | 1 +
 .../src/main/resources/kamelets/aws-lambda-sink.kamelet.yaml     | 1 +
 .../src/main/resources/kamelets/aws-s3-sink.kamelet.yaml         | 1 +
 .../src/main/resources/kamelets/aws-s3-source.kamelet.yaml       | 1 +
 .../src/main/resources/kamelets/aws-sns-fifo-sink.kamelet.yaml   | 1 +
 .../src/main/resources/kamelets/aws-sns-sink.kamelet.yaml        | 1 +
 .../src/main/resources/kamelets/aws-sqs-batch-sink.kamelet.yaml  | 1 +
 .../src/main/resources/kamelets/aws-sqs-fifo-sink.kamelet.yaml   | 1 +
 .../src/main/resources/kamelets/aws-sqs-sink.kamelet.yaml        | 1 +
 .../src/main/resources/kamelets/aws-sqs-source.kamelet.yaml      | 1 +
 13 files changed, 13 insertions(+)

diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml
index 637de34a8..3fbab7e8e 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: "source"
+    camel.apache.org/kamelet.group: "AWS DynamoDB Streams"
 spec:
   definition:
     title: "AWS DynamoDB Streams Source"
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml
index 9b0479a12..00019cb9e 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-kinesis-firehose-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS Kinesis Firehose"
 spec:
   definition:
     title: AWS Kinesis Firehose Sink
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml
index cbe0da454..2d5f3d3b0 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-kinesis-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS Kinesis"
 spec:
   definition:
     title: "AWS Kinesis Sink"
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml
index d4d656d10..3e95c98dc 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: "source"
+    camel.apache.org/kamelet.group: "AWS Kinesis"
 spec:
   definition:
     title: "AWS Kinesis Source"
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-lambda-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-lambda-sink.kamelet.yaml
index e4676981d..893c2b1cf 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-lambda-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-lambda-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS Lambda"
 spec:
   definition:
     title: AWS Lambda Sink
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
index c4330f946..a9449c7f6 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-s3-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: "sink"
+    camel.apache.org/kamelet.group: "AWS S3"
 spec:
   definition:
     title: "AWS S3 Sink"
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-s3-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-s3-source.kamelet.yaml
index 71a219532..618c71f3e 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-s3-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-s3-source.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: "source"
+    camel.apache.org/kamelet.group: "AWS S3"
 spec:
   definition:
     title: "AWS S3 Source"
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sns-fifo-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sns-fifo-sink.kamelet.yaml
index 251cbe9ff..bfa0ec898 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sns-fifo-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sns-fifo-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS SNS"
 spec:
   definition:
     title: AWS SNS FIFO Sink
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sns-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sns-sink.kamelet.yaml
index 88c3b81fa..2cc0e9f2f 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sns-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sns-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS SNS"
 spec:
   definition:
     title: AWS SNS Sink
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-batch-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-batch-sink.kamelet.yaml
index a1100a894..938946641 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-batch-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-batch-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS SQS"
 spec:
   definition:
     title: AWS SQS Batch Sink
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-fifo-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-fifo-sink.kamelet.yaml
index 0417d29f9..33ab8345a 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-fifo-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-fifo-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS SQS"
 spec:
   definition:
     title: AWS SQS FIFO Sink
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-sink.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-sink.kamelet.yaml
index 94e7b8921..0715edddc 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-sink.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-sink.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: sink
+    camel.apache.org/kamelet.group: "AWS SQS"
 spec:
   definition:
     title: AWS SQS Sink
diff --git a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml
index df46b6dea..1402ae8bc 100644
--- a/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml
+++ b/library/camel-kamelets-catalog/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml
@@ -7,6 +7,7 @@ metadata:
     camel.apache.org/provider: "Apache Software Foundation"
   labels:
     camel.apache.org/kamelet.type: "source"
+    camel.apache.org/kamelet.group: "AWS SQS"
 spec:
   definition:
     title: "AWS SQS Source"