Skip to content

Commit

Permalink
update config loading
Browse files Browse the repository at this point in the history
  • Loading branch information
alex-dzeda committed Jan 8, 2024
1 parent 1ce7596 commit d47bc3d
Show file tree
Hide file tree
Showing 6 changed files with 265 additions and 8 deletions.
1 change: 1 addition & 0 deletions docker-compose.migrate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ services:
image: migrate/migrate
volumes:
- .:/go/src/github.com/CMSgov/bcda-ssas-app
- ./ssas/cfg/configs:/usr/local/configs
4 changes: 2 additions & 2 deletions docker-compose.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,11 @@ services:
dockerfile: Dockerfiles/Dockerfile.tests
args:
VERSION: latest
env_file:
- ./ssas/cfg/configs/local.env
environment:
- DB=postgresql://postgres:toor@db:5432
- DATABASE_URL=postgresql://postgres:toor@db:5432/bcda?sslmode=disable
- BCDA_SSAS_CLIENT_ID=fake-client-id
- DEPLOYMENT_TARGET=test
- BCDA_SSAS_SECRET=fake-secret
- SSAS_ADMIN_SIGNING_KEY_PATH=../../../shared_files/ssas/admin_test_signing_key.pem
- SSAS_PUBLIC_SIGNING_KEY_PATH=../../../shared_files/ssas/public_test_signing_key.pem
Expand All @@ -30,6 +29,7 @@ services:
- SSAS_CLIENT_ASSERTION_AUD=http://local.testing.cms.gov/api/v2/Token/auth
volumes:
- .:/go/src/github.com/CMSgov/bcda-ssas-app
- ./ssas/cfg/configs:/usr/local/configs
postman_test:
build:
context: .
Expand Down
3 changes: 1 addition & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ services:
args:
VERSION: latest
image: bcda-ssas:latest
env_file:
- ./ssas/cfg/configs/local.env
environment:
- DATABASE_URL=postgresql://postgres:toor@db:5432/bcda?sslmode=disable
- ATO_PUBLIC_KEY_FILE=../shared_files/ATO_public.pem
Expand All @@ -50,6 +48,7 @@ services:
- SSAS_CLIENT_ASSERTION_AUD=http://local.testing.cms.gov/api/v2/Token/auth
volumes:
- ./shared_files:/usr/local/shared_files
- ./ssas/cfg/configs:/usr/local/configs
ports:
- "3103:3003"
- "3104:3004"
Expand Down
44 changes: 44 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
module github.com/CMSgov/bcda-ssas-app

go 1.19

require (
github.com/go-chi/chi/v5 v5.0.7
github.com/go-chi/render v1.0.2
github.com/golang-jwt/jwt/v4 v4.4.2
github.com/lib/pq v1.10.6
github.com/newrelic/go-agent/v3 v3.18.1
github.com/patrickmn/go-cache v2.1.1-0.20180815053127-5633e0862627+incompatible
github.com/pborman/uuid v1.2.1
github.com/sirupsen/logrus v1.9.0
github.com/stretchr/testify v1.8.1
golang.org/x/crypto v0.17.0
gopkg.in/macaroon.v2 v2.1.0
gorm.io/driver/postgres v1.5.4
gorm.io/gorm v1.25.5
)

require (
github.com/ajg/form v1.5.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20231201235250-de7065d80cb9 // indirect
github.com/jackc/pgx/v5 v5.5.1 // indirect
github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/joho/godotenv v1.5.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
google.golang.org/grpc v1.56.3 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit d47bc3d

Please sign in to comment.