Fix #1808 - remove empty x-descriptors field (#1814)

apache · Dec 20, 2023 · f71d9f8 · f71d9f8
1 parent d1cd3da
commit f71d9f8
Show file tree

Hide file tree

Showing 58 changed files with 62 additions and 194 deletions.
diff --git a/kamelets/google-calendar-source.kamelet.yaml b/kamelets/google-calendar-source.kamelet.yaml
@@ -91,13 +91,11 @@ spec:
         title: Sync Flow
         description: Specifies to sync events for incremental synchronization.
         type: boolean
-        x-descriptors:
         default: false
       consumeFromNow:
         title: Consume from now
         description: Specfies to consume events in the calendar from now on.
         type: boolean
-        x-descriptors:
         default: true
   types:
     out:

diff --git a/kamelets/google-mail-source.kamelet.yaml b/kamelets/google-mail-source.kamelet.yaml
@@ -86,7 +86,6 @@ spec:
         title: Mark as Read
         description: Mark the message as read once it has been consumed
         type: boolean
-        x-descriptors:
         default: true
       labels:
         title: Gmail Labels

diff --git a/kamelets/google-pubsub-source.kamelet.yaml b/kamelets/google-pubsub-source.kamelet.yaml
@@ -32,7 +32,7 @@ spec:
     title: "Google Pubsub Source"
     description: |-
       Consume messages from Google Cloud Pub/Sub.
-      
+
       If you specify the `serviceAccountKey` property, you must base64 encode it before you pass it as a parameter.
     required:
       - projectId
@@ -57,7 +57,6 @@ spec:
         title: Synchronous Pull
         description: Specifies to synchronously pull batches of messages.
         type: boolean
-        x-descriptors:
         default: false
       maxMessagesPerPoll:
         title: Max Messages Per Poll
@@ -68,7 +67,7 @@ spec:
         title: Concurrent Consumers
         description: The number of parallel streams to consume from the subscription.
         type: integer
-        default: 1        
+        default: 1
   dependencies:
     - "camel:kamelet"
     - "camel:google-pubsub"

diff --git a/kamelets/google-sheets-source.kamelet.yaml b/kamelets/google-sheets-source.kamelet.yaml
@@ -89,7 +89,6 @@ spec:
         title: Split Results
         description: True if value range result should be split into rows or columns to process each of them individually.
         type: boolean
-        x-descriptors:
         default: true
       range:
         title: Cells Range
@@ -141,7 +140,7 @@ spec:
         json:
           format: "application-json"
           description: |-
-            Json representation of a GoogleSheets ValueRange object that holds all values for the given cell range. 
+            Json representation of a GoogleSheets ValueRange object that holds all values for the given cell range.
             Or Json array of values for a single row/column in the range when 'splitResults' mode is enabled.
           mediaType: application/json
         json-struct:

diff --git a/kamelets/google-storage-cdc-source.kamelet.yaml b/kamelets/google-storage-cdc-source.kamelet.yaml
@@ -36,7 +36,7 @@ spec:
       Service account key is the basic method for authenticating to the Google Pubsub and Google Storage.
 
       To use this Kamelet you'll need to set up Events notification for your Google Storage Bucket.
-      
+
       You must encode the `serviceAccountKey` property before you pass it as a parameter.
     required:
       - projectId
@@ -63,7 +63,6 @@ spec:
         title: Synchronous Pull
         description: Specifies to synchronously pull batches of messages.
         type: boolean
-        x-descriptors:
         default: false
       maxMessagesPerPoll:
         title: Max Messages Per Poll
@@ -85,8 +84,7 @@ spec:
           If getObject is enabled, then the file created in the Bucket will be
           get and returned as body, if not only the event will be returned as body.
         type: boolean
-        x-descriptors:
-        default: false        
+        default: false
   dependencies:
     - "camel:kamelet"
     - "camel:google-pubsub"

diff --git a/kamelets/google-storage-sink.kamelet.yaml b/kamelets/google-storage-sink.kamelet.yaml
@@ -32,9 +32,9 @@ spec:
     title: "Google Storage Sink"
     description: |-
       Upload objects to Google Cloud Storage.
