logstash-mixin-aws 4.4.1 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '01656229a43f5ede21677884c8ea991f17916c1788f3d649f53522ea54e3f750'
-  data.tar.gz: d13097ef493258bd57bd748d81ac6d060b4a1400264fc6b29948be2a31b5e9bc
+  metadata.gz: 5f0ffda43078e41e39ca90e34f89a212e95164a3dd40b47b98a141d4c20d4b14
+  data.tar.gz: 9d252aad0445ec9f49b78708eccf61d4caff1b0808e5a4f3fa45d634f7b4b2ad
 SHA512:
-  metadata.gz: 55c0c1592cf6f02bfe3318b8b201232057d67a0070a8963d1bd233d045e5dd7846658665a6e7c2be3fb6e136f378fce19c6e1c836ca308506ed5bb6bd28889d7
-  data.tar.gz: 916511950a77a3cccb5c168bc1faa040f8e5aca31c62aa0f2c5806f38556f1492eafc48230ba6798ded1d7a3871639adcfe6d3c2eba573809f8b3bc605f4879b
+  metadata.gz: 45e12f518ddc54c3fa6d9775511ec3fb4f01fe86b7f311858349d5f93a7e307a555edad97b80487de7e73cd5b8ec8508a7baf3adf0a0aaba4256fa761fb322a4
+  data.tar.gz: fbf5d5b3dd042b2af41e670126b9b65c5562b0cd84d8f62e5a4bf6baef7f0e72d22f29dac7e9850cc8d6af4c95a1e2e7babea81bda31df1342b2b1e6aa37be76

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 5.0.0
+  - Drop support for aws-sdk-v1
+
 ## 4.4.1
   -  Fix: proxy with assumed role (properly) [#50](https://github.com/logstash-plugins/logstash-mixin-aws/pull/50).
 

data/README.md

@@ -1,6 +1,6 @@
 # Logstash Plugin
 
-[![Travis Build Status](https://travis-ci.org/logstash-plugins/logstash-mixin-aws.svg)](https://travis-ci.org/logstash-plugins/logstash-mixin-aws)
+[![Travis Build Status](https://travis-ci.com/logstash-plugins/logstash-mixin-aws.svg)](https://travis-ci.com/logstash-plugins/logstash-mixin-aws)
 
 This is a plugin for [Logstash](https://github.com/elastic/logstash).
 

data/lib/logstash/plugin_mixins/aws_config.rb

@@ -1,17 +1,8 @@
 # encoding: utf-8
 require "logstash/config/mixin"
 
-# This module provides helper for the `AWS-SDK` v1,
-# and it will be deprecated in the near future, please use the V2 module
-# for any new development.
 module LogStash::PluginMixins::AwsConfig
-  require "logstash/plugin_mixins/aws_config/v1"
   require "logstash/plugin_mixins/aws_config/v2"
 
   US_EAST_1 = "us-east-1"
-
-  def self.included(base)
-    # Add these methods to the 'base' given.
-    base.send(:include, V1)
-  end
 end

data/logstash-mixin-aws.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name            = 'logstash-mixin-aws'
-  s.version         = '4.4.1'
+  s.version         = '5.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "AWS mixins to provide a unified interface for Amazon Webservice"
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   # Gem dependencies
   s.add_runtime_dependency "logstash-core-plugin-api", ">= 1.60", "<= 2.99"
   s.add_runtime_dependency 'logstash-codec-plain'
-  s.add_runtime_dependency 'aws-sdk-v1', '>= 1.61.0'
   s.add_runtime_dependency 'aws-sdk', '~> 2'
   s.add_development_dependency 'logstash-devutils'
   s.add_development_dependency 'timecop'

data/spec/plugin_mixin/aws_config_spec.rb

@@ -16,90 +16,6 @@ class DummyInputAwsConfigV2NoRegionMethod < LogStash::Inputs::Base
   include LogStash::PluginMixins::AwsConfig::V2
 end
 
-class DummyInputAwsConfigV1 < LogStash::Inputs::Base
-  include LogStash::PluginMixins::AwsConfig
-
-  def aws_service_endpoint(region)
-    { :dummy_input_aws_config_region => "#{region}.awswebservice.local" }
-  end
-end
-
-describe LogStash::PluginMixins::AwsConfig do
-  let(:settings) { {} }
-
-  subject { DummyInputAwsConfigV1.new(settings).aws_options_hash }
-
-  describe 'config credential' do
-
-    context 'in credential file' do
-      let(:settings) { { 'aws_credentials_file' => File.join(File.dirname(__FILE__), '..', 'fixtures/aws_credentials_file_sample_test.yml') } }
-
-      it 'should support reading configuration from a yaml file' do
-        expect(subject).to include(:access_key_id => "1234", :secret_access_key => "secret")
-      end
-    end
-
-    context 'inline' do
-      context 'temporary credential' do
-        let(:settings) { { 'access_key_id' => '1234', 'secret_access_key' => 'secret', 'session_token' => 'session_token' } }
-
-        it "should support passing as key, value, and session_token" do
-          expect(subject[:access_key_id]).to eq(settings["access_key_id"])
-          expect(subject[:secret_access_key]).to_not eq(settings["secret_access_key"])
-          expect(subject[:secret_access_key].value).to eq(settings["secret_access_key"])
-          expect(subject[:session_token]).to_not eq(settings["session_token"])
-          expect(subject[:session_token].value).to eq(settings["session_token"])
-        end
-      end
-
-      context 'normal credential' do
-        let(:settings) { { 'access_key_id' => '1234',  'secret_access_key' => 'secret' } }
-
-        it 'should support passing credentials as key, value' do
-          expect(subject[:access_key_id]).to eq(settings['access_key_id'])
-          expect(subject[:secret_access_key]).to_not eq(settings['secret_access_key'])
-          expect(subject[:secret_access_key].value).to eq(settings['secret_access_key'])
-        end
-      end
-    end
-  end
-
-  describe 'config region' do
-    context 'region provided' do
-      let(:settings) { { 'access_key_id' => '1234',  'secret_access_key' => 'secret', 'region' => 'us-west-2' } }
-
-      it 'should use provided region to generate the endpoint configuration' do
-        expect(subject[:dummy_input_aws_config_region]).to eq("us-west-2.awswebservice.local")
-      end
-    end
-
-    context "region not provided" do
-      let(:settings) { { 'access_key_id' => '1234',  'secret_access_key' => 'secret'} }
-
-      it 'should use default region to generate the endpoint configuration' do
-        expect(subject[:dummy_input_aws_config_region]).to eq("us-east-1.awswebservice.local")
-      end
-    end
-  end
-
-  describe 'config endpoint' do
-    context "endpoint provided" do
-      let(:settings) { { 'access_key_id' => '1234',  'secret_access_key' => 'secret', 'endpoint' => 'http://localhost'} }
-
-      it 'should use specified endpoint' do
-          expect(subject[:endpoint]).to eq("http://localhost")
-      end
-    end
-  end
-
-  context 'when we arent providing credentials' do
-    let(:settings) { {} }
-    it 'should always return a hash' do
-      expect(subject).to eq({ :use_ssl => true, :dummy_input_aws_config_region => "us-east-1.awswebservice.local" })  
-    end
-  end
-end
-
 describe LogStash::PluginMixins::AwsConfig::V2 do
   let(:settings) { {} }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-mixin-aws
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 5.0.0
 platform: ruby
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2021-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -44,20 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.61.0
-  name: aws-sdk-v1
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.61.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -116,7 +102,6 @@ files:
 - README.md
 - lib/logstash/plugin_mixins/aws_config.rb
 - lib/logstash/plugin_mixins/aws_config/generic.rb
-- lib/logstash/plugin_mixins/aws_config/v1.rb
 - lib/logstash/plugin_mixins/aws_config/v2.rb
 - logstash-mixin-aws.gemspec
 - spec/fixtures/aws_credentials_file_sample_test.yml

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

@@ -1,64 +0,0 @@
-# encoding: utf-8
-require "logstash/plugin_mixins/aws_config/generic"
-
-module LogStash::PluginMixins::AwsConfig::V1
-  def self.included(base)
-    # Make sure we require the V1 classes when including this module.
-    # require 'aws-sdk' will load v2 classes.
-    require "aws-sdk-v1"
-    base.extend(self)
-    base.send(:include, LogStash::PluginMixins::AwsConfig::Generic)
-    base.setup_aws_config
-  end
-
-  public
-  def setup_aws_config
-    # Should we require (true) or disable (false) using SSL for communicating with the AWS API
-    # The AWS SDK for Ruby defaults to SSL so we preserve that
-    config :use_ssl, :validate => :boolean, :default => true
-  end
-
-  public
-  def aws_options_hash
-    opts = {}
-
-    if @role_arn || @role_session_name
-      @logger.warn("role_arn and role_session_name settings are not supported in the v1 plugin")
-    end
-
-    if @access_key_id.is_a?(NilClass) ^ @secret_access_key.is_a?(NilClass)
-      @logger.warn("Likely config error: Only one of access_key_id or secret_access_key was provided but not both.")
-    end
-
-    if @access_key_id && @secret_access_key
-      opts = {
-        :access_key_id => @access_key_id,
-        :secret_access_key => @secret_access_key
-      }
-      opts[:session_token] = @session_token if @session_token
-    elsif @aws_credentials_file
-      opts = YAML.load_file(@aws_credentials_file)
-    end
-
-    opts[:proxy_uri] = @proxy_uri if @proxy_uri
-    opts[:use_ssl] = @use_ssl
-
-
-    # The AWS SDK for Ruby doesn't know how to make an endpoint hostname from a region
-    # for example us-west-1 -> foosvc.us-west-1.amazonaws.com
-    # So our plugins need to know how to generate their endpoints from a region
-    # Furthermore, they need to know the symbol required to set that value in the AWS SDK
-    # Classes using this module must implement aws_service_endpoint(region:string)
-    # which must return a hash with one key, the aws sdk for ruby config symbol of the service
-    # endpoint, which has a string value of the service endpoint hostname
-    # for example, CloudWatch, { :cloud_watch_endpoint => "monitoring.#{region}.amazonaws.com" }
-    # For a list, see https://github.com/aws/aws-sdk-ruby/blob/master/lib/aws/core/configuration.rb
-    opts.merge!(self.aws_service_endpoint(@region))
-
-    if !@endpoint.is_a?(NilClass)
-      opts[:endpoint] = @endpoint
-    end
-
-    return opts
-  end # def aws_options_hash
-end