Skip to content

Update the module using the PDK #344

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

Closed
wants to merge 22 commits into from
Closed

Update the module using the PDK #344

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
6168886
Prepare for PDK update
smortex Feb 9, 2022
1791e09
pdk update --template-ref 2.4.0
smortex Feb 9, 2022
f72d3d1
Pet rubocop
smortex Feb 9, 2022
3e25635
Modernize/Fix CI
smortex Feb 9, 2022
cd74f49
Fix acceptance tests to work with Litmus
smortex Feb 12, 2022
8eabccc
Fix installation path of puppet modules
smortex Feb 13, 2022
aeecff2
Ignore messages from ls(1) on stderr
smortex Feb 13, 2022
ae31048
Conditionaly include postgresql::server::contrib
smortex Feb 13, 2022
00c4580
Mark broken tests as pending
smortex Feb 13, 2022
c658702
Add missing dependency
smortex Oct 27, 2022
8a09ec3
Add missing dependency
smortex Oct 27, 2022
2eabf41
Add missing dependency
smortex Oct 27, 2022
ab1ebc6
Auto-select the default PostgreSQL version
smortex Oct 27, 2022
0f9ab7e
Fix CI failures related to legacy facts
smortex Oct 27, 2022
adfe470
More CI fixes with latest posgresql module
smortex Oct 27, 2022
0b8973b
pdk update --template-ref 3.0.0
smortex Oct 8, 2023
68d8c64
bundle exec puppet-lint manifests --fix
smortex Oct 8, 2023
0af3a80
Disable out-of-scope puppet-lint checks
smortex Oct 8, 2023
b8a52bc
Remove local facts overrides
smortex Oct 9, 2023
cb14e5d
Match the ensure value of the manifest
smortex Oct 9, 2023
62550d8
Match owner / mode of the manifest
smortex Oct 9, 2023
e62e37d
Add path to the custom facts
smortex Oct 9, 2023
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
Prev Previous commit
Next Next commit
Fix CI failures related to legacy facts
  • Loading branch information
@smortex
smortex committed Oct 8, 2023
commit 0f9ab7e92152520ad8e733e2f0c0fdb5f7940f59
8 changes: 5 additions & 3 deletions spec/unit/classes/database/ssl_configuration_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
release: { 'full' => '7.0', 'major' => '7' },
selinux: { 'enabled' => true },
},
fqdn: 'cheery-rime@puppet',
networking: {
fqdn: 'cheery-rime@puppet',
},
}
end

Expand Down Expand Up @@ -125,7 +127,7 @@
it 'has ident rule' do
is_expected.to contain_postgresql__server__pg_ident_rule("Map the SSL certificate of the server as a #{params[:database_username]} user")
.with_map_name(identity_map)
.with_system_username(facts[:fqdn])
.with_system_username(facts[:networking][:fqdn])
.with_database_username(params[:database_name])
end

Expand Down Expand Up @@ -184,7 +186,7 @@
it 'has read ident rule' do
is_expected.to contain_postgresql__server__pg_ident_rule("Map the SSL certificate of the server as a #{params[:read_database_username]} user")
.with_map_name(read_identity_map)
.with_system_username(facts[:fqdn])
.with_system_username(facts[:networking][:fqdn])
Copy link
Collaborator

@bastelfreak bastelfreak Oct 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't that be:

Suggested change
.with_system_username(facts[:networking][:fqdn])
.with_system_username(facts[:networking]['fqdn'])

Copy link
Collaborator Author

@smortex smortex Oct 9, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Humm… it seems to be worse. That being said at the beginning of the file we have:

      let(:facts) do
        {
          # ...
          networking: {
            fqdn: 'cheery-rime@puppet',
          },
          # ...
        }
      end

This module is hell… 😱

.with_database_username(params[:read_database_username])
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/unit/classes/master/config_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
context "on #{os}" do
let(:facts) do
facts.merge(puppetversion: Puppet.version,
fqdn: 'puppetdb.example.com',
networking: { fqdn: 'puppetdb.example.com' },
selinux: true)
end

Expand Down
4 changes: 3 additions & 1 deletion spec/unit/classes/server/command_processing_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
context 'on a supported platform' do
let(:facts) do
{
osfamily: 'OpenBSD',
os: {
family: 'OpenBSD',
},
puppetversion: Puppet.version,
}
end
Expand Down
9 changes: 6 additions & 3 deletions spec/unit/classes/server/database_ini_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@
context 'on a supported platform' do
let(:facts) do
{
osfamily: 'RedHat',
operatingsystem: 'RedHat',
os: {
family: 'RedHat',
},
puppetversion: Puppet.version,
operatingsystemrelease: '7.0',
fqdn: 'test.domain.local',
networking: {
fqdn: 'test.domain.local',
},
}
end

Expand Down
9 changes: 6 additions & 3 deletions spec/unit/classes/server/db_connection_uri_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
context 'on a supported platform' do
let(:facts) do
{
osfamily: 'RedHat',
operatingsystem: 'RedHat',
os: {
family: 'RedHat',
},
operatingsystemrelease: '7.0',
fqdn: 'test.domain.local',
networking: {
fqdn: 'test.domain.local',
},
}
end

Expand Down
9 changes: 6 additions & 3 deletions spec/unit/classes/server/db_read_uri_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,13 @@
context 'on a supported platform' do
let(:facts) do
{
osfamily: 'RedHat',
operatingsystem: 'RedHat',
os: {
family: 'RedHat',
},
operatingsystemrelease: '7.0',
fqdn: 'test.domain.local',
networking: {
fqdn: 'test.domain.local',
},
}
end

Expand Down
8 changes: 6 additions & 2 deletions spec/unit/classes/server/global_ini_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
context 'on a supported platform' do
let(:facts) do
{
osfamily: 'RedHat',
fqdn: 'foo.com',
os: {
family: 'RedHat',
},
networking: {
fqdn: 'foo.com',
},
}
end

Expand Down
8 changes: 6 additions & 2 deletions spec/unit/classes/server/jetty_ini_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
context 'on a supported platform' do
let(:facts) do
{
osfamily: 'RedHat',
fqdn: 'test.domain.local',
os: {
family: 'RedHat',
},
networking: {
fqdn: 'test.domain.local',
},
}
end

Expand Down
8 changes: 6 additions & 2 deletions spec/unit/classes/server/puppetdb_ini_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
context 'on a supported platform' do
let(:facts) do
{
osfamily: 'RedHat',
fqdn: 'test.domain.local',
os: {
family: 'RedHat',
},
networking: {
fqdn: 'test.domain.local',
},
}
end

Expand Down
9 changes: 6 additions & 3 deletions spec/unit/classes/server/read_database_ini_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@
context 'on a supported platform' do
let(:facts) do
{
osfamily: 'RedHat',
operatingsystem: 'RedHat',
os: {
family: 'RedHat',
},
puppetversion: Puppet.version,
operatingsystemrelease: '7.0',
fqdn: 'test.domain.local',
networking: {
fqdn: 'test.domain.local',
},
}
end

Expand Down