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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 818efc953a67373bc805010913c45d885adf6ddc65f9e4488fe015593a776d13
4
- data.tar.gz: 3ef95cd4c7adbecfda0c8082bf63d936b4b14c2bfd44d3669f69467fa215fd0e
3
+ metadata.gz: bd7fc8e31d1c925fe7f8aa9f2fcd35ecf711060d15f3ec6b3bf1587ce6e3e853
4
+ data.tar.gz: 2bd3d32bd653b36eb943667b43b6fe495f3bf6a448aa4b7a21df2beba82f7386
5
5
  SHA512:
6
- metadata.gz: 9f6a6561d2a2e2ea97802f4473f2b7b77ae6ce71dbd23163d1ea1ede42dd7484ee78617594057163757aeea0846254b21dc377da0be2ea1677c119ba90c4c58f
7
- data.tar.gz: 4f72684a92ce299c13b8d9f507bd8168190ffb334be3a2e0c4c58e574ab149d596345bd874c0fbd193b00941adff2481074f1ce32095c0847bc199db454f27ea
6
+ metadata.gz: f0d7510ed02b889bab83f1837f4f4452d18573323f4fec480333fe9652b77db559a4289895fc858cc96794fd1625bd6a163282b35a99847f2eddd4718f942ac1
7
+ data.tar.gz: 1b9d536f7e0c4d5a5648696e6cf19d752e482407e765b8c4a2b0a3857ab608b790588ca8e28b27827c5ce5891e6ca17f1341e36fb1bc3fc7d304775e3215505f
@@ -1,16 +1,19 @@
1
1
  ---
2
- sudo: required
3
- services: docker
4
- addons:
5
- apt:
6
- packages:
7
- - docker-ce
2
+ sudo: false
3
+ language: ruby
4
+ cache: bundler
8
5
  matrix:
9
6
  include:
10
- - env: ELASTIC_STACK_VERSION=8.x SNAPSHOT=true
11
- - env: ELASTIC_STACK_VERSION=7.x SNAPSHOT=true
12
- - env: ELASTIC_STACK_VERSION=7.x
13
- - env: ELASTIC_STACK_VERSION=6.x
7
+ - rvm: jruby-9.1.13.0
8
+ env: LOGSTASH_BRANCH=master
9
+ - rvm: jruby-9.1.13.0
10
+ env: LOGSTASH_BRANCH=6.x
11
+ - rvm: jruby-9.1.13.0
12
+ env: LOGSTASH_BRANCH=6.5
13
+ - rvm: jruby-1.7.27
14
+ env: LOGSTASH_BRANCH=5.6
14
15
  fast_finish: true
15
- install: ci/unit/docker-setup.sh
16
- script: ci/unit/docker-run.sh
16
+ install: true
17
+ script: ci/build.sh
18
+ jdk: oraclejdk8
19
+ before_install: gem install bundler -v '< 2'
@@ -1,6 +1,6 @@
1
- ## 5.1.0
2
- - Updated `march_hare` dependency to `4.x`, which enables consumers to reliably manage a connection blocked/unblocked state machine that survives connection recovery.
3
- - Removed support for Logstash 5.x since `march_hare` >= 3.x is not compatible.
1
+ ## 6.0.0
2
+ - Removed obsolete options `verify_ssl`, `debug`, `tls_certificate_path` and `tls_certificate_password`
3
+
4
4
  ## 5.0.2
5
5
  - 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)
6
6
  ## 5.0.1
@@ -0,0 +1,21 @@
1
+ #!/bin/bash
2
+ # version: 1
3
+ ########################################################
4
+ #
5
+ # AUTOMATICALLY GENERATED! DO NOT EDIT
6
+ #
7
+ ########################################################
8
+ set -e
9
+
10
+ echo "Starting build process in: `pwd`"
11
+ source ./ci/setup.sh
12
+
13
+ if [[ -f "ci/run.sh" ]]; then
14
+ echo "Running custom build script in: `pwd`/ci/run.sh"
15
+ source ./ci/run.sh
16
+ else
17
+ echo "Running default build scripts in: `pwd`/ci/build.sh"
18
+ bundle install
19
+ bundle exec rake vendor
20
+ bundle exec rspec spec
21
+ fi
@@ -0,0 +1,26 @@
1
+ #!/bin/bash
2
+ # version: 1
3
+ ########################################################
4
+ #
5
+ # AUTOMATICALLY GENERATED! DO NOT EDIT
6
+ #
7
+ ########################################################
8
+ set -e
9
+ if [ "$LOGSTASH_BRANCH" ]; then
10
+ echo "Building plugin using Logstash source"
11
+ BASE_DIR=`pwd`
12
+ echo "Checking out branch: $LOGSTASH_BRANCH"
13
+ git clone -b $LOGSTASH_BRANCH https://github.com/elastic/logstash.git ../../logstash --depth 1
14
+ printf "Checked out Logstash revision: %s\n" "$(git -C ../../logstash rev-parse HEAD)"
15
+ cd ../../logstash
16
+ echo "Building plugins with Logstash version:"
17
+ cat versions.yml
18
+ echo "---"
19
+ # We need to build the jars for that specific version
20
+ echo "Running gradle assemble in: `pwd`"
21
+ ./gradlew assemble
22
+ cd $BASE_DIR
23
+ export LOGSTASH_SOURCE=1
24
+ else
25
+ echo "Building plugin using released gems on rubygems"
26
+ fi
@@ -54,18 +54,12 @@ module LogStash
54
54
  # Version of the SSL protocol to use.
55
55
  config :ssl_version, :validate => :string, :default => "TLSv1.2"
56
56
 
57
- config :verify_ssl, :validate => :boolean, :default => false,
58
- :obsolete => "This function did not actually function correctly and was removed." +
59
- "If you wish to validate SSL certs use the ssl_certificate_path and ssl_certificate_password options."
60
-
61
57
  # Path to an SSL certificate in PKCS12 (.p12) format used for verifying the remote host
62
58
  config :ssl_certificate_path, :validate => :path
63
59
 
64
60
  # Password for the encrypted PKCS12 (.p12) certificate file specified in ssl_certificate_path
65
61
  config :ssl_certificate_password, :validate => :password
66
62
 
67
- config :debug, :validate => :boolean, :obsolete => "Use the logstash --debug flag for this instead."
68
-
69
63
  # Set this to automatically recover from a broken connection. You almost certainly don't want to override this!!!
70
64
  config :automatic_recovery, :validate => :boolean, :default => true
71
65
 
@@ -81,12 +75,6 @@ module LogStash
81
75
  # Passive queue creation? Useful for checking queue existance without modifying server state
82
76
  config :passive, :validate => :boolean, :default => false
83
77
 
84
- # TLS certifcate path
85
- config :tls_certificate_path, :validate => :path, :obsolete => "This setting is obsolete. Use ssl_certificate_path instead"
86
-
87
- # TLS certificate password
88
- config :tls_certificate_password, :validate => :string, :obsolete => "This setting is obsolete. Use ssl_certificate_password instead"
89
-
90
78
  # Extra queue arguments as an array.
91
79
  # To make a RabbitMQ queue mirrored, use: `{"x-ha-policy" => "all"}`
92
80
  config :arguments, :validate => :array, :default => {}
@@ -1,7 +1,7 @@
1
1
 
2
2
  Gem::Specification.new do |s|
3
3
  s.name = 'logstash-mixin-rabbitmq_connection'
4
- s.version = '5.1.0'
4
+ s.version = '6.0.0'
5
5
  s.licenses = ['Apache License (2.0)']
6
6
  s.summary = "Common functionality for RabbitMQ plugins"
7
7
  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|
17
17
  s.test_files = s.files.grep(%r{^(test|spec|features)/})
18
18
 
