Merge branch 'mark-helpers-sensitive' into 'master'

Mark helper properties sensitive on custom resources

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6989

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Hossein Pursultani <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Co-authored-by: Ian Baum <[email protected]>

Author: balasankarc

files/gitlab-cookbooks/gitlab/resources/database_objects.rb

@@ -3,8 +3,8 @@
 
 unified_mode true
 
-property :pg_helper, [GeoPgHelper, PgHelper], required: true
-property :account_helper, [AccountHelper], required: true
+property :pg_helper, [GeoPgHelper, PgHelper], required: true, sensitive: true
+property :account_helper, [AccountHelper], required: true, sensitive: true
 
 action :create do
   rails_enabled = node['gitlab']['gitlab_rails']['enable']

files/gitlab-cookbooks/gitlab/resources/sidekiq_service.rb

@@ -11,7 +11,7 @@
 property :log_directory_group, [String, nil], default: nil
 property :log_user, [String, nil], default: nil
 property :log_group, [String, nil], default: nil
-property :logfiles_helper, default: lazy { LogfilesHelper.new(node) }
+property :logfiles_helper, default: lazy { LogfilesHelper.new(node) }, sensitive: true
 property :template_name, String, default: 'sidekiq'
 
 action :enable do

files/gitlab-cookbooks/pgbouncer/resources/pgbouncer_user.rb

@@ -4,11 +4,11 @@
 unified_mode true
 
 property :type, String, name_property: true
-property :account_helper, default: AccountHelper.new(node)
+property :account_helper, default: AccountHelper.new(node), sensitive: true
 property :add_auth_function, [true, false], required: true
 property :database, String, required: true
 property :password, String, required: true
-property :helper, [GeoPgHelper, PgHelper], required: true
+property :helper, [GeoPgHelper, PgHelper], required: true, sensitive: true
 property :user, String, required: true
 
 action :create do

files/gitlab-cookbooks/postgresql/resources/config.rb

@@ -2,7 +2,7 @@
 
 property :name, String, name_property: true
 property :username, default: lazy { node['postgresql']['username'] }
-property :helper, default: lazy { PgHelper.new(node) }
+property :helper, default: lazy { PgHelper.new(node) }, sensitive: true
 
 action :create do
   postgresql_helper = new_resource.helper

files/gitlab-cookbooks/postgresql/resources/database.rb

@@ -2,7 +2,7 @@
 
 property :database, String, name_property: true
 property :owner, String, default: lazy { node['postgresql']['sql_user'] }
-property :helper, default: lazy { PgHelper.new(node) }
+property :helper, default: lazy { PgHelper.new(node) }, sensitive: true
 property :database_port, Integer, default: lazy { node['postgresql']['port'] }
 property :database_socket, String, default: lazy { node['postgresql']['unix_socket_directory'] }
 property :user, String, default: lazy { AccountHelper.new(node).postgresql_user }

files/gitlab-cookbooks/postgresql/resources/extension.rb

@@ -2,7 +2,7 @@
 
 property :extension, String, name_property: true
 property :database, String
-property :helper, default: lazy { PgHelper.new(node) }
+property :helper, default: lazy { PgHelper.new(node) }, sensitive: true
 
 action :enable do
   postgresql_query "enable #{new_resource.extension} extension" do

files/gitlab-cookbooks/postgresql/resources/query.rb

@@ -6,7 +6,7 @@
 property :description, String, name_property: true
 property :query, String
 property :db_name, String, default: 'template1'
-property :helper, default: lazy { PgHelper.new(node) }
+property :helper, default: lazy { PgHelper.new(node) }, sensitive: true
 
 action :run do
   account_helper = AccountHelper.new(node)

files/gitlab-cookbooks/postgresql/resources/schema.rb

@@ -3,7 +3,7 @@
 property :schema, String, name_property: true
 property :database, String
 property :owner, String, default: 'CURRENT_USER'
-property :helper, default: lazy { PgHelper.new(node) }
+property :helper, default: lazy { PgHelper.new(node) }, sensitive: true
 
 action :create do
   postgresql_query "create #{new_resource.schema} schema on #{new_resource.database}" do

files/gitlab-cookbooks/postgresql/resources/user.rb

@@ -3,7 +3,7 @@
 property :username, String, name_property: true
 property :password, String
 property :options, Array
-property :helper, default: lazy { PgHelper.new(node) }
+property :helper, default: lazy { PgHelper.new(node) }, sensitive: true
 
 action :create do
   account_helper = AccountHelper.new(node)

files/gitlab-cookbooks/redis/resources/service.rb

@@ -2,11 +2,11 @@
 
 property :socket_group, String
 property :dir, String, default: lazy { node['redis']['dir'] }
-property :account_helper, default: lazy { AccountHelper.new(node) }
-property :omnibus_helper, default: lazy { OmnibusHelper.new(node) }
-property :redis_helper, default: lazy { RedisHelper.new(node) }
+property :account_helper, default: lazy { AccountHelper.new(node) }, sensitive: true
+property :omnibus_helper, default: lazy { OmnibusHelper.new(node) }, sensitive: true
+property :redis_helper, default: lazy { RedisHelper.new(node) }, sensitive: true
 property :runit_sv_timeout, [Integer, nil], default: lazy { node['redis']['runit_sv_timeout'] }
-property :logfiles_helper, default: lazy { LogfilesHelper.new(node) }
+property :logfiles_helper, default: lazy { LogfilesHelper.new(node) }, sensitive: true
 
 action :create do
   logging_settings = new_resource.logfiles_helper.logging_settings('redis')