Skip to content

Commit

Permalink
chefstyle fixes
Browse files Browse the repository at this point in the history
Signed-off-by: nikhil2611 <nikhilgupta2102@gmail.com>
  • Loading branch information
nikhil2611 committed Dec 13, 2023
1 parent 51e4e41 commit 5675d97
Show file tree
Hide file tree
Showing 16 changed files with 108 additions and 122 deletions.
12 changes: 5 additions & 7 deletions lib/chef-cli/policyfile/artifactory_cookbook_source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,12 @@ def preferred_source_for?(cookbook_name)
end

def universe_graph
@universe_graph ||= begin
full_community_graph.inject({}) do |normalized_graph, (cookbook_name, metadata_by_version)|
normalized_graph[cookbook_name] = metadata_by_version.inject({}) do |deps_by_version, (version, metadata)|
deps_by_version[version] = metadata["dependencies"]
deps_by_version
end
normalized_graph
@universe_graph ||= full_community_graph.inject({}) do |normalized_graph, (cookbook_name, metadata_by_version)|
normalized_graph[cookbook_name] = metadata_by_version.inject({}) do |deps_by_version, (version, metadata)|
deps_by_version[version] = metadata["dependencies"]
deps_by_version
end
normalized_graph
end
end

Expand Down
16 changes: 6 additions & 10 deletions lib/chef-cli/policyfile/chef_server_cookbook_source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,12 @@ def preferred_source_for?(cookbook_name)
end

def universe_graph
@universe_graph ||= begin
full_chef_server_graph.inject({}) do |normalized_graph, (cookbook_name, metadata_by_version)|
normalized_graph[cookbook_name] = metadata_by_version.inject({}) do |deps_by_version, (version, metadata)|
deps_by_version[version] = metadata["dependencies"]
deps_by_version
end
normalized_graph
@universe_graph ||= full_chef_server_graph.inject({}) do |normalized_graph, (cookbook_name, metadata_by_version)|
normalized_graph[cookbook_name] = metadata_by_version.inject({}) do |deps_by_version, (version, metadata)|
deps_by_version[version] = metadata["dependencies"]
deps_by_version
end
normalized_graph
end
end

Expand Down Expand Up @@ -90,9 +88,7 @@ def http_connection_for(base_url)

def full_chef_server_graph
@full_chef_server_graph ||=
begin
http_connection_for(uri.to_s).get("/universe")
end
http_connection_for(uri.to_s).get("/universe")
end
end
end
Expand Down
12 changes: 5 additions & 7 deletions lib/chef-cli/policyfile/community_cookbook_source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,12 @@ def ==(other)
end

def universe_graph
@universe_graph ||= begin
full_community_graph.inject({}) do |normalized_graph, (cookbook_name, metadata_by_version)|
normalized_graph[cookbook_name] = metadata_by_version.inject({}) do |deps_by_version, (version, metadata)|
deps_by_version[version] = metadata["dependencies"]
deps_by_version
end
normalized_graph
@universe_graph ||= full_community_graph.inject({}) do |normalized_graph, (cookbook_name, metadata_by_version)|
normalized_graph[cookbook_name] = metadata_by_version.inject({}) do |deps_by_version, (version, metadata)|
deps_by_version[version] = metadata["dependencies"]
deps_by_version
end
normalized_graph
end
end

Expand Down
14 changes: 6 additions & 8 deletions lib/chef-cli/policyfile/delivery_supermarket_source.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,13 @@ def default_source_args
end

def universe_graph
@universe_graph ||= begin
@community_source.universe_graph.inject({}) do |truncated, (cookbook_name, version_and_deps_list)|
sorted_versions = version_and_deps_list.keys.sort_by do |version_string|
Semverse::Version.new(version_string)
end
greatest_version = sorted_versions.last
truncated[cookbook_name] = { greatest_version => version_and_deps_list[greatest_version] }
truncated
@universe_graph ||= @community_source.universe_graph.inject({}) do |truncated, (cookbook_name, version_and_deps_list)|
sorted_versions = version_and_deps_list.keys.sort_by do |version_string|
Semverse::Version.new(version_string)
end
greatest_version = sorted_versions.last
truncated[cookbook_name] = { greatest_version => version_and_deps_list[greatest_version] }
truncated
end
end

Expand Down
30 changes: 13 additions & 17 deletions lib/chef-cli/policyfile/policyfile_location_specification.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,20 +62,18 @@ def revision_id

# @return A policyfile lock fetcher compatible with the given source_options
def fetcher
@fetcher ||= begin
if source_options[:path] && !source_options[:git]
Policyfile::LocalLockFetcher.new(name, source_options, storage_config)
elsif source_options[:remote]
Policyfile::RemoteLockFetcher.new(name, source_options)
elsif source_options[:server]
Policyfile::ChefServerLockFetcher.new(name, source_options, chef_config)
elsif source_options[:git]
Policyfile::GitLockFetcher.new(name, source_options, storage_config)
else
raise ChefCLI::InvalidPolicyfileLocation.new(
"Invalid policyfile lock location type. The supported locations are: #{LOCATION_TYPES.join(", ")}"
)
end
@fetcher ||= if source_options[:path] && !source_options[:git]
Policyfile::LocalLockFetcher.new(name, source_options, storage_config)
elsif source_options[:remote]
Policyfile::RemoteLockFetcher.new(name, source_options)
elsif source_options[:server]
Policyfile::ChefServerLockFetcher.new(name, source_options, chef_config)
elsif source_options[:git]
Policyfile::GitLockFetcher.new(name, source_options, storage_config)
else
raise ChefCLI::InvalidPolicyfileLocation.new(
"Invalid policyfile lock location type. The supported locations are: #{LOCATION_TYPES.join(", ")}"
)
end
end

