Revert back

Author: Strnadj

.env-issuer.sample

@@ -29,10 +29,10 @@ ISSUER_KMS_SOL_PROVIDER=localstorage
 
 # If the provider is aws-sm for BJJ, ed25519 and ETH keys you need to specify AWS credentials.
 # For localstack, you can use the AWS_REGION=local and ISSUER_KMS_AWS_URL=http://localhost:4566
-AWS_ACCESS_KEY_ID=<aws-access-key>
-AWS_SECRET_ACCESS_KEY=<aws-secret-key>
+ISSUER_KMS_AWS_ACCESS_KEY=<aws-access-key>
+ISSUER_KMS_AWS_SECRET_KEY=<aws-secret-key>
 # If you want to use localstack region have to be local and the url should be http://localhost:4566
-AWS_REGION=<aws-region>
+ISSUER_KMS_AWS_REGION=<aws-region>
 # Uncomment the following line if you want to use localstack:
 #ISSUER_KMS_AWS_URL=http://localstack:4566
 

Makefile

@@ -21,9 +21,21 @@ ISSUER_KMS_ETH_PROVIDER := ${ISSUER_KMS_ETH_PROVIDER}
 ISSUER_KMS_BJJ_PROVIDER := ${ISSUER_KMS_BJJ_PROVIDER}
 ISSUER_KMS_SOL_PROVIDER := ${ISSUER_KMS_SOL_PROVIDER}
 
-aws_access_key := ${AWS_ACCESS_KEY_ID}
-aws_secret_key := ${AWS_SECRET_ACCESS_KEY}
-aws_region := ${AWS_REGION}
+aws_access_key := ${ISSUER_KMS_AWS_ACCESS_KEY}
+ifeq ($(aws_access_key),)
+	aws_access_key := ${AWS_ACCESS_KEY_ID}
+endif
+
+aws_secret_key := ${ISSUER_KMS_AWS_SECRET_KEY}
+ifeq ($(aws_secret_key),)
+	aws_secret_key := ${AWS_SECRET_ACCESS_KEY}
+endif
+
+aws_region := ${ISSUER_KMS_AWS_REGION}
+ifeq ($(aws_region),)
+	aws_region := ${AWS_REGION}
+endif
+
 aws_endpoint := ${ISSUER_KMS_AWS_URL}
 
 ISSUER_RESOLVER_FILE := ${ISSUER_RESOLVER_FILE}
@@ -89,16 +101,16 @@ endif
 ifeq ($(ISSUER_KMS_BJJ_PROVIDER), vault)
 	$(DOCKER_COMPOSE_INFRA_CMD) up -d vault
 endif
-ifeq ($(ISSUER_KMS_ETH_PROVIDER)$(AWS_REGION), aws-smlocal)
+ifeq ($(ISSUER_KMS_ETH_PROVIDER)$(aws_region), aws-smlocal)
 	$(DOCKER_COMPOSE_INFRA_CMD) up -d localstack
 endif
-ifeq ($(ISSUER_KMS_ETH_PROVIDER)$(AWS_REGION), aws-kmslocal)
+ifeq ($(ISSUER_KMS_ETH_PROVIDER)$(aws_region), aws-kmslocal)
 	$(DOCKER_COMPOSE_INFRA_CMD) up -d localstack
 endif
-ifeq ($(ISSUER_KMS_BJJ_PROVIDER)$(AWS_REGION), aws-smlocal)
+ifeq ($(ISSUER_KMS_BJJ_PROVIDER)$(aws_region), aws-smlocal)
 	$(DOCKER_COMPOSE_INFRA_CMD) up -d localstack
 endif
-ifeq ($(ISSUER_KMS_SOL_PROVIDER)$(AWS_REGION), aws-smlocal)
+ifeq ($(ISSUER_KMS_SOL_PROVIDER)$(aws_region), aws-smlocal)
 	$(DOCKER_COMPOSE_INFRA_CMD) up -d localstack
 endif
 

README.md

@@ -267,9 +267,9 @@ change the following variables in the .env-issuer file:
 ISSUER_KMS_BJJ_PROVIDER=aws-sm
 ISSUER_KMS_ETH_PROVIDER=aws-sm
 ISSUER_KMS_SOL_PROVIDER=aws-sm
-AWS_ACCESS_KEY_ID=<your-aws-access-key>
-AWS_SECRET_ACCESS_KEY=<your-aws-secret-key>
-AWS_REGION=<your-aws-region>
+ISSUER_KMS_AWS_ACCESS_KEY=<your-aws-access-key>
+ISSUER_KMS_AWS_SECRET_KEY=<your-aws-secret-key>
+ISSUER_KMS_AWS_REGION=<your-aws-region>
 ```
 
 After configuring the variables, run the following commands:
@@ -296,9 +296,9 @@ Another alternative is to configure the issuer node to store the private keys of
 ```shell
 ISSUER_KMS_BJJ_PROVIDER= [localstorage | vault | aws-sm] 
 ISSUER_KMS_ETH_PROVIDER=aws-kms
-AWS_ACCESS_KEY_ID=<your-aws-access-key>
-AWS_SECRET_ACCESS_KEY=<your-aws-secret-key>
-AWS_REGION=<your-aws-region>
+ISSUER_KMS_AWS_ACCESS_KEY=<your-aws-access-key>
+ISSUER_KMS_AWS_SECRET_KEY=<your-aws-secret-key>
+ISSUER_KMS_AWS_REGION=<your-aws-region>
 ```
 After configuring the variables, run the following commands:
 ```shell