From f1569c2c2e60515fc023be9b9a681ab0466595c9 Mon Sep 17 00:00:00 2001 From: "thibault.dewailly" Date: Mon, 22 Apr 2024 06:28:55 +0000 Subject: [PATCH] fix: dns level is called dns_support_level --- REFERENCE.md | 4 ++-- manifests/config.pp | 2 +- manifests/init.pp | 4 ++-- manifests/params.pp | 2 +- spec/classes/thebastion_spec.rb | 6 ++++-- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/REFERENCE.md b/REFERENCE.md index d1f186c..4c18fea 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -239,13 +239,13 @@ Whether to display last login information on connection Default value: `$thebastion::params::display_last_login` -##### `dns_level` +##### `dns_support_level` Data type: `Integer[0,2]` Manage DNS Level resolution, 0 being no resolution, 1 forced resolution, 2 full resolution -Default value: `$thebastion::params::dns_level` +Default value: `$thebastion::params::dns_support_level` ##### `documentation_url` diff --git a/manifests/config.pp b/manifests/config.pp index a7a7ff7..3f3283b 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -29,7 +29,7 @@ 'defaultAccountEgressKeySize' => $thebastion::default_account_egress_key_size, 'defaultLogin' => $thebastion::default_login, 'displayLastLogin' => $thebastion::display_last_login, - 'dnsLevel' => $thebastion::dns_level, + 'dnsSupportLevel' => $thebastion::dns_support_level, 'documentationURL' => $thebastion::documentation_url, 'egressKeysFrom' => $thebastion::egress_keys_from, 'enableAccountAccessLog' => $thebastion::enable_account_access_log, diff --git a/manifests/init.pp b/manifests/init.pp index 752b922..4f5c3d5 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -58,7 +58,7 @@ # The default remote user to use for egress ssh connections where no user has been specified by bastion's caller # @param display_last_login # Whether to display last login information on connection -# @param dns_level +# @param dns_support_level # Manage DNS Level resolution, 0 being no resolution, 1 forced resolution, 2 full resolution # @param documentation_url # The URL of the documentation where users will be pointed to, for example when displaying help @@ -256,7 +256,7 @@ Integer[256,8192] $default_account_egress_key_size = $thebastion::params::default_account_egress_key_size, String $default_login = $thebastion::params::default_login, Boolean $display_last_login = $thebastion::params::display_last_login, - Integer[0,2] $dns_level = $thebastion::params::dns_level, + Integer[0,2] $dns_support_level = $thebastion::params::dns_support_level, Stdlib::HTTPUrl $documentation_url = $thebastion::params::documentation_url, Array[Stdlib::IP::Address::V4] $egress_keys_from = $thebastion::params::egress_keys_from, Boolean $enable_account_access_log = $thebastion::params::enable_account_access_log, diff --git a/manifests/params.pp b/manifests/params.pp index 73ed472..7737da9 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -150,7 +150,7 @@ $default_account_egress_key_size = 256 $default_login = '' $display_last_login = true - $dns_level = 2 + $dns_support_level = 2 $documentation_url = 'https://ovh.github.io/the-bastion/' $egress_keys_from = [] $enable_account_access_log = true diff --git a/spec/classes/thebastion_spec.rb b/spec/classes/thebastion_spec.rb index 8f83403..7ed8e6a 100644 --- a/spec/classes/thebastion_spec.rb +++ b/spec/classes/thebastion_spec.rb @@ -155,7 +155,7 @@ default_account_egress_key_size: 4096, default_login: 'root', display_last_login: false, - dns_level: 1, + dns_support_level: 1, documentation_url: 'http://my.cutiedoc.com/bastion/', egress_keys_from: ['127.0.0.1', '192.0.1.0/24'], enable_account_access_log: false, @@ -226,7 +226,7 @@ expect(parsed['defaultAccountEgressKeySize']).to eq(4096) expect(parsed['defaultLogin']).to eq('root') expect(parsed['displayLastLogin']).to be false - expect(parsed['dnsLevel']).to eq(1) + expect(parsed['dnsSupportLevel']).to eq(1) expect(parsed['documentationURL']).to eq('http://my.cutiedoc.com/bastion/') expect(parsed['enableAccountAccessLog']).to be false expect(parsed['enableAccountSqlLog']).to be false @@ -303,6 +303,7 @@ default_account_egress_key_size: 16_384, default_login: 42, display_last_login: 'yes', + dns_support_level: 42, documentation_url: 'https:/my.sypertypo.org/bastion/', enable_account_access_log: 'yes', enable_account_sql_log: 'yes', @@ -372,6 +373,7 @@ it { is_expected.to compile.and_raise_error(%r{default_login}) } it { is_expected.to compile.and_raise_error(%r{display_last_login}) } it { is_expected.to compile.and_raise_error(%r{documentation_url}) } + it { is_expected.to compile.and_raise_error(%r{dns_support_level}) } it { is_expected.to compile.and_raise_error(%r{egress_keys_from}) } it { is_expected.to compile.and_raise_error(%r{enable_account_access_log}) } it { is_expected.to compile.and_raise_error(%r{enable_account_sql_log}) }