Skip to content

Commit

Permalink
Revert permissions, try cleaning up tests image
Browse files Browse the repository at this point in the history
  • Loading branch information
carlpartridge committed Oct 8, 2024
1 parent 0221f17 commit d605d3b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
12 changes: 8 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,21 @@ package:
-e GPG_SEC_KEY_FILE='${GPG_SEC_KEY_FILE}' \
-v ${PWD}:/go/src/github.com/CMSgov/bcda-app packaging $(version)

setup-tests:
# Clean up any existing data to ensure we spin up container in a known state.
docker compose -f docker-compose.test.yml rm -fsv tests
docker compose -f docker-compose.test.yml build tests

LINT_TIMEOUT ?= 3m
lint:
docker compose -f docker-compose.test.yml build tests
$(MAKE) setup-tests
docker compose -f docker-compose.test.yml run \
--rm tests golangci-lint run --exclude="(conf\.(Un)?[S,s]etEnv)" --exclude="github\.com\/stretchr\/testify\/suite\.Suite contains sync\.RWMutex" --timeout=$(LINT_TIMEOUT) --verbose
# TODO: Remove the exclusion of G301 as part of BCDA-8414
docker compose -f docker-compose.test.yml run --rm tests gosec -exclude=G301 ./... ./optout

smoke-test:
docker compose -f docker-compose.test.yml build tests
$(MAKE) setup-tests
test/smoke_test/smoke_test.sh $(env) $(maintenanceMode)

postman:
Expand All @@ -46,7 +50,7 @@ postman:
--global-var maintenanceMode=$(maintenanceMode)

unit-test: unit-test-ssas unit-test-db unit-test-localstack load-fixtures-ssas
docker compose -f docker-compose.test.yml build tests
$(MAKE) setup-tests
@docker compose -f docker-compose.test.yml run --rm tests bash scripts/unit_test.sh

unit-test-ssas:
Expand Down Expand Up @@ -83,7 +87,7 @@ unit-test-db-snapshot:
docker compose -f docker-compose.test.yml exec db-unit-test sh -c 'PGPASSWORD=$$POSTGRES_PASSWORD pg_dump -U postgres --format custom --file=/docker-entrypoint-initdb.d/dump.pgdata --create $$POSTGRES_DB'

performance-test:
docker compose -f docker-compose.test.yml build tests
$(MAKE) setup-tests
docker compose -f docker-compose.test.yml run --rm -w /go/src/github.com/CMSgov/bcda-app/test/performance_test tests sh performance_test.sh

test:
Expand Down
4 changes: 2 additions & 2 deletions bcdaworker/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ func init() {

func createWorkerDirs() {
staging := conf.GetEnv("FHIR_STAGING_DIR")
err := os.MkdirAll(staging, 0766)
err := os.MkdirAll(staging, 0744)
if err != nil {
log.Worker.Fatal(err)
}
localTemp := conf.GetEnv("FHIR_TEMP_DIR")
err = os.MkdirAll(localTemp, 0766)
err = os.MkdirAll(localTemp, 0744)
if err != nil {
log.Worker.Fatal(err)
}
Expand Down

0 comments on commit d605d3b

Please sign in to comment.