Skip to content

Commit d4fd0e8

Browse files
authored
Merge branch 'main' into extensions_loop
2 parents 30b33c5 + bf450fa commit d4fd0e8

7 files changed

Lines changed: 90 additions & 13 deletions

File tree

.whitesource

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"scanSettings": {
3+
"configMode": "AUTO",
4+
"configExternalURL": "",
5+
"projectToken": "",
6+
"baseBranches": []
7+
},
8+
"scanSettingsSAST": {
9+
"enableScan": true,
10+
"scanPullRequests": true,
11+
"incrementalScan": true,
12+
"baseBranches": [],
13+
"snippetSize": 10
14+
},
15+
"checkRunSettings": {
16+
"vulnerableCheckRunConclusionLevel": "failure",
17+
"displayMode": "diff",
18+
"useMendCheckNames": true
19+
},
20+
"checkRunSettingsSAST": {
21+
"checkRunConclusionLevel": "failure",
22+
"severityThreshold": "high"
23+
},
24+
"issueSettings": {
25+
"minSeverityLevel": "LOW",
26+
"issueType": "DEPENDENCY"
27+
},
28+
"issueSettingsSAST": {
29+
"minSeverityLevel": "high",
30+
"issueType": "repo"
31+
},
32+
"remediateSettings": {
33+
"workflowRules": {
34+
"enabled": true
35+
}
36+
},
37+
"imageSettings":{
38+
"imageTracing":{
39+
"enableImageTracingPR": false,
40+
"addRepositoryCoordinate": false,
41+
"addDockerfilePath": false,
42+
"addMendIdentifier": false
43+
}
44+
}
45+
}

CHANGELOG.md

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
55

66
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
77

