Merge 6.0.x into 6.3.x

puppetlabs · Jul 2, 2019 · c10ed54 · c10ed54
2 parents b218262 + 50f869d
commit c10ed54
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 7 deletions.
diff --git a/documentation/release_notes.markdown b/documentation/release_notes.markdown
@@ -110,6 +110,29 @@ canonical: "/puppetdb/latest/release_notes.html"
 
 ---
 
+## PuppetDB 6.0.4
+
+### New features and improvements
+
+- **Order `facts` and `fact-contents` by value.** The v4 `/facts` endpoint now supports ordering by fact value. For more information, see [Facts][facts]. [PUP-3687](https://tickets.puppetlabs.com/browse/PDB-3687)
+
+### Bug fixes
+
+- PuppetDB database migrations failed due to a bug in the most recent releases of PostgreSQL 9.4.23, 9.5.18, 9.6.14, 10.9, and 11.4. This release does not change migration behavior, but includes changes to PuppetDB's database migration to avoid triggering the issue. See [PostgreSQL bug #15865](https://www.postgresql.org/message-id/15865-17940eacc8f8b081%40postgresql.org) for details about the issue. [PDB-4422](https://tickets.puppetlabs.com/browse/PDB-4422)
+
+- Certnames using unusual characters or that are very long will now be stored properly for catalogs. In previous releases, certnames with special characters, or very long certnames, caused duplicate node entries. [PUP-4390](https://tickets.puppetlabs.com/browse/PDB-4390)
+
+- Resolved a bug  where garbage collection table names were causing a conflict. [PUP-4347](https://tickets.puppetlabs.com/browse/PDB-4347)
+
+- Resolved an bug that was causing PuppetDB to crash when performing older database migrations. [PUP-3840](https://tickets.puppetlabs.com/browse/PDB-3840)
+
+- In previous releases, if the database was inaccessible during startup, PuppetDB could become unkillable. [PUP-4308](https://tickets.puppetlabs.com/browse/PDB-4308)
+
+- PuppetDB now logs the correct error when an attempt to query a remote PuppetDB server for sync fails. Previously, PuppetDB was incorrectly reporting a `FileNotFoundException`.
+ [PUP-3592](https://tickets.puppetlabs.com/browse/PDB-3592)
+
+- **Storing catalogs with Unicode Unicode alphanumeric tags.** PuppetDB now successfully stores catalogs with Unicode alphanumeric tags.  [PDB-4326](https://tickets.puppetlabs.com/browse/PDB-4326)
+
 ## PuppetDB 6.0.3
 
 ### New features
@@ -217,6 +240,29 @@ Molly Waggett, Morgan Rhodes, Rob Browning, and Zachary Kent
 
 ---
 
+## PuppetDB 5.2.9
+
+### New features and improvements
+
+- **Order `facts` and `fact-contents` by value.** The v4 `/facts` endpoint now supports ordering by fact value. For more information, see [Facts][facts]. [PUP-3687](https://tickets.puppetlabs.com/browse/PDB-3687)
+
+### Bug fixes
+
+- PuppetDB database migrations failed due to a bug in the most recent releases of PostgreSQL 9.4.23, 9.5.18, 9.6.14, 10.9, and 11.4. This release does not change migration behavior, but includes changes to PuppetDB's database migration to avoid triggering the issue. See [PostgreSQL bug #15865](https://www.postgresql.org/message-id/15865-17940eacc8f8b081%40postgresql.org) for details about the issue. [PDB-4422](https://tickets.puppetlabs.com/browse/PDB-4422)
+
+- Certnames using unusual characters or that are very long will now be stored properly for catalogs. In previous releases, certnames with special characters, or very long certnames, caused duplicate node entries. [PUP-4390](https://tickets.puppetlabs.com/browse/PDB-4390)
+
+- Resolved a bug  where garbage collection table names were causing a conflict. [PUP-4347](https://tickets.puppetlabs.com/browse/PDB-4347)
+
+- Resolved an bug that was causing PuppetDB to crash when performing older database migrations. [PUP-3840](https://tickets.puppetlabs.com/browse/PDB-3840)
+
+- In previous releases, if the database was inaccessible during startup, PuppetDB could become unkillable. [PUP-4308](https://tickets.puppetlabs.com/browse/PDB-4308)
+
+- PuppetDB now logs the correct error when an attempt to query a remote PuppetDB server for sync fails. Previously, PuppetDB was incorrectly reporting a `FileNotFoundException`.
+ [PUP-3592](https://tickets.puppetlabs.com/browse/PDB-3592)
+
+- **Storing catalogs with Unicode Unicode alphanumeric tags.** PuppetDB now successfully stores catalogs with Unicode alphanumeric tags.  [PDB-4326](https://tickets.puppetlabs.com/browse/PDB-4326)
+
 ## PuppetDB 5.2.8
 
 ### New features

diff --git a/ext/bin/pdbbox-env b/ext/bin/pdbbox-env
@@ -10,9 +10,10 @@ if test "$#" -lt 1 -o -z "$PDBBOX"; then
 fi
 
 pgport="$(cat "$PDBBOX/pg/port")"
+pghost="$(tail -1 "$PDBBOX/pg/bind-addrs")"
 
 export PGBOX="$PDBBOX/pg"
-export PDB_TEST_DB_HOST=localhost
+export PDB_TEST_DB_HOST="$pghost"
 export PDB_TEST_DB_PORT="$pgport"
 export PDB_TEST_DB_USER=pdb_test
 export PDB_TEST_DB_USER_PASSWORD="$(cat "$PDBBOX/test-pass")"

diff --git a/ext/bin/pdbbox-init b/ext/bin/pdbbox-init
@@ -4,7 +4,7 @@ set -ueo pipefail
 
 usage()
 {
-    echo "Usage: $(basename $0) <-s|--sandbox> DIR --pgbin DIR --pgport PORT"
+    echo "Usage: $(basename $0) <-s|--sandbox> DIR --pgbin DIR --pgport PORT --bind-addr ADDR1 [--bind-addr ADDR2 ...]"
 }
 
 misuse()
@@ -16,6 +16,7 @@ misuse()
 pdbbox=''
 pgbin=''
 pgport=''
+bind_addr=()
 while test $# -gt 0; do
     case "$1" in
         -s|--sandbox)
@@ -36,20 +37,32 @@ while test $# -gt 0; do
             pgport="$1"
             shift
             ;;
+        --bind-addr)
+            shift
+            test $# -gt 0 || misuse
+            bind_addr+=("$1")
+            shift
+            ;;
         *)
             misuse
     esac
 done
 test "$pdbbox" || misuse
 test "$pgbin" || misuse
 test "$pgport" || misuse
+test "$bind_addr" || misuse
+
+bind_args=()
+for addr in "${bind_addr[@]}"; do
+    bind_args+=(--bind-addr "$addr")
+done
 
 export PGBOX="$pdbbox/pg"
 export PGUSER=postgres
 
 mkdir "$pdbbox"
 
-pgbox init --pgbin "$pgbin" --port "$pgport" -- -E UTF8 --locale=C
+pgbox init --pgbin "$pgbin" --port "$pgport" "${bind_args[@]}" -- -E UTF8 --locale=C
 
 mkdir "$pdbbox/var"
 
@@ -151,14 +164,16 @@ cat > "$pdbbox/logback.xml" <<EOF
 </configuration>
 EOF
 
+host=${bind_addr[${#bind_addr[@]}-1]}
+
 cat > "$pdbbox/pdb.ini" <<EOF
 
 [global]
 vardir = $abs_pdbbox/var
 logging-config = $abs_pdbbox/logback.xml
 
 [database]
-subname = //localhost:$pgport/puppetdb
+subname = //$host:$pgport/puppetdb
 username = puppetdb
 password = $passwd
 

diff --git a/ext/bin/require-pgbox b/ext/bin/require-pgbox
@@ -13,7 +13,7 @@ usage() { echo "Usage: $cmdname VERSION INSTALLDIR_IF_NEEDED"; }
 misuse() { usage 1>&2; exit 2; }
 
 declare -A known_hash
-known_hash[0.0.0]=b5840a59f5437677e22a33dd27b27282c5186d1ecd89b23d8d2ef4c62d3511ce
+known_hash[0.0.0]=c4dd424ddbcaf33cb0d3ef51255943cbdd87446ea7bf220528441849de35cfef
 
 test "$#" -eq 2 || misuse
 
@@ -42,7 +42,7 @@ tmpdir="$(cd "$tmpdir" && pwd)"
 trap "$(printf 'rm -rf %q' "$tmpdir")" EXIT
 
 cd "$tmpdir"
-curl -O "https://gitlab.com/pgbox-org/pgbox/raw/8ba9c69e061c89ef6f06cb40f5d60e85c1e2e336/pgbox"
+curl -O "https://gitlab.com/pgbox-org/pgbox/raw/82e512d37a7c6c2ae72d1293ea98945eaaae51f4/pgbox"
 obshash="$("$script_home/sha256sum" < pgbox | cut -d' ' -f1)"
 cd ..
 

diff --git a/ext/bin/with-pdbbox b/ext/bin/with-pdbbox
@@ -61,7 +61,9 @@ set -x
 
 trap "$(printf 'rm -rf %q' "$box")" EXIT
 export PDBBOX="$box"
-"$script_home"/pdbbox-init --sandbox "$box" --pgbin "$pgbin" --pgport "$pgport"
+"$script_home"/pdbbox-init --sandbox "$box" --pgbin "$pgbin" \
+              --pgport "$pgport" \
+              --bind-addr ip6-localhost --bind-addr localhost
 
 # Use a subshell for a nested EXIT trap
 (trap '"$script_home"/pdbbox-env pg_ctl stop' EXIT