diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2018-01-17 13:34:18 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2018-01-17 13:34:18 -0800 |
| commit | 746562d6358c27b838c95ea27b2a2bd82c03cefe (patch) | |
| tree | baa587f091d06c1385543bbde818970e5fee7b75 /lib/chef/chef_fs | |
| parent | fcd8d778baeeb990a64fe9042164bbd3e1dd5269 (diff) | |
| download | chef-746562d6358c27b838c95ea27b2a2bd82c03cefe.tar.gz | |
prepping for rubocop 0.52.1lcg/rubocop-0.52.1
Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
Diffstat (limited to 'lib/chef/chef_fs')
| -rw-r--r-- | lib/chef/chef_fs/data_handler/acl_data_handler.rb | 2 | ||||
| -rw-r--r-- | lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb | 4 | ||||
| -rw-r--r-- | lib/chef/chef_fs/file_system/chef_server/policies_dir.rb | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/lib/chef/chef_fs/data_handler/acl_data_handler.rb b/lib/chef/chef_fs/data_handler/acl_data_handler.rb index 6c8833004a..834fc5ca0b 100644 --- a/lib/chef/chef_fs/data_handler/acl_data_handler.rb +++ b/lib/chef/chef_fs/data_handler/acl_data_handler.rb @@ -13,7 +13,7 @@ class Chef "delete" => {}, "grant" => {}, }) - result.keys.each do |key| + result.each_key do |key| result[key] = normalize_hash(result[key], { "actors" => [], "groups" => [] }) result[key]["actors"] = result[key]["actors"].sort result[key]["groups"] = result[key]["groups"].sort diff --git a/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb b/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb index 64488ed705..9b0ea18cd8 100644 --- a/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/cookbook_dir.rb @@ -1,6 +1,6 @@ # # Author:: John Keiser (<jkeiser@chef.io>) -# Copyright:: Copyright 2012-2016, Chef Software Inc. +# Copyright:: Copyright 2012-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -76,7 +76,7 @@ class Chef if @children.nil? @children = [] manifest = chef_object.cookbook_manifest - manifest.by_parent_directory.each do |segment, files| + manifest.by_parent_directory.each_value do |files| files.each do |file| parts = file[:path].split("/") # Get or create the path to the file diff --git a/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb b/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb index a4add1378d..8259db473d 100644 --- a/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb +++ b/lib/chef/chef_fs/file_system/chef_server/policies_dir.rb @@ -1,6 +1,6 @@ # # Author:: John Keiser (<jkeiser@chef.io>) -# Copyright:: Copyright 2012-2016, Chef Software Inc. +# Copyright:: Copyright 2012-2018, Chef Software Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -71,7 +71,7 @@ class Chef result = [] data = root.get_json(api_path) data.keys.sort.each do |policy_name| - data[policy_name]["revisions"].keys.each do |policy_revision| + data[policy_name]["revisions"].each_key do |policy_revision| filename = "#{policy_name}-#{policy_revision}.json" result << make_child_entry(filename, true) end |