Add Global params for host obfuscation and migrate off settings #921
+29
−29
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
chris1984
force-pushed
the
obfuscate-settings
branch
3 times, most recently
from
3e407b8 to
efbca09
Compare
chris1984
force-pushed
the
obfuscate-settings
branch
from
efbca09 to
2fd7b5d
Compare
ShimShtein
reviewed
Nov 12, 2024
Comment on lines
+4
to
+5
| CommonParameter.find_or_create_by!(name: 'obfuscate_inventory_hostnames', value: false) | ||
| CommonParameter.find_or_create_by!(name: 'obfuscate_inventory_ips', value: false) |
There was a problem hiding this comment.
Suggested change
| CommonParameter.find_or_create_by!(name: 'obfuscate_inventory_hostnames', value: false) | |
| CommonParameter.find_or_create_by!(name: 'obfuscate_inventory_ips', value: false) | |
| hostname_setting = CommonParameter.find_or_create_by!(name: 'obfuscate_inventory_hostnames', value: false) | |
| ip_setting = CommonParameter.find_or_create_by!(name: 'obfuscate_inventory_ips', value: false) |
You can skip the find_by later in the code
| @@ -61,7 +61,7 @@ def obfuscate_hostname?(host) | |||
| insights_client_setting = ActiveModel::Type::Boolean.new.cast(insights_client_setting) | |||
| return insights_client_setting unless insights_client_setting.nil? | |||
|
|
|||
| Setting[:obfuscate_inventory_hostnames] | |||
| CommonParameter.find_by(name: 'obfuscate_inventory_hostnames')&.value | |||
There was a problem hiding this comment.
You should look for a value on the host, not just the common parameter, similar to
| @@ -79,7 +79,7 @@ def obfuscate_ips?(host) | |||
| insights_client_setting = ActiveModel::Type::Boolean.new.cast(insights_client_setting) | |||
| return insights_client_setting unless insights_client_setting.nil? | |||
|
|
|||
| Setting[:obfuscate_inventory_ips] | |||
| CommonParameter.find_by(name: 'obfuscate_inventory_ips')&.value | |||
There was a problem hiding this comment.
If it's a parameter, you have to look up the value on the host object itself:
| @@ -114,7 +114,7 @@ def hostname_match | |||
| foreman_hostname = ForemanRhCloud.foreman_host&.name | |||
| if bash_hostname == foreman_hostname | |||
| fqdn(ForemanRhCloud.foreman_host) | |||
| elsif Setting[:obfuscate_inventory_hostnames] | |||
| elsif CommonParameter.find_by(name: 'obfuscate_inventory_hostnames')&.value | |||
There was a problem hiding this comment.
If it's a parameter, you have to look up the value on the host object itself:
| @@ -23,8 +23,8 @@ class MetadataGeneratorTest < ActiveSupport::TestCase | |||
| end | |||
|
|
|||
| test 'generates an empty report with hidden hostname and ip' do | |||
| Setting[:obfuscate_inventory_hostnames] = true | |||
| Setting[:obfuscate_inventory_ips] = true | |||
| CommonParameter.find_or_create_by!(name: 'obfuscate_inventory_ips', value: true) | |||
There was a problem hiding this comment.
If the parameter exists, I think this method will not reset its value.
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.
What are the changes introduced in this pull request?
obfuscate_inventory_hostnamesandobfuscate_inventory_ipsand set them tofalsewhich is the default value forinsights-clientobfuscate_inventory_hostnamesandobfuscate_inventory_ipsand deletes the settings from the plugin and DB