diff --git a/.github/workflows/kubernetes.yml b/.github/workflows/e2e-tests.yml similarity index 65% rename from .github/workflows/kubernetes.yml rename to .github/workflows/e2e-tests.yml index 08b996e5a..a0f861aab 100644 --- a/.github/workflows/kubernetes.yml +++ b/.github/workflows/e2e-tests.yml @@ -15,29 +15,31 @@ # limitations under the License. # --------------------------------------------------------------------------- -name: Kubernetes +name: E2E Tests on: pull_request: branches: - main - - kamelet-catalog-1.6 + - release-2.3.x push: branches: - main - - kamelet-catalog-1.6 + - release-2.3.x jobs: test: runs-on: ubuntu-latest env: - YAKS_IMAGE_NAME: "docker.io/yaks/yaks" - YAKS_VERSION: "0.9.0-202202081449" + YAKS_IMAGE_NAME: "docker.io/citrusframework/yaks" + YAKS_VERSION: "0.19.1" YAKS_RUN_OPTIONS: "--timeout=15m" KUBECTL_WAIT_TIMEOUT: "180s" steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 + with: + persist-credentials: false - name: Cleanup run: | ls -lart @@ -56,41 +58,51 @@ jobs: echo "Final status:" df -h - - name: Set up JDK 11 - uses: AdoptOpenJDK/install-jdk@v1 + - name: Set up JDK + uses: actions/setup-java@v4 with: - version: "11" + distribution: 'temurin' + java-version: 17 + cache: 'maven' - name: Kind Cluster - uses: container-tools/kind-action@v1 + uses: container-tools/kind-action@v2.0.4 with: - version: v0.11.0 - node_image: kindest/node:v1.21.1@sha256:fae9a58f17f18f06aeac9772ca8b5ac680ebbed985e266f711d936e91d113bad + version: v0.22.0 + node_image: kindest/node:v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245 + cpu: 3 - name: Info run: | kubectl version kubectl cluster-info kubectl describe nodes - name: Camel K Tools - uses: container-tools/camel-k-action@v1 + uses: container-tools/camel-k-action@v1.0.3 with: - version: v1.6.0 + version: v2.3.0 + - name: Set JitPack dependency coordinates + env: + HEAD_REF: ${{ github.head_ref }} + HEAD_REPO: ${{ github.event.pull_request.head.repo.full_name }} + run: | + echo "Set JitPack dependency coordinates to ${HEAD_REPO/\//.}:camel-kamelets-utils:${HEAD_REF//\//'~'}-SNAPSHOT" + + export PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + + # Overwrite JitPack coordinates in the local Kamelets so the tests can use the utility classes in this branch or PR + find . -maxdepth 1 -name '*.kamelet.yaml' -exec sed -i "s/mvn:org.apache.camel.kamelets:camel-kamelets-utils:${PROJECT_VERSION}/github:${HEAD_REPO/\//.}:camel-kamelets-utils:${HEAD_REF//\//'~'}-SNAPSHOT/g" {} + - name: Install Camel K run: | # Configure install options - export KAMEL_INSTALL_BUILD_PUBLISH_STRATEGY=Spectrum export KAMEL_INSTALL_REGISTRY=$KIND_REGISTRY export KAMEL_INSTALL_REGISTRY_INSECURE=true - kamel install -w - # TODO replaces the below statement with --operator-env-vars KAMEL_INSTALL_DEFAULT_KAMELETS=false - # when we use camel k 1.8.0 - kubectl delete kamelets --all + kamel install --global --olm=false --operator-env-vars KAMEL_INSTALL_DEFAULT_KAMELETS=false -w # Install the local kamelets find . -maxdepth 1 -name '*.kamelet.yaml' -exec kubectl apply -f {} \; - name: YAKS tools uses: citrusframework/yaks-install-action@v1.0 with: - version: ${{ env.YAKS_VERSION }} + version: v${{ env.YAKS_VERSION }} - name: Install YAKS run: | yaks install --operator-image $YAKS_IMAGE_NAME:$YAKS_VERSION diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 460135002..bbd096bd5 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -2,19 +2,19 @@ name: Publish Website on: push: branches: - - kamelet-catalog-1.4 - - main + - main + - release-2.3.x jobs: publish-pages: runs-on: ubuntu-latest if: github.repository == 'openshift-integration/kamelet-catalog' steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: - ref: kamelet-catalog-1.4 + ref: release-2.3.x - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: ref: main - name: Build diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml index 489ecb98c..5aa626562 100644 --- a/.github/workflows/validate.yaml +++ b/.github/workflows/validate.yaml @@ -21,9 +21,7 @@ on: pull_request: branches: - main - - kamelet-catalog-1.3 - - kamelet-catalog-1.4 - - kamelet-catalog-1.6 + - release-2.3.x paths-ignore: - '**.adoc' - 'KEYS' @@ -32,9 +30,7 @@ on: push: branches: - main - - kamelet-catalog-1.3 - - kamelet-catalog-1.4 - - kamelet-catalog-1.6 + - release-2.3.x paths-ignore: - '**.adoc' - 'KEYS' @@ -46,11 +42,11 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Install Go - uses: actions/setup-go@v1 + uses: actions/setup-go@v5 with: - go-version: 1.15.x + go-version: 1.20.x - name: Run Validator run: | echo "Running Kamelet validator..." diff --git a/test/aws-kinesis/aws-kinesis-inmem-binding.feature b/test/aws-kinesis/aws-kinesis-inmem-binding.feature index 84cd9897f..fd3e44478 100644 --- a/test/aws-kinesis/aws-kinesis-inmem-binding.feature +++ b/test/aws-kinesis/aws-kinesis-inmem-binding.feature @@ -14,10 +14,10 @@ Feature: AWS-Kinesis Kamelet | aws.kinesis.command | "create-stream", "--stream-name", "${camel.kamelet.aws-kinesis-source.aws-kinesis-credentials.stream}", "--shard-count", "1" | When load Kubernetes resource aws-kinesis-client.yaml - Given load KameletBinding aws-kinesis-to-inmem.yaml - Then KameletBinding aws-kinesis-to-inmem should be available - Given load KameletBinding inmem-to-log.yaml - And KameletBinding inmem-to-log should be available + Given load Pipe aws-kinesis-to-inmem.yaml + Then Pipe aws-kinesis-to-inmem should be available + Given load Pipe inmem-to-log.yaml + And Pipe inmem-to-log should be available And Camel K integration aws-kinesis-to-inmem is running And Camel K integration inmem-to-log is running @@ -37,5 +37,5 @@ Feature: AWS-Kinesis Kamelet | aws.kinesis.clientName | aws-kinesis-client-citrus:randomString(10, LOWERCASE) | | aws.kinesis.command | "delete-stream", "--stream-name", "${camel.kamelet.aws-kinesis-source.aws-kinesis-credentials.stream}" | Then load Kubernetes resource aws-kinesis-client.yaml - Given delete KameletBinding inmem-to-log - Given delete KameletBinding aws-kinesis-to-inmem + Given delete Pipe inmem-to-log + Given delete Pipe aws-kinesis-to-inmem diff --git a/test/aws-kinesis/aws-kinesis-to-inmem.yaml b/test/aws-kinesis/aws-kinesis-to-inmem.yaml index 678991d15..62b101824 100644 --- a/test/aws-kinesis/aws-kinesis-to-inmem.yaml +++ b/test/aws-kinesis/aws-kinesis-to-inmem.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: aws-kinesis-to-inmem spec: @@ -34,4 +34,4 @@ spec: ref: kind: InMemoryChannel apiVersion: messaging.knative.dev/v1 - name: messages \ No newline at end of file + name: messages diff --git a/test/aws-kinesis/aws-kinesis-uri-binding.feature b/test/aws-kinesis/aws-kinesis-uri-binding.feature index 5d9604096..0e09bb86d 100644 --- a/test/aws-kinesis/aws-kinesis-uri-binding.feature +++ b/test/aws-kinesis/aws-kinesis-uri-binding.feature @@ -14,8 +14,8 @@ Feature: AWS Kinesis Kamelet - binding to URI Scenario: Create Camel K resources Given Kamelet aws-kinesis-source is available - Given load KameletBinding aws-kinesis-uri-binding.yaml - Given KameletBinding aws-kinesis-uri-binding is available + Given load Pipe aws-kinesis-uri-binding.yaml + Given Pipe aws-kinesis-uri-binding is available Given variable loginfo is "aws2-kinesis://${camel.kamelet.aws-kinesis-source.aws-kinesis-credentials.stream}" Then Camel K integration aws-kinesis-uri-binding should print ${loginfo} diff --git a/test/aws-kinesis/aws-kinesis-uri-binding.yaml b/test/aws-kinesis/aws-kinesis-uri-binding.yaml index 7d32f7cd5..e73f52a81 100644 --- a/test/aws-kinesis/aws-kinesis-uri-binding.yaml +++ b/test/aws-kinesis/aws-kinesis-uri-binding.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: aws-kinesis-uri-binding spec: diff --git a/test/aws-kinesis/yaks-config.yaml b/test/aws-kinesis/yaks-config.yaml index a88430cff..b1c9c28b8 100644 --- a/test/aws-kinesis/yaks-config.yaml +++ b/test/aws-kinesis/yaks-config.yaml @@ -30,6 +30,11 @@ config: tags: - "not @ignored" settings: + loggers: + - name: INTEGRATION_STATUS + level: INFO + - name: INTEGRATION_LOGS + level: INFO dependencies: - groupId: org.apache.camel artifactId: camel-aws2-kinesis diff --git a/test/aws-sqs/aws-sqs-inmem-binding.feature b/test/aws-sqs/aws-sqs-inmem-binding.feature index 94ebb8093..71881e30e 100644 --- a/test/aws-sqs/aws-sqs-inmem-binding.feature +++ b/test/aws-sqs/aws-sqs-inmem-binding.feature @@ -14,10 +14,10 @@ Feature: AWS SQS Kamelet - binding to InMemoryChannel | aws.sqs.command | "create-queue", "--queue-name", "${camel.kamelet.aws-sqs-source.aws-sqs-credentials.queueNameOrArn}" | When load Kubernetes resource aws-sqs-client.yaml - Given load KameletBinding aws-sqs-to-inmem.yaml - Given load KameletBinding inmem-to-log.yaml - Then KameletBinding aws-sqs-to-inmem is available - And KameletBinding inmem-to-log should be available + Given load Pipe aws-sqs-to-inmem.yaml + Given load Pipe inmem-to-log.yaml + Then Pipe aws-sqs-to-inmem is available + And Pipe inmem-to-log should be available Then Camel K integration aws-sqs-to-inmem is running And Camel K integration inmem-to-log is running @@ -31,8 +31,8 @@ Feature: AWS SQS Kamelet - binding to InMemoryChannel Then Camel K integration inmem-to-log should print "${aws.sqs.message}" Scenario: Remove Camel K resources - Given delete KameletBinding aws-sqs-to-inmem - Given delete KameletBinding inmem-to-log + Given delete Pipe aws-sqs-to-inmem + Given delete Pipe inmem-to-log Scenario: Remove AWS SQS queue Given variables diff --git a/test/aws-sqs/aws-sqs-to-inmem.yaml b/test/aws-sqs/aws-sqs-to-inmem.yaml index 5cee4f963..0755d6698 100644 --- a/test/aws-sqs/aws-sqs-to-inmem.yaml +++ b/test/aws-sqs/aws-sqs-to-inmem.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: aws-sqs-to-inmem spec: diff --git a/test/aws-sqs/aws-sqs-uri-binding.feature b/test/aws-sqs/aws-sqs-uri-binding.feature index e6ede82ea..f1bccd903 100644 --- a/test/aws-sqs/aws-sqs-uri-binding.feature +++ b/test/aws-sqs/aws-sqs-uri-binding.feature @@ -14,8 +14,8 @@ Feature: AWS SQS Kamelet - binding to URI Scenario: Create Camel K resources Given Kamelet aws-sqs-source is available - Given load KameletBinding aws-sqs-uri-binding.yaml - Given KameletBinding aws-sqs-uri-binding is available + Given load Pipe aws-sqs-uri-binding.yaml + Given Pipe aws-sqs-uri-binding is available Given variable loginfo is "Installed features" Then Camel K integration aws-sqs-uri-binding should print ${loginfo} @@ -27,7 +27,7 @@ Feature: AWS SQS Kamelet - binding to URI Then Camel K integration aws-sqs-uri-binding should print "${aws.sqs.message}" Scenario: Remove Camel K resources - Given delete KameletBinding aws-sqs-uri-binding + Given delete Pipe aws-sqs-uri-binding Given delete Camel K integration aws-sqs-uri-binding Scenario: Remove AWS SQS queue diff --git a/test/aws-sqs/aws-sqs-uri-binding.yaml b/test/aws-sqs/aws-sqs-uri-binding.yaml index 64da30f2a..76e3e6b68 100644 --- a/test/aws-sqs/aws-sqs-uri-binding.yaml +++ b/test/aws-sqs/aws-sqs-uri-binding.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: aws-sqs-uri-binding spec: @@ -31,4 +31,4 @@ spec: secretKey: ${camel.kamelet.aws-sqs-source.aws-sqs-credentials.secretKey} region: ${camel.kamelet.aws-sqs-source.aws-sqs-credentials.region} sink: - uri: log:info \ No newline at end of file + uri: log:info diff --git a/test/aws-sqs/yaks-config.yaml b/test/aws-sqs/yaks-config.yaml index 27f212f10..8689e9248 100644 --- a/test/aws-sqs/yaks-config.yaml +++ b/test/aws-sqs/yaks-config.yaml @@ -31,6 +31,11 @@ config: tags: - "not @ignored" settings: + loggers: + - name: INTEGRATION_STATUS + level: INFO + - name: INTEGRATION_LOGS + level: INFO dependencies: - groupId: org.apache.camel artifactId: camel-aws2-sqs diff --git a/test/extract-field/extract-field-action-pipe.yaml b/test/extract-field/extract-field-action-pipe.yaml new file mode 100644 index 000000000..362a80397 --- /dev/null +++ b/test/extract-field/extract-field-action-pipe.yaml @@ -0,0 +1,41 @@ +# --------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# --------------------------------------------------------------------------- + +apiVersion: camel.apache.org/v1 +kind: Pipe +metadata: + name: extract-field-action-pipe +spec: + source: + ref: + kind: Kamelet + apiVersion: camel.apache.org/v1 + name: timer-source + properties: + period: 10000 + contentType: application/json + message: > + ${input} + steps: + - ref: + kind: Kamelet + apiVersion: camel.apache.org/v1 + name: extract-field-action + properties: + field: ${field} + sink: + uri: yaks:resolveURL('test-service')/result diff --git a/test/extract-field/extract-field-action.feature b/test/extract-field/extract-field-action.feature new file mode 100644 index 000000000..34b5585ff --- /dev/null +++ b/test/extract-field/extract-field-action.feature @@ -0,0 +1,45 @@ +# --------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# --------------------------------------------------------------------------- + +Feature: Extract field Kamelet action + + Background: + Given HTTP server timeout is 15000 ms + Given HTTP server "test-service" + Given variable field = "subject" + + Scenario: Create Http server + Given create Kubernetes service test-service with target port 8080 + Given purge endpoint test-service + + Scenario: Create Kamelet binding + Given variable input is + """ + { "id": "citrus:randomUUID()", "${field}": "Camel K rocks!" } + """ + When load Pipe extract-field-action-pipe.yaml + Then Camel K integration extract-field-action-pipe should be running + And Camel K integration extract-field-action-pipe should print Routes startup + + Scenario: Verify output message sent + Given expect HTTP request body: "Camel K rocks!" + When receive POST /result + Then send HTTP 200 OK + + Scenario: Remove resources + Given delete Pipe extract-field-action-pipe + And delete Kubernetes service test-service diff --git a/test/extract-field/extract-field-test.yaml b/test/extract-field/extract-field-test.yaml deleted file mode 100644 index 93e41dbf0..000000000 --- a/test/extract-field/extract-field-test.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: camel.apache.org/v1 -kind: KameletBinding -metadata: - name: extract-field-test -spec: - source: - ref: - kind: Kamelet - apiVersion: camel.apache.org/v1 - name: timer-source - properties: - period: 5000 - contentType: application/json - message: > - ${input} - steps: - - ref: - kind: Kamelet - apiVersion: camel.apache.org/v1 - name: extract-field-action - properties: - field: ${field} - sink: - uri: http://test-extract-service.${YAKS_NAMESPACE}/result diff --git a/test/extract-field/extract-field.feature b/test/extract-field/extract-field.feature deleted file mode 100644 index f4f46de80..000000000 --- a/test/extract-field/extract-field.feature +++ /dev/null @@ -1,29 +0,0 @@ -Feature: Extract field Kamelet action - - Background: - Given HTTP server timeout is 15000 ms - Given HTTP server "test-extract-service" - - Scenario: Create Http server - Given create Kubernetes service test-extract-service with target port 8080 - - Scenario: Create Kamelet binding - Given Camel K resource polling configuration - | maxAttempts | 200 | - | delayBetweenAttempts | 2000 | - Given variable field = "subject" - Given variable input is - """ - { "id": "citrus:randomUUID()", "subject": "Camel K rocks!" } - """ - When load Kubernetes custom resource extract-field-test.yaml in kameletbindings.camel.apache.org - Then Camel K integration extract-field-test should be running - - Scenario: Verify output message sent - Given expect HTTP request body: "Camel K rocks!" - When receive POST /result - Then send HTTP 200 OK - - Scenario: Remove resources - Given delete KameletBinding extract-field-test - And delete Kubernetes service test-extract-service diff --git a/test/extract-field/yaks-config.yaml b/test/extract-field/yaks-config.yaml index ec92ff819..902d6daba 100644 --- a/test/extract-field/yaks-config.yaml +++ b/test/extract-field/yaks-config.yaml @@ -16,14 +16,24 @@ # --------------------------------------------------------------------------- config: + namespace: + temporary: false runtime: env: - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES value: false - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES value: false + - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT + value: true + settings: + loggers: + - name: INTEGRATION_STATUS + level: INFO + - name: INTEGRATION_LOGS + level: INFO resources: - - extract-field-test.yaml + - extract-field-action-pipe.yaml dump: enabled: true failedOnly: true diff --git a/test/ftp/ftp-server.groovy b/test/ftp/ftp-server.groovy index 57c5d4b4b..eecca9af9 100644 --- a/test/ftp/ftp-server.groovy +++ b/test/ftp/ftp-server.groovy @@ -1,4 +1,4 @@ -import com.consol.citrus.util.FileUtils +import org.citrusframework.util.FileUtils import org.apache.ftpserver.DataConnectionConfigurationFactory import org.apache.ftpserver.listener.ListenerFactory diff --git a/test/ftp/sink/ftp-sink-test.yaml b/test/ftp/sink/ftp-sink-pipe.yaml similarity index 94% rename from test/ftp/sink/ftp-sink-test.yaml rename to test/ftp/sink/ftp-sink-pipe.yaml index 60444bddd..c440548f3 100644 --- a/test/ftp/sink/ftp-sink-test.yaml +++ b/test/ftp/sink/ftp-sink-pipe.yaml @@ -1,7 +1,7 @@ apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: - name: ftp-sink-test + name: ftp-sink-pipe spec: source: ref: diff --git a/test/ftp/sink/ftp-sink.feature b/test/ftp/sink/ftp-sink.feature index c09e07146..26ba40331 100644 --- a/test/ftp/sink/ftp-sink.feature +++ b/test/ftp/sink/ftp-sink.feature @@ -23,8 +23,8 @@ Feature: FTP Kamelet sink Given Camel K resource polling configuration | maxAttempts | 200 | | delayBetweenAttempts | 2000 | - When load Kubernetes custom resource ftp-sink-test.yaml in kameletbindings.camel.apache.org - Then Camel K integration ftp-sink-test should be running + When load Pipe ftp-sink-pipe.yaml + Then Camel K integration ftp-sink-pipe should be running Scenario: Verify FTP file created When endpoint ftp-server receives body @@ -45,5 +45,5 @@ Feature: FTP Kamelet sink Then receive Camel exchange from("file:~/ftp/user/admin?directoryMustExist=true&fileName=${file}") with body: ${message} Scenario: Remove resources - Given delete KameletBinding ftp-sink-test + Given delete Pipe ftp-sink-pipe And delete Kubernetes service ftp-server diff --git a/test/ftp/sink/yaks-config.yaml b/test/ftp/sink/yaks-config.yaml index 8e4a23065..74d8a3e5b 100644 --- a/test/ftp/sink/yaks-config.yaml +++ b/test/ftp/sink/yaks-config.yaml @@ -26,9 +26,16 @@ config: value: false - name: CITRUS_TYPE_CONVERTER value: camel + - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT + value: true settings: + loggers: + - name: INTEGRATION_STATUS + level: INFO + - name: INTEGRATION_LOGS + level: INFO dependencies: - - groupId: com.consol.citrus + - groupId: org.citrusframework artifactId: citrus-ftp version: "@citrus.version@" - groupId: org.apache.camel @@ -37,7 +44,7 @@ config: resources: - ../ftp-server.groovy - ../ftp.server.properties - - ftp-sink-test.yaml + - ftp-sink-pipe.yaml dump: enabled: true failedOnly: true diff --git a/test/ftp/source/ftp-source-test.yaml b/test/ftp/source/ftp-source-pipe.yaml similarity index 91% rename from test/ftp/source/ftp-source-test.yaml rename to test/ftp/source/ftp-source-pipe.yaml index f44fcaa6a..b983c2301 100644 --- a/test/ftp/source/ftp-source-test.yaml +++ b/test/ftp/source/ftp-source-pipe.yaml @@ -1,7 +1,7 @@ apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: - name: ftp-source-test + name: ftp-source-pipe spec: source: ref: diff --git a/test/ftp/source/ftp-source.feature b/test/ftp/source/ftp-source.feature index c792fe7b6..c196b99ee 100644 --- a/test/ftp/source/ftp-source.feature +++ b/test/ftp/source/ftp-source.feature @@ -28,9 +28,9 @@ Feature: FTP Kamelet source Given Camel K resource polling configuration | maxAttempts | 200 | | delayBetweenAttempts | 2000 | - When load KameletBinding ftp-source-test.yaml - Then Camel K integration ftp-source-test should be running - And Camel K integration ftp-source-test should print Routes startup summary + When load Pipe ftp-source-pipe.yaml + Then Camel K integration ftp-source-pipe should be running + And Camel K integration ftp-source-pipe should print Routes startup summary Scenario: Create FTP file Given sleep 5000 ms @@ -42,6 +42,6 @@ Feature: FTP Kamelet source Then send HTTP 200 OK Scenario: Remove resources - Given delete KameletBinding ftp-source-test + Given delete Pipe ftp-source-pipe And delete Kubernetes service ftp-server And delete Kubernetes service ftp-to-http-service diff --git a/test/ftp/source/yaks-config.yaml b/test/ftp/source/yaks-config.yaml index a15f86708..c2d7076c1 100644 --- a/test/ftp/source/yaks-config.yaml +++ b/test/ftp/source/yaks-config.yaml @@ -26,9 +26,16 @@ config: value: false - name: CITRUS_TYPE_CONVERTER value: camel + - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT + value: true settings: + loggers: + - name: INTEGRATION_STATUS + level: INFO + - name: INTEGRATION_LOGS + level: INFO dependencies: - - groupId: com.consol.citrus + - groupId: org.citrusframework artifactId: citrus-ftp version: "@citrus.version@" - groupId: org.apache.camel @@ -37,7 +44,7 @@ config: resources: - ../ftp-server.groovy - ../ftp.server.properties - - ftp-source-test.yaml + - ftp-source-pipe.yaml dump: enabled: true failedOnly: true diff --git a/test/http-sink/http-sink-test.yaml b/test/http-sink/http-sink-pipe.yaml similarity index 89% rename from test/http-sink/http-sink-test.yaml rename to test/http-sink/http-sink-pipe.yaml index 99d59497d..99ba7081a 100644 --- a/test/http-sink/http-sink-test.yaml +++ b/test/http-sink/http-sink-pipe.yaml @@ -1,7 +1,7 @@ apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: - name: http-sink-test + name: http-sink-pipe spec: source: ref: diff --git a/test/http-sink/http-sink.feature b/test/http-sink/http-sink.feature index 8cd6886b9..6a13e0ca8 100644 --- a/test/http-sink/http-sink.feature +++ b/test/http-sink/http-sink.feature @@ -1,4 +1,4 @@ -Feature: Extract field Kamelet action +Feature: Http Kamelet sink Background: Given HTTP server timeout is 15000 ms @@ -12,8 +12,8 @@ Feature: Extract field Kamelet action Given Camel K resource polling configuration | maxAttempts | 200 | | delayBetweenAttempts | 2000 | - When load KameletBinding http-sink-test.yaml - Then Camel K integration http-sink-test should be running + When load Pipe http-sink-pipe.yaml + Then Camel K integration http-sink-pipe should be running Scenario: Verify request message sent Given expect HTTP request body: ${message} @@ -22,5 +22,5 @@ Feature: Extract field Kamelet action Then send HTTP 201 CREATED Scenario: Remove resources - Given delete KameletBinding http-sink-test + Given delete Pipe http-sink-pipe And delete Kubernetes service sink-http-service diff --git a/test/http-sink/yaks-config.yaml b/test/http-sink/yaks-config.yaml index 526265e68..270401845 100644 --- a/test/http-sink/yaks-config.yaml +++ b/test/http-sink/yaks-config.yaml @@ -24,8 +24,16 @@ config: value: false - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES value: false + - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT + value: true + settings: + loggers: + - name: INTEGRATION_STATUS + level: INFO + - name: INTEGRATION_LOGS + level: INFO resources: - - http-sink-test.yaml + - http-sink-pipe.yaml dump: enabled: true failedOnly: true diff --git a/test/insert-field/insert-field-action-pipe.yaml b/test/insert-field/insert-field-action-pipe.yaml new file mode 100644 index 000000000..12a13686b --- /dev/null +++ b/test/insert-field/insert-field-action-pipe.yaml @@ -0,0 +1,42 @@ +# --------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# --------------------------------------------------------------------------- + +apiVersion: camel.apache.org/v1 +kind: Pipe +metadata: + name: insert-field-action-pipe +spec: + source: + ref: + kind: Kamelet + apiVersion: camel.apache.org/v1 + name: timer-source + properties: + period: 10000 + contentType: application/json + message: > + ${input} + steps: + - ref: + kind: Kamelet + apiVersion: camel.apache.org/v1 + name: insert-field-action + properties: + field: ${field} + value: ${value} + sink: + uri: yaks:resolveURL('test-service')/result diff --git a/test/insert-field/insert-field-action.feature b/test/insert-field/insert-field-action.feature new file mode 100644 index 000000000..a9412cb0d --- /dev/null +++ b/test/insert-field/insert-field-action.feature @@ -0,0 +1,51 @@ +# --------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# --------------------------------------------------------------------------- + +Feature: Insert field Kamelet action + + Background: + Given HTTP server timeout is 5000 ms + Given HTTP server "test-service" + Given variables + | field | subject | + | value | Camel K rocks! | + + Scenario: Create Http server + Given create Kubernetes service test-service with target port 8080 + Given purge endpoint test-service + + Scenario: Create Kamelet binding + Given variable input is + """ + { "id": "citrus:randomUUID()" } + """ + When load Pipe insert-field-action-pipe.yaml + Then Camel K integration insert-field-action-pipe should be running + And Camel K integration insert-field-action-pipe should print Routes startup + + Scenario: Verify output message sent + Given expect HTTP request body + """ + { "id": "@ignore@", "${field}": "${value}" } + """ + And expect HTTP request header: Content-Type="application/json;charset=UTF-8" + When receive POST /result + Then send HTTP 200 OK + + Scenario: Remove resources + Given delete Pipe insert-field-action-pipe + And delete Kubernetes service test-service diff --git a/test/insert-field/insert-field-test.yaml b/test/insert-field/insert-field-test.yaml deleted file mode 100644 index 1b6e451a6..000000000 --- a/test/insert-field/insert-field-test.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: camel.apache.org/v1 -kind: KameletBinding -metadata: - name: insert-field-test -spec: - source: - ref: - kind: Kamelet - apiVersion: camel.apache.org/v1 - name: timer-source - properties: - period: 5000 - contentType: application/json - message: > - ${input} - steps: - - ref: - kind: Kamelet - apiVersion: camel.apache.org/v1 - name: insert-field-action - properties: - field: ${field} - value: ${value} - sink: - uri: http://test-insert-service.${YAKS_NAMESPACE}/result diff --git a/test/insert-field/insert-field.feature b/test/insert-field/insert-field.feature deleted file mode 100644 index c7299fddc..000000000 --- a/test/insert-field/insert-field.feature +++ /dev/null @@ -1,35 +0,0 @@ -Feature: Extract field Kamelet action - - Background: - Given HTTP server timeout is 15000 ms - Given HTTP server "test-insert-service" - Given variables - | field | subject | - | value | Camel K rocks! | - - Scenario: Create Http server - Given create Kubernetes service test-insert-service with target port 8080 - - Scenario: Create Kamelet binding - Given Camel K resource polling configuration - | maxAttempts | 200 | - | delayBetweenAttempts | 2000 | - Given variable input is - """ - { "id": "citrus:randomUUID()" } - """ - When load Kubernetes custom resource insert-field-test.yaml in kameletbindings.camel.apache.org - Then Camel K integration insert-field-test should be running - - Scenario: Verify output message sent - Given expect HTTP request body - """ - { "id": "@ignore@", "${field}": "${value}" } - """ - And HTTP request header Content-Type="application/json" - When receive POST /result - Then send HTTP 200 OK - - Scenario: Remove resources - Given delete KameletBinding insert-field-test - And delete Kubernetes service test-insert-service diff --git a/test/insert-field/yaks-config.yaml b/test/insert-field/yaks-config.yaml index 8db3e791f..2c7834fe7 100644 --- a/test/insert-field/yaks-config.yaml +++ b/test/insert-field/yaks-config.yaml @@ -16,14 +16,24 @@ # --------------------------------------------------------------------------- config: + namespace: + temporary: false runtime: env: - name: YAKS_CAMELK_AUTO_REMOVE_RESOURCES value: false - name: YAKS_KUBERNETES_AUTO_REMOVE_RESOURCES value: false + - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT + value: true + settings: + loggers: + - name: INTEGRATION_STATUS + level: INFO + - name: INTEGRATION_LOGS + level: INFO resources: - - insert-field-test.yaml + - insert-field-action-pipe.yaml dump: enabled: true failedOnly: true diff --git a/test/jira/README.md b/test/jira/README.md index 60e49b1bf..9ca25c6ef 100644 --- a/test/jira/README.md +++ b/test/jira/README.md @@ -7,7 +7,7 @@ This test verifies the Jira Kamelet source defined in [jira-source.kamelet.yaml] The test verifies the jira-source Kamelet by creating a Camel K integration that uses the Kamelet and listens for new Jira issue objects. It tests 3 Kamelet configuration types (property, URI, secret). -In jira-source test new issue object is passed to InMemoryChannel, which is bound to logger-sink Kamelet by KameletBinding. +In jira-source test new issue object is passed to InMemoryChannel, which is bound to logger-sink Kamelet by Pipe. ### Test Kamelet @@ -32,7 +32,7 @@ The test performs the following high level steps: - Test is run in temporary namespace, which is deleted with all remaining resources after test finished -### Test KameletBinding (TBD) +### Test Pipe (TBD) The test performs the following high level steps: @@ -42,13 +42,13 @@ The test performs the following high level steps: - Create and label secret used by Yaks test - Create InMemoryChannel messages - Create logger-sink Kamelet -- Create KameletBinding inmem-to-log, which binds InMemoryChannel messages to logger-sink Kamelet +- Create Pipe inmem-to-log, which binds InMemoryChannel messages to logger-sink Kamelet - Create Camel K integration jira-to-inmem, which flows from jira-source Kamelet to InMemoryChannel messages (property based configuration) *Scenario Verify resources* - Verify that jira-source and logger-sink Kamelets are available -- Verify that KameletBinding inmem-to-log is available +- Verify that Pipe inmem-to-log is available - Verify that integration jira-to-inmem is running *Scenario Verify new Jira issue is created* @@ -57,7 +57,7 @@ based configuration) - Verify the issue was logged by Camel K integration inmem-to-log *Cleanup* -- Test removes Camel K integrations, KameletBinding, secrets, InMemoryChannel +- Test removes Camel K integrations, Pipe, secrets, InMemoryChannel - Test is run in temporary namespace, which is deleted with all remaining resources after test finished ## Installation diff --git a/test/jira/inmem-to-log.yaml b/test/jira/inmem-to-log.yaml index aacd88569..f2c4cfb0c 100644 --- a/test/jira/inmem-to-log.yaml +++ b/test/jira/inmem-to-log.yaml @@ -1,5 +1,5 @@ apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: inmem-to-log spec: diff --git a/test/jira/jira-binding.feature b/test/jira/jira-binding.feature index f2e6958f5..2eb5166a7 100644 --- a/test/jira/jira-binding.feature +++ b/test/jira/jira-binding.feature @@ -7,10 +7,10 @@ Feature: Jira Kamelet Binding Scenario: Verify resources Given Kamelet logger-sink is available - Given load KameletBinding jira-to-inmem.yaml - Given load KameletBinding inmem-to-log.yaml - Given KameletBinding jira-to-inmem is available - Given KameletBinding inmem-to-log is available + Given load Pipe jira-to-inmem.yaml + Given load Pipe inmem-to-log.yaml + Given Pipe jira-to-inmem is available + Given Pipe inmem-to-log is available Given variable loginfo is "knative://channel/messages" Then Camel K integration inmem-to-log should print ${loginfo} @@ -48,5 +48,5 @@ Feature: Jira Kamelet Binding Scenario: Remove Camel K resources Given delete Camel K integration jira-to-inmem Given delete Camel K integration inmem-to-log - Given delete KameletBinding jira-to-inmem - Given delete KameletBinding inmem-to-log + Given delete Pipe jira-to-inmem + Given delete Pipe inmem-to-log diff --git a/test/jira/jira-to-inmem.yaml b/test/jira/jira-to-inmem.yaml index c1ecd5912..8074fa774 100644 --- a/test/jira/jira-to-inmem.yaml +++ b/test/jira/jira-to-inmem.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: jira-to-inmem spec: @@ -34,4 +34,4 @@ spec: ref: kind: InMemoryChannel apiVersion: messaging.knative.dev/v1beta1 - name: messages \ No newline at end of file + name: messages diff --git a/test/jira/jira-uri-binding.feature b/test/jira/jira-uri-binding.feature index d23de5339..7e00cbee3 100644 --- a/test/jira/jira-uri-binding.feature +++ b/test/jira/jira-uri-binding.feature @@ -6,8 +6,8 @@ Feature: Jira Kamelet - binding to URI Given Kamelet jira-source is available Scenario: Verify resources - Given load KameletBinding jira-uri-binding.yaml - Given KameletBinding jira-uri-binding is available + Given load Pipe jira-uri-binding.yaml + Given Pipe jira-uri-binding is available Given variable loginfo is "Installed features" Then Camel K integration jira-uri-binding should print ${loginfo} diff --git a/test/jira/jira-uri-binding.yaml b/test/jira/jira-uri-binding.yaml index e761aba33..a67c3c16d 100644 --- a/test/jira/jira-uri-binding.yaml +++ b/test/jira/jira-uri-binding.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: jira-uri-binding spec: diff --git a/test/jira/yaks-config.yaml b/test/jira/yaks-config.yaml index ce10f779c..766ad8390 100644 --- a/test/jira/yaks-config.yaml +++ b/test/jira/yaks-config.yaml @@ -19,6 +19,12 @@ config: namespace: temporary: false runtime: + settings: + loggers: + - name: INTEGRATION_STATUS + level: INFO + - name: INTEGRATION_LOGS + level: INFO resources: - jira-to-log-uri-based.groovy - jira-to-log-secret-based.groovy diff --git a/test/kafka/kafka-sink-test.yaml b/test/kafka/kafka-sink-pipe.yaml similarity index 92% rename from test/kafka/kafka-sink-test.yaml rename to test/kafka/kafka-sink-pipe.yaml index f43fe4751..9fe8cd668 100644 --- a/test/kafka/kafka-sink-test.yaml +++ b/test/kafka/kafka-sink-pipe.yaml @@ -1,7 +1,7 @@ apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: - name: kafka-sink-test + name: kafka-sink-pipe spec: source: ref: diff --git a/test/kafka/kafka-sink.feature b/test/kafka/kafka-sink.feature index a82688832..cf8dbc982 100644 --- a/test/kafka/kafka-sink.feature +++ b/test/kafka/kafka-sink.feature @@ -16,8 +16,8 @@ Feature: Kafka Kamelet sink Given Camel K resource polling configuration | maxAttempts | 200 | | delayBetweenAttempts | 2000 | - When load KameletBinding kafka-sink-test.yaml - Then Camel K integration kafka-sink-test should be running + When load Pipe kafka-sink-pipe.yaml + Then Camel K integration kafka-sink-pipe should be running Scenario: Receive message on Kafka topic and verify sink output Given Kafka connection @@ -25,4 +25,4 @@ Feature: Kafka Kamelet sink Then receive Kafka message with body: ${message} Scenario: Remove resources - Given delete KameletBinding kafka-sink-test + Given delete Pipe kafka-sink-pipe diff --git a/test/kafka/kafka-source-test.yaml b/test/kafka/kafka-source-pipe.yaml similarity index 91% rename from test/kafka/kafka-source-test.yaml rename to test/kafka/kafka-source-pipe.yaml index 0e68132fd..0d35e611f 100644 --- a/test/kafka/kafka-source-test.yaml +++ b/test/kafka/kafka-source-pipe.yaml @@ -1,7 +1,7 @@ apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: - name: kafka-source-test + name: kafka-source-pipe spec: source: ref: diff --git a/test/kafka/kafka-source.feature b/test/kafka/kafka-source.feature index 7c67b1506..9856184f0 100644 --- a/test/kafka/kafka-source.feature +++ b/test/kafka/kafka-source.feature @@ -23,9 +23,10 @@ Feature: Kafka Kamelet source Given Camel K resource polling configuration | maxAttempts | 200 | | delayBetweenAttempts | 2000 | - When load KameletBinding kafka-source-test.yaml - Then Camel K integration kafka-source-test should be running - And Camel K integration kafka-source-test should print Resetting offset for partition ${topic}-0 + When load Pipe kafka-source-pipe.yaml + Then Camel K integration kafka-source-pipe should be running + And Camel K integration kafka-source-pipe should print Subscribing ${topic}-Thread 0 to topic ${topic} + And sleep 10sec Scenario: Send message to Kafka topic and verify sink output Given Kafka connection @@ -38,5 +39,5 @@ Feature: Kafka Kamelet source And send HTTP 200 OK Scenario: Remove resources - Given delete KameletBinding kafka-source-test + Given delete Pipe kafka-source-pipe And delete Kubernetes service kafka-to-http-service diff --git a/test/kafka/yaks-config.yaml b/test/kafka/yaks-config.yaml index a00971804..715551724 100644 --- a/test/kafka/yaks-config.yaml +++ b/test/kafka/yaks-config.yaml @@ -26,9 +26,17 @@ config: value: false - name: CITRUS_TYPE_CONVERTER value: camel + - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT + value: true + settings: + loggers: + - name: INTEGRATION_STATUS + level: INFO + - name: INTEGRATION_LOGS + level: INFO resources: - - kafka-source-test.yaml - - kafka-sink-test.yaml + - kafka-source-pipe.yaml + - kafka-sink-pipe.yaml dump: enabled: true failedOnly: true diff --git a/test/postgresql/postgresql-sink-test.yaml b/test/postgresql/postgresql-sink-pipe.yaml similarity index 93% rename from test/postgresql/postgresql-sink-test.yaml rename to test/postgresql/postgresql-sink-pipe.yaml index 6b4af3ea7..3311acca7 100644 --- a/test/postgresql/postgresql-sink-test.yaml +++ b/test/postgresql/postgresql-sink-pipe.yaml @@ -1,7 +1,7 @@ apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: - name: postgresql-sink-test + name: postgresql-sink-pipe spec: source: ref: diff --git a/test/postgresql/postgresql-sink.feature b/test/postgresql/postgresql-sink.feature index 053fa6721..118e8aec8 100644 --- a/test/postgresql/postgresql-sink.feature +++ b/test/postgresql/postgresql-sink.feature @@ -23,11 +23,11 @@ Feature: PostgreSQL Kamelet sink | maxAttempts | 200 | | delayBetweenAttempts | 2000 | Given SQL query max retry attempts: 10 - When load KameletBinding postgresql-sink-test.yaml - Then Camel K integration postgresql-sink-test should be running - And Camel K integration postgresql-sink-test should print Started source (timer://tick) + When load Pipe postgresql-sink-pipe.yaml + Then Camel K integration postgresql-sink-pipe should be running + And Camel K integration postgresql-sink-pipe should print Started source (timer://tick) Then SQL query: SELECT headline FROM headlines WHERE ID=${id} And verify column HEADLINE=Camel K rocks! Scenario: Remove resources - Given delete KameletBinding postgresql-sink-test + Given delete Pipe postgresql-sink-pipe diff --git a/test/postgresql/yaks-config.yaml b/test/postgresql/yaks-config.yaml index f32237945..3345042a0 100644 --- a/test/postgresql/yaks-config.yaml +++ b/test/postgresql/yaks-config.yaml @@ -19,7 +19,6 @@ config: namespace: temporary: false runtime: - settings: testcontainers: enabled: true env: @@ -29,8 +28,16 @@ config: value: false - name: YAKS_TESTCONTAINERS_AUTO_REMOVE_RESOURCES value: false + - name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT + value: true + settings: + loggers: + - name: INTEGRATION_STATUS + level: INFO + - name: INTEGRATION_LOGS + level: INFO resources: - - postgresql-sink-test.yaml + - postgresql-sink-pipe.yaml dump: enabled: true failedOnly: true diff --git a/test/salesforce/README.md b/test/salesforce/README.md index f7e6cf4ef..76d68d04f 100644 --- a/test/salesforce/README.md +++ b/test/salesforce/README.md @@ -28,7 +28,7 @@ The test performs the following high level steps: - Delete the Camel K integration - Delete the secret from the current namespacce -### Test KameletBinding +### Test Pipe The test performs the following high level steps: @@ -40,14 +40,14 @@ The test performs the following high level steps: - Obtain an authorization token from Salesforce login - Obtain the account id for the Salesforce account - Create the Kamelet in the current namespace in the cluster -- Create the KameletBinding that binds the Salesforce source to a Http URI +- Create the Pipe that binds the Salesforce source to a Http URI - Create a new Http service that exposes the URI endpoint - Wait for services to start properly - Create a new Case object on the Salesforce API - Verify that the Http URI service endpoint has received the Case object event *Cleanup* -- Delete the KameletBinding +- Delete the Pipe - Delete the Http URI service endpoint - Delete the secret from the current namespacce diff --git a/test/salesforce/salesforce-binding.feature b/test/salesforce/salesforce-binding.feature index 3c3e0ca32..c0f420f6b 100644 --- a/test/salesforce/salesforce-binding.feature +++ b/test/salesforce/salesforce-binding.feature @@ -20,12 +20,12 @@ Feature: Salesforce Kamelet binding Then verify HTTP response expression: $.records[0].Id="@variable(account_id)@" And receive HTTP 200 OK - Scenario: Create KameletBinding + Scenario: Create Pipe Given variable query is "SELECT Id, Subject FROM Case" And variable topicName is "CamelTestTopic" - And load KameletBinding salesforce-to-uri.yaml + And load Pipe salesforce-to-uri.yaml Then Kamelet salesforce-source is available - And KameletBinding salesforce-to-uri is available + And Pipe salesforce-to-uri is available Scenario: Create Http service Given HTTP server "salesforce-case-service" @@ -59,6 +59,6 @@ Feature: Salesforce Kamelet binding """ And receive POST /case - Scenario: Remove KameletBinding - Given delete KameletBinding salesforce-to-uri + Scenario: Remove Pipe + Given delete Pipe salesforce-to-uri And delete Kubernetes service salesforce-case-service diff --git a/test/salesforce/salesforce-inmem-binding.feature b/test/salesforce/salesforce-inmem-binding.feature index ce845835c..414218aa5 100644 --- a/test/salesforce/salesforce-inmem-binding.feature +++ b/test/salesforce/salesforce-inmem-binding.feature @@ -7,12 +7,12 @@ Feature: Salesforce Kamelet Scenario: Verify Kamelet source Given Kamelet salesforce-source is available - Given load KameletBinding salesforce-to-inmem.yaml - Given load KameletBinding inmem-to-log.yaml - Then KameletBinding salesforce-to-inmem should be available + Given load Pipe salesforce-to-inmem.yaml + Given load Pipe inmem-to-log.yaml + Then Pipe salesforce-to-inmem should be available And Camel K integration salesforce-to-inmem is running - And KameletBinding inmem-to-log should be available + And Pipe inmem-to-log should be available Given variable loginfo is "Installed features" Then Camel K integration salesforce-to-inmem should print ${loginfo} Then sleep 10000 ms @@ -54,5 +54,5 @@ Feature: Salesforce Kamelet And Camel K integration inmem-to-log should print "Subject":"${subject}" Scenario: Remove Camel K resources - Given delete KameletBinding salesforce-to-broker - Given delete KameletBinding broker-to-log + Given delete Pipe salesforce-to-broker + Given delete Pipe broker-to-log diff --git a/test/salesforce/salesforce-to-inmem.yaml b/test/salesforce/salesforce-to-inmem.yaml index 022612ea2..e10920747 100644 --- a/test/salesforce/salesforce-to-inmem.yaml +++ b/test/salesforce/salesforce-to-inmem.yaml @@ -1,5 +1,5 @@ apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: salesforce-to-inmem spec: diff --git a/test/salesforce/salesforce-to-uri.yaml b/test/salesforce/salesforce-to-uri.yaml index 28d713304..09cc0f2f0 100644 --- a/test/salesforce/salesforce-to-uri.yaml +++ b/test/salesforce/salesforce-to-uri.yaml @@ -1,5 +1,5 @@ apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: salesforce-to-uri spec: diff --git a/test/salesforce/yaks-config.yaml b/test/salesforce/yaks-config.yaml index de5ed0786..974c39680 100644 --- a/test/salesforce/yaks-config.yaml +++ b/test/salesforce/yaks-config.yaml @@ -19,6 +19,12 @@ config: namespace: temporary: false runtime: + settings: + loggers: + - name: INTEGRATION_STATUS + level: INFO + - name: INTEGRATION_LOGS + level: INFO resources: - salesforce-to-uri.yaml - salesforce-to-log-uri-based.groovy diff --git a/test/slack/slack-broker-binding.feature b/test/slack/slack-broker-binding.feature index c409e4faf..7287177af 100644 --- a/test/slack/slack-broker-binding.feature +++ b/test/slack/slack-broker-binding.feature @@ -8,12 +8,12 @@ Feature: Slack Kamelet Scenario: Verify Slack Kamelet to broker binding Given Kamelet slack-source is available - Given load KameletBinding broker-to-log.yaml - Given load KameletBinding slack-to-broker.yaml + Given load Pipe broker-to-log.yaml + Given load Pipe slack-to-broker.yaml - Then KameletBinding slack-to-broker should be available + Then Pipe slack-to-broker should be available And Camel K integration slack-to-broker should print kamelet://slack-source/source - And KameletBinding broker-to-log should be available + And Pipe broker-to-log should be available Given variable loginfo is "knative://event/custom-type" Then Camel K integration broker-to-log should print ${loginfo} @@ -38,5 +38,5 @@ Feature: Slack Kamelet And Camel K integration broker-to-log should print ${message} Scenario: Remove Camel K resources - Given delete KameletBinding broker-to-log - Given delete KameletBinding slack-to-broker + Given delete Pipe broker-to-log + Given delete Pipe slack-to-broker diff --git a/test/slack/slack-inmem-binding.feature b/test/slack/slack-inmem-binding.feature index 1e4c4f732..4afb49fe3 100644 --- a/test/slack/slack-inmem-binding.feature +++ b/test/slack/slack-inmem-binding.feature @@ -7,13 +7,13 @@ Feature: Slack Kamelet Scenario: Verify Slack Kamelet to InMemoryChannel binding Given Kamelet slack-source is available - Given load KameletBinding inmem-to-log.yaml - And KameletBinding inmem-to-log should be available + Given load Pipe inmem-to-log.yaml + And Pipe inmem-to-log should be available Given variable loginfo is "knative://channel/messages" Then Camel K integration inmem-to-log should print ${loginfo} - Given load KameletBinding slack-to-inmem.yaml - Then KameletBinding slack-to-inmem should be available + Given load Pipe slack-to-inmem.yaml + Then Pipe slack-to-inmem should be available And Camel K integration slack-to-inmem should print Installed features Given variable message is "Hello from Kamelet source citrus:randomString(10)" @@ -32,6 +32,6 @@ Feature: Slack Kamelet And Camel K integration inmem-to-log should print ${message} Scenario: Remove Camel K resources - Given delete KameletBinding inmem-to-log - Given delete KameletBinding slack-to-inmem + Given delete Pipe inmem-to-log + Given delete Pipe slack-to-inmem #NOTE: InMemoryChannel is autoremoved diff --git a/test/slack/slack-to-broker.yaml b/test/slack/slack-to-broker.yaml index 0fe3cb0fb..c1b897b22 100644 --- a/test/slack/slack-to-broker.yaml +++ b/test/slack/slack-to-broker.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: slack-to-broker spec: @@ -38,4 +38,4 @@ spec: template: metadata: autoscaling.knative.dev/minScale: "1" - 000autoscaling.knative.dev/maxScale: "3" \ No newline at end of file + 000autoscaling.knative.dev/maxScale: "3" diff --git a/test/slack/slack-to-inmem.yaml b/test/slack/slack-to-inmem.yaml index 83109f102..1e84281df 100644 --- a/test/slack/slack-to-inmem.yaml +++ b/test/slack/slack-to-inmem.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: slack-to-inmem spec: @@ -32,4 +32,4 @@ spec: ref: kind: InMemoryChannel apiVersion: messaging.knative.dev/v1 - name: messages \ No newline at end of file + name: messages diff --git a/test/slack/slack-uri-binding.feature b/test/slack/slack-uri-binding.feature index a7653f488..1bb210aa6 100644 --- a/test/slack/slack-uri-binding.feature +++ b/test/slack/slack-uri-binding.feature @@ -5,8 +5,8 @@ Feature: Slack Kamelet - secret based configuration Given Disable auto removal of Kamelet resources Scenario: Create Camel K resources - Given load KameletBinding slack-uri-binding.yaml - Given KameletBinding slack-uri-binding is available + Given load Pipe slack-uri-binding.yaml + Given Pipe slack-uri-binding is available Given variable loginfo is "Installed features" Then Camel K integration slack-uri-binding should print ${loginfo} @@ -27,4 +27,4 @@ Feature: Slack Kamelet - secret based configuration And Camel K integration slack-uri-binding should print ${message} Scenario: Remove Camel K resources - secret based configuration - Given delete Camel K integration slack-uri-binding + Given delete Pipe slack-uri-binding diff --git a/test/slack/slack-uri-binding.yaml b/test/slack/slack-uri-binding.yaml index 101100bcb..40ac8e4f8 100644 --- a/test/slack/slack-uri-binding.yaml +++ b/test/slack/slack-uri-binding.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: slack-uri-binding spec: @@ -29,4 +29,4 @@ spec: channel: ${camel.kamelet.slack-source.slack-credentials.channel} token: ${camel.kamelet.slack-source.slack-credentials.token} sink: - uri: log:info \ No newline at end of file + uri: log:info diff --git a/test/slack/yaks-config.yaml b/test/slack/yaks-config.yaml index 4cc437281..028d012f2 100644 --- a/test/slack/yaks-config.yaml +++ b/test/slack/yaks-config.yaml @@ -19,6 +19,12 @@ config: namespace: temporary: false runtime: + settings: + loggers: + - name: INTEGRATION_STATUS + level: INFO + - name: INTEGRATION_LOGS + level: INFO resources: - slack-to-log-uri-based.groovy - slack-credentials.properties diff --git a/test/telegram/telegram-inmem-binding.feature b/test/telegram/telegram-inmem-binding.feature index 8a5a89aa4..b71f4ed6e 100644 --- a/test/telegram/telegram-inmem-binding.feature +++ b/test/telegram/telegram-inmem-binding.feature @@ -10,11 +10,11 @@ Feature: Telegram Kamelet - binding to InMemoryChannel Scenario: Verify Kamelet source - binding to InMem Given Kamelet telegram-source is available - Given load KameletBinding inmem-to-log.yaml - Given load KameletBinding telegram-to-inmem.yaml + Given load Pipe inmem-to-log.yaml + Given load Pipe telegram-to-inmem.yaml Given Camel K integration telegram-to-inmem is running - And KameletBinding inmem-to-log should be available + And Pipe inmem-to-log should be available Given variable loginfo is "Installed features" Then Camel K integration inmem-to-log should print ${loginfo} Then Camel K integration telegram-to-inmem should print ${loginfo} @@ -26,6 +26,6 @@ Feature: Telegram Kamelet - binding to InMemoryChannel Then sleep 10000 ms Scenario: Remove Camel K, Kubernetes resources - Given delete KameletBinding telegram-to-inmem - Given delete KameletBinding inmem-to-log + Given delete Pipe telegram-to-inmem + Given delete Pipe inmem-to-log Given delete Kubernetes resource telegram-client.yaml diff --git a/test/telegram/telegram-to-inmem.yaml b/test/telegram/telegram-to-inmem.yaml index a83dd4298..9d138d12d 100644 --- a/test/telegram/telegram-to-inmem.yaml +++ b/test/telegram/telegram-to-inmem.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: telegram-to-inmem spec: diff --git a/test/telegram/telegram-uri-binding.feature b/test/telegram/telegram-uri-binding.feature index bf039b39b..b7e9c9588 100644 --- a/test/telegram/telegram-uri-binding.feature +++ b/test/telegram/telegram-uri-binding.feature @@ -9,7 +9,7 @@ Feature: Telegram Kamelet - binding to URI Scenario: Create Camel K resources Given Kamelet telegram-source is available - Given load KameletBinding telegram-uri-binding.yaml + Given load Pipe telegram-uri-binding.yaml Given Camel K integration telegram-uri-binding is running Given variable loginfo is "Installed features" Then Camel K integration telegram-uri-binding should print ${loginfo} @@ -20,5 +20,5 @@ Feature: Telegram Kamelet - binding to URI And Camel K integration telegram-uri-binding should print "${message}" Scenario: Remove Camel K, Kubernetes resources - Given delete Camel K integration telegram-uri-binding + Given delete Pipe telegram-uri-binding Given delete Kubernetes resource telegram-client.yaml diff --git a/test/telegram/telegram-uri-binding.yaml b/test/telegram/telegram-uri-binding.yaml index 13da70eb2..6d0a910ad 100644 --- a/test/telegram/telegram-uri-binding.yaml +++ b/test/telegram/telegram-uri-binding.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: telegram-uri-binding spec: @@ -28,4 +28,4 @@ spec: properties: authorizationToken: ${camel.kamelet.telegram-source.telegram-credentials.authorizationToken} sink: - uri: log:info \ No newline at end of file + uri: log:info diff --git a/test/telegram/yaks-config.yaml b/test/telegram/yaks-config.yaml index e58e6d308..7bc8932bc 100644 --- a/test/telegram/yaks-config.yaml +++ b/test/telegram/yaks-config.yaml @@ -19,6 +19,12 @@ config: namespace: temporary: false runtime: + settings: + loggers: + - name: INTEGRATION_STATUS + level: INFO + - name: INTEGRATION_LOGS + level: INFO resources: - telegram-to-log-uri-based.groovy - telegram-client.yaml diff --git a/test/utils/broker-to-log.yaml b/test/utils/broker-to-log.yaml index 7590f05a1..d0a6eeba5 100644 --- a/test/utils/broker-to-log.yaml +++ b/test/utils/broker-to-log.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: broker-to-log spec: @@ -32,4 +32,4 @@ spec: template: metadata: autoscaling.knative.dev/minScale: "1" - autoscaling.knative.dev/maxScale: "3" \ No newline at end of file + autoscaling.knative.dev/maxScale: "3" diff --git a/test/utils/inmem-to-log.yaml b/test/utils/inmem-to-log.yaml index bf6f47fa2..0bd6ef9df 100644 --- a/test/utils/inmem-to-log.yaml +++ b/test/utils/inmem-to-log.yaml @@ -16,7 +16,7 @@ # --------------------------------------------------------------------------- apiVersion: camel.apache.org/v1 -kind: KameletBinding +kind: Pipe metadata: name: inmem-to-log spec: