From 1ac2bdba1158c4f526c925d3c78d28384f1b9c79 Mon Sep 17 00:00:00 2001
From: Andrea Tarocchi <andrea.tarocchi@gmail.com>
Date: Sat, 18 Sep 2021 17:51:51 +0200
Subject: [PATCH] Fixed aws-cloudwatch-sink.kamelet.yaml by making set header
 work as intended.

---
 aws-cloudwatch-sink.kamelet.yaml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/aws-cloudwatch-sink.kamelet.yaml b/aws-cloudwatch-sink.kamelet.yaml
index 72fc32b0f..9fe27eb94 100644
--- a/aws-cloudwatch-sink.kamelet.yaml
+++ b/aws-cloudwatch-sink.kamelet.yaml
@@ -67,42 +67,50 @@ spec:
             steps:
             - set-header:
                 name: CamelAwsCwMetricName
-                simple: "${header[metric-name]}"
+                simple: "${header[metric-name]}"             
           - simple: "${header[ce-metric-name]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricName
                 simple: "${header[ce-metric-name]}"
+      - choice:
+          when:                
           - simple: "${header[metric-value]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricValue
-                simple: "${header[metric-value]}"
+                simple: "${header[metric-value]}"              
           - simple: "${header[ce-metric-value]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricValue
                 simple: "${header[ce-metric-value]}"
+      - choice:
+          when:                
           - simple: "${header[metric-unit]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricUnit
-                simple: "${header[metric-unit]}"
+                simple: "${header[metric-unit]}"              
           - simple: "${header[ce-metric-unit]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricUnit
                 simple: "${header[ce-metric-unit]}"
+      - choice:
+          when:                
           - simple: "${header[metric-timestamp]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricTimestamp
-                simple: "${header[metric-timestamp]}"
+                simple: "${header[metric-timestamp]}"               
           - simple: "${header[ce-metric-timestamp]}"
             steps:
             - set-header:
                 name: CamelAwsCwMetricTimestamp
                 simple: "${header[ce-metric-timestamp]}"
+      - choice:
+          when:                
           - simple: "${header[metric-dimension-name]}"
             steps:
             - set-header:
@@ -113,6 +121,8 @@ spec:
             - set-header:
                 name: CamelAwsCwMetricDimensionName
                 simple: "${header[ce-metric-dimension-name]}"
+      - choice:
+          when:                
           - simple: "${header[metric-dimension-value]}"
             steps:
             - set-header: