From 93b7e5c25e008cd329f5dd97d795c001f6102033 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 21 Jun 2019 21:09:42 +0000 Subject: [PATCH 1/5] Update aws-sdk requirement from ~> 2.3 to >= 2.3, < 4.0 Updates the requirements on [aws-sdk](https://github.com/aws/aws-sdk-ruby) to permit the latest version. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/master/gems/aws-sdk/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) Signed-off-by: dependabot[bot] --- sensu-plugins-http.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sensu-plugins-http.gemspec b/sensu-plugins-http.gemspec index c9da208..9bbb1b3 100644 --- a/sensu-plugins-http.gemspec +++ b/sensu-plugins-http.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength s.add_runtime_dependency 'sensu-plugin', '~> 4.0' - s.add_runtime_dependency 'aws-sdk', '~> 2.3' + s.add_runtime_dependency 'aws-sdk', '>= 2.3', '< 4.0' s.add_runtime_dependency 'oj', '~> 2.18' s.add_runtime_dependency 'rest-client', '~> 2.0.2' From b2c11fc1ff8929a26e4e65e2e61b3ac9db263d32 Mon Sep 17 00:00:00 2001 From: Jef Spaleta Date: Fri, 17 Jan 2020 16:15:59 -0900 Subject: [PATCH 2/5] updated aws-sdk to latest minor release --- CHANGELOG.md | 1 + sensu-plugins-http.gemspec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 826e3bc..22e3da3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ This CHANGELOG follows the format listed [here](https://github.com/sensu-plugins ### Breaking Change - Updated json requirement from '< 2.0.0' to '~> 2.3' +- Updated aws-sdk requirement from '~> 2.3' to '~> 3.0' ### Fixed - `check-http.rb`: An empty response body when using `-w` no longer creates a potentially confusing `no implicit conversion of nil into String` error diff --git a/sensu-plugins-http.gemspec b/sensu-plugins-http.gemspec index 9b7cee5..8b87a5d 100644 --- a/sensu-plugins-http.gemspec +++ b/sensu-plugins-http.gemspec @@ -34,7 +34,7 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength s.add_runtime_dependency 'sensu-plugin', '~> 4.0' - s.add_runtime_dependency 'aws-sdk', '>= 2.3', '< 4.0' + s.add_runtime_dependency 'aws-sdk', '~> 3.0' s.add_runtime_dependency 'oj', '~> 2.18' s.add_runtime_dependency 'rest-client', '~> 2.1' From bcd4c94651d336551cb4d43dc8dd5e74ccb66c55 Mon Sep 17 00:00:00 2001 From: Jef Spaleta Date: Sat, 18 Jan 2020 13:56:43 -0900 Subject: [PATCH 3/5] extend travis wait time for kitchen scripts --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 05c79b7..0121853 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ script: - gem build sensu-plugins-http.gemspec - gem install sensu-plugins-http-*.gem - bundle exec rake quick - - bundle exec rake kitchen:ruby-`echo $TRAVIS_RUBY_VERSION | sed -e "s/\.//g"`-debian-8 + - travis_wait bundle exec rake kitchen:ruby-`echo $TRAVIS_RUBY_VERSION | sed -e "s/\.//g"`-debian-8 before_deploy: - bash -c "[ ! -d bonsai/ ] && git clone https://github.com/sensu/sensu-go-bonsai-asset.git bonsai || echo 'bonsai/ exists, skipping git clone'; cp asset_build_scripts/Dockerfile.* bonsai/ruby-runtime/" deploy: From 90e23591f3ac6b7a67bb738bfef5105bb145139e Mon Sep 17 00:00:00 2001 From: Jef Spaleta Date: Sat, 18 Jan 2020 14:29:26 -0900 Subject: [PATCH 4/5] fix warning from kitchen, and extend kitchen wait further --- .travis.yml | 2 +- sensu-plugins-http.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0121853..b0597c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ script: - gem build sensu-plugins-http.gemspec - gem install sensu-plugins-http-*.gem - bundle exec rake quick - - travis_wait bundle exec rake kitchen:ruby-`echo $TRAVIS_RUBY_VERSION | sed -e "s/\.//g"`-debian-8 + - travis_wait 30 bundle exec rake kitchen:ruby-`echo $TRAVIS_RUBY_VERSION | sed -e "s/\.//g"`-debian-8 before_deploy: - bash -c "[ ! -d bonsai/ ] && git clone https://github.com/sensu/sensu-go-bonsai-asset.git bonsai || echo 'bonsai/ exists, skipping git clone'; cp asset_build_scripts/Dockerfile.* bonsai/ruby-runtime/" deploy: diff --git a/sensu-plugins-http.gemspec b/sensu-plugins-http.gemspec index 31ab80c..f081ae3 100644 --- a/sensu-plugins-http.gemspec +++ b/sensu-plugins-http.gemspec @@ -46,7 +46,7 @@ Gem::Specification.new do |s| # rubocop:disable Metrics/BlockLength s.add_development_dependency 'kitchen-vagrant', '~> 1.3' s.add_development_dependency 'pry', '~> 0.10' s.add_development_dependency 'rake', '~> 13.0' - s.add_development_dependency 'rdoc' + s.add_development_dependency 'rdoc', '~> 4.2' s.add_development_dependency 'redcarpet', '~> 3.2' s.add_development_dependency 'rspec', '~> 3.1' s.add_development_dependency 'rubocop', '~> 0.79.0' From 54ee3bb96f20c81f9fcdf1077bb2a36a25d43ba5 Mon Sep 17 00:00:00 2001 From: Jef Spaleta Date: Sat, 18 Jan 2020 15:14:02 -0900 Subject: [PATCH 5/5] extend kitchen wait further --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b0597c9..7cab217 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ script: - gem build sensu-plugins-http.gemspec - gem install sensu-plugins-http-*.gem - bundle exec rake quick - - travis_wait 30 bundle exec rake kitchen:ruby-`echo $TRAVIS_RUBY_VERSION | sed -e "s/\.//g"`-debian-8 + - travis_wait 60 bundle exec rake kitchen:ruby-`echo $TRAVIS_RUBY_VERSION | sed -e "s/\.//g"`-debian-8 before_deploy: - bash -c "[ ! -d bonsai/ ] && git clone https://github.com/sensu/sensu-go-bonsai-asset.git bonsai || echo 'bonsai/ exists, skipping git clone'; cp asset_build_scripts/Dockerfile.* bonsai/ruby-runtime/" deploy: