Fixing ruby 2.7 warnings in third party gems

1
2
3
4
5
6
7
8
9
10
11
12
gem "activesupport"
gem "aws-sdk-s3"
gem "aws-sdk-sqs"
gem "dotenv"
gem "foreman"
gem "httparty"
gem "minitest"
gem "rack-test"
gem "rake"
gem "rlua", git: "https://github.com/whitequark/rlua", branch: "master"
gem "sinatra"
gem "zeitwerk"

1
2
3
4
5
6
7
8
9
def call(context)
  if
    context.http_request.body &&
    context.http_request.body.size > 0
  then
    context.http_request.headers['expect'] = '100-continue'
  end
  @handler.call(context)
end

1
2
3
4
5
6
def call(context)
  if context.http_request.body && context.http_request.body.size > 0
    context.http_request.headers['expect'] = '100-continue'
  end
  @handler.call(context)
end

1
2
3
4
5
# from
!xml.match(/<[\w_]/)

# to
!xml.match(/<\w/)

1
2
3
4
5
6
7
def create_bucket(options = {})
  resp = @client.create_bucket(options)
  Bucket.new(
    name: options[:bucket],
    client: @client
  )
end

1
2
3
4
5
6
# WARNING ABOUT GENERATED CODE
#
# This file is generated. See the contributing guide for more information:
# https://github.com/aws/aws-sdk-ruby/blob/master/CONTRIBUTING.md
#
# WARNING ABOUT GENERATED CODE

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
# @option options [required, Hash] :request
# @option options [Boolean] :resp (false)
# @option options [Boolean] :merge (true)
def build(options)
  request = options.fetch(:request)
  merge = options.fetch(:merge, true)
  streaming = options.fetch(:streaming, false)
  params = ResourceClientRequestParams.new(params: request['params'])
  parts = []
  parts << request_options(params) if merge
  parts << assignment(options)
  parts << "@client."
  parts << operation_name(request)
  parts << arguments(merge, params, streaming)
  parts.join
end

def assignment(options)
  if options.fetch(:resp, false)
    'resp = '
  else
    ''
  end
end

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
module AwsSdkCodeGenerator
  class ResourceActionCode

    def initialize(options)
      action = options.fetch(:action)
      @request = action.fetch('request')
      @resource = action.fetch('resource', nil)
      @streaming = options.fetch(:streaming, false)
    end

    def build
      parts = []
      if batch_action?
        parts << 'batch = []'
        parts << client_request
        parts << ResourceBatchBuilder.new(resource: @resource).build
        parts << "#{resource_type}::Collection.new([batch], size: batch.size)"
      elsif resource_action?
        parts << client_request
        parts << ResourceBuilder.new(resource: @resource, request_made: true).build
      else
        parts << client_request
        parts << 'resp.data'
      end
      parts.join("\n").rstrip
    end

    private

    def client_request
      ResourceClientRequest.build(request: @request, resp: true, streaming: @streaming)
    end

    # ...
  end
end

1
2
3
4
5
6
7
8
9
10
# from
elsif resource_action?
  parts << client_request
  parts << ResourceBuilder.new(resource: @resource, request_made: true).build

# to
elsif resource_action?
  parts << client_request
  parts << ResourceBuilder.new(resource: @resource, request_made: true).build
  parts << "hello"

1
2
3
4
5
6
7
8
9
10
def put_object(options = {})
  options = options.merge(bucket: @name)
  resp = @client.put_object(options)
  Object.new(
    bucket_name: @name,
    key: options[:key],
    client: @client
  )
  hello
end

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
# from
def build
  parts = []
  if batch_action?
    parts << 'batch = []'
    parts << client_request
    parts << ResourceBatchBuilder.new(resource: @resource).build
    parts << "#{resource_type}::Collection.new([batch], size: batch.size)"
  elsif resource_action?
    parts << client_request
    parts << ResourceBuilder.new(resource: @resource, request_made: true).build
  else
    parts << client_request
    parts << 'resp.data'
  end
  parts.join("\n").rstrip
end

private

def client_request
  ResourceClientRequest.build(request: @request, resp: true, streaming: @streaming)
end