19
19
  s.platform = RUBY_PLATFORM
20
-
21
- # MarchHare 3.x+ includes ruby syntax from 2.x
22
- # This effectively requires Logstash >= 6.x
23
- s.required_ruby_version = '>= 2.0.0'
24
-
25
- s.add_runtime_dependency 'march_hare', ['~> 4.0'] #(MIT license)
20
+ s.add_runtime_dependency 'march_hare', ['~> 3.0'] #(MIT license)
26
21
  s.add_runtime_dependency 'stud', '~> 0.0.22'
27
22
 
28
23
  s.add_development_dependency 'logstash-devutils'
metadata CHANGED
@@ -1,21 +1,21 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: logstash-mixin-rabbitmq_connection
3
3
  version: !ruby/object:Gem::Version
4
- version: 5.1.0
4
+ version: 6.0.0
5
5
  platform: java
6
6
  authors:
7
7
  - Elastic
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-09-06 00:00:00.000000000 Z
11
+ date: 2019-01-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  requirement: !ruby/object:Gem::Requirement
15
15
  requirements:
16
16
  - - "~>"
17
17
  - !ruby/object:Gem::Version
18
- version: '4.0'
18
+ version: '3.0'
19
19
  name: march_hare
20
20
  prerelease: false
21
21
  type: :runtime
@@ -23,7 +23,7 @@ dependencies:
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: '4.0'
26
+ version: '3.0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  requirement: !ruby/object:Gem::Requirement
29
29
  requirements:
@@ -97,11 +97,8 @@ files:
97
97
  - Gemfile
98
98
  - README.md
99
99
  - Rakefile
100
- - ci/unit/Dockerfile
101
- - ci/unit/docker-compose.yml
102
- - ci/unit/docker-run.sh
103
- - ci/unit/docker-setup.sh
104
- - ci/unit/run.sh
100
+ - ci/build.sh
101
+ - ci/setup.sh
105
102
  - lib/logstash/plugin_mixins/rabbitmq_connection.rb
106
103
  - logstash-mixin-rabbitmq_connection.gemspec
107
104
  - spec/fixtures/README.md
@@ -145,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
145
142
  requirements:
146
143
  - - ">="
147
144
  - !ruby/object:Gem::Version
148
- version: 2.0.0
145
+ version: '0'
149
146
  required_rubygems_version: !ruby/object:Gem::Requirement
150
147
  requirements:
151
148
  - - ">="
