This is an automated email from the ASF dual-hosted git repository. nfilotto pushed a commit to branch 3229/yaml-camel-case in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit dcecf171a559e19c9d353a17af2e3963fe5f3c83 Author: Nicolas Filotto <[email protected]> AuthorDate: Thu Sep 1 15:19:52 2022 +0200 refactor: Use yaml camelCase for all the project resources --- config/samples/bases/camel_v1_integration.yaml | 2 +- config/samples/bases/camel_v1_kamelet.yaml | 2 +- .../attachments/schema/integration-schema.json | 66 ++++++------- .../ROOT/attachments/schema/kamelet-schema.json | 66 ++++++------- docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc | 108 ++++++++++----------- .../modules/ROOT/pages/kamelets/kamelets-user.adoc | 4 +- e2e/global/common/files/cron-fallback.yaml | 4 +- e2e/global/common/files/cron-quartz.yaml | 4 +- e2e/global/common/files/cron-timer.yaml | 4 +- e2e/global/common/files/cron-yaml.yaml | 4 +- e2e/global/common/files/cron.yaml | 4 +- e2e/global/common/files/rest-consumer.yaml | 2 +- e2e/global/common/files/timer-source.kamelet.yaml | 4 +- e2e/global/common/files/yaml.yaml | 4 +- e2e/global/common/kamelet_binding_test.go | 4 +- .../common/languages/files/yaml-polyglot.yaml | 4 +- e2e/global/common/languages/files/yaml.yaml | 4 +- e2e/global/knative/files/flow.yaml | 2 +- e2e/global/knative/files/yaml.yaml | 4 +- e2e/local/files/yaml.yaml | 4 +- e2e/namespace/install/cli/files/run.yaml | 2 +- e2e/namespace/install/cli/files/yaml.yaml | 4 +- e2e/namespace/install/files/yaml.yaml | 4 +- e2e/namespace/native/files/yaml.yaml | 4 +- e2e/namespace/upgrade/files/yaml.yaml | 4 +- e2e/support/test_support.go | 6 +- .../common/kamelet-beans/beans-source.kamelet.yaml | 2 +- .../timer-source.kamelet.yaml | 2 +- .../timer-source.kamelet.yaml | 2 +- .../kamelet-binding-http/timer-source.kamelet.yaml | 2 +- .../timer-source.kamelet.yaml | 4 +- .../kamelet-binding/timer-source.kamelet.yaml | 2 +- .../kamelet-no-properties/kamelet-no-props.feature | 2 +- .../kamelet-steps/prefix-action.kamelet.yaml | 2 +- .../common/kamelet-steps/timer-source.kamelet.yaml | 2 +- e2e/yaks/common/kamelet/echo-sink.kamelet.yaml | 2 +- e2e/yaks/common/kamelet/timer-source.kamelet.yaml | 2 +- e2e/yaks/common/knative-sinkbinding/source.yaml | 2 +- pkg/install/testdata/timer-source.kamelet.yaml | 2 +- pkg/metadata/metadata_dependencies_test.go | 2 +- pkg/resources/resources.go | 8 +- pkg/util/modeline/parser_test.go | 2 +- pkg/util/source/inspector_yaml_test.go | 8 +- 43 files changed, 184 insertions(+), 188 deletions(-) diff --git a/config/samples/bases/camel_v1_integration.yaml b/config/samples/bases/camel_v1_integration.yaml index 0b58d2527..b93303779 100644 --- a/config/samples/bases/camel_v1_integration.yaml +++ b/config/samples/bases/camel_v1_integration.yaml @@ -26,6 +26,6 @@ spec: parameters: period: '1000' steps: - - set-body: + - setBody: constant: Hello from Camel K - to: log:info diff --git a/config/samples/bases/camel_v1_kamelet.yaml b/config/samples/bases/camel_v1_kamelet.yaml index b40b66186..4e1871a53 100644 --- a/config/samples/bases/camel_v1_kamelet.yaml +++ b/config/samples/bases/camel_v1_kamelet.yaml @@ -40,7 +40,7 @@ spec: parameters: period: "#property:period" steps: - - set-body: + - setBody: constant: "#property:message" - to: kamelet:sink uri: timer:tick diff --git a/docs/modules/ROOT/attachments/schema/integration-schema.json b/docs/modules/ROOT/attachments/schema/integration-schema.json index c1117d555..9d8da4d6c 100644 --- a/docs/modules/ROOT/attachments/schema/integration-schema.json +++ b/docs/modules/ROOT/attachments/schema/integration-schema.json @@ -5195,10 +5195,10 @@ "custom-data-format": { "$ref": "#/definitions/org.apache.camel.model.dataformat.CustomDataFormat" }, - "fhir-json": { + "fhirJson": { "$ref": "#/definitions/org.apache.camel.model.dataformat.FhirJsonDataFormat" }, - "fhir-xml": { + "fhirXml": { "$ref": "#/definitions/org.apache.camel.model.dataformat.FhirXmlDataFormat" }, "flatpack": { @@ -5225,13 +5225,13 @@ "json": { "$ref": "#/definitions/org.apache.camel.model.dataformat.JsonDataFormat" }, - "json-api": { + "jsonApi": { "$ref": "#/definitions/org.apache.camel.model.dataformat.JsonApiDataFormat" }, "lzf": { "$ref": "#/definitions/org.apache.camel.model.dataformat.LZFDataFormat" }, - "mime-multipart": { + "mimeMultipart": { "$ref": "#/definitions/org.apache.camel.model.dataformat.MimeMultipartDataFormat" }, "pgp": { @@ -5258,16 +5258,16 @@ "thrift": { "$ref": "#/definitions/org.apache.camel.model.dataformat.ThriftDataFormat" }, - "tidy-markup": { + "tidyMarkup": { "$ref": "#/definitions/org.apache.camel.model.dataformat.TidyMarkupDataFormat" }, - "univocity-csv": { + "univocityCsv": { "$ref": "#/definitions/org.apache.camel.model.dataformat.UniVocityCsvDataFormat" }, - "univocity-fixed": { + "univocityFixed": { "$ref": "#/definitions/org.apache.camel.model.dataformat.UniVocityFixedWidthDataFormat" }, - "univocity-tsv": { + "univocityTsv": { "$ref": "#/definitions/org.apache.camel.model.dataformat.UniVocityTsvDataFormat" }, "xmlrpc": { @@ -5299,7 +5299,7 @@ "datasonnet": { "$ref": "#/definitions/org.apache.camel.model.language.DatasonnetExpression" }, - "exchange-property": { + "exchangeProperty": { "$ref": "#/definitions/org.apache.camel.model.language.ExchangePropertyExpression" }, "groovy": { @@ -5577,7 +5577,7 @@ "org.apache.camel.k.loader.yaml.parser.CircuitBreakerStepParser$CBDefinition": { "type": "object", "properties": { - "on-fallback": { + "onFallback": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.CircuitBreakerStepParser$FBDefinition" }, "steps": { @@ -5832,7 +5832,7 @@ "random": { "$ref": "#/definitions/org.apache.camel.model.loadbalancer.RandomLoadBalancerDefinition" }, - "round-robin": { + "roundRobin": { "$ref": "#/definitions/org.apache.camel.model.loadbalancer.RoundRobinLoadBalancerDefinition" }, "steps": { @@ -9160,7 +9160,7 @@ "maximum-failover-attempts": { "type": "string" }, - "round-robin": { + "roundRobin": { "type": "string" }, "sticky": { @@ -9204,7 +9204,7 @@ "id": { "type": "string" }, - "round-robin": { + "roundRobin": { "type": "string" } } @@ -9222,22 +9222,22 @@ "choice": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.ChoiceStepParser$Definition" }, - "circuit-breaker": { + "circuitBreaker": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.CircuitBreakerStepParser$CBDefinition" }, - "claim-check": { + "claimCheck": { "$ref": "#/definitions/org.apache.camel.model.ClaimCheckDefinition" }, - "convert-body-to": { + "convertBodyTo": { "$ref": "#/definitions/org.apache.camel.model.ConvertBodyDefinition" }, "delay": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.DelayStepParser$Definition" }, - "do-try": { + "doTry": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.DoTryStepParser$DoTryDefinition" }, - "dynamic-router": { + "dynamicRouter": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.DynamicRouterStepParser$Definition" }, "enrich": { @@ -9249,10 +9249,10 @@ "filter": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.FilterStepParser$Definition" }, - "idempotent-consumer": { + "idempotentConsumer": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.IdempotentConsumerParser$Definition" }, - "load-balance": { + "loadBalance": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.LoadBalanceStepParser$Definition" }, "log": { @@ -9273,25 +9273,25 @@ "pipeline": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.PipelineStepParser$Definition" }, - "poll-enrich": { + "pollEnrich": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.PollEnrichStepParser$Definition" }, "process": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.ProcessStepParser$Definition" }, - "recipient-list": { + "recipientList": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.RecipientListStepParser$Definition" }, - "remove-header": { + "removeHeader": { "$ref": "#/definitions/org.apache.camel.model.RemoveHeaderDefinition" }, - "remove-headers": { + "removeHeaders": { "$ref": "#/definitions/org.apache.camel.model.RemoveHeadersDefinition" }, - "remove-properties": { + "removeProperties": { "$ref": "#/definitions/org.apache.camel.model.RemovePropertiesDefinition" }, - "remove-property": { + "removeProperty": { "$ref": "#/definitions/org.apache.camel.model.RemovePropertyDefinition" }, "resequence": { @@ -9300,7 +9300,7 @@ "rollback": { "$ref": "#/definitions/org.apache.camel.model.RollbackDefinition" }, - "routing-slip": { + "routingSlip": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.RoutingSlipStepParser$Definition" }, "saga": { @@ -9312,19 +9312,19 @@ "script": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.ScriptStepParser$Definition" }, - "service-call": { + "serviceCall": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.ServiceCallStepParser$Definition" }, - "set-body": { + "setBody": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.SetBodyStepParser$Definition" }, - "set-exchange-pattern": { + "setExchangePattern": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.SetExchangePatternStepParser$Definition" }, - "set-header": { + "setHeader": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.SetHeaderStepParser$Definition" }, - "set-property": { + "setProperty": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.SetPropertyStepParser$Definition" }, "sort": { @@ -9345,7 +9345,7 @@ "throttle": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.ThrottleStepParser$Definition" }, - "throw-exception": { + "throwException": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.ThrowExceptionStepParser$Definition" }, "to": { diff --git a/docs/modules/ROOT/attachments/schema/kamelet-schema.json b/docs/modules/ROOT/attachments/schema/kamelet-schema.json index 3c5802b99..e29b5ec67 100644 --- a/docs/modules/ROOT/attachments/schema/kamelet-schema.json +++ b/docs/modules/ROOT/attachments/schema/kamelet-schema.json @@ -499,10 +499,10 @@ "custom-data-format": { "$ref": "#/definitions/org.apache.camel.model.dataformat.CustomDataFormat" }, - "fhir-json": { + "fhirJson": { "$ref": "#/definitions/org.apache.camel.model.dataformat.FhirJsonDataFormat" }, - "fhir-xml": { + "fhirXml": { "$ref": "#/definitions/org.apache.camel.model.dataformat.FhirXmlDataFormat" }, "flatpack": { @@ -529,13 +529,13 @@ "json": { "$ref": "#/definitions/org.apache.camel.model.dataformat.JsonDataFormat" }, - "json-api": { + "jsonApi": { "$ref": "#/definitions/org.apache.camel.model.dataformat.JsonApiDataFormat" }, "lzf": { "$ref": "#/definitions/org.apache.camel.model.dataformat.LZFDataFormat" }, - "mime-multipart": { + "mimeMultipart": { "$ref": "#/definitions/org.apache.camel.model.dataformat.MimeMultipartDataFormat" }, "pgp": { @@ -562,16 +562,16 @@ "thrift": { "$ref": "#/definitions/org.apache.camel.model.dataformat.ThriftDataFormat" }, - "tidy-markup": { + "tidyMarkup": { "$ref": "#/definitions/org.apache.camel.model.dataformat.TidyMarkupDataFormat" }, - "univocity-csv": { + "univocityCsv": { "$ref": "#/definitions/org.apache.camel.model.dataformat.UniVocityCsvDataFormat" }, - "univocity-fixed": { + "univocityFixed": { "$ref": "#/definitions/org.apache.camel.model.dataformat.UniVocityFixedWidthDataFormat" }, - "univocity-tsv": { + "univocityTsv": { "$ref": "#/definitions/org.apache.camel.model.dataformat.UniVocityTsvDataFormat" }, "xmlrpc": { @@ -603,7 +603,7 @@ "datasonnet": { "$ref": "#/definitions/org.apache.camel.model.language.DatasonnetExpression" }, - "exchange-property": { + "exchangeProperty": { "$ref": "#/definitions/org.apache.camel.model.language.ExchangePropertyExpression" }, "groovy": { @@ -881,7 +881,7 @@ "org.apache.camel.k.loader.yaml.parser.CircuitBreakerStepParser$CBDefinition": { "type": "object", "properties": { - "on-fallback": { + "onFallback": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.CircuitBreakerStepParser$FBDefinition" }, "steps": { @@ -1136,7 +1136,7 @@ "random": { "$ref": "#/definitions/org.apache.camel.model.loadbalancer.RandomLoadBalancerDefinition" }, - "round-robin": { + "roundRobin": { "$ref": "#/definitions/org.apache.camel.model.loadbalancer.RoundRobinLoadBalancerDefinition" }, "steps": { @@ -4464,7 +4464,7 @@ "maximum-failover-attempts": { "type": "string" }, - "round-robin": { + "roundRobin": { "type": "string" }, "sticky": { @@ -4508,7 +4508,7 @@ "id": { "type": "string" }, - "round-robin": { + "roundRobin": { "type": "string" } } @@ -4526,22 +4526,22 @@ "choice": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.ChoiceStepParser$Definition" }, - "circuit-breaker": { + "circuitBreaker": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.CircuitBreakerStepParser$CBDefinition" }, - "claim-check": { + "claimCheck": { "$ref": "#/definitions/org.apache.camel.model.ClaimCheckDefinition" }, - "convert-body-to": { + "convertBodyTo": { "$ref": "#/definitions/org.apache.camel.model.ConvertBodyDefinition" }, "delay": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.DelayStepParser$Definition" }, - "do-try": { + "doTry": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.DoTryStepParser$DoTryDefinition" }, - "dynamic-router": { + "dynamicRouter": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.DynamicRouterStepParser$Definition" }, "enrich": { @@ -4553,10 +4553,10 @@ "filter": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.FilterStepParser$Definition" }, - "idempotent-consumer": { + "idempotentConsumer": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.IdempotentConsumerParser$Definition" }, - "load-balance": { + "loadBalance": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.LoadBalanceStepParser$Definition" }, "log": { @@ -4577,25 +4577,25 @@ "pipeline": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.PipelineStepParser$Definition" }, - "poll-enrich": { + "pollEnrich": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.PollEnrichStepParser$Definition" }, "process": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.ProcessStepParser$Definition" }, - "recipient-list": { + "recipientList": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.RecipientListStepParser$Definition" }, - "remove-header": { + "removeHeader": { "$ref": "#/definitions/org.apache.camel.model.RemoveHeaderDefinition" }, - "remove-headers": { + "removeHeaders": { "$ref": "#/definitions/org.apache.camel.model.RemoveHeadersDefinition" }, - "remove-properties": { + "removeProperties": { "$ref": "#/definitions/org.apache.camel.model.RemovePropertiesDefinition" }, - "remove-property": { + "removeProperty": { "$ref": "#/definitions/org.apache.camel.model.RemovePropertyDefinition" }, "resequence": { @@ -4604,7 +4604,7 @@ "rollback": { "$ref": "#/definitions/org.apache.camel.model.RollbackDefinition" }, - "routing-slip": { + "routingSlip": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.RoutingSlipStepParser$Definition" }, "saga": { @@ -4616,19 +4616,19 @@ "script": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.ScriptStepParser$Definition" }, - "service-call": { + "serviceCall": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.ServiceCallStepParser$Definition" }, - "set-body": { + "setBody": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.SetBodyStepParser$Definition" }, - "set-exchange-pattern": { + "setExchangePattern": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.SetExchangePatternStepParser$Definition" }, - "set-header": { + "setHeader": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.SetHeaderStepParser$Definition" }, - "set-property": { + "setProperty": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.SetPropertyStepParser$Definition" }, "sort": { @@ -4649,7 +4649,7 @@ "throttle": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.ThrottleStepParser$Definition" }, - "throw-exception": { + "throwException": { "$ref": "#/definitions/org.apache.camel.k.loader.yaml.parser.ThrowExceptionStepParser$Definition" }, "to": { diff --git a/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc b/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc index 6e52c598d..cc4aa273e 100644 --- a/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc +++ b/docs/modules/ROOT/pages/kamelets/kamelets-dev.adoc @@ -81,7 +81,7 @@ spec: parameters: period: "{{period}}" steps: - - set-body: + - setBody: constant: "{{message}}" - to: "kamelet:sink" ---- @@ -591,7 +591,7 @@ If we managed to reduce our integration to contain only a Camel route, convertin parameters: period: "{{period}}" steps: - - set-header: + - setHeader: name: CamelCaffeineAction constant: GET - tod: "caffeine-cache:cache-${routeId}?key=lastUpdate" @@ -599,35 +599,35 @@ If we managed to reduce our integration to contain only a Camel route, convertin when: - simple: "${header.CamelCaffeineActionHasResult}" steps: - - set-property: + - setProperty: name: lastUpdate simple: "${body}" otherwise: steps: - - set-property: + - setProperty: name: lastUpdate simple: "${date-with-timezone:now-{{lookAhead}}m:UTC:yyyy-MM-dd'T'HH:mm:ss.SSS}" - - set-header: + - setHeader: name: CamelHttpMethod constant: GET - tod: "https://earthquake.usgs.gov/fdsnws/event/1/query?format=geojson&updatedafter=${exchangeProperty.lastUpdate}&orderby=time-asc"; - unmarshal: json: {} - - set-property: + - setProperty: name: generated simple: "${body[metadata][generated]}" - - set-property: + - setProperty: name: lastUpdate simple: "${date-with-timezone:exchangeProperty.generated:UTC:yyyy-MM-dd'T'HH:mm:ss.SSS}" - - claim-check: + - claimCheck: operation: Push - - set-body: - exchange-property: lastUpdate - - set-header: + - setBody: + exchangeProperty: lastUpdate + - setHeader: name: CamelCaffeineAction constant: PUT - tod: "caffeine-cache:cache-${routeId}?key=lastUpdate" - - claim-check: + - claimCheck: operation: Pop - split: jsonpath: "$.features[*]" @@ -672,7 +672,7 @@ spec: parameters: period: "{{period}}" steps: - - set-header: + - setHeader: name: CamelCaffeineAction constant: GET - tod: "caffeine-cache:cache-${routeId}?key=lastUpdate" @@ -680,35 +680,35 @@ spec: when: - simple: "${header.CamelCaffeineActionHasResult}" steps: - - set-property: + - setProperty: name: lastUpdate simple: "${body}" otherwise: steps: - - set-property: + - setProperty: name: lastUpdate simple: "${date-with-timezone:now-{{lookAhead}}m:UTC:yyyy-MM-dd'T'HH:mm:ss.SSS}" - - set-header: + - setHeader: name: CamelHttpMethod constant: GET - tod: "https://earthquake.usgs.gov/fdsnws/event/1/query?format=geojson&updatedafter=${exchangeProperty.lastUpdate}&orderby=time-asc"; - unmarshal: json: {} - - set-property: + - setProperty: name: generated simple: "${body[metadata][generated]}" - - set-property: + - setProperty: name: lastUpdate simple: "${date-with-timezone:exchangeProperty.generated:UTC:yyyy-MM-dd'T'HH:mm:ss.SSS}" - - claim-check: + - claimCheck: operation: Push - - set-body: - exchange-property: lastUpdate - - set-header: + - setBody: + exchangeProperty: lastUpdate + - setHeader: name: CamelCaffeineAction constant: PUT - tod: "caffeine-cache:cache-${routeId}?key=lastUpdate" - - claim-check: + - claimCheck: operation: Pop - split: jsonpath: "$.features[*]" @@ -809,7 +809,7 @@ spec: parameters: period: "{{period}}" steps: - - set-header: + - setHeader: name: CamelCaffeineAction constant: GET - tod: "caffeine-cache:cache-${routeId}?key=lastUpdate" @@ -817,35 +817,35 @@ spec: when: - simple: "${header.CamelCaffeineActionHasResult}" steps: - - set-property: + - setProperty: name: lastUpdate simple: "${body}" otherwise: steps: - - set-property: + - setProperty: name: lastUpdate simple: "${date-with-timezone:now-{{lookAhead}}m:UTC:yyyy-MM-dd'T'HH:mm:ss.SSS}" - - set-header: + - setHeader: name: CamelHttpMethod constant: GET - tod: "https://earthquake.usgs.gov/fdsnws/event/1/query?format=geojson&updatedafter=${exchangeProperty.lastUpdate}&orderby=time-asc"; - unmarshal: json: {} - - set-property: + - setProperty: name: generated simple: "${body[metadata][generated]}" - - set-property: + - setProperty: name: lastUpdate simple: "${date-with-timezone:exchangeProperty.generated:UTC:yyyy-MM-dd'T'HH:mm:ss.SSS}" - - claim-check: + - claimCheck: operation: Push - - set-body: - exchange-property: lastUpdate - - set-header: + - setBody: + exchangeProperty: lastUpdate + - setHeader: name: CamelCaffeineAction constant: PUT - tod: "caffeine-cache:cache-${routeId}?key=lastUpdate" - - claim-check: + - claimCheck: operation: Pop - split: jsonpath: "$.features[*]" @@ -965,7 +965,7 @@ Let's start with a simple integration: parameters: period: 5000 steps: - - set-body: + - setBody: constant: Hello - to: direct:endpoint ---- @@ -996,7 +996,7 @@ Now, let's check if we can also send an image, by changing the second route: parameters: period: 5000 steps: - - set-header: + - setHeader: name: CamelHttpMethod constant: GET - to: https://github.com/apache/camel/raw/7204aa132662ab6cb8e3c5afea8b9b0859eff0e8/docs/img/logo.png @@ -1028,44 +1028,44 @@ When applied to the current use case, the main route can be changed into somethi when: - simple: "${header[Content-Type]} == 'image/png'" steps: - - convert-body-to: + - convertBodyTo: type: "byte[]" - - set-header: + - setHeader: name: CamelTelegramMediaType constant: PHOTO_PNG - simple: "${header[Content-Type]} == 'image/jpeg'" steps: - - convert-body-to: + - convertBodyTo: type: "byte[]" - - set-header: + - setHeader: name: CamelTelegramMediaType constant: PHOTO_JPG otherwise: steps: - - convert-body-to: + - convertBodyTo: type: "java.lang.String" - choice: # <2> when: - simple: "${header[text]}" steps: - - set-header: + - setHeader: name: CamelTelegramMediaTitleCaption simple: "${header[text]}" - simple: "${header[ce-text]}" steps: - - set-header: + - setHeader: name: CamelTelegramMediaTitleCaption simple: "${header[ce-text]}" - choice: # <3> when: - simple: "${header[chat-id]}" steps: - - set-header: + - setHeader: name: CamelTelegramChatId simple: "${header[chat-id]}" - simple: "${header[ce-chat-id]}" steps: - - set-header: + - setHeader: name: CamelTelegramChatId simple: "${header[ce-chat-id]}" - to: @@ -1141,44 +1141,44 @@ spec: - simple: "${header[Content-Type]} == 'image/png'" steps: - log: h1 - - convert-body-to: + - convertBodyTo: type: "byte[]" - - set-header: + - setHeader: name: CamelTelegramMediaType constant: PHOTO_PNG - simple: "${header[Content-Type]} == 'image/jpeg'" steps: - - convert-body-to: + - convertBodyTo: type: "byte[]" - - set-header: + - setHeader: name: CamelTelegramMediaType constant: PHOTO_JPG otherwise: steps: - - convert-body-to: + - convertBodyTo: type: "java.lang.String" - choice: when: - simple: "${header[text]}" steps: - - set-header: + - setHeader: name: CamelTelegramMediaTitleCaption simple: "${header[text]}" - simple: "${header[ce-text]}" steps: - - set-header: + - setHeader: name: CamelTelegramMediaTitleCaption simple: "${header[ce-text]}" - choice: when: - simple: "${header[chat-id]}" steps: - - set-header: + - setHeader: name: CamelTelegramChatId simple: "${header[chat-id]}" - simple: "${header[ce-chat-id]}" steps: - - set-header: + - setHeader: name: CamelTelegramChatId simple: "${header[ce-chat-id]}" - to: diff --git a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc index 34643b3f6..81808570a 100644 --- a/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc +++ b/docs/modules/ROOT/pages/kamelets/kamelets-user.adoc @@ -79,7 +79,7 @@ spec: parameters: authorizationToken: "#property:botToken" steps: - - convert-body-to: + - convertBodyTo: type: "java.lang.String" type-class: "java.lang.String" charset: "UTF8" @@ -593,7 +593,7 @@ spec: parameters: authorizationToken: "#property:botToken" steps: - - convert-body-to: + - convertBodyTo: type: "java.lang.String" type-class: "java.lang.String" charset: "UTF8" diff --git a/e2e/global/common/files/cron-fallback.yaml b/e2e/global/common/files/cron-fallback.yaml index c80e309b7..4d309edcd 100644 --- a/e2e/global/common/files/cron-fallback.yaml +++ b/e2e/global/common/files/cron-fallback.yaml @@ -20,10 +20,10 @@ parameters: schedule: "0/1 * * * * ?" steps: - - set-header: + - setHeader: name: "m" constant: "string!" - - set-body: + - setBody: simple: "Magic${header.m}" - to: uri: "log:info" diff --git a/e2e/global/common/files/cron-quartz.yaml b/e2e/global/common/files/cron-quartz.yaml index 6fcce4f73..5845784de 100644 --- a/e2e/global/common/files/cron-quartz.yaml +++ b/e2e/global/common/files/cron-quartz.yaml @@ -22,10 +22,10 @@ parameters: cron: "0/1 * * * * ?" steps: - - set-header: + - setHeader: name: "m" constant: "string!" - - set-body: + - setBody: simple: "Magic${header.m}" - to: uri: "log:info" diff --git a/e2e/global/common/files/cron-timer.yaml b/e2e/global/common/files/cron-timer.yaml index 707d1974c..e8d8fb418 100644 --- a/e2e/global/common/files/cron-timer.yaml +++ b/e2e/global/common/files/cron-timer.yaml @@ -22,10 +22,10 @@ parameters: period: "60000" steps: - - set-header: + - setHeader: name: "m" constant: "string!" - - set-body: + - setBody: simple: "Magic${header.m}" - to: uri: "log:info" diff --git a/e2e/global/common/files/cron-yaml.yaml b/e2e/global/common/files/cron-yaml.yaml index e01728528..9b6735053 100644 --- a/e2e/global/common/files/cron-yaml.yaml +++ b/e2e/global/common/files/cron-yaml.yaml @@ -20,10 +20,10 @@ parameters: schedule: "* * * * ?" steps: - - set-header: + - setHeader: name: "m" constant: "string!" - - set-body: + - setBody: simple: "Magic${header.m}" - to: uri: "log:info" diff --git a/e2e/global/common/files/cron.yaml b/e2e/global/common/files/cron.yaml index 4290e1038..dacdcbb7c 100644 --- a/e2e/global/common/files/cron.yaml +++ b/e2e/global/common/files/cron.yaml @@ -20,10 +20,10 @@ parameters: schedule: "* * * * ?" steps: - - set-header: + - setHeader: name: "m" constant: "string!" - - set-body: + - setBody: simple: "Magic${header.m}" - to: uri: "log:info" diff --git a/e2e/global/common/files/rest-consumer.yaml b/e2e/global/common/files/rest-consumer.yaml index b7b8e26bb..e948b78b6 100644 --- a/e2e/global/common/files/rest-consumer.yaml +++ b/e2e/global/common/files/rest-consumer.yaml @@ -25,5 +25,5 @@ steps: - log: message: "get ${header.name}" - - set-body: + - setBody: simple: "${header.name} Doe" diff --git a/e2e/global/common/files/timer-source.kamelet.yaml b/e2e/global/common/files/timer-source.kamelet.yaml index 63d9b309e..d72a593d2 100644 --- a/e2e/global/common/files/timer-source.kamelet.yaml +++ b/e2e/global/common/files/timer-source.kamelet.yaml @@ -61,9 +61,9 @@ spec: parameters: period: "{{period}}" steps: - - set-body: + - setBody: constant: "{{message}}" - - set-header: + - setHeader: name: "Content-Type" constant: "{{contentType}}" - to: kamelet:sink diff --git a/e2e/global/common/files/yaml.yaml b/e2e/global/common/files/yaml.yaml index 9ccf65273..8877c8557 100644 --- a/e2e/global/common/files/yaml.yaml +++ b/e2e/global/common/files/yaml.yaml @@ -20,9 +20,9 @@ parameters: period: "5000" steps: - - set-header: + - setHeader: name: "m" constant: "string!" - - set-body: + - setBody: simple: "Magic${header.m}" - to: "log:info" diff --git a/e2e/global/common/kamelet_binding_test.go b/e2e/global/common/kamelet_binding_test.go index a98854254..9f2ae654f 100644 --- a/e2e/global/common/kamelet_binding_test.go +++ b/e2e/global/common/kamelet_binding_test.go @@ -154,12 +154,12 @@ func createErrorProducerKamelet(ns string, name string) func() error { "uri": "timer:tick", "steps": []map[string]interface{}{ { - "set-body": map[string]interface{}{ + "setBody": map[string]interface{}{ "constant": "{{message}}", }, }, { - "set-body": map[string]interface{}{ + "setBody": map[string]interface{}{ "simple": "${mandatoryBodyAs(Boolean)}", }, }, diff --git a/e2e/global/common/languages/files/yaml-polyglot.yaml b/e2e/global/common/languages/files/yaml-polyglot.yaml index 0634d2fa6..6ba033229 100644 --- a/e2e/global/common/languages/files/yaml-polyglot.yaml +++ b/e2e/global/common/languages/files/yaml-polyglot.yaml @@ -20,9 +20,9 @@ parameters: period: "5000" steps: - - set-header: + - setHeader: name: "m" constant: "polyglot-yaml" - - set-body: + - setBody: simple: "Magic${header.m}" - to: "log:info" diff --git a/e2e/global/common/languages/files/yaml.yaml b/e2e/global/common/languages/files/yaml.yaml index 9ccf65273..8877c8557 100644 --- a/e2e/global/common/languages/files/yaml.yaml +++ b/e2e/global/common/languages/files/yaml.yaml @@ -20,9 +20,9 @@ parameters: period: "5000" steps: - - set-header: + - setHeader: name: "m" constant: "string!" - - set-body: + - setBody: simple: "Magic${header.m}" - to: "log:info" diff --git a/e2e/global/knative/files/flow.yaml b/e2e/global/knative/files/flow.yaml index 2108deb5f..0742e9522 100644 --- a/e2e/global/knative/files/flow.yaml +++ b/e2e/global/knative/files/flow.yaml @@ -18,6 +18,6 @@ - from: uri: "knative:endpoint/example" steps: - - set-body: + - setBody: constant: "Hello Camel K from yaml" - to: "log:info" \ No newline at end of file diff --git a/e2e/global/knative/files/yaml.yaml b/e2e/global/knative/files/yaml.yaml index 9ccf65273..8877c8557 100644 --- a/e2e/global/knative/files/yaml.yaml +++ b/e2e/global/knative/files/yaml.yaml @@ -20,9 +20,9 @@ parameters: period: "5000" steps: - - set-header: + - setHeader: name: "m" constant: "string!" - - set-body: + - setBody: simple: "Magic${header.m}" - to: "log:info" diff --git a/e2e/local/files/yaml.yaml b/e2e/local/files/yaml.yaml index 9ccf65273..8877c8557 100644 --- a/e2e/local/files/yaml.yaml +++ b/e2e/local/files/yaml.yaml @@ -20,9 +20,9 @@ parameters: period: "5000" steps: - - set-header: + - setHeader: name: "m" constant: "string!" - - set-body: + - setBody: simple: "Magic${header.m}" - to: "log:info" diff --git a/e2e/namespace/install/cli/files/run.yaml b/e2e/namespace/install/cli/files/run.yaml index e9dc02507..1f55bd691 100644 --- a/e2e/namespace/install/cli/files/run.yaml +++ b/e2e/namespace/install/cli/files/run.yaml @@ -20,6 +20,6 @@ parameters: period: "5000" steps: - - set-body: + - setBody: simple: "Magic {{property:default}}" - to: "log:info" diff --git a/e2e/namespace/install/cli/files/yaml.yaml b/e2e/namespace/install/cli/files/yaml.yaml index 9ccf65273..8877c8557 100644 --- a/e2e/namespace/install/cli/files/yaml.yaml +++ b/e2e/namespace/install/cli/files/yaml.yaml @@ -20,9 +20,9 @@ parameters: period: "5000" steps: - - set-header: + - setHeader: name: "m" constant: "string!" - - set-body: + - setBody: simple: "Magic${header.m}" - to: "log:info" diff --git a/e2e/namespace/install/files/yaml.yaml b/e2e/namespace/install/files/yaml.yaml index 9ccf65273..8877c8557 100644 --- a/e2e/namespace/install/files/yaml.yaml +++ b/e2e/namespace/install/files/yaml.yaml @@ -20,9 +20,9 @@ parameters: period: "5000" steps: - - set-header: + - setHeader: name: "m" constant: "string!" - - set-body: + - setBody: simple: "Magic${header.m}" - to: "log:info" diff --git a/e2e/namespace/native/files/yaml.yaml b/e2e/namespace/native/files/yaml.yaml index 9ccf65273..8877c8557 100644 --- a/e2e/namespace/native/files/yaml.yaml +++ b/e2e/namespace/native/files/yaml.yaml @@ -20,9 +20,9 @@ parameters: period: "5000" steps: - - set-header: + - setHeader: name: "m" constant: "string!" - - set-body: + - setBody: simple: "Magic${header.m}" - to: "log:info" diff --git a/e2e/namespace/upgrade/files/yaml.yaml b/e2e/namespace/upgrade/files/yaml.yaml index 9ccf65273..8877c8557 100644 --- a/e2e/namespace/upgrade/files/yaml.yaml +++ b/e2e/namespace/upgrade/files/yaml.yaml @@ -20,9 +20,9 @@ parameters: period: "5000" steps: - - set-header: + - setHeader: name: "m" constant: "string!" - - set-body: + - setBody: simple: "Magic${header.m}" - to: "log:info" diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go index 28eec818f..84af0ec49 100644 --- a/e2e/support/test_support.go +++ b/e2e/support/test_support.go @@ -107,11 +107,9 @@ func setTestLocus(t *testing.T) { testLocus = t } -// // Only panic the test if absolutely necessary and there is // no test locus. In most cases, the test should fail gracefully // using the test locus to error out and fail now. -// func failTest(err error) { if testLocus != nil { testLocus.Error(err) @@ -726,9 +724,7 @@ func ServiceType(ns string, name string) func() corev1.ServiceType { } } -// // Find the service in the given namespace with the given type -// func ServicesByType(ns string, svcType corev1.ServiceType) func() []corev1.Service { return func() []corev1.Service { svcs := []corev1.Service{} @@ -1814,7 +1810,7 @@ func CreateTimerKamelet(ns string, name string) func() error { "uri": "timer:tick", "steps": []map[string]interface{}{ { - "set-body": map[string]interface{}{ + "setBody": map[string]interface{}{ "constant": "{{message}}", }, }, diff --git a/e2e/yaks/common/kamelet-beans/beans-source.kamelet.yaml b/e2e/yaks/common/kamelet-beans/beans-source.kamelet.yaml index 6a27d9b2b..fadefaa8c 100644 --- a/e2e/yaks/common/kamelet-beans/beans-source.kamelet.yaml +++ b/e2e/yaks/common/kamelet-beans/beans-source.kamelet.yaml @@ -32,6 +32,6 @@ spec: from: uri: timer:tick steps: - - set-body: + - setBody: simple: "Bean time is ${bean:{{myBean}}?method=getTime}!" - to: "kamelet:sink" diff --git a/e2e/yaks/common/kamelet-binding-autoload/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-binding-autoload/timer-source.kamelet.yaml index a89ecb177..73cb0ac4a 100644 --- a/e2e/yaks/common/kamelet-binding-autoload/timer-source.kamelet.yaml +++ b/e2e/yaks/common/kamelet-binding-autoload/timer-source.kamelet.yaml @@ -43,6 +43,6 @@ spec: parameters: period: "{{period}}" steps: - - set-body: + - setBody: constant: "{{message}}" - to: "kamelet:sink" diff --git a/e2e/yaks/common/kamelet-binding-broker/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-binding-broker/timer-source.kamelet.yaml index 268ca01fc..1e714cc15 100644 --- a/e2e/yaks/common/kamelet-binding-broker/timer-source.kamelet.yaml +++ b/e2e/yaks/common/kamelet-binding-broker/timer-source.kamelet.yaml @@ -49,6 +49,6 @@ spec: parameters: period: "{{period}}" steps: - - set-body: + - setBody: constant: "{{message}}" - to: "kamelet:sink" diff --git a/e2e/yaks/common/kamelet-binding-http/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-binding-http/timer-source.kamelet.yaml index 268ca01fc..1e714cc15 100644 --- a/e2e/yaks/common/kamelet-binding-http/timer-source.kamelet.yaml +++ b/e2e/yaks/common/kamelet-binding-http/timer-source.kamelet.yaml @@ -49,6 +49,6 @@ spec: parameters: period: "{{period}}" steps: - - set-body: + - setBody: constant: "{{message}}" - to: "kamelet:sink" diff --git a/e2e/yaks/common/kamelet-binding-property-encoding/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-binding-property-encoding/timer-source.kamelet.yaml index 987a5b83a..d04540b08 100644 --- a/e2e/yaks/common/kamelet-binding-property-encoding/timer-source.kamelet.yaml +++ b/e2e/yaks/common/kamelet-binding-property-encoding/timer-source.kamelet.yaml @@ -61,9 +61,9 @@ spec: parameters: period: "{{period}}" steps: - - set-body: + - setBody: constant: "{{message}}" - - set-header: + - setHeader: name: "Content-Type" constant: "{{contentType}}" - to: kamelet:sink diff --git a/e2e/yaks/common/kamelet-binding/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-binding/timer-source.kamelet.yaml index 268ca01fc..1e714cc15 100644 --- a/e2e/yaks/common/kamelet-binding/timer-source.kamelet.yaml +++ b/e2e/yaks/common/kamelet-binding/timer-source.kamelet.yaml @@ -49,6 +49,6 @@ spec: parameters: period: "{{period}}" steps: - - set-body: + - setBody: constant: "{{message}}" - to: "kamelet:sink" diff --git a/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature b/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature index 6f6b42afc..d2864e8ea 100644 --- a/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature +++ b/e2e/yaks/common/kamelet-no-properties/kamelet-no-props.feature @@ -13,7 +13,7 @@ Feature: Kamelet may have no properties from: uri: timer:tick steps: - - set-body: + - setBody: constant: "Hello World" - to: "kamelet:sink" """ diff --git a/e2e/yaks/common/kamelet-steps/prefix-action.kamelet.yaml b/e2e/yaks/common/kamelet-steps/prefix-action.kamelet.yaml index 9c0cdbfc3..a99add38f 100644 --- a/e2e/yaks/common/kamelet-steps/prefix-action.kamelet.yaml +++ b/e2e/yaks/common/kamelet-steps/prefix-action.kamelet.yaml @@ -41,5 +41,5 @@ spec: from: uri: "kamelet:source" steps: - - set-body: + - setBody: simple: "{{prefix}} ${body}" diff --git a/e2e/yaks/common/kamelet-steps/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet-steps/timer-source.kamelet.yaml index 268ca01fc..1e714cc15 100644 --- a/e2e/yaks/common/kamelet-steps/timer-source.kamelet.yaml +++ b/e2e/yaks/common/kamelet-steps/timer-source.kamelet.yaml @@ -49,6 +49,6 @@ spec: parameters: period: "{{period}}" steps: - - set-body: + - setBody: constant: "{{message}}" - to: "kamelet:sink" diff --git a/e2e/yaks/common/kamelet/echo-sink.kamelet.yaml b/e2e/yaks/common/kamelet/echo-sink.kamelet.yaml index ec70cb408..f4fe1e3fd 100644 --- a/e2e/yaks/common/kamelet/echo-sink.kamelet.yaml +++ b/e2e/yaks/common/kamelet/echo-sink.kamelet.yaml @@ -40,5 +40,5 @@ spec: from: uri: "kamelet:source" steps: - - set-body: + - setBody: simple: "{{prefix}}${body}" diff --git a/e2e/yaks/common/kamelet/timer-source.kamelet.yaml b/e2e/yaks/common/kamelet/timer-source.kamelet.yaml index 268ca01fc..1e714cc15 100644 --- a/e2e/yaks/common/kamelet/timer-source.kamelet.yaml +++ b/e2e/yaks/common/kamelet/timer-source.kamelet.yaml @@ -49,6 +49,6 @@ spec: parameters: period: "{{period}}" steps: - - set-body: + - setBody: constant: "{{message}}" - to: "kamelet:sink" diff --git a/e2e/yaks/common/knative-sinkbinding/source.yaml b/e2e/yaks/common/knative-sinkbinding/source.yaml index 9ec23fa81..96127b254 100644 --- a/e2e/yaks/common/knative-sinkbinding/source.yaml +++ b/e2e/yaks/common/knative-sinkbinding/source.yaml @@ -20,7 +20,7 @@ parameters: period: "1000" steps: - - set-body: + - setBody: constant: "Hello SinkBinding !!!" - transform: simple: "${body.toUpperCase()}" diff --git a/pkg/install/testdata/timer-source.kamelet.yaml b/pkg/install/testdata/timer-source.kamelet.yaml index 64759fa34..5b9ea0e73 100644 --- a/pkg/install/testdata/timer-source.kamelet.yaml +++ b/pkg/install/testdata/timer-source.kamelet.yaml @@ -49,6 +49,6 @@ spec: parameters: period: "{{period}}" steps: - - set-body: + - setBody: constant: "{{message}}" - to: "kamelet:sink" diff --git a/pkg/metadata/metadata_dependencies_test.go b/pkg/metadata/metadata_dependencies_test.go index c3a014b94..4e6ede33c 100644 --- a/pkg/metadata/metadata_dependencies_test.go +++ b/pkg/metadata/metadata_dependencies_test.go @@ -653,7 +653,7 @@ const yamlWithLanguages = ` - from: uri: "direct:start" steps: - - set-body: + - setBody: constant: "Hello Camel K" - transform: language: diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index ed390e1eb..13072d671 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -470,9 +470,9 @@ var assets = func() http.FileSystem { "/samples/bases/camel_v1_integration.yaml": &vfsgen۰CompressedFileInfo{ name: "camel_v1_integration.yaml", modTime: time.Time{}, - uncompressedSize: 1194, + uncompressedSize: 1193, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x6f\xe3\x38\x0c\xbd\xeb\x57\x3c\xc4\x87\x99\x01\xf2\x35\x7b\xf4\x9e\xb2\x99\x04\x63\xb4\x48\x80\x3a\xdd\xa2\x47\xc5\xa6\x6d\xa2\xb2\xe8\x95\xe4\xba\xf9\xf7\x0b\x39\x49\x9b\x62\xae\xd5\x49\x96\x49\xbe\xf7\xf8\xc8\x04\xb3\xaf\x3b\x2a\xc1\x3d\x17\x64\x3d\x95\x08\x82\xd0\x10\x56\x9d\x2e\x1a\x42\x2e\x55\x18\xb4\x23\x6c\xa5\xb7\xa5\x0e\x2c\x16\xdf\x57\xf9\xf6\x07\x7a\x5b\x92\x83\x58\x82\x38\xb4\xe2\x48\x25\x28\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x6f\xe3\x38\x0c\xbd\xeb\x57\x3c\xc4\x87\x99\x01\xf2\x35\x7b\xf4\x9e\x32\x99\x04\x63\xb4\x48\x80\x3a\xdd\xa2\x47\xc5\xa6\x6d\xa2\xb2\xe8\x95\xe4\xba\xf9\xf7\x0b\x39\x49\x9b\x62\xaf\xd5\x49\x96\x49\xbe\xf7\xf8\xc8\x04\xb3\xaf\x3b\x2a\xc1\x3d\x17\x64\x3d\x95\x08\x82\xd0\x10\x56\x9d\x2e\x1a\x42\x2e\x55\x18\xb4\x23\x6c\xa5\xb7\xa5\x0e\x2c\x16\xdf\x57\xf9\xf6\x07\x7a\x5b\x92\x83\x58\x82\x38\xb4\xe2\x48\x25\x28\x [...] }, "/samples/bases/camel_v1_integrationkit.yaml": &vfsgen۰CompressedFileInfo{ name: "camel_v1_integrationkit.yaml", @@ -491,9 +491,9 @@ var assets = func() http.FileSystem { "/samples/bases/camel_v1_kamelet.yaml": &vfsgen۰CompressedFileInfo{ name: "camel_v1_kamelet.yaml", modTime: time.Time{}, - uncompressedSize: 1605, + uncompressedSize: 1604, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x54\x4d\x6f\xe3\x46\x0c\xbd\xeb\x57\x3c\x58\x97\x5d\x20\x76\x92\x1e\xd5\x93\x9b\x75\x50\x63\xb7\xf6\x22\xf2\x76\xb1\x47\x5a\xa2\x65\xc2\xd2\xcc\x74\x86\x8a\xe2\x7f\x5f\x8c\x3e\x62\x27\x45\x6f\xd1\x6d\x38\x1c\xf2\x3d\xbe\x47\xa5\x98\x7f\xdc\x97\xa4\xf8\x26\x05\x9b\xc0\x25\xd4\x42\x8f\x8c\xa5\xa3\xe2\xc8\xc8\xed\x41\x3b\xf2\x8c\x47\xdb\x9a\x92\x54\xac\xc1\xa7\x65\xfe\xf8\x19\xad\x29\xd9\xc3\x1a\x86\xf5\x68\xac\xe7\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x54\xc1\x72\xdb\x38\x0c\xbd\xeb\x2b\xde\x58\x97\x76\x26\x71\x92\x3d\x6a\x4f\x6e\x9a\xcc\x7a\xda\xb5\x3b\x91\xbb\x9d\x1e\x61\x09\x96\x31\x96\x48\x2e\x09\x45\xf1\xdf\xef\x90\x92\x63\x27\x3b\xbd\x55\x37\x82\x20\xf0\x1e\xde\x83\x72\x5c\xff\xbe\x2f\xcb\xf1\x55\x2a\x36\x81\x6b\xa8\x85\xee\x19\x0b\x47\xd5\x9e\x51\xda\x9d\x0e\xe4\x19\x8f\xb6\x37\x35\xa9\x58\x83\x0f\x8b\xf2\xf1\x23\x7a\x53\xb3\x87\x35\x0c\xeb\xd1\x59\xcf\x [...] }, "/samples/bases/camel_v1_kameletbinding.yaml": &vfsgen۰CompressedFileInfo{ name: "camel_v1_kameletbinding.yaml", diff --git a/pkg/util/modeline/parser_test.go b/pkg/util/modeline/parser_test.go index b03e711c5..f1f011181 100644 --- a/pkg/util/modeline/parser_test.go +++ b/pkg/util/modeline/parser_test.go @@ -116,7 +116,7 @@ func TestParseYAMLFile(t *testing.T) { parameters: period: "1000" steps: - - set-body: + - setBody: constant: "Hello Camel K from yaml" - to: "log:info" diff --git a/pkg/util/source/inspector_yaml_test.go b/pkg/util/source/inspector_yaml_test.go index 1a85b1fd5..84b033984 100644 --- a/pkg/util/source/inspector_yaml_test.go +++ b/pkg/util/source/inspector_yaml_test.go @@ -203,7 +203,7 @@ const YAMLRestDSL = ` simple: "${body.contains(\",\")}" - split: tokenize: ";" - - set-body: + - setBody: simple: "${body.toLowerCase()}" - to: uri: "log:out" @@ -227,7 +227,7 @@ const YAMLRestDSLWithRoute = ` simple: "${body.contains(\",\")}" - split: tokenize: ";" - - set-body: + - setBody: simple: "${body.toLowerCase()}" - to: uri: "log:out" @@ -263,7 +263,7 @@ const YAMLFromDSL = ` parameters: period: "5000" steps: - - set-body: + - setBody: constant: "Hello Yaml !!!" - transform: simple: "${body.toUpperCase()}" @@ -278,7 +278,7 @@ const YAMLFromDSLWithRoute = ` parameters: period: "5000" steps: - - set-body: + - setBody: constant: "Hello Yaml !!!" - transform: simple: "${body.toUpperCase()}"
