Skip to content

Commit d770c35

Browse files
authored
Hexkit update (#112)
1 parent 80727b7 commit d770c35

23 files changed

+41
-57
lines changed

.pyproject_generation/pyproject_custom.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies = [
66
"typer >= 0.15",
77
"ghga-service-commons[api, auth, crypt] >= 4.1",
88
"ghga-event-schemas >= 5.0",
9-
"hexkit[akafka, s3, mongodb, opentelemetry] >= 5.0",
9+
"hexkit[akafka, s3, mongodb, opentelemetry] >= 5.1.1",
1010
"crypt4gh >= 1.7",
1111
"hvac >= 2",
1212
"httpx >= 0.28",

lock/requirements-dev.txt

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -531,9 +531,9 @@ h11==0.16.0 \
531531
# via
532532
# httpcore
533533
# uvicorn
534-
hexkit==5.1.0 \
535-
--hash=sha256:16cb52ea84ef00fe2d25cdbb1ae05d6a7023040e1e4978e51716a259e0759e86 \
536-
--hash=sha256:4dc81925e09152449e7df211145d8f08ad78dc1cb4bf8074ba2eb5c47870e359
534+
hexkit==5.1.1 \
535+
--hash=sha256:08be6279675c65ef4fcbab0a2d280f93ec0f427692c3d966d05f4afb600ba84d \
536+
--hash=sha256:a548fc35e3c50bdd2c82941ce6288182db919daa6b65eb255d9ecb0a2135bc8b
537537
# via
538538
# fsb (pyproject.toml)
539539
# ghga-service-commons
@@ -711,7 +711,6 @@ opentelemetry-api==1.33.1 \
711711
--hash=sha256:4db83ebcf7ea93e64637ec6ee6fabee45c5cbe4abd9cf3da95c43828ddb50b83
712712
# via
713713
# hexkit
714-
# opentelemetry-distro
715714
# opentelemetry-exporter-otlp-proto-grpc
716715
# opentelemetry-exporter-otlp-proto-http
717716
# opentelemetry-instrumentation
@@ -724,10 +723,6 @@ opentelemetry-api==1.33.1 \
724723
# opentelemetry-propagator-aws-xray
725724
# opentelemetry-sdk
726725
# opentelemetry-semantic-conventions
727-
opentelemetry-distro==0.54b1 \
728-
--hash=sha256:009486513b32b703e275bb2f9ccaf5791676bbf5e2dcfdd90201ddc8f56f122b \
729-
--hash=sha256:61d6b97bb7a245fddbb829345bb4ad18be39eb52f770fab89a127107fca3149f
730-
# via hexkit
731726
opentelemetry-exporter-otlp==1.33.1 \
732727
--hash=sha256:4d050311ea9486e3994575aa237e32932aad58330a31fba24fdba5c0d531cf04 \
733728
--hash=sha256:9bcf1def35b880b55a49e31ebd63910edac14b294fd2ab884953c4deaff5b300
@@ -751,7 +746,6 @@ opentelemetry-instrumentation==0.54b1 \
751746
--hash=sha256:a4ae45f4a90c78d7006c51524f57cd5aa1231aef031eae905ee34d5423f5b198
752747
# via
753748
# hexkit
754-
# opentelemetry-distro
755749
# opentelemetry-instrumentation-aiokafka
756750
# opentelemetry-instrumentation-asgi
757751
# opentelemetry-instrumentation-botocore
@@ -798,7 +792,6 @@ opentelemetry-sdk==1.33.1 \
798792
--hash=sha256:85b9fcf7c3d23506fbc9692fd210b8b025a1920535feec50bd54ce203d57a531
799793
# via
800794
# hexkit
801-
# opentelemetry-distro
802795
# opentelemetry-exporter-otlp-proto-grpc
803796
# opentelemetry-exporter-otlp-proto-http
804797
opentelemetry-semantic-conventions==0.54b1 \

lock/requirements.txt

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -482,9 +482,9 @@ h11==0.16.0 \
482482
# -c lock/requirements-dev.txt
483483
# httpcore
484484
# uvicorn
485-
hexkit==5.1.0 \
486-
--hash=sha256:16cb52ea84ef00fe2d25cdbb1ae05d6a7023040e1e4978e51716a259e0759e86 \
487-
--hash=sha256:4dc81925e09152449e7df211145d8f08ad78dc1cb4bf8074ba2eb5c47870e359
485+
hexkit==5.1.1 \
486+
--hash=sha256:08be6279675c65ef4fcbab0a2d280f93ec0f427692c3d966d05f4afb600ba84d \
487+
--hash=sha256:a548fc35e3c50bdd2c82941ce6288182db919daa6b65eb255d9ecb0a2135bc8b
488488
# via
489489
# -c lock/requirements-dev.txt
490490
# fsb (pyproject.toml)
@@ -620,7 +620,6 @@ opentelemetry-api==1.33.1 \
620620
# via
621621
# -c lock/requirements-dev.txt
622622
# hexkit
623-
# opentelemetry-distro
624623
# opentelemetry-exporter-otlp-proto-grpc
625624
# opentelemetry-exporter-otlp-proto-http
626625
# opentelemetry-instrumentation
@@ -633,12 +632,6 @@ opentelemetry-api==1.33.1 \
633632
# opentelemetry-propagator-aws-xray
634633
# opentelemetry-sdk
635634
# opentelemetry-semantic-conventions
636-
opentelemetry-distro==0.54b1 \
637-
--hash=sha256:009486513b32b703e275bb2f9ccaf5791676bbf5e2dcfdd90201ddc8f56f122b \
638-
--hash=sha256:61d6b97bb7a245fddbb829345bb4ad18be39eb52f770fab89a127107fca3149f
639-
# via
640-
# -c lock/requirements-dev.txt
641-
# hexkit
642635
opentelemetry-exporter-otlp==1.33.1 \
643636
--hash=sha256:4d050311ea9486e3994575aa237e32932aad58330a31fba24fdba5c0d531cf04 \
644637
--hash=sha256:9bcf1def35b880b55a49e31ebd63910edac14b294fd2ab884953c4deaff5b300
@@ -670,7 +663,6 @@ opentelemetry-instrumentation==0.54b1 \
670663
# via
671664
# -c lock/requirements-dev.txt
672665
# hexkit
673-
# opentelemetry-distro
674666
# opentelemetry-instrumentation-aiokafka
675667
# opentelemetry-instrumentation-asgi
676668
# opentelemetry-instrumentation-botocore
@@ -733,7 +725,6 @@ opentelemetry-sdk==1.33.1 \
733725
# via
734726
# -c lock/requirements-dev.txt
735727
# hexkit
736-
# opentelemetry-distro
737728
# opentelemetry-exporter-otlp-proto-grpc
738729
# opentelemetry-exporter-otlp-proto-http
739730
opentelemetry-semantic-conventions==0.54b1 \

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ dependencies = [
66
"typer >= 0.15",
77
"ghga-service-commons[api, auth, crypt] >= 4.1",
88
"ghga-event-schemas >= 5.0",
9-
"hexkit[akafka, s3, mongodb, opentelemetry] >= 5.0",
9+
"hexkit[akafka, s3, mongodb, opentelemetry] >= 5.1.1",
1010
"crypt4gh >= 1.7",
1111
"hvac >= 2",
1212
"httpx >= 0.28",

services/dcs/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,21 +43,21 @@ We recommend using the provided Docker container.
4343

4444
A pre-built version is available at [docker hub](https://hub.docker.com/repository/docker/ghga/download-controller-service):
4545
```bash
46-
docker pull ghga/download-controller-service:6.0.1
46+
docker pull ghga/download-controller-service:6.0.2
4747
```
4848

4949
Or you can build the container yourself from the [`./Dockerfile`](./Dockerfile):
5050
```bash
5151
# Execute in the repo's root dir:
52-
docker build -t ghga/download-controller-service:6.0.1 .
52+
docker build -t ghga/download-controller-service:6.0.2 .
5353
```
5454

5555
For production-ready deployment, we recommend using Kubernetes, however,
5656
for simple use cases, you could execute the service using docker
5757
on a single server:
5858
```bash
5959
# The entrypoint is preconfigured:
60-
docker run -p 8080:8080 ghga/download-controller-service:6.0.1 --help
60+
docker run -p 8080:8080 ghga/download-controller-service:6.0.2 --help
6161
```
6262

6363
If you prefer not to use containers, you may install the service from source:

services/dcs/openapi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ info:
206206
\ Object Storage. \n\nThis is an implementation of the DRS standard from the Global\
207207
\ Alliance for Genomics and Health, please find more information at: https://github.com/ga4gh/data-repository-service-schemas"
208208
title: Download Controller Service
209-
version: 6.0.1
209+
version: 6.0.2
210210
openapi: 3.1.0
211211
paths:
212212
/health:

services/dcs/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ classifiers = [
2121
"Intended Audience :: Developers",
2222
]
2323
name = "dcs"
24-
version = "6.0.1"
24+
version = "6.0.2"
2525
description = "Download Controller Service - a GA4GH DRS-compliant service for delivering files from S3 encrypted according to the GA4GH Crypt4GH standard."
2626

2727

services/ekss/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,21 @@ We recommend using the provided Docker container.
6565

6666
A pre-built version is available at [docker hub](https://hub.docker.com/repository/docker/ghga/encryption-key-store-service):
6767
```bash
68-
docker pull ghga/encryption-key-store-service:3.0.1
68+
docker pull ghga/encryption-key-store-service:3.0.2
6969
```
7070

7171
Or you can build the container yourself from the [`./Dockerfile`](./Dockerfile):
7272
```bash
7373
# Execute in the repo's root dir:
74-
docker build -t ghga/encryption-key-store-service:3.0.1 .
74+
docker build -t ghga/encryption-key-store-service:3.0.2 .
7575
```
7676

7777
For production-ready deployment, we recommend using Kubernetes, however,
7878
for simple use cases, you could execute the service using docker
7979
on a single server:
8080
```bash
8181
# The entrypoint is preconfigured:
82-
docker run -p 8080:8080 ghga/encryption-key-store-service:3.0.1 --help
82+
docker run -p 8080:8080 ghga/encryption-key-store-service:3.0.2 --help
8383
```
8484

8585
If you prefer not to use containers, you may install the service from source:

services/ekss/openapi.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ info:
234234
description: A service managing storage and retrieval of symmetric keys in a HashiCorp
235235
Vault.
236236
title: Encryption Key Store Service
237-
version: 3.0.1
237+
version: 3.0.2
238238
openapi: 3.1.0
239239
paths:
240240
/health:

services/ekss/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
66

77
[project]
88
name = "ekss"
9-
version = "3.0.1"
9+
version = "3.0.2"
1010
description = "Encryption Key Store Service - providing crypt4gh file secret extraction, storage and envelope generation"
1111
readme = "README.md"
1212
authors = [

0 commit comments

Comments
 (0)