@@ -1,11 +0,0 @@
1
- ARG ELASTIC_STACK_VERSION
2
- FROM docker.elastic.co/logstash/logstash:$ELASTIC_STACK_VERSION
3
- COPY --chown=logstash:logstash Gemfile /usr/share/plugins/plugin/Gemfile
4
- COPY --chown=logstash:logstash *.gemspec /usr/share/plugins/plugin/
5
- RUN cp /usr/share/logstash/logstash-core/versions-gem-copy.yml /usr/share/logstash/versions.yml
6
- ENV PATH="${PATH}:/usr/share/logstash/vendor/jruby/bin"
7
- ENV LOGSTASH_SOURCE="1"
8
- RUN gem install bundler -v '< 2'
9
- WORKDIR /usr/share/plugins/plugin
10
- RUN bundle install
11
- COPY --chown=logstash:logstash . /usr/share/plugins/plugin
@@ -1,17 +0,0 @@
1
- version: '3'
2
-
3
- # run tests: cd ci/unit; docker-compose up --build --force-recreate
4
- # manual: cd ci/unit; docker-compose run logstash bash
5
- services:
6
-
7
- logstash:
8
- build:
9
- context: ../../
10
- dockerfile: ci/unit/Dockerfile
11
- args:
12
- - ELASTIC_STACK_VERSION=$ELASTIC_STACK_VERSION
13
- command: /usr/share/plugins/plugin/ci/unit/run.sh
14
- environment:
15
- LS_JAVA_OPTS: "-Xmx256m -Xms256m"
16
- LOGSTASH_SOURCE: 1
17
- tty: true
@@ -1,5 +0,0 @@
1
- #!/usr/bin/env bash
2
-
3
- # This is intended to be run inside the docker container as the command of the docker-compose.
4
- set -ex
5
- docker-compose -f ci/unit/docker-compose.yml up --exit-code-from logstash
@@ -1,55 +0,0 @@
1
- #!/usr/bin/env bash
2
-
3
- # This is intended to be run the plugin's root directory. `ci/unit/docker-test.sh`
4
- # Ensure you have Docker installed locally and set the ELASTIC_STACK_VERSION environment variable.
5
- set -e
6
-
7
- VERSION_URL="https://raw.githubusercontent.com/elastic/logstash/master/ci/logstash_releases.json"
8
-
9
- if [ -z "${ELASTIC_STACK_VERSION}" ]; then
10
- echo "Please set the ELASTIC_STACK_VERSION environment variable"
11
- echo "For example: export ELASTIC_STACK_VERSION=6.2.4"
12
- exit 1
13
- fi
14
-
15
- echo "Fetching versions from $VERSION_URL"
16
- VERSIONS=$(curl $VERSION_URL)
17
-
18
- if [[ "$SNAPSHOT" = "true" ]]; then
19
- ELASTIC_STACK_RETRIEVED_VERSION=$(echo $VERSIONS | jq '.snapshots."'"$ELASTIC_STACK_VERSION"'"')
20
- echo $ELASTIC_STACK_RETRIEVED_VERSION
21
- else
22
- ELASTIC_STACK_RETRIEVED_VERSION=$(echo $VERSIONS | jq '.releases."'"$ELASTIC_STACK_VERSION"'"')
23
- fi
24
-
25
- if [[ "$ELASTIC_STACK_RETRIEVED_VERSION" != "null" ]]; then
26
- # remove starting and trailing double quotes
27
- ELASTIC_STACK_RETRIEVED_VERSION="${ELASTIC_STACK_RETRIEVED_VERSION%\"}"
28
- ELASTIC_STACK_RETRIEVED_VERSION="${ELASTIC_STACK_RETRIEVED_VERSION#\"}"
29
- echo "Translated $ELASTIC_STACK_VERSION to ${ELASTIC_STACK_RETRIEVED_VERSION}"
30
- export ELASTIC_STACK_VERSION=$ELASTIC_STACK_RETRIEVED_VERSION
31
- fi
32
-
33
- echo "Testing against version: $ELASTIC_STACK_VERSION"
34
-
35
- if [[ "$ELASTIC_STACK_VERSION" = *"-SNAPSHOT" ]]; then
36
- cd /tmp
37
-
38
- jq=".build.projects.logstash.packages.\"logstash-$ELASTIC_STACK_VERSION-docker-image.tar.gz\".url"
39
- result=$(curl --silent https://artifacts-api.elastic.co/v1/versions/$ELASTIC_STACK_VERSION/builds/latest | jq -r $jq)
40
- echo $result
41
- curl $result > logstash-docker-image.tar.gz
42
- tar xfvz logstash-docker-image.tar.gz repositories
43
- echo "Loading docker image: "
44
- cat repositories
45
- docker load < logstash-docker-image.tar.gz
46
- rm logstash-docker-image.tar.gz
47
- cd -
48
- fi
49
-
50
- if [ -f Gemfile.lock ]; then
51
- rm Gemfile.lock
52
- fi
53
-
54
- docker-compose -f ci/unit/docker-compose.yml down
55
- docker-compose -f ci/unit/docker-compose.yml build
@@ -1,7 +0,0 @@
1
- #!/usr/bin/env bash
2
-
3
- # This is intended to be run inside the docker container as the command of the docker-compose.
4
- set -ex
5
-
6
- #bundle exec rspec -fd --pattern spec/**/*_spec.rb,spec/**/*_specs.rb
7
- bundle exec rspec -fd