Merge pull request #596 from k1LoW/drop-support-for-ruby-2.x

fix: Drop support for Ruby 2.x

.github/workflows/ci.yml

@@ -35,14 +35,11 @@ jobs:
       fail-fast: false
       matrix:
         ruby-version:
-          - '2.3'
-          - '2.4'
-          - '2.5'
-          - '2.6'
-          - '2.7'
           - '3.0'
           - '3.1'
           - '3.2'
+          - '3.3'
+          - '3.4'
     runs-on: ubuntu-latest
     env:
       DISABLE_AWS_CLIENT_CHECK: true

Rakefile

@@ -6,7 +6,6 @@ begin
   require 'rspec'
   require 'rspec/core'
   require 'rspec/core/rake_task'
-  require 'octorelease' unless ENV['CI']
   require 'parallel'
   require 'rubocop/rake_task'
 rescue LoadError

awspec.gemspec

@@ -20,12 +20,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 3.0'
   spec.add_runtime_dependency 'addressable'
   spec.add_runtime_dependency 'awsecrets', '~> 1'
   spec.add_runtime_dependency 'aws-sdk', '~> 3'
+  spec.add_runtime_dependency 'base64', '~> 0.1.0'
   spec.add_runtime_dependency 'dry-inflector'
   spec.add_runtime_dependency 'ipaddress'
+  spec.add_runtime_dependency 'ostruct', '~> 0.6.1'
   spec.add_runtime_dependency 'rspec', '~> 3.0'
   spec.add_runtime_dependency 'rspec-its'
   spec.add_runtime_dependency 'term-ansicolor'

lib/awspec/generator/doc/type/rds_db_cluster.rb

@@ -3,16 +3,16 @@
 module Awspec::Generator
   module Doc
     module Type
-      class RdsDbCluster < Base
+      class RdsDBCluster < Base
         def initialize
           super
-          @type_name = 'RdsDbCluster'
-          @type = Awspec::Type::RdsDbCluster.new('my-rds-db-cluster')
+          @type_name = 'RdsDBCluster'
+          @type = Awspec::Type::RdsDBCluster.new('my-rds-db-cluster')
           @ret = @type.resource_via_client
           @matchers = [
-            Awspec::Type::RdsDbCluster::STATES.map { |state| "be_#{state.tr('-', '_')}" }.join(', ')
+            Awspec::Type::RdsDBCluster::STATES.map { |state| "be_#{state.tr('-', '_')}" }.join(', ')
           ]
-          @ignore_matchers = Awspec::Type::RdsDbCluster::STATES.map { |state| "be_#{state.tr('-', '_')}" }
+          @ignore_matchers = Awspec::Type::RdsDBCluster::STATES.map { |state| "be_#{state.tr('-', '_')}" }
           @describes = []
         end
       end

lib/awspec/generator/doc/type/rds_db_cluster_parameter_group.rb

@@ -3,10 +3,10 @@
 module Awspec::Generator
   module Doc
     module Type
-      class RdsDbClusterParameterGroup < Base
+      class RdsDBClusterParameterGroup < Base
         def initialize
           super
-          @type = Awspec::Type::RdsDbClusterParameterGroup.new('my-rds-db-cluster-parameter-group')
+          @type = Awspec::Type::RdsDBClusterParameterGroup.new('my-rds-db-cluster-parameter-group')
           @matchers = []
           @ignore_matchers = []
           @describes = []

lib/awspec/generator/doc/type/rds_db_parameter_group.rb

@@ -3,10 +3,10 @@
 module Awspec::Generator
   module Doc
     module Type
-      class RdsDbParameterGroup < Base
+      class RdsDBParameterGroup < Base
         def initialize
           super
-          @type = Awspec::Type::RdsDbParameterGroup.new('my-rds-db-parameter-group')
+          @type = Awspec::Type::RdsDBParameterGroup.new('my-rds-db-parameter-group')
           @matchers = []
           @ignore_matchers = []
           @describes = []

lib/awspec/generator/doc/type/rds_db_subnet_group.rb

@@ -3,11 +3,11 @@
 module Awspec::Generator
   module Doc
     module Type
-      class RdsDbSubnetGroup < Base
+      class RdsDBSubnetGroup < Base
         def initialize
           super
-          @type_name = 'RdsDbSubnetGroup'
-          @type = Awspec::Type::RdsDbSubnetGroup.new('my-rds-db-subnet-group')
+          @type_name = 'RdsDBSubnetGroup'
+          @type = Awspec::Type::RdsDBSubnetGroup.new('my-rds-db-subnet-group')
           @ret = @type.resource_via_client
           @matchers = %w[belong_to_vpc belong_to_subnet]
           @ignore_matchers = []

