Skip to content

Commit

Permalink
Merge branch 'main' into feat/vc-di
Browse files Browse the repository at this point in the history
  • Loading branch information
sarthakvijayvergiya authored Apr 27, 2024
2 parents ffd3552 + 89957ac commit 7f1f202
Show file tree
Hide file tree
Showing 8 changed files with 40 additions and 23 deletions.
16 changes: 11 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# Aries Cloud Agent Python Changelog

## 0.12.1rc0
## 0.12.1rc1

### April 24, 2024
### April 26, 2024

Release 0.12.1rc0 is a small patch to cleanup some edge case issues in the handling of Out of Band invitations, and connection querying uncovered after the 0.12.0 release. Fixes and improvements were also made to the generation of ACA-Py's OpenAPI specifications.
Release 0.12.1rc1 is a small patch to cleanup some edge case issues in the handling of Out of Band invitations, revocation notification webhooks, and connection querying uncovered after the 0.12.0 release. Fixes and improvements were also made to the generation of ACA-Py's OpenAPI specifications.

### 0.12.1rc0 Breaking Changes
### 0.12.1rc1 Breaking Changes

There are no breaking changes in this release.

#### 0.12.1rc0 Categorized List of Pull Requests
#### 0.12.1rc1 Categorized List of Pull Requests