# to
def build
  parts = []
  if batch_action?
    parts << 'batch = []'
    parts << client_request
    parts << ResourceBatchBuilder.new(resource: @resource).build
    parts << "#{resource_type}::Collection.new([batch], size: batch.size)"
  elsif resource_action?
    parts << client_request(false)
    parts << ResourceBuilder.new(resource: @resource, request_made: true).build
  else
    parts << client_request
    parts << 'resp.data'
  end
  parts.join("\n").rstrip
end

private

def client_request(resp = true)
  ResourceClientRequest.build(request: @request, resp: resp, streaming: @streaming)
end

1
2
3
4
5
6
7
8
9
10
11
12
13
def initiate_multipart_upload(options = {})
  options = options.merge(
    bucket: @bucket_name,
    key: @key
  )
  @client.create_multipart_upload(options)
  MultipartUpload.new(
    bucket_name: @bucket_name,
    object_key: @key,
    id: resp.data.upload_id,
    client: @client
  )
end

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
module AwsSdkCodeGenerator
  class ResourceBuilder

    # @option options [required, Hash] :resource
    # @option options [required, Boolean] :request_made
    def initialize(options = {})
      @resource = options.fetch(:resource)
      @request_made = options.fetch(:request_made)
    end

    def build
      "#{resource_class}.new(#{constructor_options})"
    end

    private

    def resource_class
      @resource['type']
    end

    def constructor_options
      options = {}
      options.update(identifiers)
      options[:data] = data_path if @resource['path']
      options[:client] = "@client"
      HashFormatter.new(wrap:false).format(options)
    end

    def identifiers
      (@resource['identifiers'] || []).inject({}) do |hash, identifier|
        value = ResourceValueSource.new(identifier).to_s
        hash[Underscore.underscore(identifier['target']).to_sym] = value
        hash
      end
    end

    def data_path
      if @request_made
        ResourceValueSource.new('source' => 'response', 'path' => @resource['path'])
      else
        ResourceValueSource.new('source' => 'data', 'path' => @resource['path'])
      end
    end

  end
end

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
def build
  parts = []
  if batch_action?
    parts << 'batch = []'
    parts << client_request
    parts << ResourceBatchBuilder.new(resource: @resource).build
    parts << "#{resource_type}::Collection.new([batch], size: batch.size)"
  elsif resource_action?
    parts << client_request(@resource['identifiers'].any? { |i| i['source'] == 'response' })
    parts << ResourceBuilder.new(resource: @resource, request_made: true).build
  else
    parts << client_request
    parts << 'resp.data'
  end
  parts.join("\n").rstrip
end

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
# resource_builder.rb:
def constructor_options
  options = {}
  options.update(identifiers)
  options[:data] = data_path if @resource['path']
  options[:client] = "@client"
  HashFormatter.new(wrap:false).format(options)
end

# ...
def data_path
  if @request_made
    ResourceValueSource.new('source' => 'response', 'path' => @resource['path'])
  else
    ResourceValueSource.new('source' => 'data', 'path' => @resource['path'])
  end
end

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
def build
  parts = []
  if batch_action?
    parts << 'batch = []'
    parts << client_request
    parts << ResourceBatchBuilder.new(resource: @resource).build
    parts << "#{resource_type}::Collection.new([batch], size: batch.size)"
  elsif resource_action?
    parts << client_request(
      @resource['identifiers'].any? { |i| i['source'] == 'response' } || @resource['path']
    )
    parts << ResourceBuilder.new(resource: @resource, request_made: true).build
  else
    parts << client_request
    parts << 'resp.data'
  end
  parts.join("\n").rstrip
end

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
# gems/aws-sdk-s3/lib/aws-sdk-s3.rb`

# [...]
require_relative 'aws-sdk-s3/bucket'
# [... more requires ...]
require_relative 'aws-sdk-s3/customizations'
require_relative 'aws-sdk-s3/event_streams'


# gems/aws-sdk-s3/lib/aws-sdk-s3/customizations.rb

# [...]

require 'aws-sdk-s3/customizations/bucket'
require 'aws-sdk-s3/customizations/object'
require 'aws-sdk-s3/customizations/object_summary'
require 'aws-sdk-s3/customizations/multipart_upload'
require 'aws-sdk-s3/customizations/types/list_object_versions_output'


# gems/aws-sdk-s3/lib/aws-sdk-s3/customizations/bucket.rb`

require 'uri'

