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

chore(deps): Bump uvicorn from 0.31.0 to 0.32.0 in /nats_events #806

Closed
wants to merge 40 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
39d0a2a
:sparkles: add origin and timestamp to event metadata (#46)
ff137 Feb 28, 2024
d7005d2
:art: reduce default log levels for handling webhooks (#60)
ff137 Mar 5, 2024
7ac0335
chore(deps-dev): Bump pytest-ruff from 0.1.1 to 0.3 in /redis_events …
dependabot[bot] Mar 5, 2024
de9631f
:sparkles: add group_id to metadata (#73)
ff137 Mar 11, 2024
1c15e3b
:bug: fix double writing of webhook events (#114)
ff137 Mar 25, 2024
c507c5c
:arrow_up: Upgrade ACA-Py to 0.12.0 (#136)
ff137 Apr 23, 2024
39954e8
➖ remove asynctest dependency (#190)
ff137 May 9, 2024
a04f771
⬆️ Bulk upgrade common dependencies (#191)
ff137 May 9, 2024
a9db941
:construction_worker: replace docker compose action with official set…
ff137 May 9, 2024
fae99e3
:heavy_minus_sign: Remove unused and :arrow_up: upgrade more dependen…
ff137 May 9, 2024
76e3917
:arrow_up: Replace `fastapi` with `fastapi-slim` (#209)
ff137 May 10, 2024
2ab90b9
:arrow_up: Upgrade all lock files
ff137 May 28, 2024
ddffbf2
Upgrade pydantic to v2 in /redis-events (#330)
ff137 Jun 11, 2024
938aba9
:arrow_up: Update ACA-Py tag (#349)
ff137 Jun 20, 2024
c0ae772
0.12.2b1 release (#364)
ff137 Jun 26, 2024
dc5b5d0
Sync with upstream (#382)
ff137 Jul 5, 2024
ef11e60
0.12.2b2 (#380)
ff137 Jul 9, 2024
95283b6
:arrow_up: ACA-Py 1.0.0rc4 (#394)
ff137 Jul 11, 2024
531db16
:art: add more verbose info logs for redis cluster startup (#419)
ff137 Jul 18, 2024
6e9fd85
:arrow_up: Bulk dependency upgrades (#534)
ff137 Aug 6, 2024
4f2f6fc
:arrow_up: Upgrade 1.0.0rc5 (#535)
cl0ete Aug 7, 2024
dc7ec87
:arrow_up: Upgrade 1.0.0rc6 (#536)
cl0ete Aug 8, 2024
344dce7
chore(deps): Bump hyperledger/aries-cloudagent-python (#516)
dependabot[bot] Aug 8, 2024
8b67799
:arrow_up: Upgrade 1.0.0 (#551)
cl0ete Aug 19, 2024
d76e7a2
:see_no_evil: obfuscate redis password from log (#566)
ff137 Aug 20, 2024
06c67b4
chore(deps): Bump hyperledger/aries-cloudagent-python (#565)
dependabot[bot] Aug 20, 2024
b4a9a3b
:arrow_up: Update ruff and aiohttp (#567)
ff137 Aug 20, 2024
a88a2c5
Test release: 1.0.0b0 with pagination ordering support (#605)
ff137 Aug 29, 2024
177980f
:bug: fix askar dependency should use test package (#606)
ff137 Aug 30, 2024
d24e15e
use tag 1.0.0b1 (#607)
ff137 Aug 30, 2024
f673a13
:arrow_up: Update lock files
ff137 Aug 30, 2024
a1cdae4
:arrow_up: Update lock files
ff137 Aug 30, 2024
ad1ecd1
:tada: NATS Plugin :construction: (#666)
ff137 Oct 4, 2024
f254f8b
:art: nats_events: update log levels (#731)
ff137 Oct 7, 2024
49567f9
Revert ":art: nats_events: update log levels (#731)" (#732)
ff137 Oct 7, 2024
f919e4a
🎨 nats_events: update log levels (#733)
ff137 Oct 7, 2024
3d37abb
chore(deps): Bump the all-actions group across 1 directory with 3 upd…
dependabot[bot] Oct 7, 2024
f02cb32
chore(deps-dev): Bump pytest-asyncio in /plugin_globals (#584)
dependabot[bot] Oct 7, 2024
19bf85c
Skip-nats-outbound-messages (#734)
ff137 Oct 8, 2024
2c0c9d7
chore(deps): Bump uvicorn from 0.31.0 to 0.32.0 in /nats_events
dependabot[bot] Oct 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
12 changes: 12 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,18 @@ updates:
- dependency-name: "*"
update-types: ["version-update:semver-major"]

# Maintain dependencies for Python Packages
- package-ecosystem: "pip"
directory: "/nats_events"
schedule:
interval: "weekly"
day: "monday"
time: "04:00"
timezone: "Canada/Pacific"
ignore:
- dependency-name: "*"
update-types: ["version-update:semver-major"]

# Maintain dependencies for Python Packages
- package-ecosystem: "pip"
directory: "/oid4vci/integration/afj_runner"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/create-release-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
#----------------------------------------------
- uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.12'
#----------------------------------------------
# Install poetry
#----------------------------------------------
Expand Down Expand Up @@ -202,7 +202,7 @@ jobs:
# ----------------------------------------------
- name: Initialize Docker Compose
if: ${{ steps.upgrade_available.outputs.available == 'true' && github.event.inputs.re_release != 'true'}}
uses: isbang/compose-action@v1.5.1
uses: isbang/compose-action@v2.0.2
# ----------------------------------------------
# Collect plugins that fail integration tests
# ----------------------------------------------
Expand Down Expand Up @@ -366,7 +366,7 @@ jobs:
#----------------------------------------------
- name: Create PR
if: ${{ steps.upgrade_available.outputs.available == 'true' && github.event.inputs.re_release != 'true'}}
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
author: Release Bot <release-bot@users.noreply.github.com>
committer: Release Bot <release-bot@users.noreply.github.com>
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
# ----------------------------------------------
- uses: actions/setup-python@v5
with:
python-version: '3.9'
python-version: '3.12'
#----------------------------------------------
# Check the latest version from plugins_global lock file
#----------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/pr-integration-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ jobs:
#----------------------------------------------
# Get docker compose
#----------------------------------------------
- name: Initialize Docker Compose
uses: isbang/compose-action@v1.5.1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
#----------------------------------------------
# Get changed files
#----------------------------------------------
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v44
uses: tj-actions/changed-files@v45
#----------------------------------------------
# Get changed plugins
#----------------------------------------------
Expand All @@ -42,7 +42,7 @@ jobs:
declare -a changed_dirs=()
for dir in ./*/; do
current_folder=$(basename "$dir")
if [[ $current_folder == "plugin_globals" ]]; then
if [[ $current_folder == "plugin_globals" ]] || [[ $current_folder == "kafka_events" ]] || [[ $current_folder == "nats_events" ]]; then
continue
fi
for changed_file in ${{ steps.changed-files.outputs.all_changed_files }}; do
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr-linting-and-unit-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ jobs:
id: setup-poetry
- uses: actions/setup-python@v5
with:
python-version: "3.9"
python-version: "3.12"
cache: "poetry"
#----------------------------------------------
# Get changed files
#----------------------------------------------
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v44
uses: tj-actions/changed-files@v45
#----------------------------------------------
# Get changed plugins
#----------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ __pycache__/
**/test-reports/
.coverage
coverage.xml
settings.json
.env
.env
.venv
20 changes: 20 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"cSpell.words": [
"acapy",
"actionmenu",
"aiohttp",
"basicmessage",
"basicmessages",
"cloudagent",
"CREDS",
"crids",
"devcontainer",
"didcomm",
"jetstream",
"keylist",
"linedata",
"Pydantic",
"resp",
"verkey"
]
}
4 changes: 2 additions & 2 deletions basicmessage_storage/.devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.134.0/containers/python-3/.devcontainer/base.Dockerfile
ARG VARIANT="3.9-bullseye"
ARG VARIANT="3.12-bullseye"
FROM mcr.microsoft.com/vscode/devcontainers/python:0-${VARIANT}

ARG POETRY_VERSION="1.7.1"
ARG POETRY_VERSION="1.8.3"
ENV POETRY_HOME="/opt/poetry" \
POETRY_VERSION=${POETRY_VERSION}

Expand Down
12 changes: 7 additions & 5 deletions basicmessage_storage/basicmessage_storage/v1_0/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class Config:
"""Inner class for configuration."""

alias_generator = _alias_generator
allow_population_by_field_name = True
populate_by_name = True

@classmethod
def default(cls):
Expand All @@ -33,7 +33,7 @@ def default(cls):

def process_config_dict(config_dict: dict) -> dict:
"""Remove any keys that are not in the config class."""
_filter = BasicMessageStorageConfig.default().dict().keys()
_filter = BasicMessageStorageConfig.default().model_dump().keys()
for key, value in config_dict.items():
if key in _filter:
config_dict[key] = value
Expand All @@ -57,7 +57,7 @@ def get_config(settings: Mapping[str, Any]) -> BasicMessageStorageConfig:
tenant_plugin_config_dict = process_config_dict(tenant_plugin_config_dict)
LOGGER.debug("Parsed (global): %s", global_plugin_config_dict)
LOGGER.debug("Parsed (tenant): %s", tenant_plugin_config_dict)
default_config = BasicMessageStorageConfig.default().dict()
default_config = BasicMessageStorageConfig.default().model_dump()
LOGGER.debug("Default Config: %s", default_config)
config_dict = merge(
{}, default_config, global_plugin_config_dict, tenant_plugin_config_dict
Expand All @@ -68,6 +68,8 @@ def get_config(settings: Mapping[str, Any]) -> BasicMessageStorageConfig:
LOGGER.warning("Using default configuration")
config = BasicMessageStorageConfig.default()

LOGGER.debug("Returning config: %s", config.json(indent=2))
LOGGER.debug("Returning config(aliases): %s", config.json(by_alias=True, indent=2))
LOGGER.debug("Returning config: %s", config.model_dump_json(indent=2))
LOGGER.debug(
"Returning config(aliases): %s", config.model_dump_json(by_alias=True, indent=2)
)
return config
4 changes: 4 additions & 0 deletions basicmessage_storage/basicmessage_storage/v1_0/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
request_schema,
response_schema,
)
from aries_cloudagent.admin.decorators.auth import tenant_authentication
from aries_cloudagent.admin.request_context import AdminRequestContext
from aries_cloudagent.messaging.models.base import BaseModelError
from aries_cloudagent.messaging.models.openapi import OpenAPISchema
Expand Down Expand Up @@ -102,6 +103,7 @@ class BasicMessageListQueryStringSchema(OpenAPISchema):
@match_info_schema(BasicConnIdMatchInfoSchema())
@request_schema(SendMessageSchema())
@response_schema(BasicMessageModuleResponseSchema(), 200, description="")
@tenant_authentication
@error_handler
async def plugin_connections_send_message(request: web.BaseRequest):
"""Request handler for sending a basic message to a connection.
Expand Down Expand Up @@ -150,6 +152,7 @@ async def plugin_connections_send_message(request: web.BaseRequest):
)
@querystring_schema(BasicMessageListQueryStringSchema())
@response_schema(BasicMessageListSchema(), 200, description="")
@tenant_authentication
@error_handler
async def all_messages_list(request: web.BaseRequest):
"""Request handler for searching basic message records from All agents/connections.
Expand Down Expand Up @@ -193,6 +196,7 @@ async def all_messages_list(request: web.BaseRequest):
)
@match_info_schema(BasicMessageIdMatchInfoSchema())
@response_schema(DeleteResponseSchema(), 200, description="")
@tenant_authentication
@error_handler
async def delete_message(request: web.BaseRequest):
"""Request handler for searching basic message record by id.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from unittest.mock import AsyncMock, MagicMock, Mock, patch

from aries_cloudagent.admin.request_context import AdminRequestContext
from aries_cloudagent.core.in_memory import InMemoryProfile
from aries_cloudagent.protocols.basicmessage.v1_0 import routes as base_module

from basicmessage_storage.v1_0.models import BasicMessageRecord
Expand All @@ -15,7 +16,12 @@
class TestRoutes(IsolatedAsyncioTestCase):
async def asyncSetUp(self) -> None:
self.session_inject = {}
self.context = AdminRequestContext.test_context(self.session_inject)
self.context = AdminRequestContext.test_context(
session_inject=self.session_inject,
profile=InMemoryProfile.test_profile(
settings={"admin.admin_insecure_mode": True}
),
)
self.request_dict = {
"context": self.context,
"outbound_message_router": AsyncMock(),
Expand Down
6 changes: 3 additions & 3 deletions basicmessage_storage/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM python:3.9-slim AS base
FROM python:3.12-slim AS base
WORKDIR /usr/src/app

# Install and configure poetry
USER root

ENV POETRY_VERSION=1.7.1
ENV POETRY_VERSION=1.8.3
ENV POETRY_HOME=/opt/poetry
RUN apt-get update && apt-get install -y curl && apt-get clean
RUN curl -sSL https://install.python-poetry.org | python -
Expand All @@ -19,7 +19,7 @@ ARG install_flags='--with integration --extras aca-py'
RUN poetry install ${install_flags}
USER $user

FROM python:3.9-bullseye
FROM python:3.12-bullseye
WORKDIR /usr/src/app
COPY --from=base /usr/src/app/.venv /usr/src/app/.venv
ENV PATH="/usr/src/app/.venv/bin:$PATH"
Expand Down
2 changes: 1 addition & 1 deletion basicmessage_storage/integration/Dockerfile.test.runner
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9-slim
FROM python:3.12-slim
WORKDIR /usr/src/app

# install poetry
Expand Down
Loading