Skip to content

Commit a44ba40

Browse files
cjen1-msfteddyashtonachamayou
authored
[release/6.x] Cherry pick: Recovery script change (#7306) (#7323)
Co-authored-by: Eddy Ashton <edashton@microsoft.com> Co-authored-by: Amaury Chamayou <amchamay@microsoft.com>
1 parent 504abef commit a44ba40

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
1515
- Node will now retry when fetching snapshots. This is controlled with `command.join.fetch_snapshot_max_attempts` and `command.join.fetch_snapshot_retry_interval`. (#7317)
1616
- Remove pyopenssl (#7297)
1717

18+
### Changed
19+
20+
- The `submit_recovery_share.sh` script will no longer try to create a virtual environment and install the CCF Python package on every call. Instead it will return an error if the package is not installed (specifically if the `ccf_cose_sign1` tool it relies on cannot be found) (#7306)
21+
1822
[6.0.14]: https://github.com/microsoft/CCF/releases/tag/ccf-6.0.14
1923

2024
### Added

python/utils/submit_recovery_share.sh

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,10 @@ if [ -z "${member_id_cert}" ]; then
6666
exit 1
6767
fi
6868

69-
if [ ! -f "env/bin/activate" ]
70-
then
71-
python3 -m venv env
69+
if ! command -v ccf_cose_sign1 > /dev/null; then
70+
echo "Error: This script requires the ccf_cose_sign1 CLI tool, distributed as part of the CCF Python package. Please install it via 'pip install ccf' in the current Python environment"
71+
exit 1
7272
fi
73-
source env/bin/activate
74-
pip install -q ccf
7573

7674
# Compute member ID, as the SHA-256 fingerprint of the signing certificate
7775
member_id=$(openssl x509 -in "$member_id_cert" -noout -fingerprint -sha256 | cut -d "=" -f 2 | sed 's/://g' | awk '{print tolower($0)}')

0 commit comments

Comments
 (0)