lib/awspec/generator/spec/rds_db_cluster.rb

@@ -2,7 +2,7 @@
 
 module Awspec::Generator
   module Spec
-    class RdsDbCluster
+    class RdsDBCluster
       include Awspec::Helper::Finder
       def generate(db_cluster_identifier)
         cluster = find_db_cluster(db_cluster_identifier)

lib/awspec/generator/spec/rds_db_cluster_parameter_group.rb

@@ -2,7 +2,7 @@
 
 module Awspec::Generator
   module Spec
-    class RdsDbClusterParameterGroup
+    class RdsDBClusterParameterGroup
       include Awspec::Helper::Finder
       def generate_by_parameter_group(parameter_group)
         @parameter_group = parameter_group

lib/awspec/generator/spec/rds_db_parameter_group.rb

@@ -2,7 +2,7 @@
 
 module Awspec::Generator
   module Spec
-    class RdsDbParameterGroup
+    class RdsDBParameterGroup
       include Awspec::Helper::Finder
       def generate_by_parameter_group(parameter_group)
         @parameter_group = parameter_group

lib/awspec/matcher/belong_to_subnet.rb

@@ -34,7 +34,7 @@
     end
 
     # RDS DB Subnet Group
-    if type.instance_of?(Awspec::Type::RdsDbSubnetGroup)
+    if type.instance_of?(Awspec::Type::RdsDBSubnetGroup)
       subnets = type.resource_via_client[:subnets]
       ret = subnets.find do |s|
         s[:subnet_identifier] == subnet_id

lib/awspec/type/rds_db_cluster.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Awspec::Type
-  class RdsDbCluster < ResourceBase
+  class RdsDBCluster < ResourceBase
     aws_resource Aws::RDS::Types::DBCluster
 
     def resource_via_client

lib/awspec/type/rds_db_cluster_parameter_group.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Awspec::Type
-  class RdsDbClusterParameterGroup < ResourceBase
+  class RdsDBClusterParameterGroup < ResourceBase
     def resource_via_client
       return @resource_via_client if @resource_via_client
 

lib/awspec/type/rds_db_parameter_group.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Awspec::Type
-  class InvalidRdsDbParameter < StandardError
+  class InvalidRdsDBParameter < StandardError
     ##
     # Overrides the superclass initialize method to include more information
     # and default error message.
@@ -19,7 +19,7 @@ class RdsDBParameters
     ##
     # Thanks to AWS for creating parameters names like
     # 'rds.accepted_password_auth_method', which would be caught as method 'rds'
-    # by method_missing in RdsDbParameterGroup class, this class was created
+    # by method_missing in RdsDBParameterGroup class, this class was created
     # See https://github.com/k1LoW/awspec/issues/527 for more details
     def initialize(params)
       @params = params
@@ -33,11 +33,11 @@ def method_missing(name)
       param_name = name.to_sym
       return @params[param_name] if @params.include?(param_name)
 
-      raise InvalidRdsDbParameter, name
+      raise InvalidRdsDBParameter, name
     end
   end
 
-  class RdsDbParameterGroup < ResourceBase
+  class RdsDBParameterGroup < ResourceBase
     def resource_via_client
       return @resource_via_client if @resource_via_client
 

lib/awspec/type/rds_db_subnet_group.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Awspec::Type
-  class RdsDbSubnetGroup < ResourceBase
+  class RdsDBSubnetGroup < ResourceBase
     aws_resource Aws::RDS::Types::DBSubnetGroup
 
     def resource_via_client

spec/generator/spec/rds_db_cluster_spec.rb

@@ -2,11 +2,11 @@
 
 require 'spec_helper'
 
-describe 'Awspec::Generator::Spec::RdsDbCluster' do
+describe 'Awspec::Generator::Spec::RdsDBCluster' do
   before do
     Awspec::Stub.load 'rds_db_cluster'
   end
-  let(:rds_db_cluster) { Awspec::Generator::Spec::RdsDbCluster.new }
+  let(:rds_db_cluster) { Awspec::Generator::Spec::RdsDBCluster.new }
   it 'generate spec' do
     spec = <<-'EOF'
 describe rds_db_cluster('my-rds-db-cluster') do

spec/type/rds_db_parameter_group_spec.rb

@@ -10,5 +10,5 @@
   its(:max_allowed_packet) { should eq '16777216' }
   its('rds.logical_replication') { should eq '1' }
   its('rds.accepted_password_auth_method') { should eq 'md5+scram' }
-  its('rds.foobar') { will raise_error(Awspec::Type::InvalidRdsDbParameter) }
+  its('rds.foobar') { will raise_error(Awspec::Type::InvalidRdsDBParameter) }
 end