logstash-integration-aws 7.1.3-java → 7.1.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4cbe08b7343729fa42923adec2223fef762443a605affa60a7cee5dd4f6bd6c
-  data.tar.gz: 01b5095d1534b0527573fae1c29c7eba3be667754d7162f5122a1cc21d3e8f70
+  metadata.gz: a30619ed8bc31761d0134555c20ba7f9e682cce080d89d36e83cbc1a402d4678
+  data.tar.gz: f1b9247104f4e1ad28b6bab42696ebf064f9fac37d0cfdcf03a3269bcb25566b
 SHA512:
-  metadata.gz: 30b3e667cdbaf3ecd4fdf6768c8ea3740ac9935b2761b42370e459162c7cc38075d41c6501bc4499d25b377a70911f9733ed51a636e019075db3e8bd512e35aa
-  data.tar.gz: 7eefe2ea51c7b2b84a20148b7fcf55316818fd0b84ec2cd94e54a055abd542ff58c1143a78e1c7685ac3ca07993e2d2f8f44d4902495387749b12985175d8e7d
+  metadata.gz: b424d54d88b11c1cdc12b5d27e5da5d6c3900331f4dab53d0f6931ddfa4adaf678251103f3ec7f70ae3a52c632ed83138efe153efd122d84ff916e7091e09fa7
+  data.tar.gz: d585032f64c6f9f3ffcc91653bf06446e157e6c2f4f1370f084ab18967b900e64a36f0df76e4b5325380b19ed795fbe4e91a7039737270a106ad9b57d78d1634

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 7.1.4
+  - Fix `use_aws_bundled_ca` to use bundled ca certs per plugin level instead of global [#33](https://github.com/logstash-plugins/logstash-integration-aws/pull/33)
+
 ## 7.1.3
   - Added an option `use_aws_bundled_ca` to use bundled ca certs that ships with AWS SDK to verify SSL peer certificates [#32](https://github.com/logstash-plugins/logstash-integration-aws/pull/32)
 

data/VERSION

@@ -1 +1 @@
-7.1.3
+7.1.4

data/lib/logstash/inputs/cloudwatch.rb

@@ -130,8 +130,6 @@ class LogStash::Inputs::CloudWatch < LogStash::Inputs::Base
     raise 'Interval must be divisible by period' unless @interval % @period == 0
     raise "Filters must be defined for when using #{@namespace} namespace" if @filters.nil? && filters_required?(@namespace)
 
-    setup_aws_client_config
-
     @last_check = Time.now
   end # def register
 

data/lib/logstash/inputs/s3.rb

@@ -100,7 +100,6 @@ class LogStash::Inputs::S3 < LogStash::Inputs::Base
 
     @logger.info("Registering", :bucket => @bucket, :region => @region)
 
-    setup_aws_client_config
     s3 = get_s3object
 
     @s3bucket = s3.bucket(@bucket)

data/lib/logstash/inputs/sqs.rb

@@ -99,7 +99,6 @@ class LogStash::Inputs::SQS < LogStash::Inputs::Threadable
     require "aws-sdk-sqs"
     @logger.info("Registering SQS input", :queue => @queue, :queue_owner_aws_account_id => @queue_owner_aws_account_id)
 
-    setup_aws_client_config
     setup_queue
   end
 

data/lib/logstash/outputs/cloudwatch.rb

@@ -163,7 +163,6 @@ class LogStash::Outputs::CloudWatch < LogStash::Outputs::Base
     require "thread"
     require "aws-sdk-cloudwatch"
 
-    setup_aws_client_config
     @cw = Aws::CloudWatch::Client.new(aws_options_hash)
 
     @event_queue = SizedQueue.new(@queue_size)

data/lib/logstash/outputs/s3.rb

@@ -209,8 +209,6 @@ class LogStash::Outputs::S3 < LogStash::Outputs::Base
       raise LogStash::ConfigurationError, "Logstash must have the permissions to write to the temporary directory: #{@temporary_directory}"
     end
 
-    setup_aws_client_config
-
     if @validate_credentials_on_root_bucket && !WriteBucketPermissionValidator.new(@logger).valid?(bucket_resource, upload_options)
       raise LogStash::ConfigurationError, "Logstash must have the privileges to write to root bucket `#{@bucket}`, check your credentials or your permissions."
     end

data/lib/logstash/outputs/sns.rb

@@ -58,7 +58,6 @@ class LogStash::Outputs::Sns < LogStash::Outputs::Base
   def register
     require "aws-sdk-sns"
 
-    setup_aws_client_config
     @sns = Aws::SNS::Client.new(aws_options_hash)
 
     publish_boot_message_arn()

data/lib/logstash/outputs/sqs.rb

@@ -86,7 +86,6 @@ class LogStash::Outputs::SQS < LogStash::Outputs::Base
 
   public
   def register
-    setup_aws_client_config
     @sqs = Aws::SQS::Client.new(aws_options_hash)
 
     if @batch_events > 10

data/lib/logstash/plugin_mixins/aws_config/v2.rb

@@ -35,11 +35,14 @@ module LogStash::PluginMixins::AwsConfig::V2
       opts = symbolize_keys_and_cast_true_false(additional_settings).merge(opts)
     end
 
-    return opts
-  end
+    if @use_aws_bundled_ca
+      aws_core_library = Gem.loaded_specs['aws-sdk-core']&.full_gem_path or fail("AWS Core library not available")
+      opts[:ssl_ca_bundle] = File.expand_path('ca-bundle.crt', aws_core_library).tap do |aws_core_ca_bundle|
+        fail("AWS Core CA bundle not found") unless File.exists?(aws_core_ca_bundle)
+      end
+    end
 
-  def setup_aws_client_config
-    Aws.use_bundled_cert! if @use_aws_bundled_ca
+    return opts
   end
 
   private

data/lib/logstash-integration-aws_jars.rb

@@ -1,4 +1,4 @@
 # AUTOGENERATED BY THE GRADLE SCRIPT. DO NOT EDIT.
 
 require 'jar_dependencies'
-require_jar('org.logstash.plugins.integration.aws', 'logstash-integration-aws', '7.1.3')
+require_jar('org.logstash.plugins.integration.aws', 'logstash-integration-aws', '7.1.4')

data/spec/plugin_mixin/aws_config_spec.rb

@@ -152,6 +152,25 @@ describe LogStash::PluginMixins::AwsConfig::V2 do
 
       end
     end
+
+  end
+
+  describe 'use aws bundled ca' do
+    context 'set to true' do
+      let(:settings) { { 'use_aws_bundled_ca' => true } }
+
+      it 'points ssl_ca_bundle to aws-sdk-core certs' do
+        expect(subject[:ssl_ca_bundle]).to match /aws-sdk-core.*ca-bundle\.crt\z/
+      end
+    end
+
+    context 'set to false' do
+      let(:settings) { { 'use_aws_bundled_ca' => false } }
+
+      it 'does not include the AWS bundled CA' do
+        expect(subject).to_not include :ssl_ca_bundle
+      end
+    end
   end
 
   describe 'config proxy' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-integration-aws
 version: !ruby/object:Gem::Version
-  version: 7.1.3
+  version: 7.1.4
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-14 00:00:00.000000000 Z
+date: 2023-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -408,7 +408,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/helpers.rb
 - spec/unit/outputs/sqs_spec.rb
-- vendor/jar-dependencies/org/logstash/plugins/integration/aws/logstash-integration-aws/7.1.3/logstash-integration-aws-7.1.3.jar
+- vendor/jar-dependencies/org/logstash/plugins/integration/aws/logstash-integration-aws/7.1.4/logstash-integration-aws-7.1.4.jar
 homepage: http://www.elastic.co/guide/en/logstash/current/index.html
 licenses:
 - Apache-2.0