-      
+
       If you specify the `serviceAccountKey` property, you must base64 encode it before you pass it as a parameter.
-       
+
       In the header, you can set the `file` / `ce-file` property to specify the filename to upload. If you do set property in the header, the Kamelet uses the exchange ID as filename.
     required:
       - bucketNameOrArn
@@ -54,7 +54,6 @@ spec:
         title: Autocreate Bucket
         description: Specifies to automatically create the Google Cloud Storage bucket.
         type: boolean
-        x-descriptors:
         default: false
   dependencies:
     - "camel:core"

diff --git a/kamelets/google-storage-source.kamelet.yaml b/kamelets/google-storage-source.kamelet.yaml
@@ -52,13 +52,11 @@ spec:
         title: Auto-delete Objects
         description: Specifies to delete objects after consuming them.
         type: boolean
-        x-descriptors:
         default: true
       autoCreateBucket:
         title: Autocreate Bucket
         description: Specifies to automatically create the Google Cloud Storage bucket.
         type: boolean
-        x-descriptors:
         default: false
   dataTypes:
     out:
@@ -80,7 +78,7 @@ spec:
         CamelGoogleCloudStorageETag:
           title: ETag Value
           description: |-
-            The hex encoded 128-bit MD5 digest of the associated object according to RFC 1864. 
+            The hex encoded 128-bit MD5 digest of the associated object according to RFC 1864.
             Is the generation number of the object for which you are retrieving information.
           type: string
       types:

diff --git a/kamelets/http-secured-sink.kamelet.yaml b/kamelets/http-secured-sink.kamelet.yaml
@@ -56,7 +56,6 @@ spec:
         title: Authentication Preemptive
         description: If this option is true, camel-http sends preemptive basic authentication to the server.
         type: boolean
-        x-descriptors:
         default: false
       authUsername:
         title: Authentication Username
@@ -86,7 +85,7 @@ spec:
           constant: "{{method}}"
       - to:
           uri: "{{url}}"
-          parameters: 
+          parameters:
             authMethod: "{{authMethod}}"
             authUsername: "{{authUsername}}"
             authPassword: "{{authPassword}}"

diff --git a/kamelets/infinispan-sink.kamelet.yaml b/kamelets/infinispan-sink.kamelet.yaml
@@ -58,7 +58,6 @@ spec:
         description: If the Infinispan instance is secured or not
         type: boolean
         default: true
-        x-descriptors:
       username:
         title: Username
         description: Username to connect to Infinispan.

diff --git a/kamelets/infinispan-source.kamelet.yaml b/kamelets/infinispan-source.kamelet.yaml
@@ -52,7 +52,6 @@ spec:
         description: If the Infinispan instance is secured or not
         type: boolean
         default: true
-        x-descriptors:
       username:
         title: Username
         description: Username to connect to Infinispan.

diff --git a/kamelets/kafka-apicurio-registry-not-secured-source.kamelet.yaml b/kamelets/kafka-apicurio-registry-not-secured-source.kamelet.yaml
@@ -58,13 +58,11 @@ spec:
         description: If true, periodically commit to ZooKeeper the offset of messages already fetched by the consumer
         type: boolean
         default: true
-        x-descriptors:
       allowManualCommit:
         title: Allow Manual Commit
         description: Whether to allow doing manual commits
         type: boolean
         default: false
-        x-descriptors:
       pollOnError:
         title: Poll On Error Behavior
         description: What to do if kafka threw an exception while polling for new messages. There are 5 enums and the value can be one of DISCARD, ERROR_HANDLER, RECONNECT, RETRY, STOP
@@ -89,7 +87,6 @@ spec:
         title: Automatically Deserialize Headers
         description: When enabled the Kamelet source will deserialize all message headers to String representation.
         type: boolean
-        x-descriptors:
         default: true
       valueDeserializer:
         title: Value Deserializer

