Merge branch '7.x' into doc-7.y

* 7.x: (PDB-5700) 7.15.0 release notes (PUP-11899) update integration tests for new Puppet log message (maint) Update version to 7.15.1-SNAPSHOT (maint) Update version to 7.15.0 for release Set clj-parent=5.6.6 (PE-36861) Update ezbake to 2.5.5 Set clj-parent=5.6.5 (PE-36861) Update ezbake to 2.5.4 Set clj-parent=5.6.4
puppetlabs · Nov 7, 2023 · fe6257c · fe6257c
2 parents df6a718 + f742e74
commit fe6257c
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 13 deletions.
diff --git a/documentation/release_notes_7.markdown b/documentation/release_notes_7.markdown
@@ -15,6 +15,33 @@ canonical: "/puppetdb/latest/release_notes.html"
 
 # PuppetDB: Release notes
 
+## PuppetDB 7.15.0
+
+Released November 7 2023
+
+### Security fixes
+
+* Update trapperkeeper-webserver-jetty9 to 4.5.2 to address
+  CVE-2023-44487, CVE-2023-36478, GHSA-58qw-p7qm-5rvh,
+  GHSA-hmr7-m48g-48f6, GHSA-3gh6-v5v9-6v9j
+
+* Update Bouncy Castle FIPS to v1.0.2.4 to resolve CVE-2022-45156
+  and CVE-2023-33202
+
+### Bug fixes
+
+* Update jvm-ssl-utils to 3.5.2 to address a stack overflow in
+  certificates with tags.
+
+## New features and improvements
+
+* Allow for Puppet::Util::Puppetdb to flush config.
+  ([PE-36947](https://perforce.atlassian.net/browse/PE-36947))
+
+### Contributors
+
+Austin Blatt, Nick Burgan-Illig, Joshua Partlow, and Rob Browning
+
 ## PuppetDB 7.14.0
 
 Released August 22 2023

diff --git a/project.clj b/project.clj
@@ -1,6 +1,6 @@
-(def pdb-version "7.14.1-SNAPSHOT")
+(def pdb-version "7.15.1-SNAPSHOT")
 
-(def clj-parent-version "5.6.3")
+(def clj-parent-version "5.6.6")
 
 (defn true-in-env? [x]
   (#{"true" "yes" "1"} (System/getenv x)))
@@ -313,7 +313,7 @@
                                                ;; in the final package.
                                                [puppetlabs/puppetdb ~pdb-version :exclusions [com.zaxxer/HikariCP]]]
                       :name "puppetdb"
-                      :plugins [[puppetlabs/lein-ezbake "2.5.3"]]}
+                      :plugins [[puppetlabs/lein-ezbake "2.5.5"]]}
              :testutils {:source-paths ^:replace ["test"]
                          :resource-paths ^:replace []
                          ;; Something else may need adjustment, but

diff --git a/test/puppetlabs/puppetdb/integration/reports.clj b/test/puppetlabs/puppetdb/integration/reports.clj
@@ -234,14 +234,17 @@
       (let [[report] (int/pql-query pdb "reports { certname = 'my_agent' and noop = false }")
             metrics (get-href pdb (get-in report [:metrics :href]))
             logs  (get-href pdb (get-in report [:logs :href]))
-            ;; In Puppet 7, disable_i18n is true by default, so the "Retrieving locales"
+            puppet-major-version (->> (int/bundle-exec {} "puppet" "--version")
+                                      :out
+                                      str/trim-newline
+                                      (re-matches #"^(\d+)\..*")
+                                      second
+                                      Integer/parseInt)
+            ;; Starting in Puppet 7, disable_i18n is true by default, so the "Retrieving locales"
             ;; log message does not exist
-            info-log-count (if (->> (int/bundle-exec {} "puppet" "--version")
-                                    :out
-                                    str/trim-newline
-                                    (re-matches #"^6.*"))
-                             6
-                             5)]
+            info-log-count (if (> puppet-major-version 6) 5 6)
+            ;; during the lifetime of puppet 7 and 8 PUP-11899 added a log message
+            notice-log-count (if (> puppet-major-version 6) 4 3)]
 
         (is (= #{{:name "total", :value 1, :category "events"}
                  {:name "changed", :value 1, :category "resources"}
@@ -257,9 +260,10 @@
                             (set (:tags e)))))
                   logs))
 
-        (is (= 3 (count
-                  (filter #(= "notice" (:level %))
-                          logs))))
+        (is (= notice-log-count
+               (count
+                (filter #(= "notice" (:level %))
+                        logs))))
 
         (is (= info-log-count
                (count