Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update readme and change aws access key name #75

Merged
merged 1 commit into from
Oct 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .env.default
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
AWS_ACCESS_KEY_ID=dummy-123
AWS_SECRET_ACCESS_KEY=dummy-123
AWS_ACCESS_KEY_ID=dummy123
AWS_SECRET_ACCESS_KEY=dummy123
AWS_S3_BUCKET_NAME=test-bucket
AWS_S3_REGION_NAME=eu-central-1
AWS_S3_ENDPOINT_URL=http://localhost:9090
AWS_DB_REGION_NAME=eu-central-1
AWS_DB_TABLE_NAME=test-db
AWS_DB_ENDPOINT_URL=http://localhost:8080
KML_STORAGE_HOST_URL=http://localhost:9090/test-bucket
ALLOWED_DOMAINS=.*localhost,.*admin\.ch,.*bgdi\.ch
ALLOWED_DOMAINS=.*localhost,.*admin\.ch,.*bgdi\.ch
6 changes: 3 additions & 3 deletions .env.testing
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
AWS_ACCESS_KEY_ID=dummy-123
AWS_SECRET_ACCESS_KEY=dummy-123
AWS_ACCESS_KEY_ID=dummy123
AWS_SECRET_ACCESS_KEY=dummy123
AWS_S3_BUCKET_NAME=test-bucket
AWS_S3_REGION_NAME=wonderland
# for some reason currently mocking the DynamoDB only works with a real region.
# Fake regions will cause a crash when mocking.
AWS_DB_REGION_NAME=us-east-1
AWS_DB_TABLE_NAME=test-db
ALLOWED_DOMAINS=.*\.geo\.admin\.ch,http://localhost
ALLOWED_DOMAINS=.*\.geo\.admin\.ch,http://localhost
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,10 @@ source .env.local
export ENV_FILE=.env.local
```

Then, you can run the dev target to ensure you have everything needed to develop, test and serve locally
Then, you can run the setup target to ensure you have everything needed to develop, test and serve locally

```bash
make dev
make setup
```

The other services that are used (DynamoDB local and [MinIO](https://www.min.io) as local S3 replacement) are wrapped in a docker compose.
Expand Down
6 changes: 3 additions & 3 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ services:
sleep 1;
done;
echo minio server is up;
/usr/bin/mc alias set minio http://s3:9000 dummy-123 dummy-123;
/usr/bin/mc alias set minio http://s3:9000 dummy123 dummy123;
/usr/bin/mc mb minio/test-bucket;
/usr/bin/mc policy set public minio/test-bucket;
exit 0;
Expand Down Expand Up @@ -76,6 +76,6 @@ services:
links:
- dynamodb-local
environment:
- AWS_ACCESS_KEY_ID=dummy-123
- AWS_SECRET_ACCESS_KEY=dummy-123
- AWS_ACCESS_KEY_ID=dummy123
- AWS_SECRET_ACCESS_KEY=dummy123
- AWS_DEFAULT_REGION=wonderland
4 changes: 2 additions & 2 deletions minio.env
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
MINIO_ACCESS_KEY=dummy-123
MINIO_SECRET_KEY=dummy-123
MINIO_ACCESS_KEY=dummy123
MINIO_SECRET_KEY=dummy123