[Do not merge] WIP/Adding result json output file #172
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lbakerchef
reviewed
Jun 28, 2022
lib/chef/knife/ec_backup.rb
Outdated
| @@ -91,11 +98,13 @@ def for_each_user | |||
|
|
|||
| def for_each_organization | |||
| rest.get('/organizations').each_pair do |name, url| | |||
| $organizations_hash["total"]=$organizations_hash["total"]+1 | |||
There was a problem hiding this comment.
Suggested change
| $organizations_hash["total"]=$organizations_hash["total"]+1 | |
| next unless (config[:org].nil? || config[:org] == name) | |
| $organizations_hash["total"]=$organizations_hash["total"]+1 |
I'm not sure, but do we want this instead?
There was a problem hiding this comment.
(Maybe we should ask Marc)
lbakerchef
reviewed
Jun 28, 2022
lib/chef/knife/ec_backup.rb
Outdated
| @@ -91,11 +98,13 @@ def for_each_user | |||
|
|
|||
| def for_each_organization | |||
| rest.get('/organizations').each_pair do |name, url| | |||
| $organizations_hash["total"]=$organizations_hash["total"]+1 | |||
There was a problem hiding this comment.
Suggested change
| $organizations_hash["total"]=$organizations_hash["total"]+1 | |
| $organizations_hash["total"]+=1 |
Shorter and more idiomatic.
lbakerchef
requested changes
Jun 28, 2022
lib/chef/knife/ec_backup.rb
Outdated
| @@ -115,18 +124,24 @@ def for_each_organization | |||
| end | |||
|
|
|||
| def download_user(username, url) | |||
| $users_hash["total"]=$users_hash["total"]+1 | |||
There was a problem hiding this comment.
Suggested change
| $users_hash["total"]=$users_hash["total"]+1 | |
| $users_hash["total"]+=1 |
lib/chef/knife/ec_backup.rb
Outdated
| File.open("#{dest_dir}/users/#{username}.json", 'w') do |file| | ||
| file.write(Chef::JSONCompat.to_json_pretty(rest.get(url))) | ||
| end | ||
| $users_hash["success_count"]=$users_hash["success_count"]+1 |
There was a problem hiding this comment.
Suggested change
| $users_hash["success_count"]=$users_hash["success_count"]+1 | |
| $users_hash["success_count"]+=1 |
lib/chef/knife/ec_backup.rb
Outdated
| knife_ec_error_handler.add(ex) | ||
| end | ||
|
|
||
| def download_user_acl(username) | ||
| $user_acls_hash["total"]=$user_acls_hash["total"]+1 |
There was a problem hiding this comment.
Suggested change
| $user_acls_hash["total"]=$user_acls_hash["total"]+1 | |
| $user_acls_hash["total"]+=1 |
lib/chef/knife/ec_backup.rb
Outdated
| File.open("#{dest_dir}/user_acls/#{username}.json", 'w') do |file| | ||
| file.write(Chef::JSONCompat.to_json_pretty(user_acl_rest.get("users/#{username}/_acl"))) | ||
| end | ||
| $user_acls_hash["success_count"]=$user_acls_hash["success_count"]+1 |
There was a problem hiding this comment.
Suggested change
| $user_acls_hash["success_count"]=$user_acls_hash["success_count"]+1 | |
| $user_acls_hash["success_count"]+=1 |
Signed-off-by: Vinay Satish <[email protected]>
vinay-satish
force-pushed
the
zei/adding_output_json
branch
from
ed9fc04
to
6650d51
Compare
|
Kudos, SonarCloud Quality Gate passed!
|
|
Is this acceptance criteria being satisfied for this PR, or is there another PR? |
|
It looks like the verify pipeline has some failures. |
PrajaktaPurohit
changed the title
|
Do not merge until chef/chef#13107 is merged and Gemfile.lock is updated to point to the new chef/chef |
| gem "chef", "~> 17" | ||
| gem "ohai", "~> 17" | ||
| gem "knife", "~> 17" |
There was a problem hiding this comment.
might as well bump all of these to chef-18, this would be a major gem bump for knife-ec-backup.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Signed-off-by: Vinay Satish [email protected]
Description
Related Issue
Types of changes
Checklist: