s3_gate: Fix custom user wallets folder creation during compose up #99

nzinkevich · 2025-01-09T09:08:08Z

nzinkevich commented

2025-01-09 09:08:08 +00:00

Close #98

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

Close #98 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>

👍 1

nzinkevich self-assigned this 2025-01-09 09:08:08 +00:00

nzinkevich added 1 commit 2025-01-09 09:08:08 +00:00

[#98 ] s3_gate: Fix custom user wallets folder creation during compose up

DCO action / DCO (pull_request) Successful in 24s

Details

744713a019

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>

requested reviews from alexvanin, fyrchik

2025-01-09 09:08:08 +00:00

requested reviews from storage-services-committers, storage-services-developers

2025-01-09 09:34:17 +00:00

dkirillov reviewed 2025-01-10 07:40:40 +00:00

services/s3_gate/issue-creds.sh Outdated

					
				@ -22,2 +23,3 @@

				if [[ -z "$2" ]]; then

				  WALLET_PATH=/wallets/wallet.json

				  # use gate wallet

				  WALLET_PATH=/wallet.json

dkirillov commented

2025-01-10 07:40:40 +00:00

Why do we change logic? It seems we can keep using only users wallets

diff --git a/services/s3_gate/issue-creds.sh b/services/s3_gate/issue-creds.sh
index 1caa40c..844eaf9 100755
--- a/services/s3_gate/issue-creds.sh
+++ b/services/s3_gate/issue-creds.sh
@@ -22,7 +22,7 @@ set -e
 WALLET_PATH=/wallets/$2
 if [[ -z "$2" ]]; then
   # use gate wallet
-  WALLET_PATH=/wallet.json
+  WALLET_PATH=/wallets/wallet.json
 fi
 
 S3_GATE_PUBLIC_KEY=$3
diff --git a/services/s3_gate/prepare.mk b/services/s3_gate/prepare.mk
index e39f90a..c97add8 100644
--- a/services/s3_gate/prepare.mk
+++ b/services/s3_gate/prepare.mk
@@ -1,6 +1,6 @@
 .PHONY: s3cred register
 
-password?=s3
+password?=
 contract_password?=s3
 gate_public_key?=
 wallet?=

Why do we change logic? It seems we can keep using only users wallets ```diff diff --git a/services/s3_gate/issue-creds.sh b/services/s3_gate/issue-creds.sh index 1caa40c..844eaf9 100755 --- a/services/s3_gate/issue-creds.sh +++ b/services/s3_gate/issue-creds.sh @@ -22,7 +22,7 @@ set -e WALLET_PATH=/wallets/$2 if [[ -z "$2" ]]; then # use gate wallet - WALLET_PATH=/wallet.json + WALLET_PATH=/wallets/wallet.json fi S3_GATE_PUBLIC_KEY=$3 diff --git a/services/s3_gate/prepare.mk b/services/s3_gate/prepare.mk index e39f90a..c97add8 100644 --- a/services/s3_gate/prepare.mk +++ b/services/s3_gate/prepare.mk @@ -1,6 +1,6 @@ .PHONY: s3cred register -password?=s3 +password?= contract_password?=s3 gate_public_key?= wallet?= ```

dkirillov marked this conversation as resolved

nzinkevich force-pushed fix_wallets_folder from 744713a019 to e219f60783

2025-01-10 11:15:18 +00:00

Compare

nzinkevich force-pushed fix_wallets_folder from e219f60783 to 4f08dc665e

2025-01-10 11:18:48 +00:00

Compare

nzinkevich force-pushed fix_wallets_folder from 4f08dc665e to 5471dbfc0e

2025-01-10 11:19:55 +00:00

Compare

dkirillov approved these changes 2025-01-10 12:31:00 +00:00

acid-ant changed title from ~~[#98] s3_gate: Fix custom user wallets folder creation during compose up~~ to s3_gate: Fix custom user wallets folder creation during compose up

2025-01-10 14:21:14 +00:00

acid-ant approved these changes 2025-01-10 14:23:39 +00:00

fyrchik approved these changes 2025-01-16 07:34:14 +00:00

fyrchik merged commit 5471dbfc0e into master

2025-01-16 07:34:22 +00:00

Sign in to join this conversation.

No reviewers