TrueCloudLab/frostfs-dev-env
42
0
Fork 18
Code Issues 15 Pull requests Releases Activity Actions

[#98] s3_gate: Fix custom user wallets folder creation during compose up
All checks were successful
DCO action / DCO (pull_request) Successful in 1m1s
Details

Browse source 
Make custom wallets volume to point to the `wallets` directory in the project's root.
Fix defaults for issuing credentials.

Signed-off-by: Nikita Zinkevich <n.zinkevich@yadro.com>
This commit is contained in:
Nikita Zinkevich 2025-01-09 11:23:42 +03:00
parent 90147c7108
commit e219f60783
Signed by: nzinkevich
GPG key ID: 748EA1D0B2E6420A
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
README.md
View file

@ -143,7 +143,7 @@ Registers user wallet and issues s3 credentials.
Usage and default parameter values: Usage and default parameter values:
```sh ```sh
make s3cred [password=""] [contract_password=s3] [wallet=/user_wallet.json] [gate_public_key=0313b1ac3a8076e155a7e797b24f0b650cccad5941ea59d7cfd51a024a8b2a06bf] make s3cred [password=""] [contract_password=s3] [wallet=""] [gate_public_key=0313b1ac3a8076e155a7e797b24f0b650cccad5941ea59d7cfd51a024a8b2a06bf]
``` ```
As soon as the storage node is in the network map (see above) you can generate S3 As soon as the storage node is in the network map (see above) you can generate S3
@ -159,8 +159,9 @@ $ make s3cred
"container_id": "EXArWh8x1zeHG3851s1RtoCo7dowxF6rhLGA15nbMffT" "container_id": "EXArWh8x1zeHG3851s1RtoCo7dowxF6rhLGA15nbMffT"
} }
``` ```
Running without any parameters will result in defaults which are based on the private key from Running without any parameters results in defaults which are based on the private key from
`/user-wallet.json` file and `/wallet.json` contract wallet. `/wallet/wallet.json` user wallet and `/wallet.json` contract wallet.
If `wallet` parameter is set, gate searches custom user wallet file in `/wallets` directory.
Now let's configure an S3 client (AWS CLI will be used as example): Now let's configure an S3 client (AWS CLI will be used as example):
@ -172,7 +173,7 @@ Default region name []: us-east-1
Default output format []: json Default output format []: json
``` ```
If you need to create credentials for different users, put user wallets to `wallets` dir and specify them via `wallet` parameter. If you need to create credentials for different users, put user wallet to `wallets` dir and specify it via `wallet` parameter.
Pass wallet password in `password` parameter if it's not default. The same is for `contract_wallet` and `gate_public_key` params. Pass wallet password in `password` parameter if it's not default. The same is for `contract_wallet` and `gate_public_key` params.
```sh ```sh

6
services/s3_gate/docker-compose.yml
View file

@ -14,10 +14,8 @@ services:
volumes: volumes:
# Gate wallet # Gate wallet
- ./wallet.json:/wallet.json - ./wallet.json:/wallet.json
# Custom user wallets # Folder for custom user wallets
- ./wallets:/wallets - ./../../wallets/:/wallets/
# Default user wallet
- ./../../wallets/wallet.json:/wallets/wallet.json
- ./tls.key:/tls.key - ./tls.key:/tls.key
- ./tls.crt:/tls.crt - ./tls.crt:/tls.crt
- ./../../vendor/hosts:/etc/hosts - ./../../vendor/hosts:/etc/hosts

1
services/s3_gate/issue-creds.sh
View file

@ -25,6 +25,7 @@ fi
S3_GATE_PUBLIC_KEY=$3 S3_GATE_PUBLIC_KEY=$3
if [[ -z "$3" ]]; then if [[ -z "$3" ]]; then
# use gate wallet's public key
S3_GATE_PUBLIC_KEY=0313b1ac3a8076e155a7e797b24f0b650cccad5941ea59d7cfd51a024a8b2a06bf S3_GATE_PUBLIC_KEY=0313b1ac3a8076e155a7e797b24f0b650cccad5941ea59d7cfd51a024a8b2a06bf
fi fi