fix: DP tests, MongoDB and order (#3939)

Co-authored-by: Joël Galeran <[email protected]>
prisma · Sep 13, 2023 · 10adf28 · 10adf28
1 parent 4d7f18a
commit 10adf28
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 26 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -1267,27 +1267,29 @@ jobs:
  - name: Install Dependencies
  run: pnpm install
 
- - name: test DP1 ${{ matrix.platform }}
+ # see above why this is not a matrix for each DP variant
+ - name: test Accelerate (DP2) with extension ${{ matrix.platform }}
  uses: nick-invision/retry@v2
  with:
  timeout_minutes: 15
  max_attempts: 3
  retry_wait_seconds: 30
  command: bash .github/scripts/test-project.sh ${{ github.job }} ${{ matrix.platform }}
  env:
- DATAPROXY_FLAVOR: 'DP1'
- PRISMA_GENERATE_FLAG: '--data-proxy'
- DATAPROXY_COMMON_URL: ${{ secrets.DATAPROXY_COMMON_URL }}
- ITX_PDP_MONGODB_DATABASE_URL: ${{ secrets.ITX_PDP_MONGODB_DATABASE_URL }}
- ITX_PDP_MONGODB: ${{ secrets.ITX_PDP_MONGODB }}
+ DATAPROXY_FLAVOR: 'DP2+Extension'
+ PRISMA_GENERATE_FLAG: '--accelerate'
+ DATAPROXY_COMMON_URL: ${{ secrets.DP2_DATAPROXY_COMMON_URL }}
+ ITX_PDP_MONGODB_DATABASE_URL: ${{ secrets.DP2_ITX_PDP_MONGODB_DATABASE_URL }}
+ ITX_PDP_MONGODB: ${{ secrets.DP2_ITX_PDP_MONGODB }}
  ITX_PDP_MYSQL_DATABASE_URL: ${{ secrets.ITX_PDP_MYSQL_DATABASE_URL }}
- ITX_PDP_MYSQL: ${{ secrets.ITX_PDP_MYSQL }}
+ ITX_PDP_MYSQL: ${{ secrets.DP2_ITX_PDP_MYSQL }}
  ITX_PDP_POSTGRESQL_DATABASE_URL: ${{ secrets.ITX_PDP_POSTGRESQL_DATABASE_URL }}
- ITX_PDP_POSTGRESQL: ${{ secrets.ITX_PDP_POSTGRESQL }}
+ ITX_PDP_POSTGRESQL: ${{ secrets.DP2_ITX_PDP_POSTGRESQL }}
  ITX_PDP_COCKROACHDB_DATABASE_URL: ${{ secrets.ITX_PDP_COCKROACHDB_DATABASE_URL }}
- ITX_PDP_COCKROACHDB: ${{ secrets.ITX_PDP_COCKROACHDB }}
-
- - name: test DP2 ${{ matrix.platform }}
+ ITX_PDP_COCKROACHDB: ${{ secrets.DP2_ITX_PDP_COCKROACHDB }}
+
+ # see above why this is not a matrix for each DP variant
+ - name: test Accelerate (DP2) without extension ${{ matrix.platform }}
  uses: nick-invision/retry@v2
  with:
  timeout_minutes: 15
@@ -1298,34 +1300,35 @@ jobs:
  DATAPROXY_FLAVOR: 'DP2'
  PRISMA_GENERATE_FLAG: '--accelerate'
  DATAPROXY_COMMON_URL: ${{ secrets.DP2_DATAPROXY_COMMON_URL }}
- ITX_PDP_MONGODB_DATABASE_URL: ${{ secrets.ITX_PDP_MONGODB_DATABASE_URL }}
- ITX_PDP_MONGODB: ${{ secrets.ITX_PDP_MONGODB }} # MongoDB is not yet supported in DP2
+ ITX_PDP_MONGODB_DATABASE_URL: ${{ secrets.DP2_ITX_PDP_MONGODB_DATABASE_URL }}
+ ITX_PDP_MONGODB: ${{ secrets.DP2_ITX_PDP_MONGODB }}
  ITX_PDP_MYSQL_DATABASE_URL: ${{ secrets.ITX_PDP_MYSQL_DATABASE_URL }}
  ITX_PDP_MYSQL: ${{ secrets.DP2_ITX_PDP_MYSQL }}
  ITX_PDP_POSTGRESQL_DATABASE_URL: ${{ secrets.ITX_PDP_POSTGRESQL_DATABASE_URL }}
  ITX_PDP_POSTGRESQL: ${{ secrets.DP2_ITX_PDP_POSTGRESQL }}
  ITX_PDP_COCKROACHDB_DATABASE_URL: ${{ secrets.ITX_PDP_COCKROACHDB_DATABASE_URL }}
  ITX_PDP_COCKROACHDB: ${{ secrets.DP2_ITX_PDP_COCKROACHDB }}
 
- - name: test DP2 with Extension ${{ matrix.platform }}
+ # see above why this is not a matrix for each DP variant
+ - name: test legacy Data Proxy (DP1) ${{ matrix.platform }}
  uses: nick-invision/retry@v2
  with:
  timeout_minutes: 15
  max_attempts: 3
  retry_wait_seconds: 30
  command: bash .github/scripts/test-project.sh ${{ github.job }} ${{ matrix.platform }}
  env:
- DATAPROXY_FLAVOR: ${{ contains(matrix.platform, 'mongodb') && 'DP2' || 'DP2+Extension' }} # MongoDB is not yet supported in DP2
- PRISMA_GENERATE_FLAG: '--accelerate'
- DATAPROXY_COMMON_URL: ${{ secrets.DP2_DATAPROXY_COMMON_URL }}
+ DATAPROXY_FLAVOR: 'DP1'
+ PRISMA_GENERATE_FLAG: '--data-proxy'
+ DATAPROXY_COMMON_URL: ${{ secrets.DATAPROXY_COMMON_URL }}
  ITX_PDP_MONGODB_DATABASE_URL: ${{ secrets.ITX_PDP_MONGODB_DATABASE_URL }}
- ITX_PDP_MONGODB: ${{ secrets.ITX_PDP_MONGODB }} # MongoDB is not yet supported in DP2
+ ITX_PDP_MONGODB: ${{ secrets.ITX_PDP_MONGODB }}
  ITX_PDP_MYSQL_DATABASE_URL: ${{ secrets.ITX_PDP_MYSQL_DATABASE_URL }}
- ITX_PDP_MYSQL: ${{ secrets.DP2_ITX_PDP_MYSQL }}
+ ITX_PDP_MYSQL: ${{ secrets.ITX_PDP_MYSQL }}
  ITX_PDP_POSTGRESQL_DATABASE_URL: ${{ secrets.ITX_PDP_POSTGRESQL_DATABASE_URL }}
- ITX_PDP_POSTGRESQL: ${{ secrets.DP2_ITX_PDP_POSTGRESQL }}
+ ITX_PDP_POSTGRESQL: ${{ secrets.ITX_PDP_POSTGRESQL }}
  ITX_PDP_COCKROACHDB_DATABASE_URL: ${{ secrets.ITX_PDP_COCKROACHDB_DATABASE_URL }}
- ITX_PDP_COCKROACHDB: ${{ secrets.DP2_ITX_PDP_COCKROACHDB }}
+ ITX_PDP_COCKROACHDB: ${{ secrets.ITX_PDP_COCKROACHDB }}
 
  - name: notify-slack
  if: failure()

diff --git a/dataproxy/nodejs-mongodb-itx/test/long-running.test.ts b/dataproxy/nodejs-mongodb-itx/test/long-running.test.ts
@@ -36,11 +36,7 @@ describe('long-running', () => {
  })
  })
 
- // While testing we figure out that MongoDB is using DP1
- // So we made the test a `test.failing` test
- // TODO: Remove this once we have DP2/accelerate implementation for MongoDB
- // testIf(!isDP1)(
- test.failing(
+ testIf(!isDP1)(
  'accelerate only: should throw an error on long-running itx that sets a timeout limit over the limit',
  async () => {
  const email = faker.internet.email()