Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
0086c0b
Bump ruff from 0.6.4 to 0.6.5
dependabot[bot] Sep 19, 2024
b701a3a
Merge pull request #804 from mendix/dependabot/pip/develop/ruff-0.6.5
jeohist Sep 19, 2024
0252f25
Add warning about pinned AWS root CAs
thoHeinze Aug 23, 2024
1dea364
Merge pull request #794 from thoHeinze/master
jeohist Sep 19, 2024
1db1e42
Bump pylint from 3.2.7 to 3.3.0
dependabot[bot] Sep 23, 2024
6a290f6
Merge pull request #805 from mendix/dependabot/pip/develop/pylint-3.3.0
jeohist Sep 23, 2024
f1cf278
Bump idna from 3.8 to 3.10
dependabot[bot] Sep 23, 2024
e2d7eb6
Merge pull request #806 from mendix/dependabot/pip/develop/idna-3.10
jeohist Sep 23, 2024
9403826
Bump ruff from 0.6.5 to 0.6.7
dependabot[bot] Sep 23, 2024
d40d76e
Merge pull request #807 from mendix/dependabot/pip/develop/ruff-0.6.7
jeohist Sep 23, 2024
5a28db4
Bump ruff from 0.6.7 to 0.6.8
dependabot[bot] Sep 30, 2024
057111d
Merge pull request #809 from mendix/dependabot/pip/develop/ruff-0.6.8
jeohist Oct 1, 2024
11cdff7
Bump pylint from 3.3.0 to 3.3.1
dependabot[bot] Oct 1, 2024
46f5794
Merge pull request #808 from mendix/dependabot/pip/develop/pylint-3.3.1
jeohist Oct 1, 2024
2624154
Bump psycopg2-binary from 2.9.9 to 2.9.10
dependabot[bot] Oct 21, 2024
b7b4e04
Bump ruff from 0.6.8 to 0.7.0
dependabot[bot] Oct 21, 2024
c22916b
Bump cryptography from 43.0.1 to 43.0.3
dependabot[bot] Oct 21, 2024
b0bf094
Merge branch 'master' into develop
sailhenz Oct 24, 2024
2e75736
Merge pull request #816 from mendix/dependabot/pip/develop/cryptograp…
jeohist Oct 25, 2024
7320625
Merge pull request #815 from mendix/dependabot/pip/develop/ruff-0.7.0
jeohist Oct 25, 2024
1c9b788
Merge pull request #814 from mendix/dependabot/pip/develop/psycopg2-b…
jeohist Oct 25, 2024
714913e
Bump ruff from 0.7.0 to 0.7.2
dependabot[bot] Nov 4, 2024
802b57c
Bump nginx from 1.22.1 to 1.26.1
Nov 6, 2024
cd81058
Merge pull request #819 from mendix/dependabot/pip/develop/ruff-0.7.2
jeohist Nov 8, 2024
137eebe
Merge branch 'develop' into UPV4-5086_bump-nginx
vaibhav1805 Nov 11, 2024
731989a
Merge pull request #820 from vaibhav1805/UPV4-5086_bump-nginx
sailhenz Nov 13, 2024
65241c2
Bump ruff from 0.7.2 to 0.7.3
dependabot[bot] Nov 15, 2024
54771bd
Merge pull request #821 from mendix/dependabot/pip/develop/ruff-0.7.3
jeohist Nov 15, 2024
66ca61b
Update and run pre-commit
jeohist Oct 1, 2024
9bb413c
Merge pull request #811 from mendix/bump_precommit
jeohist Nov 15, 2024
3aedaa1
Bump ruff from 0.7.3 to 0.7.4
dependabot[bot] Nov 18, 2024
c117b5e
Merge pull request #822 from mendix/dependabot/pip/develop/ruff-0.7.4
jeohist Nov 18, 2024
543bf62
Merge branch 'master' into develop
sailhenz Nov 21, 2024
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
7 changes: 4 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,25 @@
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: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
- id: fix-byte-order-marker
- 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.7.3'
hooks:
- id: ruff
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ cf set-env <YOUR_APP> DATABASE_CONNECTION_PARAMS '{"tcpKeepAlive": "true", "conn

To allow connection to an AWS RDS database the buildpack selects the regional CA certificate stored in [`rds-certificates`](etc/rds-certificates). If the region's certificate doesn't exist, the buildpack will fail with an error `Could not find database CA certificate in map`.

*:warning: After the root CA rotation of AWS RDS on 22nd August 2024, only buildpacks v5.0.5 or higher will continue to work, all older buildpacks only import no longer valid certificates and no longer can establish a connection to AWS RDS.*

#### Supported VCAP Schemas

Cloud Foundry database services are detected from Cloud Foundry service bindings ([VCAP](https://docs.cloudfoundry.org/devguide/deploy-apps/environment-variable.html#VCAP-SERVICES)) and translated into Mendix Runtime configuration. In case no database service is bound, the fallback is the environment variable `DATABASE_URL`.
Expand Down
2 changes: 1 addition & 1 deletion buildpack/core/runtime.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def _activate_license():
<entry key="id2" value="{{LICENSE_ID}}"/>
<entry key="license_key2" value="{{LICENSE_KEY}}"/>
</map>"""

license_key = os.environ.get(
"FORCED_LICENSE_KEY", os.environ.get("LICENSE_KEY", None)
)
Expand Down
2 changes: 1 addition & 1 deletion buildpack/infrastructure/database.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion buildpack/telemetry/metrics.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion dependencies-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ dependencies:
version: 8.6.0
nginx:
artifact: nginx_{{ version }}_linux_x64_{{ fs }}_{{ commit }}.tgz
commit: 909b06a9
commit: b1316f75
fs: cflinuxfs4
cpe: cpe:2.3:a:f5:nginx:{{ version }}:*:*:*:*:*:*:*
version: 1.22.1
version: 1.26.1
ruby:
artifact: ruby/ruby_{{ version }}_linux_x64_{{ fs }}_{{ commit }}.tgz
commit: 5fed98f8
Expand Down
6 changes: 3 additions & 3 deletions requirements-dev.in
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
click==8.1.7
idna==3.8
idna==3.10
pytest==8.3.3
pytest-timer==1.0.0
pytest-timeout==2.3.1
pylint==3.2.7
pylint==3.3.1
randomname==0.2.1
requests-mock==1.12.1
ruff==0.6.4
ruff==0.7.4
parameterized==0.9.0
4 changes: 2 additions & 2 deletions requirements.in
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
backoff==2.2.1
certifi==2024.8.30
cryptography==43.0.1
cryptography==43.0.3
distro==1.9.0
httplib2==0.22.0
jinja2==3.1.4
omegaconf==2.3.0
psycopg2-binary==2.9.9
psycopg2-binary==2.9.10
pyyaml==6.0.2
requests==2.32.3
urllib3==2.2.3
6 changes: 3 additions & 3 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ cffi==1.14.4
# via cryptography
charset-normalizer==2.0.3
# via requests
cryptography==43.0.1
cryptography==43.0.3
# via -r requirements.in
distro==1.9.0
# via -r requirements.in
httplib2==0.22.0
# via -r requirements.in
idna==3.7
idna==3.10
# via requests
jinja2==3.1.4
# via -r requirements.in
markupsafe==2.0.1
# via jinja2
omegaconf==2.3.0
# via -r requirements.in
psycopg2-binary==2.9.9
psycopg2-binary==2.9.10
# via -r requirements.in
pycparser==2.20
# via cffi
Expand Down
Loading