logstash-mixin-rabbitmq_connection 5.1.0-java → 6.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 818efc953a67373bc805010913c45d885adf6ddc65f9e4488fe015593a776d13
-  data.tar.gz: 3ef95cd4c7adbecfda0c8082bf63d936b4b14c2bfd44d3669f69467fa215fd0e
+  metadata.gz: bd7fc8e31d1c925fe7f8aa9f2fcd35ecf711060d15f3ec6b3bf1587ce6e3e853
+  data.tar.gz: 2bd3d32bd653b36eb943667b43b6fe495f3bf6a448aa4b7a21df2beba82f7386
 SHA512:
-  metadata.gz: 9f6a6561d2a2e2ea97802f4473f2b7b77ae6ce71dbd23163d1ea1ede42dd7484ee78617594057163757aeea0846254b21dc377da0be2ea1677c119ba90c4c58f
-  data.tar.gz: 4f72684a92ce299c13b8d9f507bd8168190ffb334be3a2e0c4c58e574ab149d596345bd874c0fbd193b00941adff2481074f1ce32095c0847bc199db454f27ea
+  metadata.gz: f0d7510ed02b889bab83f1837f4f4452d18573323f4fec480333fe9652b77db559a4289895fc858cc96794fd1625bd6a163282b35a99847f2eddd4718f942ac1
+  data.tar.gz: 1b9d536f7e0c4d5a5648696e6cf19d752e482407e765b8c4a2b0a3857ab608b790588ca8e28b27827c5ce5891e6ca17f1341e36fb1bc3fc7d304775e3215505f

data/.travis.yml

@@ -1,16 +1,19 @@
 ---
-sudo: required
-services: docker
-addons:
-  apt:
-    packages:
-      - docker-ce
+sudo: false
+language: ruby
+cache: bundler
 matrix:
   include:
-    - env: ELASTIC_STACK_VERSION=8.x SNAPSHOT=true
-    - env: ELASTIC_STACK_VERSION=7.x SNAPSHOT=true
-    - env: ELASTIC_STACK_VERSION=7.x
-    - env: ELASTIC_STACK_VERSION=6.x
+  - rvm: jruby-9.1.13.0
+    env: LOGSTASH_BRANCH=master
+  - rvm: jruby-9.1.13.0
+    env: LOGSTASH_BRANCH=6.x
+  - rvm: jruby-9.1.13.0
+    env: LOGSTASH_BRANCH=6.5
+  - rvm: jruby-1.7.27
+    env: LOGSTASH_BRANCH=5.6
   fast_finish: true
-install: ci/unit/docker-setup.sh
-script: ci/unit/docker-run.sh
+install: true
+script: ci/build.sh
+jdk: oraclejdk8
+before_install: gem install bundler -v '< 2'

data/CHANGELOG.md

