Skip to content

2.27.0.0-b387

2.27.0.0-b387: [#28087] YSQL: merge pgaudit tag '1.7.1'
@jaki jaki tagged this 30 Jul 19:07 
Summary:
Merge yugabyte-db/master:src/postgres/third-party-extensions/pgaudit
into pgaudit/tags/1.7.1:.  This was done using

    git checkout heads/master
    git merge -s subtree -Xsubtree=src/postgres/third-party-extensions/pgaudit 1.7.1

1.7.1 refers to commit 72da89c3fa02f3f2b9f3933214d91ad9c3428467.  It was
chosen to bring in some bug fixes, namely
344f75eaa7a0de5f157f3c98226a469aa878fbb9 (Skip auditing of relations
without permissions.) and fd3370ac948260f4feb7402e3b8106dd8aca411d (Add
exception for call statement to stack check.).

Merge conflict resolution:

- Makefile:
  - DATA: YB 180a1f7613457bc84021f3c8c186adadc92ba626 includes
    pgaudit--1.3.2--1.7.sql so that upgrades from 2024.2 and below have
    a viable migration upgrade path.  Upstream pgaudit
    72da89c3fa02f3f2b9f3933214d91ad9c3428467 adds
    pgaudit--1.7--1.7.1.sql, removes pgaudit--1.7.sql, and adds
    pgaudit--1.7.1.sql.  Do both.
- pgaudit.c:
  - pgaudit_ProcessUtility_hook: YB
    329515ec6111daf5fe1f7d169de3a437273ad2c3 (specifically
    3ccf55af8c24e0f4bb112d8aee08d4434cebd979) (and followup
    6a56ce7bcdeb0478c791efaa322b58c61007fd39) adds T_YbBackfillIndexStmt
    to the end of an if condition.  Upstream pgaudit
    fd3370ac948260f4feb7402e3b8106dd8aca411d adds T_CallStmt to the end
    of the same if condition.  Keep both, ordering YB's stmt later.
- yb.port.pgaudit.*:
  - Update in accordance with the two pgaudit commits between 1.7.0 and
    1.7.1 touching these files: 344f75eaa7a0de5f157f3c98226a469aa878fbb9
    and 73feb99b8d68b14f850ceafe2946de5fd89e2c3b.
- yb.orig.roles.*:
  - Update version number to 1.7.1.
- TestPgRegressThirdPartyExtensionsPgaudit.java:
  - To get the regress test to work for one of the newly introduced
    queries, make it subclass BasePgRegressTestPorted.  It should have
    been this way before this merge as well, but we never got around to
    it.  Some YB workarounds in the regress test may no longer be
    needed, but leave that as a potential followup cleanup (issue
    #28115).
- upstream_repositories.csv:
  - Update the commit hash for pgaudit to 1.7.1.

Jira: DB-17716

Test Plan:
On Almalinux 8:

    ./yb_build.sh fastdebug --gcc11 daemons initdb \
      --java-test TestPgRegressThirdPartyExtensionsPgaudit

Reviewers: pjain, kramanathan

Reviewed By: kramanathan

Subscribers: yql

Differential Revision: https://phorge.dev.yugabyte.com/D45614
Assets 2
Loading