Skip to content

Update postgresql connection validation #391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
h0tw1r3 merged 1 commit into from
Feb 15, 2024
Merged

Update postgresql connection validation #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions manifests/server/validate_db.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
) inherits puppetdb::params {
if ($database_password != undef and $jdbc_ssl_properties == false) {
postgresql::validate_db_connection { 'validate puppetdb postgres connection':
database_host => $database_host,
database_port => $database_port,
database_username => $database_username,
database_password => $database_password,
database_name => $database_name,
postgresql_conn_validator { 'validate puppetdb postgres connection':
host => $database_host,
port => $database_port,
db_username => $database_username,
db_password => $database_password,
db_name => $database_name,
}
}
}
12 changes: 6 additions & 6 deletions manifests/server/validate_read_db.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
$jdbc_ssl_properties = $puppetdb::params::jdbc_ssl_properties,
) inherits puppetdb::params {
if ($database_password != undef and $jdbc_ssl_properties == false) {
postgresql::validate_db_connection { 'validate puppetdb postgres (read) connection':
database_host => $database_host,
database_port => $database_port,
database_username => $database_username,
database_password => $database_password,
database_name => $database_name,
postgresql_conn_validator { 'validate puppetdb postgres (read) connection':
host => $database_host,
port => $database_port,
db_username => $database_username,
db_password => $database_password,
db_name => $database_name,
}
}
}
16 changes: 8 additions & 8 deletions spec/unit/classes/server/validate_db_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,29 @@
)
}

it { is_expected.not_to contain_postgresql__validate_db_connection('validate puppetdb postgres connection') }
it { is_expected.not_to contain_postgresql_conn_validateor('validate puppetdb postgres connection') }
end

context 'with parameter tests' do
let(:params) { { jdbc_ssl_properties: false } }

context 'with jdbc_ssl_properties set false' do
it {
is_expected.to contain_postgresql__validate_db_connection('validate puppetdb postgres connection')
is_expected.to contain_postgresql_conn_validator('validate puppetdb postgres connection')
.with(
database_host: 'localhost',
database_port: '5432',
database_username: 'puppetdb',
database_password: 'puppetdb',
database_name: 'puppetdb',
host: 'localhost',
port: '5432',
db_username: 'puppetdb',
db_password: 'puppetdb',
db_name: 'puppetdb',
)
}
end

context 'without database password' do
let(:params) { { database_password: nil } }

it { is_expected.not_to contain_postgresql__validate_db_connection('validate puppetdb postgres connection') }
it { is_expected.not_to contain_postgresql_conn_validator('validate puppetdb postgres connection') }
end
end
end
16 changes: 8 additions & 8 deletions spec/unit/classes/server/validate_read_db_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,29 +23,29 @@
)
}

it { is_expected.not_to contain_postgresql__validate_db_connection('validate puppetdb postgres (read) connection') }
it { is_expected.not_to contain_postgresql_conn_validator('validate puppetdb postgres (read) connection') }
end

context 'with parameter tests' do
let(:params) { { jdbc_ssl_properties: false } }

context 'with jdbc_ssl_properties set false' do
it {
is_expected.to contain_postgresql__validate_db_connection('validate puppetdb postgres (read) connection')
is_expected.to contain_postgresql_conn_validator('validate puppetdb postgres (read) connection')
.with(
database_host: 'localhost',
database_port: '5432',
database_username: 'puppetdb',
database_password: 'puppetdb',
database_name: 'puppetdb',
host: 'localhost',
port: '5432',
db_username: 'puppetdb',
db_password: 'puppetdb',
db_name: 'puppetdb',
)
}
end

context 'without database password' do
let(:params) { { database_password: nil } }

it { is_expected.not_to contain_postgresql__validate_db_connection('validate puppetdb postgres (read) connection') }
it { is_expected.not_to contain_postgresql_conn_validator('validate puppetdb postgres (read) connection') }
end
end
end