AWS SQS Kamelets: Introduce optional overrideEndpoint and uriEndpointOverride for testing purpose

kamelets/aws-sqs-batch-sink.kamelet.yaml

@@ -83,6 +83,7 @@ spec:
         title: AWS Host
         description: The hostname of the Amazon AWS cloud. 
         type: string
+        default: amazonaws.com
       protocol:
         title: Protocol
         description: The underlying protocol used to communicate with SQS
@@ -95,6 +96,17 @@ spec:
         type: boolean
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwritte Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
         default: false        
   dependencies:
     - "camel:aws2-sqs"
@@ -114,4 +126,6 @@ spec:
             operation: "sendBatchMessage"
             amazonAWSHost: "{{?amazonAWSHost}}"
             protocol: "{{?protocol}}"
-            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"            
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+            uriEndpointOverride: "{{?uriEndpointOverride}}"
+            overrideEndpoint: "{{overrideEndpoint}}"            

kamelets/aws-sqs-fifo-sink.kamelet.yaml

@@ -85,6 +85,7 @@ spec:
         title: AWS Host
         description: The hostname of the Amazon AWS cloud. 
         type: string
+        default: amazonaws.com
       protocol:
         title: Protocol
         description: The underlying protocol used to communicate with SQS
@@ -97,7 +98,18 @@ spec:
         type: boolean
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
-        default: false  
+        default: false
+      uriEndpointOverride:
+        title: Overwritte Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false   
   dependencies:
   - "camel:aws2-sqs"
   - "camel:core"
@@ -140,6 +152,8 @@ spec:
                   useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}" 
                   messageGroupIdStrategy: "usePropertyValue"
                   messageDeduplicationIdStrategy: "useContentBasedDeduplication"
+                  uriEndpointOverride: "{{?uriEndpointOverride}}"
+                  overrideEndpoint: "{{overrideEndpoint}}"
           otherwise:
             steps:
             - to:
@@ -154,3 +168,5 @@ spec:
                   messageDeduplicationIdStrategy: "useExchangeId"
                   amazonAWSHost: "{{?amazonAWSHost}}"
                   protocol: "{{?protocol}}"
+                  uriEndpointOverride: "{{?uriEndpointOverride}}"
+                  overrideEndpoint: "{{overrideEndpoint}}"

kamelets/aws-sqs-sink.kamelet.yaml

@@ -77,6 +77,7 @@ spec:
         title: AWS Host
         description: The hostname of the Amazon AWS cloud. 
         type: string
+        default: amazonaws.com
       protocol:
         title: Protocol
         description: The underlying protocol used to communicate with SQS
@@ -89,6 +90,17 @@ spec:
         type: boolean
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwritte Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
         default: false    
   dependencies:
     - "camel:aws2-sqs"
@@ -106,4 +118,6 @@ spec:
             region: "{{region}}"
             amazonAWSHost: "{{?amazonAWSHost}}"
             protocol: "{{?protocol}}"
-            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"            
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+            uriEndpointOverride: "{{?uriEndpointOverride}}"
+            overrideEndpoint: "{{overrideEndpoint}}"            

kamelets/aws-sqs-source.kamelet.yaml

@@ -92,6 +92,7 @@ spec:
         title: AWS Host
         description: The hostname of the Amazon AWS cloud. 
         type: string
+        default: amazonaws.com
       protocol:
         title: Protocol
         description: The underlying protocol used to communicate with SQS
@@ -112,6 +113,17 @@ spec:
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
         default: false
+      uriEndpointOverride:
+        title: Overwritte Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false    
   dependencies:
     - "camel:aws2-sqs"
     - "camel:kamelet"
@@ -127,5 +139,7 @@ spec:
         amazonAWSHost: "{{?amazonAWSHost}}"
         protocol: "{{?protocol}}"
         useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+        uriEndpointOverride: "{{?uriEndpointOverride}}"
+        overrideEndpoint: "{{overrideEndpoint}}"  
       steps:
       - to: "kamelet:sink"

library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java

