From 1e646811dea064fa6b0b0bec1a01c258d0f9f4d6 Mon Sep 17 00:00:00 2001 From: Joey den Broeder Date: Tue, 1 Oct 2024 13:29:27 +0100 Subject: [PATCH] Update and run pre-commit --- .pre-commit-config.yaml | 7 ++++--- buildpack/core/runtime.py | 2 +- buildpack/infrastructure/database.py | 2 +- buildpack/telemetry/metrics.py | 2 +- dependencies-stage.yml | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index b4da6791..62824ce1 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,12 +2,12 @@ fail_fast: false repos: - repo: https://github.com/adrienverge/yamllint.git - rev: v1.33.0 + rev: v1.35.1 hooks: - id: yamllint args: ["--format", "parsable", "--strict"] - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v4.5.0 + rev: v4.6.0 hooks: - id: trailing-whitespace - id: end-of-file-fixer @@ -15,11 +15,12 @@ repos: - id: mixed-line-ending - id: check-json - id: detect-aws-credentials + args: ["--allow-missing-credentials"] - repo: https://github.com/markdownlint/markdownlint rev: v0.12.0 hooks: - id: markdownlint_docker - repo: https://github.com/charliermarsh/ruff-pre-commit - rev: 'v0.1.6' + rev: 'v0.6.8' hooks: - id: ruff diff --git a/buildpack/core/runtime.py b/buildpack/core/runtime.py index b2c5e367..a9e79c6a 100644 --- a/buildpack/core/runtime.py +++ b/buildpack/core/runtime.py @@ -185,7 +185,7 @@ def _activate_license(): """ - + license_key = os.environ.get( "FORCED_LICENSE_KEY", os.environ.get("LICENSE_KEY", None) ) diff --git a/buildpack/infrastructure/database.py b/buildpack/infrastructure/database.py index 601bbb87..f5912d90 100644 --- a/buildpack/infrastructure/database.py +++ b/buildpack/infrastructure/database.py @@ -347,7 +347,7 @@ def init(self): jdbc_params.update({"sslmode": "verify-full"}) except Exception: raise Exception("Could not find database CA certificate in map") - + if database_type == "PostgreSQL" and not self.url.startswith("jdbc:"): self.extract_inline_cert(jdbc_params, self.SSLCERT, "postgresql.crt") self.extract_inline_cert(jdbc_params, self.SSLKEY, "postgresql.pk8") diff --git a/buildpack/telemetry/metrics.py b/buildpack/telemetry/metrics.py index 876b9413..e3e24f19 100644 --- a/buildpack/telemetry/metrics.py +++ b/buildpack/telemetry/metrics.py @@ -119,7 +119,7 @@ def micrometer_metrics_enabled(runtime_version): logging.debug("micrometer for non mendix public cloud") micrometer_enabled = True return micrometer_enabled - + def configure_metrics_registry(m2ee): diff --git a/dependencies-stage.yml b/dependencies-stage.yml index d7994f9e..87ac5424 100644 --- a/dependencies-stage.yml +++ b/dependencies-stage.yml @@ -5,5 +5,5 @@ uri: https://cdn.mendix.com/mx-buildpack/python/python_3.10.14_linux_x64_cflinuxfs4_dda5228c.tgz sha256: dda5228c36196f8a7346767ad9c9ac774ec270aa55065beb8d3d052d652b9120 cf_stacks: - - cflinuxfs4 + - cflinuxfs4 source_sha256: cefea32d3be89c02436711c95a45c7f8e880105514b78680c14fe76f5709a0f6