-
-
Notifications
You must be signed in to change notification settings - Fork 476
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- let api_basic_auth_password also be of Type Sensitive
- Loading branch information
Cocker Koch
committed
Jun 23, 2021
1 parent
aefc5b9
commit e81fcf1
Showing
6 changed files
with
94 additions
and
67 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -43,18 +43,23 @@ | |
| # @author Tyler Langlois <[email protected]> | ||
| # | ||
| define elasticsearch::index ( | ||
| Enum['absent', 'present'] $ensure = 'present', | ||
| Optional[String] $api_basic_auth_password = $elasticsearch::api_basic_auth_password, | ||
| Optional[String] $api_basic_auth_username = $elasticsearch::api_basic_auth_username, | ||
| Optional[Stdlib::Absolutepath] $api_ca_file = $elasticsearch::api_ca_file, | ||
| Optional[Stdlib::Absolutepath] $api_ca_path = $elasticsearch::api_ca_path, | ||
| String $api_host = $elasticsearch::api_host, | ||
| Integer[0, 65535] $api_port = $elasticsearch::api_port, | ||
| Enum['http', 'https'] $api_protocol = $elasticsearch::api_protocol, | ||
| Integer $api_timeout = $elasticsearch::api_timeout, | ||
| Hash $settings = {}, | ||
| Boolean $validate_tls = $elasticsearch::validate_tls, | ||
| Enum['absent', 'present'] $ensure = 'present', | ||
| Optional[Variant[String, Sensitive[String]]] $api_basic_auth_password = $elasticsearch::api_basic_auth_password, | ||
| Optional[String] $api_basic_auth_username = $elasticsearch::api_basic_auth_username, | ||
| Optional[Stdlib::Absolutepath] $api_ca_file = $elasticsearch::api_ca_file, | ||
| Optional[Stdlib::Absolutepath] $api_ca_path = $elasticsearch::api_ca_path, | ||
| String $api_host = $elasticsearch::api_host, | ||
| Integer[0, 65535] $api_port = $elasticsearch::api_port, | ||
| Enum['http', 'https'] $api_protocol = $elasticsearch::api_protocol, | ||
| Integer $api_timeout = $elasticsearch::api_timeout, | ||
| Hash $settings = {}, | ||
| Boolean $validate_tls = $elasticsearch::validate_tls, | ||
| ) { | ||
| $api_basic_auth_password_unsensitive = if $api_basic_auth_password =~ Sensitive { | ||
| $api_basic_auth_password.unwrap | ||
| } else { | ||
| $api_basic_auth_password | ||
| } | ||
|
|
||
| es_instance_conn_validator { "${name}-index-conn-validator": | ||
| server => $api_host, | ||
|
|
@@ -69,7 +74,7 @@ | |
| port => $api_port, | ||
| timeout => $api_timeout, | ||
| username => $api_basic_auth_username, | ||
| password => $api_basic_auth_password, | ||
| password => $api_basic_auth_password_unsensitive, | ||
| ca_file => $api_ca_file, | ||
| ca_path => $api_ca_path, | ||
| validate_tls => $validate_tls, | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -42,18 +42,24 @@ | |
| # @author Tyler Langlois <[email protected]> | ||
| # | ||
| class elasticsearch::license ( | ||
| Enum['absent', 'present'] $ensure = 'present', | ||
| Optional[String] $api_basic_auth_password = $elasticsearch::api_basic_auth_password, | ||
| Optional[String] $api_basic_auth_username = $elasticsearch::api_basic_auth_username, | ||
| Optional[Stdlib::Absolutepath] $api_ca_file = $elasticsearch::api_ca_file, | ||
| Optional[Stdlib::Absolutepath] $api_ca_path = $elasticsearch::api_ca_path, | ||
| String $api_host = $elasticsearch::api_host, | ||
| Integer[0, 65535] $api_port = $elasticsearch::api_port, | ||
| Enum['http', 'https'] $api_protocol = $elasticsearch::api_protocol, | ||
| Integer $api_timeout = $elasticsearch::api_timeout, | ||
| Variant[String, Hash] $content = $elasticsearch::license, | ||
| Boolean $validate_tls = $elasticsearch::validate_tls, | ||
| Enum['absent', 'present'] $ensure = 'present', | ||
| Optional[Variant[String, Sensitive[String]]] $api_basic_auth_password = $elasticsearch::api_basic_auth_password, | ||
| Optional[String] $api_basic_auth_username = $elasticsearch::api_basic_auth_username, | ||
| Optional[Stdlib::Absolutepath] $api_ca_file = $elasticsearch::api_ca_file, | ||
| Optional[Stdlib::Absolutepath] $api_ca_path = $elasticsearch::api_ca_path, | ||
| String $api_host = $elasticsearch::api_host, | ||
| Integer[0, 65535] $api_port = $elasticsearch::api_port, | ||
| Enum['http', 'https'] $api_protocol = $elasticsearch::api_protocol, | ||
| Integer $api_timeout = $elasticsearch::api_timeout, | ||
| Variant[String, Hash] $content = $elasticsearch::license, | ||
| Boolean $validate_tls = $elasticsearch::validate_tls, | ||
| ) { | ||
| $api_basic_auth_password_unsensitive = if $api_basic_auth_password =~ Sensitive { | ||
| $api_basic_auth_password.unwrap | ||
| } else { | ||
| $api_basic_auth_password | ||
| } | ||
|
|
||
| if $content =~ String { | ||
| $_content = parsejson($content) | ||
| } else { | ||
|
|
@@ -80,7 +86,7 @@ | |
| port => $api_port, | ||
| timeout => $api_timeout, | ||
| username => $api_basic_auth_username, | ||
| password => $api_basic_auth_password, | ||
| password => $api_basic_auth_password_unsensitive, | ||
| ca_file => $api_ca_file, | ||
| ca_path => $api_ca_path, | ||
| validate_tls => $validate_tls, | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,18 +45,23 @@ | |
| # @author Tyler Langlois <[email protected]> | ||
| # | ||
| define elasticsearch::pipeline ( | ||
| Enum['absent', 'present'] $ensure = 'present', | ||
| Optional[String] $api_basic_auth_password = $elasticsearch::api_basic_auth_password, | ||
| Optional[String] $api_basic_auth_username = $elasticsearch::api_basic_auth_username, | ||
| Optional[Stdlib::Absolutepath] $api_ca_file = $elasticsearch::api_ca_file, | ||
| Optional[Stdlib::Absolutepath] $api_ca_path = $elasticsearch::api_ca_path, | ||
| String $api_host = $elasticsearch::api_host, | ||
| Integer[0, 65535] $api_port = $elasticsearch::api_port, | ||
| Enum['http', 'https'] $api_protocol = $elasticsearch::api_protocol, | ||
| Integer $api_timeout = $elasticsearch::api_timeout, | ||
| Hash $content = {}, | ||
| Boolean $validate_tls = $elasticsearch::validate_tls, | ||
| Enum['absent', 'present'] $ensure = 'present', | ||
| Optional[Variant[String, Sensitive[String]]] $api_basic_auth_password = $elasticsearch::api_basic_auth_password, | ||
| Optional[String] $api_basic_auth_username = $elasticsearch::api_basic_auth_username, | ||
| Optional[Stdlib::Absolutepath] $api_ca_file = $elasticsearch::api_ca_file, | ||
| Optional[Stdlib::Absolutepath] $api_ca_path = $elasticsearch::api_ca_path, | ||
| String $api_host = $elasticsearch::api_host, | ||
| Integer[0, 65535] $api_port = $elasticsearch::api_port, | ||
| Enum['http', 'https'] $api_protocol = $elasticsearch::api_protocol, | ||
| Integer $api_timeout = $elasticsearch::api_timeout, | ||
| Hash $content = {}, | ||
| Boolean $validate_tls = $elasticsearch::validate_tls, | ||
| ) { | ||
| $api_basic_auth_password_unsensitive = if $api_basic_auth_password =~ Sensitive { | ||
| $api_basic_auth_password.unwrap | ||
| } else { | ||
| $api_basic_auth_password | ||
| } | ||
|
|
||
| es_instance_conn_validator { "${name}-ingest-pipeline": | ||
| server => $api_host, | ||
|
|
@@ -71,7 +76,7 @@ | |
| port => $api_port, | ||
| timeout => $api_timeout, | ||
| username => $api_basic_auth_username, | ||
| password => $api_basic_auth_password, | ||
| password => $api_basic_auth_password_unsensitive, | ||
| ca_file => $api_ca_file, | ||
| ca_path => $api_ca_path, | ||
| validate_tls => $validate_tls, | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -60,23 +60,28 @@ | |
| # @author Tyler Langlois <[email protected]> | ||
| # | ||
| define elasticsearch::snapshot_repository ( | ||
| String $location, | ||
| Enum['absent', 'present'] $ensure = 'present', | ||
| Optional[String] $api_basic_auth_password = $elasticsearch::api_basic_auth_password, | ||
| Optional[String] $api_basic_auth_username = $elasticsearch::api_basic_auth_username, | ||
| Optional[Stdlib::Absolutepath] $api_ca_file = $elasticsearch::api_ca_file, | ||
| Optional[Stdlib::Absolutepath] $api_ca_path = $elasticsearch::api_ca_path, | ||
| String $api_host = $elasticsearch::api_host, | ||
| Integer[0, 65535] $api_port = $elasticsearch::api_port, | ||
| Enum['http', 'https'] $api_protocol = $elasticsearch::api_protocol, | ||
| Integer $api_timeout = $elasticsearch::api_timeout, | ||
| Boolean $compress = true, | ||
| Optional[String] $chunk_size = undef, | ||
| Optional[String] $max_restore_rate = undef, | ||
| Optional[String] $max_snapshot_rate = undef, | ||
| Optional[String] $repository_type = undef, | ||
| Boolean $validate_tls = $elasticsearch::validate_tls, | ||
| String $location, | ||
| Enum['absent', 'present'] $ensure = 'present', | ||
| Optional[Variant[String, Sensitive[String]]] $api_basic_auth_password = $elasticsearch::api_basic_auth_password, | ||
| Optional[String] $api_basic_auth_username = $elasticsearch::api_basic_auth_username, | ||
| Optional[Stdlib::Absolutepath] $api_ca_file = $elasticsearch::api_ca_file, | ||
| Optional[Stdlib::Absolutepath] $api_ca_path = $elasticsearch::api_ca_path, | ||
| String $api_host = $elasticsearch::api_host, | ||
| Integer[0, 65535] $api_port = $elasticsearch::api_port, | ||
| Enum['http', 'https'] $api_protocol = $elasticsearch::api_protocol, | ||
| Integer $api_timeout = $elasticsearch::api_timeout, | ||
| Boolean $compress = true, | ||
| Optional[String] $chunk_size = undef, | ||
| Optional[String] $max_restore_rate = undef, | ||
| Optional[String] $max_snapshot_rate = undef, | ||
| Optional[String] $repository_type = undef, | ||
| Boolean $validate_tls = $elasticsearch::validate_tls, | ||
| ) { | ||
| $api_basic_auth_password_unsensitive = if $api_basic_auth_password =~ Sensitive { | ||
| $api_basic_auth_password.unwrap | ||
| } else { | ||
| $api_basic_auth_password | ||
| } | ||
|
|
||
| es_instance_conn_validator { "${name}-snapshot": | ||
| server => $api_host, | ||
|
|
@@ -96,7 +101,7 @@ | |
| port => $api_port, | ||
| timeout => $api_timeout, | ||
| username => $api_basic_auth_username, | ||
| password => $api_basic_auth_password, | ||
| password => $api_basic_auth_password_unsensitive, | ||
| ca_file => $api_ca_file, | ||
| ca_path => $api_ca_path, | ||
| validate_tls => $validate_tls, | ||
|
|
||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,19 +53,25 @@ | |
| # @author Tyler Langlois <[email protected]> | ||
| # | ||
| define elasticsearch::template ( | ||
| Enum['absent', 'present'] $ensure = 'present', | ||
| Optional[String] $api_basic_auth_password = $elasticsearch::api_basic_auth_password, | ||
| Optional[String] $api_basic_auth_username = $elasticsearch::api_basic_auth_username, | ||
| Optional[Stdlib::Absolutepath] $api_ca_file = $elasticsearch::api_ca_file, | ||
| Optional[Stdlib::Absolutepath] $api_ca_path = $elasticsearch::api_ca_path, | ||
| String $api_host = $elasticsearch::api_host, | ||
| Integer[0, 65535] $api_port = $elasticsearch::api_port, | ||
| Enum['http', 'https'] $api_protocol = $elasticsearch::api_protocol, | ||
| Integer $api_timeout = $elasticsearch::api_timeout, | ||
| Optional[Variant[String, Hash]] $content = undef, | ||
| Optional[String] $source = undef, | ||
| Boolean $validate_tls = $elasticsearch::validate_tls, | ||
| Enum['absent', 'present'] $ensure = 'present', | ||
| Optional[Variant[String, Sensitive[String]]] $api_basic_auth_password = $elasticsearch::api_basic_auth_password, | ||
| Optional[String] $api_basic_auth_username = $elasticsearch::api_basic_auth_username, | ||
| Optional[Stdlib::Absolutepath] $api_ca_file = $elasticsearch::api_ca_file, | ||
| Optional[Stdlib::Absolutepath] $api_ca_path = $elasticsearch::api_ca_path, | ||
| String $api_host = $elasticsearch::api_host, | ||
| Integer[0, 65535] $api_port = $elasticsearch::api_port, | ||
| Enum['http', 'https'] $api_protocol = $elasticsearch::api_protocol, | ||
| Integer $api_timeout = $elasticsearch::api_timeout, | ||
| Optional[Variant[String, Hash]] $content = undef, | ||
| Optional[String] $source = undef, | ||
| Boolean $validate_tls = $elasticsearch::validate_tls, | ||
| ) { | ||
| $api_basic_auth_password_unsensitive = if $api_basic_auth_password =~ Sensitive { | ||
| $api_basic_auth_password.unwrap | ||
| } else { | ||
| $api_basic_auth_password | ||
| } | ||
|
|
||
| if $content =~ String { | ||
| $_content = parsejson($content) | ||
| } else { | ||
|
|
@@ -92,7 +98,7 @@ | |
| port => $api_port, | ||
| timeout => $api_timeout, | ||
| username => $api_basic_auth_username, | ||
| password => $api_basic_auth_password, | ||
| password => $api_basic_auth_password_unsensitive, | ||
| ca_file => $api_ca_file, | ||
| ca_path => $api_ca_path, | ||
| validate_tls => $validate_tls, | ||
|
|
||