diff --git a/kamelets/kafka-azure-schema-registry-source.kamelet.yaml b/kamelets/kafka-azure-schema-registry-source.kamelet.yaml
@@ -78,13 +78,11 @@ spec:
         description: If true, periodically commit to ZooKeeper the offset of messages already fetched by the consumer
         type: boolean
         default: true
-        x-descriptors:
       allowManualCommit:
         title: Allow Manual Commit
         description: Whether to allow doing manual commits
         type: boolean
         default: false
-        x-descriptors:
       pollOnError:
         title: Poll On Error Behavior
         description: What to do if kafka threw an exception while polling for new messages. There are 5 enums and the value can be one of DISCARD, ERROR_HANDLER, RECONNECT, RETRY, STOP
@@ -109,7 +107,6 @@ spec:
         title: Automatically Deserialize Headers
         description: When enabled the Kamelet source will deserialize all message headers to String representation.
         type: boolean
-        x-descriptors:
         default: true
       valueDeserializer:
         title: Value Deserializer
@@ -127,7 +124,7 @@ spec:
         title: Specific Avro Value Type
         description: The Specific Type Avro will have to deal with
         type: string
-        example: "com.example.Order"        
+        example: "com.example.Order"
   dependencies:
     - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"
     - "camel:kafka"

diff --git a/kamelets/kafka-scram-source.kamelet.yaml b/kamelets/kafka-scram-source.kamelet.yaml
@@ -88,13 +88,11 @@ spec:
         description: If true, periodically commit to ZooKeeper the offset of messages already fetched by the consumer
         type: boolean
         default: true
-        x-descriptors:
       allowManualCommit:
         title: Allow Manual Commit
         description: Whether to allow doing manual commits
         type: boolean
         default: false
-        x-descriptors:
       pollOnError:
         title: Poll On Error Behavior
         description: What to do if kafka threw an exception while polling for new messages. There are 5 enums and the value can be one of DISCARD, ERROR_HANDLER, RECONNECT, RETRY, STOP
@@ -119,7 +117,6 @@ spec:
         title: Automatically Deserialize Headers
         description: When enabled the Kamelet source will deserialize all message headers to String representation.
         type: boolean
-        x-descriptors:
         default: true
   dependencies:
     - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"

diff --git a/kamelets/kafka-source.kamelet.yaml b/kamelets/kafka-source.kamelet.yaml
@@ -88,13 +88,11 @@ spec:
         description: If true, periodically commit to ZooKeeper the offset of messages already fetched by the consumer
         type: boolean
         default: true
-        x-descriptors:
       allowManualCommit:
         title: Allow Manual Commit
         description: Whether to allow doing manual commits
         type: boolean
         default: false
-        x-descriptors:
       pollOnError:
         title: Poll On Error Behavior
         description: What to do if kafka threw an exception while polling for new messages. There are 5 enums and the value can be one of DISCARD, ERROR_HANDLER, RECONNECT, RETRY, STOP
@@ -119,7 +117,6 @@ spec:
         title: Automatically Deserialize Headers
         description: When enabled the Kamelet source will deserialize all message headers to String representation.
         type: boolean
-        x-descriptors:
         default: true
   dependencies:
     - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.4.0-SNAPSHOT"

diff --git a/kamelets/kafka-ssl-source.kamelet.yaml b/kamelets/kafka-ssl-source.kamelet.yaml
@@ -68,13 +68,11 @@ spec:
         description: If true, periodically commit to ZooKeeper the offset of messages already fetched by the consumer
         type: boolean
         default: true
-        x-descriptors:
       allowManualCommit:
         title: Allow Manual Commit
         description: Whether to allow doing manual commits
         type: boolean
         default: false
-        x-descriptors:
       pollOnError:
         title: Poll On Error Behavior
         description: What to do if kafka threw an exception while polling for new messages. There are 5 enums and the value can be one of DISCARD, ERROR_HANDLER, RECONNECT, RETRY, STOP
@@ -99,7 +97,6 @@ spec:
         title: Automatically Deserialize Headers
         description: When enabled the Kamelet source will deserialize all message headers to String representation.
         type: boolean
