From 6642932d30040203e1920d13843a1b86df9c32b3 Mon Sep 17 00:00:00 2001 From: yuenmichelle1 Date: Thu, 30 Jan 2025 15:57:48 -0600 Subject: [PATCH 1/3] update to be compatible with ruby 3 by replacing aws-sdk to more specific aws-sdk-kinesis --- .github/workflows/run_tests_CI.yml | 2 +- Dockerfile | 2 +- lib/zoo_stream/kinesis_publisher.rb | 4 ++-- zoo_stream.gemspec | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run_tests_CI.yml b/.github/workflows/run_tests_CI.yml index 0601712..53a897d 100644 --- a/.github/workflows/run_tests_CI.yml +++ b/.github/workflows/run_tests_CI.yml @@ -11,7 +11,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.0 bundler-cache: true - name: Run tests run: bundle exec rspec diff --git a/Dockerfile b/Dockerfile index f0f072a..bbbc809 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:2.7-slim +FROM ruby:3.1-slim WORKDIR /app diff --git a/lib/zoo_stream/kinesis_publisher.rb b/lib/zoo_stream/kinesis_publisher.rb index 6846ddb..7af62c7 100644 --- a/lib/zoo_stream/kinesis_publisher.rb +++ b/lib/zoo_stream/kinesis_publisher.rb @@ -1,4 +1,4 @@ -require 'aws-sdk' +require 'aws-sdk-kinesis' module ZooStream class KinesisPublisher @@ -11,7 +11,7 @@ def initialize(stream_name: ENV.fetch("ZOO_STREAM_KINESIS_STREAM_NAME"), client: def publish(event, shard_by: nil) raise ArgumentError, "Must specify shard_by" unless shard_by - + client.put_record( stream_name: stream_name, partition_key: shard_by, diff --git a/zoo_stream.gemspec b/zoo_stream.gemspec index 93275dc..260fef7 100644 --- a/zoo_stream.gemspec +++ b/zoo_stream.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_dependency 'aws-sdk' + spec.add_dependency 'aws-sdk-kinesis' spec.add_development_dependency 'bundler', '~> 2.2' spec.add_development_dependency 'rake' From 40791da9e110251613c437696a942ffc9d240f45 Mon Sep 17 00:00:00 2001 From: yuenmichelle1 Date: Wed, 5 Feb 2025 20:47:01 -0600 Subject: [PATCH 2/3] ruby version set to 3.0 and version lock aws-sdk-kinesis --- .github/workflows/run_tests_CI.yml | 2 +- zoo_stream.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run_tests_CI.yml b/.github/workflows/run_tests_CI.yml index 53a897d..3584e8a 100644 --- a/.github/workflows/run_tests_CI.yml +++ b/.github/workflows/run_tests_CI.yml @@ -11,7 +11,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 3.0 + ruby-version: 3.0.1 bundler-cache: true - name: Run tests run: bundle exec rspec diff --git a/zoo_stream.gemspec b/zoo_stream.gemspec index 260fef7..9274282 100644 --- a/zoo_stream.gemspec +++ b/zoo_stream.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.add_dependency 'aws-sdk-kinesis' + spec.add_dependency 'aws-sdk-kinesis', '~> 1' spec.add_development_dependency 'bundler', '~> 2.2' spec.add_development_dependency 'rake' From b5aafbb22e9ff17d877b355b01d21932f6713454 Mon Sep 17 00:00:00 2001 From: yuenmichelle1 Date: Wed, 5 Feb 2025 21:35:47 -0600 Subject: [PATCH 3/3] prep for v 1.1.0 release --- CHANGELOG.md | 5 +++++ lib/zoo_stream/version.rb | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 44bad84..c57a924 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 1.1.0 + +* Ruby 3 compatibility + - Update aws-sdk to v3 and only install service specific aws-sdk-kinesis + # 1.0.1 * Made compatible down to Ruby 2.0.0 diff --git a/lib/zoo_stream/version.rb b/lib/zoo_stream/version.rb index fe6b62f..2869bd8 100644 --- a/lib/zoo_stream/version.rb +++ b/lib/zoo_stream/version.rb @@ -1,3 +1,3 @@ module ZooStream - VERSION = "1.0.1" + VERSION = "1.1.0" end