apunkt/trustgraph
1
0
Fork 0
mirror of https://github.com/trustgraph-ai/trustgraph.git synced 2026-07-23 20:21:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed parameter names

Browse source
This commit is contained in:
Cyber MacGeddon 2025-12-23 16:09:32 +00:00
parent cb945ec900
commit a66f5824f6
3 changed files with 41 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

30
docs/tech-specs/minio-to-s3-migration.md
View file

@ -53,40 +53,40 @@ The implementation works with any S3-compatible object storage system:
```bash
librarian \
--s3-endpoint <hostname:port> \
--s3-access-key <access_key> \
--s3-secret-key <secret_key>
--object-store-endpoint <hostname:port> \
--object-store-access-key <access_key> \
--object-store-secret-key <secret_key>
```
### Environment Variables (Alternative)
```bash
S3_ENDPOINT=<hostname:port>
S3_ACCESS_KEY=<access_key>
S3_SECRET_KEY=<secret_key>
OBJECT_STORE_ENDPOINT=<hostname:port>
OBJECT_STORE_ACCESS_KEY=<access_key>
OBJECT_STORE_SECRET_KEY=<secret_key>
```
### Examples
**MinIO (default):**
```bash
--s3-endpoint minio:9000 \
--s3-access-key minioadmin \
--s3-secret-key minioadmin
--object-store-endpoint minio:9000 \
--object-store-access-key minioadmin \
--object-store-secret-key minioadmin
```
**Ceph RADOS Gateway:**
```bash
--s3-endpoint ceph-rgw.example.com:8080 \
--s3-access-key user123 \
--s3-secret-key abcd1234secret
--object-store-endpoint ceph-rgw.example.com:8080 \
--object-store-access-key user123 \
--object-store-secret-key abcd1234secret
```
**AWS S3:**
```bash
--s3-endpoint s3.amazonaws.com \
--s3-access-key AKIAIOSFODNN7EXAMPLE \
--s3-secret-key wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
--object-store-endpoint s3.amazonaws.com \
--object-store-access-key AKIAIOSFODNN7EXAMPLE \
--object-store-secret-key wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
```
## Authentication

4
trustgraph-flow/trustgraph/librarian/librarian.py
View file

@ -17,12 +17,12 @@ class Librarian:
def __init__(
self,
cassandra_host, cassandra_username, cassandra_password,
s3_endpoint, s3_access_key, s3_secret_key,
object_store_endpoint, object_store_access_key, object_store_secret_key,
bucket_name, keyspace, load_document,
):
self.blob_store = BlobStore(
s3_endpoint, s3_access_key, s3_secret_key, bucket_name
object_store_endpoint, object_store_access_key, object_store_secret_key, bucket_name
)
self.table_store = LibraryTableStore(

48
trustgraph-flow/trustgraph/librarian/service.py
View file

@ -41,9 +41,9 @@ default_collection_response_queue = collection_response_queue
default_config_request_queue = config_request_queue
default_config_response_queue = config_response_queue
default_s3_endpoint = "minio:9000"
default_s3_access_key = "minioadmin"
default_s3_secret_key = "minioadmin"
default_object_store_endpoint = "minio:9000"
default_object_store_access_key = "minioadmin"
default_object_store_secret_key = "minioadmin"
default_cassandra_host = "cassandra"
bucket_name = "library"
@ -80,14 +80,14 @@ class Processor(AsyncProcessor):
"config_response_queue", default_config_response_queue
)
s3_endpoint = params.get("s3_endpoint", default_s3_endpoint)
s3_access_key = params.get(
"s3_access_key",
default_s3_access_key
object_store_endpoint = params.get("object_store_endpoint", default_object_store_endpoint)
object_store_access_key = params.get(
"object_store_access_key",
default_object_store_access_key
)
s3_secret_key = params.get(
"s3_secret_key",
default_s3_secret_key
object_store_secret_key = params.get(
"object_store_secret_key",
default_object_store_secret_key
)
cassandra_host = params.get("cassandra_host")
@ -113,8 +113,8 @@ class Processor(AsyncProcessor):
"librarian_response_queue": librarian_response_queue,
"collection_request_queue": collection_request_queue,
"collection_response_queue": collection_response_queue,
"s3_endpoint": s3_endpoint,
"s3_access_key": s3_access_key,
"object_store_endpoint": object_store_endpoint,
"object_store_access_key": object_store_access_key,
"cassandra_host": self.cassandra_host,
"cassandra_username": self.cassandra_username,
"cassandra_password": self.cassandra_password,
@ -208,9 +208,9 @@ class Processor(AsyncProcessor):
cassandra_host = self.cassandra_host,
cassandra_username = self.cassandra_username,
cassandra_password = self.cassandra_password,
s3_endpoint = s3_endpoint,
s3_access_key = s3_access_key,
s3_secret_key = s3_secret_key,
object_store_endpoint = object_store_endpoint,
object_store_access_key = object_store_access_key,
object_store_secret_key = object_store_secret_key,
bucket_name = bucket_name,
keyspace = keyspace,
load_document = self.load_document,
@ -494,23 +494,23 @@ class Processor(AsyncProcessor):
)
parser.add_argument(
'--s3-endpoint',
default=default_s3_endpoint,
help=f'S3-compatible storage endpoint (default: {default_s3_endpoint})',
'--object-store-endpoint',
default=default_object_store_endpoint,
help=f'Object storage endpoint (default: {default_object_store_endpoint})',
)
parser.add_argument(
'--s3-access-key',
'--object-store-access-key',
default='minioadmin',
help='S3 access key / username '
f'(default: {default_s3_access_key})',
help='Object storage access key / username '
f'(default: {default_object_store_access_key})',
)
parser.add_argument(
'--s3-secret-key',
'--object-store-secret-key',
default='minioadmin',
help='S3 secret key / password '
f'(default: {default_s3_secret_key})',
help='Object storage secret key / password '
f'(default: {default_object_store_secret_key})',
)
add_cassandra_args(parser)