Skip to content
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.

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

Audit: Better messages #357

Merged
merged 2 commits into from
Jun 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ RUN --mount=type=cache,target=/var/lib/apt/lists \
RUN --mount=type=cache,target=/var/lib/apt/lists \
--mount=type=cache,target=/var/cache,sharing=locked \
apt-get update \
&& apt-get install --assume-yes --no-install-recommends libproj-dev pkgconf libcairo2-dev
&& apt-get install --assume-yes --no-install-recommends libproj-dev pkgconf libcairo2-dev libgraphviz-dev

# From c2cwsgiutils

Expand Down
55 changes: 55 additions & 0 deletions ci/dpkg-versions.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
camptocamp/github-app-geo-project:latest:
ubuntu_24_04/adduser: 3.137ubuntu1
ubuntu_24_04/adwaita-icon-theme: 46.0-1
ubuntu_24_04/apt: 2.7.14build2
ubuntu_24_04/at-spi2-common: 2.52.0-1build1
ubuntu_24_04/base-passwd: 3.6.3build1
ubuntu_24_04/bash: 5.2.21-2ubuntu4
ubuntu_24_04/binutils: 2.42-4ubuntu2
Expand All @@ -27,6 +29,7 @@ camptocamp/github-app-geo-project:latest:
ubuntu_24_04/dpkg-dev: 1.22.6ubuntu6
ubuntu_24_04/e2fsprogs: 1.47.0-2.4~exp1ubuntu4
ubuntu_24_04/findutils: 4.9.0-5build1
ubuntu_24_04/fontconfig: 2.15.0-1.1ubuntu2
ubuntu_24_04/fontconfig-config: 2.15.0-1.1ubuntu2
ubuntu_24_04/fonts-dejavu-core: 2.37-8
ubuntu_24_04/fonts-dejavu-mono: 2.37-8
Expand All @@ -50,19 +53,27 @@ camptocamp/github-app-geo-project:latest:
ubuntu_24_04/gpgsm: 2.4.4-2ubuntu17
ubuntu_24_04/gpgv: 2.4.4-2ubuntu17
ubuntu_24_04/grep: 3.11-4build1
ubuntu_24_04/gtk-update-icon-cache: 3.24.41-4ubuntu1
ubuntu_24_04/gzip: 1.12-1ubuntu3
ubuntu_24_04/hicolor-icon-theme: 0.17-2
ubuntu_24_04/hostname: 3.23+nmu2ubuntu2
ubuntu_24_04/humanity-icon-theme: 0.6.16
ubuntu_24_04/init-system-helpers: 1.66ubuntu1
ubuntu_24_04/iptables: 1.8.10-3ubuntu2
ubuntu_24_04/keyboxd: 2.4.4-2ubuntu17
ubuntu_24_04/libacl1: 2.3.2-1build1
ubuntu_24_04/libaom3: 3.8.2-2ubuntu0.1
ubuntu_24_04/libapt-pkg6.0t64: 2.7.14build2
ubuntu_24_04/libasan8: 14-20240412-0ubuntu1
ubuntu_24_04/libassuan0: 2.5.6-1build1
ubuntu_24_04/libatk1.0-0t64: 2.52.0-1build1
ubuntu_24_04/libatomic1: 14-20240412-0ubuntu1
ubuntu_24_04/libattr1: 1:2.5.2-1build1
ubuntu_24_04/libaudit-common: 1:3.1.2-2.1build1
ubuntu_24_04/libaudit1: 1:3.1.2-2.1build1
ubuntu_24_04/libavahi-client3: 0.8-13ubuntu6
ubuntu_24_04/libavahi-common-data: 0.8-13ubuntu6
ubuntu_24_04/libavahi-common3: 0.8-13ubuntu6
ubuntu_24_04/libbinutils: 2.42-4ubuntu2
ubuntu_24_04/libblkid-dev: 2.39.3-9ubuntu6
ubuntu_24_04/libblkid1: 2.39.3-9ubuntu6
Expand All @@ -82,15 +93,21 @@ camptocamp/github-app-geo-project:latest:
ubuntu_24_04/libcap-ng0: 0.8.4-2build2
ubuntu_24_04/libcap2: 1:2.66-5ubuntu2
ubuntu_24_04/libcc1-0: 14-20240412-0ubuntu1
ubuntu_24_04/libcdt5: 2.42.2-9build1
ubuntu_24_04/libcgraph6: 2.42.2-9build1
ubuntu_24_04/libcom-err2: 1.47.0-2.4~exp1ubuntu4
ubuntu_24_04/libcrypt-dev: 1:4.4.36-4build1
ubuntu_24_04/libcrypt1: 1:4.4.36-4build1
ubuntu_24_04/libctf-nobfd0: 2.42-4ubuntu2
ubuntu_24_04/libctf0: 2.42-4ubuntu2
ubuntu_24_04/libcups2t64: 2.4.7-1.2ubuntu7
ubuntu_24_04/libcurl3t64-gnutls: 8.5.0-2ubuntu10.1
ubuntu_24_04/libcurl4-gnutls-dev: 8.5.0-2ubuntu10.1
ubuntu_24_04/libcurl4t64: 8.5.0-2ubuntu10.1
ubuntu_24_04/libdatrie1: 0.2.13-3build1
ubuntu_24_04/libdb5.3t64: 5.3.28+dfsg2-7
ubuntu_24_04/libdbus-1-3: 1.14.10-4ubuntu4
ubuntu_24_04/libde265-0: 1.0.15-1build3
ubuntu_24_04/libdebconfclient0: 0.271ubuntu3
ubuntu_24_04/libdeflate-dev: 1.19-1build1
ubuntu_24_04/libdeflate0: 1.19-1build1
Expand All @@ -107,11 +124,15 @@ camptocamp/github-app-geo-project:latest:
ubuntu_24_04/libfontconfig1: 2.15.0-1.1ubuntu2
ubuntu_24_04/libfreetype-dev: 2.13.2+dfsg-1build3
ubuntu_24_04/libfreetype6: 2.13.2+dfsg-1build3
ubuntu_24_04/libfribidi0: 1.0.13-3build1
ubuntu_24_04/libgcc-13-dev: 13.2.0-23ubuntu4
ubuntu_24_04/libgcc-s1: 14-20240412-0ubuntu1
ubuntu_24_04/libgcrypt20: 1.10.3-2build1
ubuntu_24_04/libgd3: 2.3.3-9ubuntu5
ubuntu_24_04/libgdbm-compat4t64: 1.23-5.1build1
ubuntu_24_04/libgdbm6t64: 1.23-5.1build1
ubuntu_24_04/libgdk-pixbuf-2.0-0: 2.42.10+dfsg-3ubuntu3.1
ubuntu_24_04/libgdk-pixbuf2.0-common: 2.42.10+dfsg-3ubuntu3.1
ubuntu_24_04/libgirepository-2.0-0: 2.80.0-6ubuntu3.1
ubuntu_24_04/libglib2.0-0t64: 2.80.0-6ubuntu3.1
ubuntu_24_04/libglib2.0-bin: 2.80.0-6ubuntu3.1
Expand All @@ -123,11 +144,24 @@ camptocamp/github-app-geo-project:latest:
ubuntu_24_04/libgomp1: 14-20240412-0ubuntu1
ubuntu_24_04/libgpg-error0: 1.47-3build2
ubuntu_24_04/libgprofng0: 2.42-4ubuntu2
ubuntu_24_04/libgraphite2-3: 1.3.14-2build1
ubuntu_24_04/libgraphviz-dev: 2.42.2-9build1
ubuntu_24_04/libgssapi-krb5-2: 1.20.1-6ubuntu2
ubuntu_24_04/libgtk2.0-0t64: 2.24.33-4ubuntu1
ubuntu_24_04/libgtk2.0-common: 2.24.33-4ubuntu1
ubuntu_24_04/libgts-0.7-5t64: 0.7.6+darcs121130-5.2build1
ubuntu_24_04/libgvc6: 2.42.2-9build1
ubuntu_24_04/libgvc6-plugins-gtk: 2.42.2-9build1
ubuntu_24_04/libgvpr2: 2.42.2-9build1
ubuntu_24_04/libharfbuzz0b: 8.3.0-2build2
ubuntu_24_04/libheif-plugin-aomdec: 1.17.6-1ubuntu4
ubuntu_24_04/libheif-plugin-libde265: 1.17.6-1ubuntu4
ubuntu_24_04/libheif1: 1.17.6-1ubuntu4
ubuntu_24_04/libhogweed6t64: 3.9.1-2.2build1
ubuntu_24_04/libhwasan0: 14-20240412-0ubuntu1
ubuntu_24_04/libice-dev: 2:1.0.10-1build3
ubuntu_24_04/libice6: 2:1.0.10-1build3
ubuntu_24_04/libicu74: 74.2-1ubuntu3
ubuntu_24_04/libidn2-0: 2.3.7-2build1
ubuntu_24_04/libip4tc2: 1.8.10-3ubuntu2
ubuntu_24_04/libip6tc2: 1.8.10-3ubuntu2
Expand All @@ -149,10 +183,12 @@ camptocamp/github-app-geo-project:latest:
ubuntu_24_04/libkrb5-3: 1.20.1-6ubuntu2
ubuntu_24_04/libkrb5support0: 1.20.1-6ubuntu2
ubuntu_24_04/libksba8: 1.6.6-1build1
ubuntu_24_04/liblab-gamut1: 2.42.2-9build1
ubuntu_24_04/libldap2: 2.6.7+dfsg-1~exp1ubuntu8
ubuntu_24_04/liblerc-dev: 4.0.0+ds-4ubuntu2
ubuntu_24_04/liblerc4: 4.0.0+ds-4ubuntu2
ubuntu_24_04/liblsan0: 14-20240412-0ubuntu1
ubuntu_24_04/libltdl7: 2.4.7-7build1
ubuntu_24_04/liblz4-1: 1.9.4-1build1
ubuntu_24_04/liblzma-dev: 5.6.1+really5.4.5-1
ubuntu_24_04/liblzma5: 5.6.1+really5.4.5-1
Expand All @@ -177,6 +213,10 @@ camptocamp/github-app-geo-project:latest:
ubuntu_24_04/libpam-modules-bin: 1.5.3-5ubuntu5.1
ubuntu_24_04/libpam-runtime: 1.5.3-5ubuntu5.1
ubuntu_24_04/libpam0g: 1.5.3-5ubuntu5.1
ubuntu_24_04/libpango-1.0-0: 1.52.1+ds-1build1
ubuntu_24_04/libpangocairo-1.0-0: 1.52.1+ds-1build1
ubuntu_24_04/libpangoft2-1.0-0: 1.52.1+ds-1build1
ubuntu_24_04/libpathplan4: 2.42.2-9build1
ubuntu_24_04/libpcre2-16-0: 10.42-4ubuntu2
ubuntu_24_04/libpcre2-32-0: 10.42-4ubuntu2
ubuntu_24_04/libpcre2-8-0: 10.42-4ubuntu2
Expand All @@ -203,6 +243,7 @@ camptocamp/github-app-geo-project:latest:
ubuntu_24_04/libpython3.12t64: 3.12.3-1
ubuntu_24_04/libquadmath0: 14-20240412-0ubuntu1
ubuntu_24_04/libreadline8t64: 8.2-4build1
ubuntu_24_04/librsvg2-2: 2.58.0+dfsg-1build1
ubuntu_24_04/librtmp1: 2.4+20151223.gitfa8646d.1-2build7
ubuntu_24_04/libsasl2-2: 2.1.28+dfsg1-5ubuntu3
ubuntu_24_04/libsasl2-modules-db: 2.1.28+dfsg1-5ubuntu3
Expand All @@ -229,6 +270,8 @@ camptocamp/github-app-geo-project:latest:
ubuntu_24_04/libstdc++6: 14-20240412-0ubuntu1
ubuntu_24_04/libsystemd0: 255.4-1ubuntu8.1
ubuntu_24_04/libtasn1-6: 4.19.0-3build1
ubuntu_24_04/libthai-data: 0.1.29-2build1
ubuntu_24_04/libthai0: 0.1.29-2build1
ubuntu_24_04/libtiff-dev: 4.5.1+git230720-4ubuntu2.1
ubuntu_24_04/libtiff6: 4.5.1+git230720-4ubuntu2.1
ubuntu_24_04/libtiffxx6: 4.5.1+git230720-4ubuntu2.1
Expand All @@ -254,10 +297,20 @@ camptocamp/github-app-geo-project:latest:
ubuntu_24_04/libxcb-shm0-dev: 1.15-1ubuntu2
ubuntu_24_04/libxcb1: 1.15-1ubuntu2
ubuntu_24_04/libxcb1-dev: 1.15-1ubuntu2
ubuntu_24_04/libxcomposite1: 1:0.4.5-1build3
ubuntu_24_04/libxcursor1: 1:1.2.1-1build1
ubuntu_24_04/libxdamage1: 1:1.1.6-1build1
ubuntu_24_04/libxdmcp-dev: 1:1.1.3-0ubuntu6
ubuntu_24_04/libxdmcp6: 1:1.1.3-0ubuntu6
ubuntu_24_04/libxdot4: 2.42.2-9build1
ubuntu_24_04/libxext-dev: 2:1.3.4-1build2
ubuntu_24_04/libxext6: 2:1.3.4-1build2
ubuntu_24_04/libxfixes3: 1:6.0.0-2build1
ubuntu_24_04/libxi6: 2:1.8.1-1build1
ubuntu_24_04/libxinerama1: 2:1.1.4-3build1
ubuntu_24_04/libxml2: 2.9.14+dfsg-1.3ubuntu3
ubuntu_24_04/libxpm4: 1:3.5.17-1build2
ubuntu_24_04/libxrandr2: 2:1.5.2-2build1
ubuntu_24_04/libxrender-dev: 1:0.9.10-1.1build1
ubuntu_24_04/libxrender1: 1:0.9.10-1.1build1
ubuntu_24_04/libxtables12: 1.8.10-3ubuntu2
Expand Down Expand Up @@ -306,10 +359,12 @@ camptocamp/github-app-geo-project:latest:
ubuntu_24_04/runc: 1.1.12-0ubuntu3
ubuntu_24_04/sed: 4.9-2build1
ubuntu_24_04/sensible-utils: 0.0.22
ubuntu_24_04/shared-mime-info: 2.4-4
ubuntu_24_04/sysvinit-utils: 3.08-6ubuntu3
ubuntu_24_04/tar: 1.35+dfsg-3build1
ubuntu_24_04/tzdata: 2024a-3ubuntu1.1
ubuntu_24_04/ubuntu-keyring: 2023.11.28.1
ubuntu_24_04/ubuntu-mono: 24.04-0ubuntu1
ubuntu_24_04/util-linux: 2.39.3-9ubuntu6
ubuntu_24_04/uuid-dev: 2.39.3-9ubuntu6
ubuntu_24_04/x11-common: 1:7.7+23ubuntu3
Expand Down
4 changes: 2 additions & 2 deletions github_app_geo_project/module/audit/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,10 @@ async def _process_snyk_dpkg(
)
message = module_utils.ansi_proc_message(proc)
if proc.returncode != 0:
message.title = "Error while setting the Python version"
message.title = f"Error while setting the Python version to {python_version}"
_LOGGER.error(message)
else:
message.title = "Setting the Python version"
message.title = f"Setting the Python version to {python_version}"
_LOGGER.debug(message)

result, body, short_message, new_success = await audit_utils.snyk(
Expand Down
2 changes: 1 addition & 1 deletion github_app_geo_project/module/audit/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ async def snyk(
result.append(message)
else:
message.title = f"Dependencies installed from {file}"
_LOGGER.debug(message)
_LOGGER.debug(message)

proc = subprocess.run( # nosec # pylint: disable=subprocess-run-check
["git", "ls-files", "Pipfile", "*/Pipfile"], capture_output=True, encoding="utf-8", timeout=30
Expand Down
Loading