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.

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

Fix keyName condition #1079

Merged
merged 1 commit into from
Oct 11, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 3 additions & 4 deletions kamelets/aws-s3-sink.kamelet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
Upload data to an Amazon S3 Bucket.

The basic authentication method for the S3 service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.

If you use the default credentials provider, the S3 client loads the credentials through this provider and doesn't use the basic authentication method.

In the header, you can optionally set the `file` / `ce-partition` property to specify the name of the file to upload.
Expand Down Expand Up @@ -119,12 +119,11 @@ spec:
- set-header:
name: CamelAwsS3Key
simple: "${header[ce-file]}"
- simple: "${properties:keyName:null} == 'null'"
- simple: "'{{?keyName}}' == ''"
steps:
- set-header:
name: CamelAwsS3Key
simple: "${exchangeId}"
# this can be simplified when https://issues.apache.org/jira/browse/CAMEL-18070 is resolved
simple: "${exchangeId}"
- to:
uri: "aws2-s3:{{bucketNameOrArn}}"
parameters:
Expand Down
3 changes: 1 addition & 2 deletions kamelets/ceph-sink.kamelet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,11 @@ spec:
- set-header:
name: CamelAwsS3Key
simple: "${header[ce-file]}"
- simple: "${properties:keyName:null} == 'null'"
- simple: "'{{?keyName}}' == ''"
steps:
- set-header:
name: CamelAwsS3Key
simple: "${exchangeId}"
# this can be simplified when https://issues.apache.org/jira/browse/CAMEL-18070 is resolved
- to:
uri: "aws2-s3:{{bucketName}}"
parameters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
Upload data to an Amazon S3 Bucket.

The basic authentication method for the S3 service is to specify an access key and a secret key. These parameters are optional because the Kamelet provides a default credentials provider.

If you use the default credentials provider, the S3 client loads the credentials through this provider and doesn't use the basic authentication method.

In the header, you can optionally set the `file` / `ce-partition` property to specify the name of the file to upload.
Expand Down Expand Up @@ -119,12 +119,11 @@ spec:
- set-header:
name: CamelAwsS3Key
simple: "${header[ce-file]}"
- simple: "${properties:keyName:null} == 'null'"
- simple: "'{{?keyName}}' == ''"
steps:
- set-header:
name: CamelAwsS3Key
simple: "${exchangeId}"
# this can be simplified when https://issues.apache.org/jira/browse/CAMEL-18070 is resolved
simple: "${exchangeId}"
- to:
uri: "aws2-s3:{{bucketNameOrArn}}"
parameters:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,12 +104,11 @@ spec:
- set-header:
name: CamelAwsS3Key
simple: "${header[ce-file]}"
- simple: "${properties:keyName:null} == 'null'"
- simple: "'{{?keyName}}' == ''"
steps:
- set-header:
name: CamelAwsS3Key
simple: "${exchangeId}"
# this can be simplified when https://issues.apache.org/jira/browse/CAMEL-18070 is resolved
- to:
uri: "aws2-s3:{{bucketName}}"
parameters:
Expand Down