8+
## [v10.6.2](https://github.com/puppetlabs/puppetlabs-postgresql/tree/v10.6.2) - 2026-06-25
9+
10+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-postgresql/compare/v10.6.1...v10.6.2)
11+
12+
### Other
13+
14+
- (MODULES-11840) Allow puppetlabs/stdlib 10.x [#1681](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1681) ([imaqsood](https://github.com/imaqsood))
15+
- (CI) Run acceptance tests against puppetcore8-nightly [#1680](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1680) ([SugatD](https://github.com/SugatD))
16+
- (MODULES-11816) Add CLAUDE.md for Claude Code guidance [#1676](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1676) ([SugatD](https://github.com/SugatD))
17+
- puppetlabs/concat: Allow 10.x [#1669](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1669) ([bastelfreak](https://github.com/bastelfreak))
18+
- grant creation via hiera through server::grant.pp [#1668](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1668) ([ikonia](https://github.com/ikonia))
19+
- fix: ignore postgresql_conf resource value when set to absent [#1657](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1657) ([davidassigbi](https://github.com/davidassigbi))
20+
- add EL10 basic support - align EL10 PGSQL 16 default package version [#1650](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1650) ([ikonia](https://github.com/ikonia))
21+
- (CAT-2385) Puppetcore update [#1646](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1646) ([shubhamshinde360](https://github.com/shubhamshinde360))
22+
- fix formating in extension [#1641](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1641) ([elfranne](https://github.com/elfranne))
23+
- Rename spec file so it runs [#1634](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1634) ([traylenator](https://github.com/traylenator))
24+
- Configure Mend for GitHub.com [#1630](https://github.com/puppetlabs/puppetlabs-postgresql/pull/1630) ([mend-for-github-com](https://github.com/mend-for-github-com))
25+
826
## [v10.6.1](https://github.com/puppetlabs/puppetlabs-postgresql/tree/v10.6.1) - 2025-12-26
927

1028
[Full Changelog](https://github.com/puppetlabs/puppetlabs-postgresql/compare/v10.6.0...v10.6.1)
@@ -1038,7 +1056,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
10381056

10391057
## [2.0.0](https://github.com/puppetlabs/puppetlabs-postgresql/tree/2.0.0) - 2013-01-15
10401058

1041-
[Full Changelog](https://github.com/puppetlabs/puppetlabs-postgresql/compare/1.0.0...2.0.0)
1059+
[Full Changelog](https://github.com/puppetlabs/puppetlabs-postgresql/compare/release-0.3.0...2.0.0)
10421060

10431061
### Added
10441062

@@ -1048,10 +1066,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
10481066

10491067
- Syntax Error [#55](https://github.com/puppetlabs/puppetlabs-postgresql/pull/55) ([Spenser309](https://github.com/Spenser309))
10501068

1051-
## [1.0.0](https://github.com/puppetlabs/puppetlabs-postgresql/tree/1.0.0) - 2012-10-24
1052-
1053-
[Full Changelog](https://github.com/puppetlabs/puppetlabs-postgresql/compare/release-0.3.0...1.0.0)
1054-
10551069
## [release-0.3.0](https://github.com/puppetlabs/puppetlabs-postgresql/tree/release-0.3.0) - 2012-09-17
10561070

10571071
[Full Changelog](https://github.com/puppetlabs/puppetlabs-postgresql/compare/release-0.2.0...release-0.3.0)

REFERENCE.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -895,6 +895,7 @@ The following parameters are available in the `postgresql::server` class:
895895
* [`password_encryption`](#-postgresql--server--password_encryption)
896896
* [`pg_hba_auth_password_encryption`](#-postgresql--server--pg_hba_auth_password_encryption)
897897
* [`roles`](#-postgresql--server--roles)
898+
* [`grants`](#-postgresql--server--grants)
898899
* [`config_entries`](#-postgresql--server--config_entries)
899900
* [`pg_hba_rules`](#-postgresql--server--pg_hba_rules)
900901
* [`backup_enable`](#-postgresql--server--backup_enable)
@@ -1343,6 +1344,14 @@ Specifies a hash from which to generate postgresql::server::role resources.
13431344

13441345
Default value: `{}`
13451346

1347+
##### <a name="-postgresql--server--grants"></a>`grants`
1348+
1349+
Data type: `Hash[String[1], Hash]`
1350+
1351+
Specifies a hash from which to generate postgresql::server::grant resources.
1352+
1353+
Default value: `{}`
1354+
13461355
##### <a name="-postgresql--server--config_entries"></a>`config_entries`
13471356

13481357
Data type: `Hash[String, Any]`

manifests/dnfmodule.pp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@
99
Variant[Enum['present', 'absent', 'purged', 'disabled', 'installed', 'latest'], String[1]] $ensure = 'installed',
1010
String[1] $module = 'postgresql',
1111
) {
12+
if $facts['os']['release']['major'] == '10' {
13+
fail('DNF modules are not supported on EL 10')
14+
}
1215
package { 'postgresql dnf module':
1316
ensure => $ensure,
1417
name => $module,

manifests/globals.pp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@
199199
},
200200
'Amazon' => '9.2',
201201
default => $facts['os']['release']['major'] ? {
202+
'10' => '16',
202203
'9' => '13',
203204
'8' => '10',
204205
'7' => '9.2',

metadata.json

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppetlabs-postgresql",
3-
"version": "10.6.1",
3+
"version": "10.6.2",
44
"author": "puppetlabs",
55
"summary": "Offers support for basic management of PostgreSQL databases.",
66
"license": "Apache-2.0",
@@ -10,7 +10,7 @@
1010
"dependencies": [
1111
{
1212
"name": "puppetlabs/stdlib",
13-
"version_requirement": ">= 9.0.0 < 10.0.0"
13+
"version_requirement": ">= 9.0.0 < 11.0.0"
1414
},
1515
{
1616
"name": "puppetlabs/apt",
@@ -31,22 +31,25 @@
3131
"operatingsystemrelease": [
3232
"7",
3333
"8",
34-
"9"
34+
"9",
35+
"10"
3536
]
3637
},
3738
{
3839
"operatingsystem": "CentOS",
3940
"operatingsystemrelease": [
4041
"7",
4142
"8",
42-
"9"
43+
"9",
44+
"10"
4345
]
4446
},
4547
{
4648
"operatingsystem": "OracleLinux",
4749
"operatingsystemrelease": [
4850
"7",
49-
"9"
51+
"9",
52+
"10"
5053
]
5154
},
5255
{
@@ -84,14 +87,16 @@
8487
"operatingsystem": "Rocky",
8588
"operatingsystemrelease": [
8689
"8",
87-
"9"
90+
"9",
91+
"10"
8892
]
8993
},
9094
{
9195
"operatingsystem": "AlmaLinux",
9296
"operatingsystemrelease": [
9397
"8",
94-
"9"
98+
"9",
99+
"10"
95100
]
96101
}
97102
],

spec/acceptance/server_instance_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# run a test task
44
require 'spec_helper_acceptance'
55

6-
describe 'postgresql instance test1', if: os[:family] == 'redhat' && !os[:release].start_with?('7') do
6+
describe 'postgresql instance test1', if: os[:family] == 'redhat' && os[:release].to_i.between?(8, 9) do
77
pp = <<-MANIFEST
88
# set global defaults
99
class { 'postgresql::globals':

0 commit comments

Comments
 (0)