Fix CMakeLists.txt with -DFLB_TLS=OFF #3043
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
thanks @yongtang ! a few requirements, would you please split the commits per components ?, e.g:
|
edsiper
added
the
waiting-for-user
This commit changes `struct flb_tls *tls` to `void *tls` at the api in flb_upstream_create_url. Since flb_upstream_create_url is used both in tls and non-tls mode, it is not possible to disable this fuction in non-tls build. Instead with the API change it is possible to build with non-tls through `#if #else #fi` inside the function. This commit is part of the effort to address the issue raised in fluent#2999 where it was not possible to disable TLS to build fluent-bit. Signed-off-by: Yong Tang <[email protected]>
This commit updates flb_io.c and use FLB_HAVE_TLS so that it is possible to build with tls and non-tls. This commit is part of the effort to address the issue raised in fluent#2999 where it was not possible to disable TLS to build fluent-bit. Signed-off-by: Yong Tang <[email protected]>
This commit updates flb_http_client.h and use FLB_HAVE_TLS so that it is possible to build with tls and non-tls. SInce flb_http_client pretty much depends on TLS, this commit use FLB_HAVE_TLS to exclude build in case non-tls build is encountered. This commit is part of the effort to address the issue raised in fluent#2999 where it was not possible to disable TLS to build fluent-bit. Signed-off-by: Yong Tang <[email protected]>
This commit updates flb_lib.c and use FLB_HAVE_TLS so that it is possible to build with tls and non-tls. This commit is part of the effort to address the issue raised in fluent#2999 where it was not possible to disable TLS to build fluent-bit. Signed-off-by: Yong Tang <[email protected]>
This commit updates flb_help.c and use FLB_HAVE_TLS so that it is possible to build with tls and non-tls. This commit is part of the effort to address the issue raised in fluent#2999 where it was not possible to disable TLS to build fluent-bit. Signed-off-by: Yong Tang <[email protected]>
This commit updates CMakeLists.txt so that it is possible to build with TLS and non-TLS selectively. This commit is part of the effort to address the issue raised in fluent#2999 where it was not possible to disable TLS to build fluent-bit. Signed-off-by: Yong Tang <[email protected]>
|
Thanks @edsiper for the review. The PR has been updated now. Please take a look and let me know if there are any other issues. |
|
I was testing version 1.7.2 with AWS ES but it failed with below error. Is this PR related to that? |
I am getting above error with version |
|
@a8j8i8t8 This patch doesn't cause your issue. |
|
@a8j8i8t8 Oops. However this patch will not help your issue. |
|
This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days. |
edsiper
requested review from
niedbalski,
patrick-stephens,
celalettin1286 and
leonardo-albertovich
as code owners
|
This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR tries to address the issue raised in #2999 where
it was not possible to disable TLS to build fluent-bit.
When cmake is invoked with
-DFLB_TLS=OFF -DFLB_OUT_TD=OFFmany plugins (especially cloud vendor provided ones like AWS/Azure/etc)
will fail as they depends on TLS. This PR mostly updates
the CMakeLists.txt to remove the plugins when TLS is disabled.
Without TLS, it is still possible to build 50+ plugins in fluent-bit
so it is worthwhile to provide this options to users.
This PR fixes #2999.
Signed-off-by: Yong Tang [email protected]
Enter
[N/A]in the box, if an item is not applicable to your change.Testing
Before we can approve your change; please submit the following in a comment:
Documentation
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.