@@ -1,6 +1,6 @@
-## 5.1.0
-   - Updated `march_hare` dependency to `4.x`, which enables consumers to reliably manage a connection blocked/unblocked state machine that survives connection recovery.
-   - Removed support for Logstash 5.x since `march_hare` >= 3.x is not compatible.
+## 6.0.0
+   - Removed obsolete options `verify_ssl`, `debug`, `tls_certificate_path` and `tls_certificate_password`
+
 ## 5.0.2
    - Bug Fix: undefined method `value' for nil:NilClass with SSL enabled, but no certificates provided [#109](https://github.com/logstash-plugins/logstash-input-rabbitmq/issues/109)
 ## 5.0.1

data/ci/build.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+# version: 1
+########################################################
+#
+# AUTOMATICALLY GENERATED! DO NOT EDIT
+#
+########################################################
+set -e
+
+echo "Starting build process in: `pwd`"
+source ./ci/setup.sh
+
+if [[ -f "ci/run.sh" ]]; then
+    echo "Running custom build script in: `pwd`/ci/run.sh"
+    source ./ci/run.sh
+else
+    echo "Running default build scripts in: `pwd`/ci/build.sh"
+    bundle install
+    bundle exec rake vendor
+    bundle exec rspec spec
+fi

data/ci/setup.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+# version: 1
+########################################################
+#
+# AUTOMATICALLY GENERATED! DO NOT EDIT
+#
+########################################################
+set -e
+if [ "$LOGSTASH_BRANCH" ]; then
+    echo "Building plugin using Logstash source"
+    BASE_DIR=`pwd`
+    echo "Checking out branch: $LOGSTASH_BRANCH"
+    git clone -b $LOGSTASH_BRANCH https://github.com/elastic/logstash.git ../../logstash --depth 1
+    printf "Checked out Logstash revision: %s\n" "$(git -C ../../logstash rev-parse HEAD)"
+    cd ../../logstash
+    echo "Building plugins with Logstash version:"
+    cat versions.yml
+    echo "---"
+    # We need to build the jars for that specific version
+    echo "Running gradle assemble in: `pwd`"
+    ./gradlew assemble
+    cd $BASE_DIR
+    export LOGSTASH_SOURCE=1
+else
+    echo "Building plugin using released gems on rubygems"
+fi

data/lib/logstash/plugin_mixins/rabbitmq_connection.rb

@@ -54,18 +54,12 @@ module LogStash
         # Version of the SSL protocol to use.
         config :ssl_version, :validate => :string, :default => "TLSv1.2"
 
-        config :verify_ssl, :validate => :boolean, :default => false,
-          :obsolete => "This function did not actually function correctly and was removed." +
-                       "If you wish to validate SSL certs use the ssl_certificate_path and ssl_certificate_password options."
-
         # Path to an SSL certificate in PKCS12 (.p12) format used for verifying the remote host
         config :ssl_certificate_path, :validate => :path
 
         # Password for the encrypted PKCS12 (.p12) certificate file specified in ssl_certificate_path
         config :ssl_certificate_password, :validate => :password
 
-        config :debug, :validate => :boolean, :obsolete => "Use the logstash --debug flag for this instead."
-
         # Set this to automatically recover from a broken connection. You almost certainly don't want to override this!!!
         config :automatic_recovery, :validate => :boolean, :default => true
 
@@ -81,12 +75,6 @@ module LogStash
         # Passive queue creation? Useful for checking queue existance without modifying server state
         config :passive, :validate => :boolean, :default => false
 
-        # TLS certifcate path
-        config :tls_certificate_path, :validate => :path, :obsolete => "This setting is obsolete. Use ssl_certificate_path instead"
-
-        # TLS certificate password
-        config :tls_certificate_password, :validate => :string, :obsolete => "This setting is obsolete. Use ssl_certificate_password instead"
-
         # Extra queue arguments as an array.
         # To make a RabbitMQ queue mirrored, use: `{"x-ha-policy" => "all"}`
         config :arguments, :validate => :array, :default => {}

data/logstash-mixin-rabbitmq_connection.gemspec

@@ -1,7 +1,7 @@
 
 Gem::Specification.new do |s|
   s.name            = 'logstash-mixin-rabbitmq_connection'
-  s.version         = '5.1.0'
+  s.version         = '6.0.0'
   s.licenses        = ['Apache License (2.0)']
   s.summary         = "Common functionality for RabbitMQ plugins"
   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"
@@ -17,12 +17,7 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
 
   s.platform = RUBY_PLATFORM
-
-  # MarchHare 3.x+ includes ruby syntax from 2.x
-  # This effectively requires Logstash >= 6.x
-  s.required_ruby_version = '>= 2.0.0'
-
-  s.add_runtime_dependency 'march_hare', ['~> 4.0'] #(MIT license)
+  s.add_runtime_dependency 'march_hare', ['~> 3.0'] #(MIT license)
   s.add_runtime_dependency 'stud', '~> 0.0.22'
 
   s.add_development_dependency 'logstash-devutils'

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: logstash-mixin-rabbitmq_connection
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 6.0.0
 platform: java
 authors:
 - Elastic
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-09-06 00:00:00.000000000 Z
+date: 2019-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   name: march_hare
   prerelease: false
   type: :runtime
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -97,11 +97,8 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- ci/unit/Dockerfile
-- ci/unit/docker-compose.yml
-- ci/unit/docker-run.sh
-- ci/unit/docker-setup.sh
-- ci/unit/run.sh
+- ci/build.sh
+- ci/setup.sh
 - lib/logstash/plugin_mixins/rabbitmq_connection.rb
 - logstash-mixin-rabbitmq_connection.gemspec
 - spec/fixtures/README.md
@@ -145,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/ci/unit/Dockerfile

@@ -1,11 +0,0 @@
-ARG ELASTIC_STACK_VERSION
-FROM docker.elastic.co/logstash/logstash:$ELASTIC_STACK_VERSION
-COPY --chown=logstash:logstash Gemfile /usr/share/plugins/plugin/Gemfile
-COPY --chown=logstash:logstash *.gemspec /usr/share/plugins/plugin/
-RUN cp /usr/share/logstash/logstash-core/versions-gem-copy.yml /usr/share/logstash/versions.yml
-ENV PATH="${PATH}:/usr/share/logstash/vendor/jruby/bin"
-ENV LOGSTASH_SOURCE="1"
-RUN gem install bundler -v '< 2'
-WORKDIR /usr/share/plugins/plugin
-RUN bundle install
-COPY --chown=logstash:logstash . /usr/share/plugins/plugin

data/ci/unit/docker-compose.yml

@@ -1,17 +0,0 @@
-version: '3'
-
-# run tests:  cd ci/unit; docker-compose up --build --force-recreate
-# manual:  cd ci/unit; docker-compose run logstash bash
-services:
-
-  logstash:
-    build:
-      context: ../../
-      dockerfile: ci/unit/Dockerfile
-      args:
-        - ELASTIC_STACK_VERSION=$ELASTIC_STACK_VERSION
-    command: /usr/share/plugins/plugin/ci/unit/run.sh
-    environment:
-      LS_JAVA_OPTS: "-Xmx256m -Xms256m"
-      LOGSTASH_SOURCE: 1
-    tty: true

data/ci/unit/docker-run.sh

@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
- # This is intended to be run inside the docker container as the command of the docker-compose.
-set -ex
-docker-compose -f ci/unit/docker-compose.yml up --exit-code-from logstash

data/ci/unit/docker-setup.sh

@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
- # This is intended to be run the plugin's root directory. `ci/unit/docker-test.sh`
-# Ensure you have Docker installed locally and set the ELASTIC_STACK_VERSION environment variable.
-set -e
-
- VERSION_URL="https://raw.githubusercontent.com/elastic/logstash/master/ci/logstash_releases.json"
-
- if [ -z "${ELASTIC_STACK_VERSION}" ]; then
-    echo "Please set the ELASTIC_STACK_VERSION environment variable"
-    echo "For example: export ELASTIC_STACK_VERSION=6.2.4"
-    exit 1
-fi
-
- echo "Fetching versions from $VERSION_URL"
-VERSIONS=$(curl $VERSION_URL)
-
- if [[ "$SNAPSHOT" = "true" ]]; then
-  ELASTIC_STACK_RETRIEVED_VERSION=$(echo $VERSIONS | jq '.snapshots."'"$ELASTIC_STACK_VERSION"'"')
-  echo $ELASTIC_STACK_RETRIEVED_VERSION
-else
-  ELASTIC_STACK_RETRIEVED_VERSION=$(echo $VERSIONS | jq '.releases."'"$ELASTIC_STACK_VERSION"'"')
-fi
-
- if [[ "$ELASTIC_STACK_RETRIEVED_VERSION" != "null" ]]; then
-  # remove starting and trailing double quotes
-  ELASTIC_STACK_RETRIEVED_VERSION="${ELASTIC_STACK_RETRIEVED_VERSION%\"}"
-  ELASTIC_STACK_RETRIEVED_VERSION="${ELASTIC_STACK_RETRIEVED_VERSION#\"}"
-  echo "Translated $ELASTIC_STACK_VERSION to ${ELASTIC_STACK_RETRIEVED_VERSION}"
-  export ELASTIC_STACK_VERSION=$ELASTIC_STACK_RETRIEVED_VERSION
-fi
-
- echo "Testing against version: $ELASTIC_STACK_VERSION"
-
- if [[ "$ELASTIC_STACK_VERSION" = *"-SNAPSHOT" ]]; then
-    cd /tmp
-
-    jq=".build.projects.logstash.packages.\"logstash-$ELASTIC_STACK_VERSION-docker-image.tar.gz\".url"
-    result=$(curl --silent https://artifacts-api.elastic.co/v1/versions/$ELASTIC_STACK_VERSION/builds/latest | jq -r $jq)
-    echo $result
-    curl $result > logstash-docker-image.tar.gz
-    tar xfvz logstash-docker-image.tar.gz  repositories
-    echo "Loading docker image: "
-    cat repositories
-    docker load < logstash-docker-image.tar.gz
-    rm logstash-docker-image.tar.gz
-    cd -
-fi
-
- if [ -f Gemfile.lock ]; then
-    rm Gemfile.lock
-fi
-
- docker-compose -f ci/unit/docker-compose.yml down
-docker-compose -f ci/unit/docker-compose.yml build

data/ci/unit/run.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
- # This is intended to be run inside the docker container as the command of the docker-compose.
-set -ex
-
- #bundle exec rspec -fd --pattern spec/**/*_spec.rb,spec/**/*_specs.rb
-bundle exec rspec -fd