-
Notifications
You must be signed in to change notification settings - Fork 289
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
logstash-output-opensearch/2.0.3 package update (#33203)
<p align="center"> <img src="https://raw.githubusercontent.com/wolfi-dev/.github/b535a42419ce0edb3c144c0edcff55a62b8ec1f8/profile/wolfi-logo-light-mode.svg" /> </p> --------- Signed-off-by: wolfi-bot <[email protected]> Signed-off-by: Jason Hall <[email protected]> Co-authored-by: wolfi-bot <[email protected]> Co-authored-by: Jason Hall <[email protected]>
- Loading branch information
1 parent
26c763f
commit 1bae9da
Showing
2 changed files
with
49 additions
and
3 deletions.
There are no files selected for viewing
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
33 changes: 33 additions & 0 deletions
33
logstash-output-opensearch/Fix-build-remove-signing_key-from-gemspec.patch
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
From 1fb62fa9602377cbc69fd35d91233577c4cf075a Mon Sep 17 00:00:00 2001 | ||
From: debasishbsws <[email protected]> | ||
Date: Tue, 26 Nov 2024 11:48:36 +0000 | ||
Subject: [PATCH] Fix(build): remove signing_key from gemspec | ||
|
||
Our ruby/build pipeline delete all the lines contains 'signing_key' by default since it leads to build failures as the key is not available in the build environment and is not needed. ref: https://github.com/chainguard-dev/melange/blob/main/pkg/build/pipelines/ruby/build.yaml#L42 | ||
|
||
But for version 2.0.3 and later it resutls in syntax error, unexpected end as it removes the condition line but not the full condition. | ||
|
||
Signed-off-by: debasishbsws <[email protected]> | ||
--- | ||
logstash-output-opensearch.gemspec | 5 +---- | ||
1 file changed, 1 insertion(+), 4 deletions(-) | ||
|
||
diff --git a/logstash-output-opensearch.gemspec b/logstash-output-opensearch.gemspec | ||
index cd04d97..1b0af3d 100644 | ||
--- a/logstash-output-opensearch.gemspec | ||
+++ b/logstash-output-opensearch.gemspec | ||
@@ -29,10 +29,7 @@ Gem::Specification.new do |s| | ||
# Tests | ||
s.test_files = s.files.grep(%r{^(test|spec|features)/}) | ||
|
||
- if $PROGRAM_NAME.end_with?("gem") && ARGV == ["build", __FILE__] && File.exist?(signing_key_path) | ||
- s.signing_key = signing_key_path | ||
- s.cert_chain = ['certs/opensearch-rubygems.pem'] | ||
- end | ||
+ s.cert_chain = ['certs/opensearch-rubygems.pem'] | ||
|
||
# Special flag to let us know this is actually a logstash plugin | ||
s.metadata = { | ||
-- | ||
2.47.1 | ||
|