Merge pull request #23 from anyproto/fix_aws_credentials_config

Fix aws credentials config

.aws/credentials

@@ -1,3 +0,0 @@
-[default]
-aws_access_key_id=minio_access_key
-aws_secret_access_key=minio_secret_key

Makefile

@@ -4,7 +4,10 @@ include .env
 generate_config:
 	mkdir -p ./storage/docker-generateconfig/
 	docker build -t generateconfig -f Dockerfile-generateconfig .
-	docker run --rm --volume ${CURDIR}/etc:/opt/processing/etc --volume ${CURDIR}/storage/docker-generateconfig:/opt/processing/docker-generateconfig --name any-sync-generator generateconfig
+	docker run --rm \
+		--volume ${CURDIR}/etc:/opt/processing/etc \
+		--volume ${CURDIR}/storage/docker-generateconfig:/opt/processing/docker-generateconfig \
+		--name any-sync-generator generateconfig
 
 start: generate_config
 	docker compose up -d
@@ -30,9 +33,8 @@ build:
 	docker compose build --no-cache --progress plain
 
 restart: down start
-update: down pull start
+update: pull down start
 upgrade: down clean start
 
 cleanEtcStorage:
-	rm -rf etc/
+	rm -rf etc/ storage/
-	rm -rf storage/

docker-compose.yml

@@ -116,7 +116,7 @@ services:
       - 8004:8000
     volumes:
       - ./etc/any-sync-filenode/:/etc/any-sync-filenode/
-      - ./.aws:/root/.aws:ro
+      - ./etc/.aws:/root/.aws:ro
       - ./storage/networkStore/any-sync-filenode/:/networkStore/
     deploy:
       resources:

docker-generateconfig/etc/aws-credentials

@@ -0,0 +1,4 @@
+[default]
+aws_access_key_id=%AWS_ACCESS_KEY_ID%
+aws_secret_access_key=%AWS_SECRET_ACCESS_KEY%
+

docker-generateconfig/processing.sh

@@ -6,16 +6,14 @@ source generateconfig/.env
 dest_path="etc"
 network_file="${dest_path}/network.yml"
 
-# Create directories for all node
+# Create directories for all node types
-for i in {1..3}; do
+for node_type in node-1 node-2 node-3 filenode coordinator consensusnode admin; do
-    mkdir -p "${dest_path}/any-sync-node-${i}"
-done
-
-# Create directories for other node types
-for node_type in filenode coordinator consensusnode; do
     mkdir -p "${dest_path}/any-sync-${node_type}"
 done
 
+# Create directory for aws credentials
+mkdir -p "${dest_path}/.aws"
+
 # add external listen host
 ./setListenIp.py "${EXTERNAL_LISTEN_HOST}" "generateconfig/nodes.yml"
 
@@ -40,9 +38,17 @@ cat "${network_file}" tmp-etc/common.yml generateconfig/account5.yml tmp-etc/con
 cp "generateconfig/nodes.yml" "${dest_path}/any-sync-coordinator/network.yml"
 
 # Generate any-sync-admin config
-mkdir -p ${dest_path}/any-sync-admin
 cp "tmp-etc/admin.yml" ${dest_path}/any-sync-admin/config.yml
 
+# Generate aws credentials
+cp "tmp-etc/aws-credentials" ${dest_path}/.aws/credentials
+
+# Replace placeholders for aws credentials
+placeholders=( "AWS_ACCESS_KEY_ID" "AWS_SECRET_ACCESS_KEY")
+for placeholder in "${placeholders[@]}"; do
+    perl -i -pe "s|%${placeholder}%|${!placeholder}|g" "${dest_path}/"/.aws/credentials
+done
+
 # Replace placeholders in config files
 for node_type in node_1 node_2 node_3 coordinator filenode consensusnode; do
     addresses="ANY_SYNC_${node_type^^}_ADDRESSES"