Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into translator
Browse files Browse the repository at this point in the history
  • Loading branch information
samteb committed Feb 15, 2024
2 parents d5bf22e + 26d4717 commit fd309d6
Show file tree
Hide file tree
Showing 153 changed files with 4,260 additions and 2,741 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/authz_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ jobs:
shell: bash
run: |
make authz/copy-default-env
make authz/test/db/setup
make authz/db/generate-types
- name: Test types
Expand All @@ -56,7 +55,6 @@ jobs:
- name: Test integration
shell: bash
run: |
make authz/test/db/setup
make authz/test/integration
# - name: Test E2E
Expand Down
21 changes: 5 additions & 16 deletions apps/authz/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ authz/db/setup:
prisma migrate reset \
--schema ${AUTHZ_DATABASE_SCHEMA} \
--force
make authz/db/seed

@echo ""
@echo "${TERM_GREEN}🛠️ Setting up Authz test database${TERM_NO_COLOR}"
Expand All @@ -65,23 +64,8 @@ authz/db/create-migration:
--schema ${AUTHZ_DATABASE_SCHEMA} \
--name ${NAME}

# To maintain seed data within their respective modules and then import them
# into the main seed.ts file for execution, it's necessary to compile the
# project and resolve its path aliases before running the vanilla JavaScript
# seed entry point.
authz/db/seed:
npx dotenv -e ${AUTHZ_PROJECT_DIR}/.env -- \
ts-node -r tsconfig-paths/register --project ${AUTHZ_PROJECT_DIR}/tsconfig.app.json ${AUTHZ_PROJECT_DIR}/src/shared/module/persistence/seed.ts

# === Testing ===

authz/test/db/setup:
npx dotenv -e ${AUTHZ_PROJECT_DIR}/.env.test --override -- \
prisma migrate reset \
--schema ${AUTHZ_DATABASE_SCHEMA} \
--skip-seed \
--force

authz/test/type:
make authz/db/generate-types
npx tsc \
Expand All @@ -106,6 +90,11 @@ authz/test/e2e:
authz/test/e2e/watch:
make authz/test/e2e ARGS=--watch

authz/test:
make authz/test/unit
make authz/test/integration
make authz/test/e2e

# === Open Policy Agent & Rego ===

authz/rego/build:
Expand Down
Loading

0 comments on commit fd309d6

Please sign in to comment.