Skip to content

Commit

Permalink
Update dependency Flask to v3.1.0 (#35)
Browse files Browse the repository at this point in the history
* Update dependency Flask to v3.1.0

* pin websockets<14.0

* add trust=True

* adapt expected secret label

* ignore pebble cve

* upgrade rock to noble

* ignore missing .trivyignore license header

* add trailing new line

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Christopher Bartz <[email protected]>
  • Loading branch information
renovate[bot] and cbartz authored Nov 20, 2024
1 parent 836abf5 commit 23aae82
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 4 deletions.
1 change: 1 addition & 0 deletions .licenserc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ header:
paths:
- '**'
paths-ignore:
- '.trivyignore'
- '.github/**'
- '**/*.json'
- '**/*.md'
Expand Down
2 changes: 2 additions & 0 deletions .trivyignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# pebble, false positive https://github.com/canonical/pebble/issues/498
CVE-2024-34156
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Flask==3.0.3
Flask==3.1.0
pydantic==2.9.2
kombu==5.4.2
pymongo==4.10.1
Expand Down
2 changes: 1 addition & 1 deletion rockcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# See LICENSE file for licensing details.

name: github-runner-webhook-router
base: ubuntu@22.04
base: ubuntu@24.04
version: '0.1'
summary: Forwards webhooks to a message queue to be consumed to spawn runners. # 79 char long summary
description: |
Expand Down
5 changes: 4 additions & 1 deletion tests/integration/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,10 @@ async def mongodb_fixture(model: Model, use_existing_app: bool) -> Application:
application = model.applications["mongodb"]
else:
application = await model.deploy(
"mongodb-k8s", channel="6/edge", application_name="mongodb"
"mongodb-k8s",
channel="6/edge",
application_name="mongodb",
trust=True,
)

await model.wait_for_idle(apps=[application.name], status="active")
Expand Down
3 changes: 2 additions & 1 deletion tests/integration/test_app.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import itertools
import json
import random
import re
import secrets
from typing import Optional

Expand Down Expand Up @@ -397,7 +398,7 @@ async def _get_mongodb_uri_from_secrets(ops_test, model: Model) -> str | None:

juju_secrets = await model.list_secrets()
for secret in juju_secrets["results"]:
if secret.label == "database.2.user.secret":
if re.match(r"database\.(\d+)\.user\.secret", secret.label):
_, show_secret, _ = await ops_test.juju(
"show-secret", secret.uri, "--reveal", "--format", "json"
)
Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ deps =
pytest-operator
requests
gunicorn
websockets<14.0 # https://github.com/juju/python-libjuju/issues/1184
-r{toxinidir}/requirements.txt
commands =
pytest -v --tb native --ignore={[vars]tst_path}unit --log-cli-level=INFO -s {posargs}
Expand Down

0 comments on commit 23aae82

Please sign in to comment.