@@ -55,7 +55,7 @@ void testGetKamelets() throws Exception {
     @Test
     void testGetKameletsDefinition() throws Exception {
         JSONSchemaProps props = catalog.getKameletDefinition("aws-sqs-source");
-        assertEquals(10, props.getProperties().keySet().size());
+        assertEquals(12, props.getProperties().keySet().size());
         assertTrue(props.getProperties().keySet().contains("queueNameOrArn"));
     }
 

library/camel-kamelets/src/main/resources/kamelets/aws-sqs-batch-sink.kamelet.yaml

@@ -83,6 +83,7 @@ spec:
         title: AWS Host
         description: The hostname of the Amazon AWS cloud. 
         type: string
+        default: amazonaws.com
       protocol:
         title: Protocol
         description: The underlying protocol used to communicate with SQS
@@ -95,6 +96,17 @@ spec:
         type: boolean
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwritte Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
         default: false        
   dependencies:
     - "camel:aws2-sqs"
@@ -114,4 +126,6 @@ spec:
             operation: "sendBatchMessage"
             amazonAWSHost: "{{?amazonAWSHost}}"
             protocol: "{{?protocol}}"
-            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"            
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+            uriEndpointOverride: "{{?uriEndpointOverride}}"
+            overrideEndpoint: "{{overrideEndpoint}}"            

library/camel-kamelets/src/main/resources/kamelets/aws-sqs-fifo-sink.kamelet.yaml

@@ -85,6 +85,7 @@ spec:
         title: AWS Host
         description: The hostname of the Amazon AWS cloud. 
         type: string
+        default: amazonaws.com
       protocol:
         title: Protocol
         description: The underlying protocol used to communicate with SQS
@@ -97,7 +98,18 @@ spec:
         type: boolean
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
-        default: false  
+        default: false
+      uriEndpointOverride:
+        title: Overwritte Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false   
   dependencies:
   - "camel:aws2-sqs"
   - "camel:core"
@@ -140,6 +152,8 @@ spec:
                   useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}" 
                   messageGroupIdStrategy: "usePropertyValue"
                   messageDeduplicationIdStrategy: "useContentBasedDeduplication"
+                  uriEndpointOverride: "{{?uriEndpointOverride}}"
+                  overrideEndpoint: "{{overrideEndpoint}}"
           otherwise:
             steps:
             - to:
@@ -154,3 +168,5 @@ spec:
                   messageDeduplicationIdStrategy: "useExchangeId"
                   amazonAWSHost: "{{?amazonAWSHost}}"
                   protocol: "{{?protocol}}"
+                  uriEndpointOverride: "{{?uriEndpointOverride}}"
+                  overrideEndpoint: "{{overrideEndpoint}}"

library/camel-kamelets/src/main/resources/kamelets/aws-sqs-sink.kamelet.yaml

@@ -77,6 +77,7 @@ spec:
         title: AWS Host
         description: The hostname of the Amazon AWS cloud. 
         type: string
+        default: amazonaws.com
       protocol:
         title: Protocol
         description: The underlying protocol used to communicate with SQS
@@ -89,6 +90,17 @@ spec:
         type: boolean
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false
+      uriEndpointOverride:
+        title: Overwritte Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
         default: false    
   dependencies:
     - "camel:aws2-sqs"
@@ -106,4 +118,6 @@ spec:
             region: "{{region}}"
             amazonAWSHost: "{{?amazonAWSHost}}"
             protocol: "{{?protocol}}"
-            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"            
+            useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+            uriEndpointOverride: "{{?uriEndpointOverride}}"
+            overrideEndpoint: "{{overrideEndpoint}}"            

library/camel-kamelets/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml

@@ -92,6 +92,7 @@ spec:
         title: AWS Host
         description: The hostname of the Amazon AWS cloud. 
         type: string
+        default: amazonaws.com
       protocol:
         title: Protocol
         description: The underlying protocol used to communicate with SQS
@@ -112,6 +113,17 @@ spec:
         x-descriptors:
         - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
         default: false
+      uriEndpointOverride:
+        title: Overwritte Endpoint URI
+        description: Set the overriding endpoint URI. This option needs to be used in combination with overrideEndpoint option.
+        type: string
+      overrideEndpoint:
+        title: Endpoint Overwrite
+        description: Set the need for overiding the endpoint URI. This option needs to be used in combination with uriEndpointOverride setting.
+        type: boolean
+        x-descriptors:
+          - 'urn:alm:descriptor:com.tectonic.ui:checkbox'
+        default: false    
   dependencies:
     - "camel:aws2-sqs"
     - "camel:kamelet"
@@ -127,5 +139,7 @@ spec:
         amazonAWSHost: "{{?amazonAWSHost}}"
         protocol: "{{?protocol}}"
         useDefaultCredentialsProvider: "{{useDefaultCredentialsProvider}}"
+        uriEndpointOverride: "{{?uriEndpointOverride}}"
+        overrideEndpoint: "{{overrideEndpoint}}"  
       steps:
       - to: "kamelet:sink"