- Out of Band Invitations and Connection Establishment updates/fixes:
- 🐛 Fix ServiceDecorator parsing in oob record handling [\#2910](https://github.com/hyperledger/aries-cloudagent-python/pull/2910) [ff137](https://github.com/ff137)
Expand All @@ -28,6 +28,9 @@ There are no breaking changes in this release.
- fix Faber demo to use oob with aip10 to support connection reuse [\#2903](https://github.com/hyperledger/aries-cloudagent-python/pull/2903) [ianco](https://github.com/ianco)
- fix: integration tests should use didex 1.1 [\#2889](https://github.com/hyperledger/aries-cloudagent-python/pull/2889) [dbluhm](https://github.com/dbluhm)

- Credential Exchange updates and fixes:
- fix: rev notifications on publish pending [\#2916](https://github.com/hyperledger/aries-cloudagent-python/pull/2916) [dbluhm](https://github.com/dbluhm)

- Endorsement of Indy Transactions fixes:
- Prevent 500 error when re-promoting DID with endorsement [\#2885](https://github.com/hyperledger/aries-cloudagent-python/pull/2885) [jamshale](https://github.com/jamshale)
- Fix ack during for auto endorsement [\#2883](https://github.com/hyperledger/aries-cloudagent-python/pull/2883) [jamshale](https://github.com/jamshale)
Expand All @@ -37,13 +40,16 @@ There are no breaking changes in this release.
- Update GHA so that broken image links work on docs site - without breaking them on GitHub [\#2852](https://github.com/hyperledger/aries-cloudagent-python/pull/2852) [swcurran](https://github.com/swcurran)

- Dependencies and Internal Updates:
- fix: fixes a regression that requires a log file in multi-tenant mode [\#2918](https://github.com/hyperledger/aries-cloudagent-python/pull/2918) [amanji](https://github.com/amanji)
- Update AnonCreds to 0.2.2 [\#2917](https://github.com/hyperledger/aries-cloudagent-python/pull/2917) [swcurran](https://github.com/swcurran)
- chore(deps): Bump aiohttp from 3.9.3 to 3.9.4 dependencies python [\#2902](https://github.com/hyperledger/aries-cloudagent-python/pull/2902) [dependabot bot](https://github.com/dependabot bot)
- chore(deps): Bump idna from 3.4 to 3.7 in /demo/playground/examples dependencies python [\#2886](https://github.com/hyperledger/aries-cloudagent-python/pull/2886) [dependabot bot](https://github.com/dependabot bot)
- chore(deps): Bump psf/black from 24.3.0 to 24.4.0 in the all-actions group dependencies github_actions [\#2893](https://github.com/hyperledger/aries-cloudagent-python/pull/2893) [dependabot bot](https://github.com/dependabot bot)
- chore(deps): Bump idna from 3.6 to 3.7 dependencies python [\#2887](https://github.com/hyperledger/aries-cloudagent-python/pull/2887) [dependabot bot](https://github.com/dependabot bot)
- refactor: logging configs setup [\#2870](https://github.com/hyperledger/aries-cloudagent-python/pull/2870) [amanji](https://github.com/amanji)

- Release management pull requests:
- 0.12.1rc1 [\#2921](https://github.com/hyperledger/aries-cloudagent-python/pull/2921) [swcurran](https://github.com/swcurran)
- 0.12.1rc0 [\#2912](https://github.com/hyperledger/aries-cloudagent-python/pull/2912) [swcurran](https://github.com/swcurran)

## 0.12.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ args = (sys.stderr,)
class = logging.handlers.TimedRotatingFileMultiProcessHandler
level = DEBUG
formatter = formatter
args = ('test.log', 'd', 7, 1)
args = ('agent.log', 'd', 7, 1)

[formatter_formatter]
format = %(asctime)s %(wallet_id)s %(levelname)s %(pathname)s:%(lineno)d %(message)s
Expand Down
35 changes: 23 additions & 12 deletions aries_cloudagent/config/logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,27 +163,42 @@ def configure(
enabled
"""

write_to_log_file = log_file is not None or log_file == ""

if multitenant:
# The default logging config for multi-tenant mode specifies a log file
# location if --log-file is specified on startup and a config file is not.
# When all else fails, the default single-tenant config file is used.
if not log_config_path:
log_config_path = (
cls.default_multitenant_config_path_ini
if write_to_log_file
else cls.default_config_path_ini
)

cls._configure_multitenant_logging(
log_config_path=log_config_path
or DEFAULT_MULTITENANT_LOGGING_CONFIG_PATH_INI,
log_config_path=log_config_path,
log_level=log_level,
log_file=log_file,
)
else:
# The default config for single-tenant mode does not specify a log file
# location. This is a check that requires a log file path to be provided if
# --log-file is specified on startup and a config file is not.
if not log_config_path and write_to_log_file and not log_file:
raise ValueError(
"log_file (--log-file) must be provided in single-tenant mode "
"using the default config since a log file path is not set."
)

cls._configure_logging(
log_config_path=log_config_path or DEFAULT_LOGGING_CONFIG_PATH_INI,
log_config_path=log_config_path or cls.default_config_path_ini,
log_level=log_level,
log_file=log_file,
)

@classmethod
def _configure_logging(cls, log_config_path, log_level, log_file):
if log_file is not None and log_file == "":
raise ValueError(
"log_file (--log-file) must be provided in singletenant mode."
)

# Setup log config and log file if provided
cls._setup_log_config_file(log_config_path, log_file)

Expand All @@ -199,10 +214,6 @@ def _configure_logging(cls, log_config_path, log_level, log_file):

@classmethod
def _configure_multitenant_logging(cls, log_config_path, log_level, log_file):
# Unlike in singletenant mode, the defualt config for multitenant mode
# specifies a default log_file if one is not explicitly provided
# so we don't need the same check here

# Setup log config and log file if provided
cls._setup_log_config_file(log_config_path, log_file)

Expand Down
2 changes: 1 addition & 1 deletion docs/features/DIDResolution.md
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ plugin:
The following is a fully functional Dockerfile encapsulating this setup:
```dockerfile=
FROM ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.12.1rc0
FROM ghcr.io/hyperledger/aries-cloudagent-python:py3.9-0.12.1rc1
RUN pip3 install git+https://github.com/dbluhm/acapy-resolver-github

CMD ["aca-py", "start", "-it", "http", "0.0.0.0", "3000", "-ot", "http", "-e", "http://localhost:3000", "--admin", "0.0.0.0", "3001", "--admin-insecure-mode", "--no-ledger", "--plugin", "acapy_resolver_github"]
Expand Down
2 changes: 1 addition & 1 deletion docs/features/SupportedRFCs.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ACA-Py or the repository `main` branch. Reminders (and PRs!) to update this page
welcome! If you have any questions, please contact us on the #aries channel on
[Hyperledger Discord](https://discord.gg/hyperledger) or through an issue in this repo.

**Last Update**: 2024-04-24, Release 0.12.1rc0
**Last Update**: 2024-04-26, Release 0.12.1rc1

> The checklist version of this document was created as a joint effort
> between [Northern Block](https://northernblock.io/), [Animo Solutions](https://animo.id/) and the Ontario government, on behalf of the Ontario government.
Expand Down
2 changes: 1 addition & 1 deletion open-api/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"openapi" : "3.0.1",
"info" : {
"title" : "Aries Cloud Agent",
"version" : "v0.12.1rc0"
"version" : "v0.12.1rc1"
},
"servers" : [ {
"url" : "/"
Expand Down
2 changes: 1 addition & 1 deletion open-api/swagger.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"swagger" : "2.0",
"info" : {
"version" : "v0.12.1rc0",
"version" : "v0.12.1rc1",
"title" : "Aries Cloud Agent"
},
"tags" : [ {
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "aries_cloudagent"
version = "0.12.1rc0"
version = "0.12.1rc1"
description = "Hyperledger Aries Cloud Agent Python (ACA-Py) is a foundation for building decentralized identity applications and services running in non-mobile environments. "
authors = ["Hyperledger Aries <[email protected]>"]
license = "Apache-2.0"
Expand Down

0 comments on commit 7f1f202

Please sign in to comment.