-        x-descriptors:
         default: true
       sslKeyPassword:
         description: The password of the private key in the key store file.
@@ -165,7 +162,7 @@ spec:
           sslProtocol: '{{sslProtocol}}'
           sslEnabledProtocols: '{{sslEnabledProtocols}}'
           sslEndpointAlgorithm: '{{sslEndpointAlgorithm}}'
-          saslMechanism: '{{saslMechanism}}' 
+          saslMechanism: '{{saslMechanism}}'
           groupId: '{{?consumerGroup}}'
           autoOffsetReset: '{{autoOffsetReset}}'
           pollOnError: '{{pollOnError}}'

diff --git a/kamelets/minio-sink.kamelet.yaml b/kamelets/minio-sink.kamelet.yaml
@@ -68,9 +68,8 @@ spec:
         example: http://localhost:9000
       autoCreateBucket:
         title: Autocreate Bucket
-        description: Specify to automatically create the MinIO bucket. 
+        description: Specify to automatically create the MinIO bucket.
         type: boolean
-        x-descriptors:
         default: false
       keyName:
         title: Key Name
@@ -89,7 +88,7 @@ spec:
           when:
             - simple: '${propertiesExist:!keyName}'
               steps:
-                - choice:   
+                - choice:
                     when:
                       - simple: "${header[file]}"
                         steps:

diff --git a/kamelets/minio-source.kamelet.yaml b/kamelets/minio-source.kamelet.yaml
@@ -47,7 +47,6 @@ spec:
         title: Auto-delete Objects
         description: Delete objects after consuming them.
         type: boolean
-        x-descriptors:
         default: true
       accessKey:
         title: Access Key
@@ -70,9 +69,8 @@ spec:
         example: http://localhost:9000
       autoCreateBucket:
         title: Autocreate Bucket
-        description: Specifies to automatically create the MinIO bucket. 
+        description: Specifies to automatically create the MinIO bucket.
         type: boolean
-        x-descriptors:
         default: false
   dependencies:
   - "camel:minio"

diff --git a/kamelets/mongodb-changes-stream-source.kamelet.yaml b/kamelets/mongodb-changes-stream-source.kamelet.yaml
@@ -64,13 +64,11 @@ spec:
         description: whether to enable ssl connection to mongodb
         type: boolean
         default: true
-        x-descriptors:
       sslValidationEnabled:
         title: Enables Ssl Certificates Validation and Host name checks.
         description: IMPORTANT this should be disabled only in test environment since can pose security issues.
         type: boolean
         default: true
-        x-descriptors:
       database:
         title: MongoDB Database
         description: Sets the name of the MongoDB database to target.

diff --git a/kamelets/mongodb-sink.kamelet.yaml b/kamelets/mongodb-sink.kamelet.yaml
@@ -56,7 +56,7 @@ spec:
         type: string
         format: password
         x-descriptors:
-        - urn:camel:group:credentials  
+        - urn:camel:group:credentials
       username:
         title: MongoDB Username
         description: A username for accessing MongoDB.
@@ -68,13 +68,11 @@ spec:
         description: whether to enable ssl connection to mongodb
         type: boolean
         default: true
-        x-descriptors:
       sslValidationEnabled:
         title: Enables Ssl Certificates Validation and Host name checks.
         description: IMPORTANT this should be disabled only in test environment since can pose security issues.
         type: boolean
         default: true
-        x-descriptors:
       database:
         title: MongoDB Database
         description: The name of the MongoDB database.
@@ -89,7 +87,6 @@ spec:
         description: Create a collection during initialization if it doesn't exist.
         type: boolean
         default: false
-        x-descriptors:
   types:
     in:
       mediaType: application/json
@@ -126,7 +123,7 @@ spec:
             - setHeader:
                 name: CamelMongoDbUpsert
                 simple: "${header[ce-dbupsert]}"
-      - to: 
+      - to:
           uri: "{{local-mongodb}}:test"
           parameters:
             createCollection: "{{?createCollection}}"