Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare for Ruby 3.4 release - add dependencies on previously default gems (base64/bigdecimal) #2986

Merged
merged 6 commits into from
Feb 12, 2024
Merged

Prepare for Ruby 3.4 release - add dependencies on previously default gems (base64/bigdecimal) #2986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9786500
Specify dependencies on base64 and bigdecimal
alextwoods Feb 12, 2024
cde48f8
Add bigdecimal to ddb
alextwoods Feb 12, 2024
0b86871
Specify dependencies on base64 and bigdecimal
alextwoods Feb 12, 2024
57cce96
Add bigdecimal to ddb
alextwoods Feb 12, 2024
e424951
Merge branch 'add_deps' of github.com:aws/aws-sdk-ruby into add_deps
alextwoods Feb 12, 2024
cabbb6e
Fix mustache issue
alextwoods Feb 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion build_tools/aws-sdk-code-generator/lib/aws-sdk-code-generator/views/gemspec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,11 @@ def deprecated?
@service.deprecated?
end

Dependency = Struct.new(:gem, :version)
Dependency = Struct.new(:gem, :version) do
def gem_version
[gem, version].compact.map { |s| "'#{s}'"}.join(', ')
end
end

end
end
Expand Down
2 changes: 1 addition & 1 deletion build_tools/aws-sdk-code-generator/templates/gemspec.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Gem::Specification.new do |spec|

{{/metadata}}
{{#dependencies}}
spec.add_dependency('{{gem}}', '{{&version}}')
spec.add_dependency({{{gem_version}}})
{{/dependencies}}

spec.required_ruby_version = '>= 2.5'
Expand Down
2 changes: 2 additions & 0 deletions gems/aws-sdk-core/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Unreleased Changes
------------------

* Issue - Add base64 as dependency to prepare for Ruby 3.4 release (#2984).

3.191.1 (2024-02-07)
------------------

Expand Down
1 change: 1 addition & 0 deletions gems/aws-sdk-core/aws-sdk-core.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Gem::Specification.new do |spec|
spec.add_dependency('aws-partitions', '~> 1', '>= 1.651.0') # necessary for new endpoint resolution
spec.add_dependency('aws-sigv4', '~> 1.8') # necessary for s3 express auth
spec.add_dependency('aws-eventstream', '~> 1', '>= 1.3.0') # necessary for binary eventstream
spec.add_dependency('base64') # necessary for base64 encoding/decoding

spec.metadata = {
'source_code_uri' => 'https://github.com/aws/aws-sdk-ruby/tree/version-3/gems/aws-sdk-core',
Expand Down
23 changes: 10 additions & 13 deletions services.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,13 +365,19 @@
"Aws::DynamoDB::Plugins::ExtendedRetries",
"Aws::DynamoDB::Plugins::SimpleAttributes",
"Aws::DynamoDB::Plugins::CRC32Validation"
]
],
"dependencies": {
"bigdecimal": null
}
},
"DynamoDBStreams": {
"models": "streams.dynamodb/2012-08-10",
"addPlugins": [
"Aws::DynamoDBStreams::Plugins::SimpleAttributes"
]
],
"dependencies": {
"bigdecimal": null
}
},
"EBS": {
"models": "ebs/2019-11-02"
Expand All @@ -381,10 +387,7 @@
"addPlugins": [
"Aws::EC2::Plugins::CopyEncryptedSnapshot",
"Aws::EC2::Plugins::RegionValidation"
],
"dependencies": {
"aws-sigv4": "~> 1.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm thinking that we are getting rid of the aws-sigv4 dependency here since it is already noted in the core, right? No reason to restate this dependency in both areas and etc.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not only is it a dependency in core - the codegen already separately adds it as a dependency: https://github.com/aws/aws-sdk-ruby/blob/version-3/build_tools/services.rb#L162

}
]
},
"EC2InstanceConnect": {
"models": "ec2-instance-connect/2018-04-02"
Expand Down Expand Up @@ -924,10 +927,7 @@
"models": "rds/2014-10-31",
"addPlugins": [
"Aws::RDS::Plugins::CrossRegionCopying"
],
"dependencies": {
"aws-sigv4": "~> 1.0"
}
]
},
"RDSDataService": {
"models": "rds-data/2018-08-01"
Expand Down Expand Up @@ -1019,9 +1019,6 @@
},
"S3Control": {
"models": "s3control/2018-08-20",
"dependencies": {
"aws-sigv4": "~> 1.1"
},
"addPlugins": [
"Aws::S3Control::Plugins::ARN",
"Aws::S3Control::Plugins::Dualstack",
Expand Down