module Aws
  module S3
    class Bucket
      # Save the old initialize method so that we can call 'super'.
      old_initialize = instance_method(:initialize)
      # Define a new initialize method that extracts out a bucket ARN.
      define_method(:initialize) do |*args|
        old_initialize.bind(self).call(*args)
        bucket_name, region, arn = Plugins::BucketARN.resolve_arn!(
          name,
          client.config.region,
          client.config.s3_use_arn_region
        )
        @name = bucket_name
        @client.config.region = region
        @arn = arn
      end

      [...]
    end
  end
end

1
2
3
4
5
6
7
8
9
10
11
12
13
14
def redefine_method(method, &block)
  visibility = method_visibility(method)
  silence_redefinition_of_method(method)
  define_method(method, &block)
  send(visibility, method)
end

def silence_redefinition_of_method(method)
  if method_defined?(method) || private_method_defined?(method)
    # This suppresses the "method redefined" warning; the self-alias
    # looks odd, but means we don't need to generate a unique name
    alias_method method, method
  end
end

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
hugopeixoto@laptop:~/w/m/ai-competition$ git diff gems.rb
diff --git a/gems.rb b/gems.rb
index 7ad8d16..dc69e9e 100644
--- a/gems.rb
+++ b/gems.rb
@@ -1,7 +1,7 @@
 source "https://rubygems.org"

 gem "activesupport"
-gem "aws-sdk-s3"
+gem "aws-sdk-s3", path: "/home/hugopeixoto/work/contrib/aws-sdk-ruby/gems/aws-sdk-s3"
 gem "aws-sdk-sqs"
 gem "byebug"
 gem "dotenv"

hugopeixoto@laptop:~/w/m/ai-competition$ bundle update
Fetching https://github.com/whitequark/rlua
Fetching gem metadata from https://rubygems.org/...........
Resolving dependencies...
Bundler could not find compatible versions for gem "aws-sdk-core":
  In gems.rb:
    aws-sdk-s3 was resolved to 1.64.0, which depends on
      aws-sdk-core (~> 3, >= 3.96.1)

    aws-sdk-sqs was resolved to 1.25.0, which depends on
      aws-sdk-core (~> 3, >= 3.71.0)

Could not find gem 'aws-sdk-core (~> 3, >= 3.96.1)', which is required by gem 'aws-sdk-s3', in any of the sources.

1
2
3
4
5
6
7
8
9
10
11
12
13
hugopeixoto@laptop:~/w/c/aws-sdk-ruby$ git diff gems/aws-sdk-s3/aws-sdk-s3.gemspec
diff --git a/gems/aws-sdk-s3/aws-sdk-s3.gemspec b/gems/aws-sdk-s3/aws-sdk-s3.gemspec
index cd7652f65..fa34b5130 100644
--- a/gems/aws-sdk-s3/aws-sdk-s3.gemspec
+++ b/gems/aws-sdk-s3/aws-sdk-s3.gemspec
@@ -25,6 +25,6 @@ Gem::Specification.new do |spec|

   spec.add_dependency('aws-sdk-kms', '~> 1')
   spec.add_dependency('aws-sigv4', '~> 1.1')
-  spec.add_dependency('aws-sdk-core', '~> 3', '>= 3.83.0')
+  spec.add_dependency('aws-sdk-core', '~> 3', '>= 3.96.1')

 end

1
2
3
4
5
6
7
8
9
10
11
12
13
1) ensure no hard-coded region /home/hugopeixoto/work/contrib/aws-sdk-ruby/gems/aws-sdk-s3/lib/aws-sdk-s3/customizations/bucket.rb has no hard-coded region
   Failure/Error: expect(val).not_to match(/(us|eu|ap|sa|ca)-[a-zA-Z]+-\d+/)

     expected "        if (client.config.region == 'us-east-1') &&\n" not to match /(us|eu|ap|sa|ca)-[a-zA-Z]+-\d+/
     Diff:
     @@ -1,2 +1,2 @@
     -/(us|eu|ap|sa|ca)-[a-zA-Z]+-\d+/
     +        if (client.config.region == 'us-east-1') &&

   # ./build_tools/spec/region_spec.rb:48:in `block (5 levels) in <top (required)>'
   # ./build_tools/spec/region_spec.rb:38:in `each'
   # ./build_tools/spec/region_spec.rb:38:in `each_with_index'
   # ./build_tools/spec/region_spec.rb:38:in `block (4 levels) in <top (required)>'