Expand Down Expand Up @@ -106,9 +104,7 @@ def errors
#
# @return [PolicyfileLock] the loaded policyfile lock
def policyfile_lock
@policyfile_lock ||= begin
PolicyfileLock.new(storage_config, ui: ui).build_from_lock_data(fetcher.lock_data)
end
@policyfile_lock ||= PolicyfileLock.new(storage_config, ui: ui).build_from_lock_data(fetcher.lock_data)
end

# @return [Hash] The source_options that describe how to fetch this exact lock again
Expand Down
12 changes: 6 additions & 6 deletions lib/chef-cli/policyfile_services/export_repo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ def with_staging_dir
random_string = SecureRandom.hex(2)
path = "chef-export-#{random_string}"
Dir.mktmpdir(path) do |d|
begin
@staging_dir = d
yield
ensure
@staging_dir = nil
end

@staging_dir = d
yield
ensure
@staging_dir = nil

end
end

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This is a Chef Infra Client recipe file. It can be used to specify resources
# which will apply configuration to a server.

log "Welcome to Chef Infra Client, #{node['example']['name']}!" do
log "Welcome to Chef Infra Client, #{node["example"]["name"]}!" do
level :info
end

Expand Down
8 changes: 4 additions & 4 deletions spec/unit/kitchen/provisioner/chef_zero_capture_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@
end

after do
begin
subject.cleanup_sandbox
rescue # rubocop:disable Lint/HandleExceptions
end

subject.cleanup_sandbox
rescue # rubocop:disable Lint/HandleExceptions

end
end

Expand Down
20 changes: 10 additions & 10 deletions spec/unit/policyfile/comparison_base_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -251,11 +251,11 @@
end

let(:http_exception) do
begin
response.error!
rescue => e
e
end

response.error!
rescue => e
e

end

before do
Expand Down Expand Up @@ -285,11 +285,11 @@
end

let(:http_exception) do
begin
response.error!
rescue => e
e
end

response.error!
rescue => e
e

end

before do
Expand Down
20 changes: 10 additions & 10 deletions spec/unit/policyfile_services/clean_policies_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@
end

let(:http_exception) do
begin
response.error!
rescue => e
e
end

response.error!
rescue => e
e

end

before do
Expand Down Expand Up @@ -196,11 +196,11 @@
end

let(:http_exception) do
begin
response.error!
rescue => e
e
end

response.error!
rescue => e
e

end

before do
Expand Down
10 changes: 5 additions & 5 deletions spec/unit/policyfile_services/clean_policy_cookbooks_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -103,11 +103,11 @@
end

let(:http_exception) do
begin
response.error!
rescue => e
e
end

response.error!
rescue => e
e

end

before do
Expand Down
14 changes: 7 additions & 7 deletions spec/unit/policyfile_services/push_archive_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,13 @@ def create_archive
context "with an invalid archive" do

let(:exception) do
begin
push_archive_service.run
rescue ChefCLI::PolicyfilePushArchiveError => e
e
else
nil
end

push_archive_service.run
rescue ChefCLI::PolicyfilePushArchiveError => e
e
else
nil

end

let(:exception_cause) { exception.cause }
Expand Down
10 changes: 5 additions & 5 deletions spec/unit/policyfile_services/rm_policy_group_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@
end

let(:http_exception) do
begin
response.error!
rescue => e
e
end

response.error!
rescue => e
e

end

before do
Expand Down
20 changes: 10 additions & 10 deletions spec/unit/policyfile_services/rm_policy_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@
end

let(:http_exception) do
begin
response.error!
rescue => e
e
end

response.error!
rescue => e
e

end

before do
Expand Down Expand Up @@ -108,11 +108,11 @@
end

let(:http_exception) do
begin
response.error!
rescue => e
e
end

response.error!
rescue => e
e

end

before do
Expand Down
20 changes: 10 additions & 10 deletions spec/unit/policyfile_services/show_policy_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@
end

let(:http_exception) do
begin
response.error!
rescue => e
e
end

response.error!
rescue => e
e

end

let(:policies_url) { "/policies" }
Expand Down Expand Up @@ -823,11 +823,11 @@
end

let(:http_exception) do
begin
response.error!
rescue => e
e
end

response.error!
rescue => e
e

end

before do
Expand Down
10 changes: 5 additions & 5 deletions spec/unit/policyfile_services/undelete_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -185,11 +185,11 @@ def next_time
end

let(:http_exception) do
begin
response.error!
rescue => e
e
end

response.error!
rescue => e
e

end

before do
Expand Down

0 comments on commit 5675d97

Please sign in to comment.