Skip to content

Commit 8a14918

Browse files
authored
Merge pull request #596 from k1LoW/drop-support-for-ruby-2.x
fix: Drop support for Ruby 2.x
2 parents 7c19ade + c99a532 commit 8a14918

18 files changed

+62
-64
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,11 @@ jobs:
3535
fail-fast: false
3636
matrix:
3737
ruby-version:
38-
- '2.3'
39-
- '2.4'
40-
- '2.5'
41-
- '2.6'
42-
- '2.7'
4338
- '3.0'
4439
- '3.1'
4540
- '3.2'
41+
- '3.3'
42+
- '3.4'
4643
runs-on: ubuntu-latest
4744
env:
4845
DISABLE_AWS_CLIENT_CHECK: true

Rakefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ begin
66
require 'rspec'
77
require 'rspec/core'
88
require 'rspec/core/rake_task'
9-
require 'octorelease' unless ENV['CI']
109
require 'parallel'
1110
require 'rubocop/rake_task'
1211
rescue LoadError

awspec.gemspec

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ Gem::Specification.new do |spec|
2020
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
2121
spec.require_paths = ['lib']
2222

23-
spec.required_ruby_version = '>= 2.3'
23+
spec.required_ruby_version = '>= 3.0'
2424
spec.add_runtime_dependency 'addressable'
2525
spec.add_runtime_dependency 'awsecrets', '~> 1'
2626
spec.add_runtime_dependency 'aws-sdk', '~> 3'
27+
spec.add_runtime_dependency 'base64', '~> 0.1.0'
2728
spec.add_runtime_dependency 'dry-inflector'
2829
spec.add_runtime_dependency 'ipaddress'
30+
spec.add_runtime_dependency 'ostruct', '~> 0.6.1'
2931
spec.add_runtime_dependency 'rspec', '~> 3.0'
3032
spec.add_runtime_dependency 'rspec-its'
3133
spec.add_runtime_dependency 'term-ansicolor'

doc/resource_types.md

Lines changed: 31 additions & 31 deletions
Large diffs are not rendered by default.

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
module Awspec::Generator
44
module Doc
55
module Type
6-
class RdsDbCluster < Base
6+
class RdsDBCluster < Base
77
def initialize
88
super
9-
@type_name = 'RdsDbCluster'
10-
@type = Awspec::Type::RdsDbCluster.new('my-rds-db-cluster')
9+
@type_name = 'RdsDBCluster'
10+
@type = Awspec::Type::RdsDBCluster.new('my-rds-db-cluster')
1111
@ret = @type.resource_via_client
1212
@matchers = [
13-
Awspec::Type::RdsDbCluster::STATES.map { |state| "be_#{state.tr('-', '_')}" }.join(', ')
13+
Awspec::Type::RdsDBCluster::STATES.map { |state| "be_#{state.tr('-', '_')}" }.join(', ')
1414
]
15-
@ignore_matchers = Awspec::Type::RdsDbCluster::STATES.map { |state| "be_#{state.tr('-', '_')}" }
15+
@ignore_matchers = Awspec::Type::RdsDBCluster::STATES.map { |state| "be_#{state.tr('-', '_')}" }
1616
@describes = []
1717
end
1818
end

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
module Awspec::Generator
44
module Doc
55
module Type
6-
class RdsDbClusterParameterGroup < Base
6+
class RdsDBClusterParameterGroup < Base
77
def initialize
88
super
9-
@type = Awspec::Type::RdsDbClusterParameterGroup.new('my-rds-db-cluster-parameter-group')
9+
@type = Awspec::Type::RdsDBClusterParameterGroup.new('my-rds-db-cluster-parameter-group')
1010
@matchers = []
1111
@ignore_matchers = []
1212
@describes = []

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
module Awspec::Generator
44
module Doc
55
module Type
6-
class RdsDbParameterGroup < Base
6+
class RdsDBParameterGroup < Base
77
def initialize
88
super
9-
@type = Awspec::Type::RdsDbParameterGroup.new('my-rds-db-parameter-group')
9+
@type = Awspec::Type::RdsDBParameterGroup.new('my-rds-db-parameter-group')
1010
@matchers = []
1111
@ignore_matchers = []
1212
@describes = []

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
module Awspec::Generator
44
module Doc
55
module Type
6-
class RdsDbSubnetGroup < Base
6+
class RdsDBSubnetGroup < Base
77
def initialize
88
super
9-
@type_name = 'RdsDbSubnetGroup'
10-
@type = Awspec::Type::RdsDbSubnetGroup.new('my-rds-db-subnet-group')
9+
@type_name = 'RdsDBSubnetGroup'
10+
@type = Awspec::Type::RdsDBSubnetGroup.new('my-rds-db-subnet-group')
1111
@ret = @type.resource_via_client
1212
@matchers = %w[belong_to_vpc belong_to_subnet]
1313
@ignore_matchers = []

lib/awspec/generator/spec/rds_db_cluster.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module Awspec::Generator
44
module Spec
5-
class RdsDbCluster
5+
class RdsDBCluster
66
include Awspec::Helper::Finder
77
def generate(db_cluster_identifier)
88
cluster = find_db_cluster(db_cluster_identifier)

lib/awspec/generator/spec/rds_db_cluster_parameter_group.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module Awspec::Generator
44
module Spec
5-
class RdsDbClusterParameterGroup
5+
class RdsDBClusterParameterGroup
66
include Awspec::Helper::Finder
77
def generate_by_parameter_group(parameter_group)
88
@parameter_group = parameter_group

0 commit comments

Comments
 (0)