Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(test): Fix YAKS tests #1586

Merged
merged 5 commits into from
Aug 23, 2023
Merged

chore(test): Fix YAKS tests #1586

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cffb616
chore(deps): Update to YAKS 0.15.1
christophd May 26, 2023
da3ec92
fix(aws2-ddb): Fix AWS2 DDB sink Kamelet
christophd Aug 23, 2023
324b4e8
chore(test): Fix AWS2 S3 YAKS tests
christophd Aug 23, 2023
1aab9a4
fix: Typo in data-type-action.kamelet
christophd May 2, 2023
2899c54
chore(test): Run YAKS tests with Camel 4.0.0
christophd Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/yaks-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ concurrency:
cancel-in-progress: true

env:
YAKS_VERSION: 0.14.2
YAKS_RUN_OPTIONS: "--timeout=15m --local -e YAKS_CAMELK_MAX_ATTEMPTS=10 -e YAKS_JBANG_CAMEL_VERSION=4.0.0-M1 -e YAKS_JBANG_KAMELETS_LOCAL_DIR=../../../kamelets"
YAKS_VERSION: 0.15.1
YAKS_RUN_OPTIONS: "--timeout=15m --local -e YAKS_CAMELK_MAX_ATTEMPTS=10 -e YAKS_JBANG_CAMEL_VERSION=4.0.0-M1 -e YAKS_JBANG_KAMELETS_LOCAL_DIR=../../../kamelets -e YAKS_CAMELK_KAMELET_API_VERSION=v1alpha1"

jobs:
test:
Expand Down
2 changes: 1 addition & 1 deletion kamelets/aws-ddb-sink.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ spec:
type: "#class:org.apache.camel.kamelets.utils.format.DataTypeProcessor"
properties:
scheme: 'aws2-ddb'
format: 'json'
format: 'application-json'
registry: '#bean:{{dataTypeRegistry}}'
from:
uri: "kamelet:source"
Expand Down
2 changes: 1 addition & 1 deletion kamelets/data-type-action.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
example: "camel"
format:
title: Data Type Format
description: Defines the data type that will be applied by this action. The Kameelet catalog supports different data types and performs automatic message conversion according to the given type.
description: Defines the data type that will be applied by this action. The Kamelet catalog supports different data types and performs automatic message conversion according to the given type.
type: string
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.0.0-SNAPSHOT"
Expand Down
2 changes: 1 addition & 1 deletion library/camel-kamelets/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ spec:
type: "#class:org.apache.camel.kamelets.utils.format.DataTypeProcessor"
properties:
scheme: 'aws2-ddb'
format: 'json'
format: 'application-json'
registry: '#bean:{{dataTypeRegistry}}'
from:
uri: "kamelet:source"
Expand Down
2 changes: 1 addition & 1 deletion library/camel-kamelets/src/main/resources/kamelets/data-type-action.kamelet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
example: "camel"
format:
title: Data Type Format
description: Defines the data type that will be applied by this action. The Kameelet catalog supports different data types and performs automatic message conversion according to the given type.
description: Defines the data type that will be applied by this action. The Kamelet catalog supports different data types and performs automatic message conversion according to the given type.
type: string
dependencies:
- "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.0.0-SNAPSHOT"
Expand Down
2 changes: 1 addition & 1 deletion test/aws-s3/amazonS3Client.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import software.amazon.awssdk.services.s3.S3Client

S3Client s3 = S3Client
.builder()
.endpointOverride(URI.create("${YAKS_TESTCONTAINERS_LOCALSTACK_S3_LOCAL_URL}"))
.endpointOverride(URI.create("${YAKS_TESTCONTAINERS_LOCALSTACK_S3_LOCAL_URL}".replace('localhost', '127.0.0.1')))
.credentialsProvider(StaticCredentialsProvider.create(
AwsBasicCredentials.create(
"${YAKS_TESTCONTAINERS_LOCALSTACK_ACCESS_KEY}",
Expand Down
4 changes: 2 additions & 2 deletions test/insert-field-action/yaks-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ 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
- name: YAKS_JBANG_CAMEL_DUMP_INTEGRATION_OUTPUT
value: true
resources:
- insert-field-action-binding.yaml
dump:
Expand Down
Loading