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.

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

Updating dependencies and minitar version #28

Merged
merged 8 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,19 @@
<!-- release_rollup -->

<!-- latest_stable_release -->
## [v8.0.9](https://github.com/chef/berkshelf/tree/v8.0.9) (2023-09-28)

#### Merged Pull Requests
- refactoring networking issues [#21](https://github.com/chef/berkshelf/pull/21) ([johnmccrae](https://github.com/johnmccrae))
- This resolves an issue where &quot;berks install&quot; fails due to a cert is already being in the hash table. [#23](https://github.com/chef/berkshelf/pull/23) ([nikhil2611](https://github.com/nikhil2611))
<!-- latest_stable_release -->

## [v8.0.7](https://github.com/chef/berkshelf/tree/v8.0.7) (2023-06-12)

#### Merged Pull Requests
- Added the SonarQube configuration [#16](https://github.com/chef/berkshelf/pull/16) ([nikhil2611](https://github.com/nikhil2611))
- Refactoring the gemspec for chef-17 support [#17](https://github.com/chef/berkshelf/pull/17) ([johnmccrae](https://github.com/johnmccrae))
- Fix cookbook dependency version validation against chef&#39;s required format to berks upload [#18](https://github.com/chef/berkshelf/pull/18) ([nikhil2611](https://github.com/nikhil2611))
<!-- latest_stable_release -->

## [v8.0.5](https://github.com/chef/berkshelf/tree/v8.0.5) (2022-10-27)

Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.0.7
8.0.9
4 changes: 2 additions & 2 deletions berkshelf.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ Gem::Specification.new do |s|

s.add_dependency "mixlib-shellout", ">= 2.0", "< 4.0"
s.add_dependency "cleanroom", "~> 1.0"
s.add_dependency "minitar", ">= 0.6"
s.add_dependency "minitar", ">= 0.6", "< 0.12"
s.add_dependency "retryable", ">= 2.0", "< 4.0"
s.add_dependency "solve", "~> 4.0"
s.add_dependency "thor", ">= 0.20"
s.add_dependency "octokit", "~> 4.0"
s.add_dependency "mixlib-archive", ">= 1.1.4", "< 2.0" # needed for ruby 3.0 / Dir.chdir removal
s.add_dependency "concurrent-ruby", "~> 1.0"
if RUBY_VERSION.match?(/3.0/)
s.add_dependency "chef", "~> 17.0" # needed for --skip-syntax-check
s.add_dependency "chef", "~> 17.10.122" # needed for --skip-syntax-check
elsif
s.add_dependency "chef", ">= 15.7.32"
end
Expand Down
2 changes: 1 addition & 1 deletion lib/berkshelf/ssl_policies.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def initialize
def add_trusted_cert(cert)
@store.add_cert(cert)
rescue OpenSSL::X509::StoreError => e
raise e unless e.message == "cert already in hash table"
raise e unless e.message.match(/cert already in hash table/)
end

def trusted_certs_dir
Expand Down
2 changes: 1 addition & 1 deletion lib/berkshelf/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Berkshelf
VERSION = "8.0.7".freeze
VERSION = "8.0.9".freeze
end
6 changes: 3 additions & 3 deletions spec/unit/berkshelf/berkshelf/api_client/connection_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -130,17 +130,17 @@
end

it "raises Berkshelf::APIClient::ServiceUnavailable for 500s" do
stub_request(:get, "http://supermarket.getchef.com/universe").to_return(status: [500, "Internal Server Error"])
stub_request(:get, "http://supermarket.getchef.com/universe").to_return(status: 500, body: "Internal Server Error")
expect { subject }.to raise_error(Berkshelf::APIClient::ServiceUnavailable)
end

it "raises Berkshelf::APIClient::ServiceNotFound for 404s" do
stub_request(:get, "http://supermarket.getchef.com/universe").to_return(status: [404, "Not Found"])
stub_request(:get, "http://supermarket.getchef.com/universe").to_return(status: 404, body: "Not Found")
expect { subject }.to raise_error(Berkshelf::APIClient::ServiceNotFound)
end

it "raises Net::HTTPBadRequest for 400s" do
stub_request(:get, "http://supermarket.getchef.com/universe").to_return(status: [400, "Bad Request"])
stub_request(:get, "http://supermarket.getchef.com/universe").to_return(status: 400, body: "Bad Request")
expect { subject }.to raise_error(Berkshelf::APIClient::BadResponse)
end

Expand Down
6 changes: 3 additions & 3 deletions spec/unit/berkshelf/community_rest_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
it "raises a CookbookNotFound error on a 404 response for a non-existent cookbook" do
stub_request(:get, "#{api_uri}/cookbooks/not_real/versions/1_0_0").to_return(
status: 404,
body: nil
body: "Not Found"
)

expect do
Expand Down Expand Up @@ -142,7 +142,7 @@
it "raises a CookbookNotFound error on a 404 response" do
stub_request(:get, "#{api_uri}/cookbooks/not_real").to_return(
status: 404,
body: nil
body: "Not Found"
)

expect do
Expand Down Expand Up @@ -177,7 +177,7 @@
it "raises a CookbookNotFound error on a 404 response" do
stub_request(:get, "#{api_uri}/cookbooks/not_real").to_return(
status: 404,
body: nil
body: "Not Found"
)

expect do
Expand Down
Loading