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

fix: removing restriction of connection pool size for bulk import #227

Draft
wants to merge 50 commits into
base: feat/bulk-import-1
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
a626f3c
feat: Changes for multitenancy dashboard (#209)
prateek3255 May 24, 2024
bac79ce
adding dev-v7.1.0 tag to this commit to ensure building
sattvikc May 24, 2024
1c6b8b7
reformats code
rishabhpoddar Jul 8, 2024
729ba6a
reformates code
rishabhpoddar Jul 8, 2024
16101d0
Merge branch '7.0' into 7.1
rishabhpoddar Jul 8, 2024
dc0d4ad
feat: multitenancy dashboard (#220)
sattvikc Jul 9, 2024
8d4c431
adding dev-v7.1.0 tag to this commit to ensure building
sattvikc Jul 10, 2024
50573f7
fix: gradle.properties in tests (#221)
sattvikc Jul 10, 2024
8c9e074
adding dev-v7.1.0 tag to this commit to ensure building
sattvikc Jul 10, 2024
774b366
adding dev-v7.1.0 tag to this commit to ensure building
sattvikc Jul 15, 2024
9343427
fix: tests (#222)
sattvikc Aug 8, 2024
60b6e0f
adding dev-v7.1.1 tag to this commit to ensure building
sattvikc Aug 8, 2024
0d115f2
fix: slow query fix (#223)
sattvikc Sep 2, 2024
b933a54
adding dev-v7.1.2 tag to this commit to ensure building
sattvikc Sep 2, 2024
c9436ff
fix: index for MAU (#224)
sattvikc Sep 4, 2024
28bcc7d
adding dev-v7.1.3 tag to this commit to ensure building
sattvikc Sep 4, 2024
1a30acd
fix: Test fix (#225)
sattvikc Sep 4, 2024
e40602c
adding dev-v7.1.3 tag to this commit to ensure building
sattvikc Sep 4, 2024
4404916
fix: removing restriction of connection pool size for bulk import
tamassoltesz Sep 20, 2024
9c093fb
fix: actually closing the connection
tamassoltesz Sep 27, 2024
e115ebe
fix: add bulk import retry logic for postgres too
tamassoltesz Sep 30, 2024
bc03e1a
chore: merge master to feature branch
tamassoltesz Oct 1, 2024
a6ed05f
fix: fix failing tests
tamassoltesz Oct 2, 2024
f474b2c
feat: OAuth provider support (#228)
sattvikc Oct 4, 2024
e2b7082
adding dev-v7.2.0 tag to this commit to ensure building
sattvikc Oct 4, 2024
c6d099c
fix: changelog (#230)
sattvikc Oct 4, 2024
cff42cb
adding dev-v7.2.0 tag to this commit to ensure building
sattvikc Oct 4, 2024
41107c5
feat: oauth2 tables and queries
tamassoltesz Oct 26, 2024
70328ff
Merge remote-tracking branch 'origin/7.2' into feat/oauth/allow-list
tamassoltesz Oct 26, 2024
a9d72a7
fix: fixing auto-merge issues
tamassoltesz Oct 26, 2024
ffa0196
Update src/main/java/io/supertokens/storage/postgresql/config/Postgre…
porcellus Oct 27, 2024
72838e3
Merge pull request #231 from supertokens/feat/oauth/allow-list
porcellus Oct 27, 2024
beb503d
fix: merge error
porcellus Oct 27, 2024
60d4363
adding dev-v7.2.0 tag to this commit to ensure building
porcellus Oct 27, 2024
e21f4bb
adding dev-v7.2.0 tag to this commit to ensure building
porcellus Oct 27, 2024
c98c447
fix: changinf jti + comma handling
tamassoltesz Oct 28, 2024
0362003
fix: flaky test
sattvikc Oct 28, 2024
847f24d
Merge pull request #233 from supertokens/flaky-test
porcellus Oct 28, 2024
939ab34
Merge branch '7.2' into fix/oauth/jti-listing
porcellus Oct 28, 2024
664e82a
Merge pull request #232 from supertokens/fix/oauth/jti-listing
porcellus Oct 28, 2024
29c7124
adding dev-v7.2.0 tag to this commit to ensure building
porcellus Oct 28, 2024
1975735
ci: add missing image to ci config
porcellus Oct 28, 2024
dc86ab9
fix: remove System.out
porcellus Oct 28, 2024
ed9e982
Merge pull request #234 from supertokens/ci/fix_ci_issues
porcellus Oct 28, 2024
609c094
adding dev-v7.2.0 tag to this commit to ensure building
porcellus Oct 28, 2024
463bbd5
chore: changelog consistency
porcellus Oct 29, 2024
71a33d8
adding dev-v7.2.0 tag to this commit to ensure building
sattvikc Oct 30, 2024
b83a780
chore: current state save
tamassoltesz Nov 5, 2024
dfcdf49
chore: merging master to feature branch
tamassoltesz Nov 5, 2024
a5c740b
fix: fixing merge error with changelog
tamassoltesz Nov 5, 2024
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
1 change: 1 addition & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ jobs:
test:
docker:
- image: rishabhpoddar/supertokens_postgresql_plugin_test
- image: rishabhpoddar/oauth-server-cicd
resource_class: large
steps:
- add_ssh_keys:
Expand Down
1 change: 1 addition & 0 deletions .circleci/doOneMillionUsersTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ do
cd ../../
git clone [email protected]:supertokens/supertokens-root.git
cd supertokens-root
rm gradle.properties

update-alternatives --install "/usr/bin/java" "java" "/usr/java/jdk-15.0.1/bin/java" 2
update-alternatives --install "/usr/bin/javac" "javac" "/usr/java/jdk-15.0.1/bin/javac" 2
Expand Down
1 change: 1 addition & 0 deletions .circleci/doTests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ do
cd ../../
git clone [email protected]:supertokens/supertokens-root.git
cd supertokens-root
rm gradle.properties

update-alternatives --install "/usr/bin/java" "java" "/usr/java/jdk-15.0.1/bin/java" 2
update-alternatives --install "/usr/bin/javac" "javac" "/usr/java/jdk-15.0.1/bin/javac" 2
Expand Down
23 changes: 17 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,27 +1,38 @@
## Summary of change

(A few sentences about this PR)

## Related issues

- Link to issue1 here
- Link to issue1 here

## Test Plan
(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your changes work. Bonus points for screenshots and videos!)

(Write your test plan here. If you changed any code, please provide us with clear instructions on how you verified your
changes work. Bonus points for screenshots and videos!)

## Documentation changes
(If relevant, please create a PR in our [docs repo](https://github.com/supertokens/docs), or create a checklist here highlighting the necessary changes)

(If relevant, please create a PR in our [docs repo](https://github.com/supertokens/docs), or create a checklist here
highlighting the necessary changes)

## Checklist for important updates

- [ ] Changelog has been updated
- [ ] `pluginInterfaceSupported.json` file has been updated (if needed)
- [ ] Changes to the version if needed
- In `build.gradle`
- In `build.gradle`
- [ ] Had installed and ran the pre-commit hook
- [ ] If there are new dependencies that have been added in `build.gradle`, please make sure to add them in `implementationDependencies.json`.
- [ ] If there are new dependencies that have been added in `build.gradle`, please make sure to add them
in `implementationDependencies.json`.
- [ ] Issue this PR against the latest non released version branch.
- To know which one it is, run find the latest released tag (`git tag`) in the format `vX.Y.Z`, and then find the latest branch (`git branch --all`) whose `X.Y` is greater than the latest released tag.
- If no such branch exists, then create one from the latest released branch.
- To know which one it is, run find the latest released tag (`git tag`) in the format `vX.Y.Z`, and then find the
latest branch (`git branch --all`) whose `X.Y` is greater than the latest released tag.
- If no such branch exists, then create one from the latest released branch.
- [ ] When adding new recipes, ensure that its performance is being measured in the `OneMillionUsersTest`

## Remaining TODOs for this PR

- [ ] Item1
- [ ] Item2
24 changes: 12 additions & 12 deletions .github/helpers/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "helpers",
"version": "1.0.0",
"description": "",
"main": "test-pass-check-pr.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "ISC",
"dependencies": {
"github-workflow-helpers": "github:supertokens/github-workflow-helpers"
}
"name": "helpers",
"version": "1.0.0",
"description": "",
"main": "test-pass-check-pr.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"author": "",
"license": "ISC",
"dependencies": {
"github-workflow-helpers": "github:supertokens/github-workflow-helpers"
}
}
12 changes: 6 additions & 6 deletions .github/workflows/github-actions-changelog.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: "Enforcing changelog in PRs Workflow"
on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review, labeled, unlabeled]
types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ]

jobs:
# Enforces the update of a changelog file on every pull request
changelog:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: dangoslen/changelog-enforcer@v2
with:
changeLogPath: 'CHANGELOG.md'
skipLabels: 'Skip-Changelog'
- uses: actions/checkout@v2
- uses: dangoslen/changelog-enforcer@v2
with:
changeLogPath: 'CHANGELOG.md'
skipLabels: 'Skip-Changelog'
30 changes: 15 additions & 15 deletions .github/workflows/lint-pr-title.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
name: "Lint PR Title"

on:
pull_request:
types:
- opened
- reopened
- edited
- synchronize
pull_request:
types:
- opened
- reopened
- edited
- synchronize

jobs:
pr-title:
name: Lint PR title
runs-on: ubuntu-latest
steps:
- uses: amannn/action-semantic-pull-request@v3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
validateSingleCommit: true
pr-title:
name: Lint PR title
runs-on: ubuntu-latest
steps:
- uses: amannn/action-semantic-pull-request@v3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
validateSingleCommit: true
38 changes: 19 additions & 19 deletions .github/workflows/tests-pass-check-pr.yml
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
name: "Check if \"Run tests\" action succeeded"

on:
pull_request:
types:
- opened
- reopened
- edited
- synchronize
pull_request:
types:
- opened
- reopened
- edited
- synchronize

jobs:
pr-run-test-action:
name: Check if "Run tests" action succeeded
timeout-minutes: 60
concurrency:
group: ${{ github.head_ref }}
cancel-in-progress: true
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: node install
run: cd ./.github/helpers && npm i
- name: Calling github API
run: cd ./.github/helpers && GITHUB_TOKEN=${{ github.token }} REPO=${{ github.repository }} RUN_ID=${{ github.run_id }} BRANCH=${{ github.head_ref }} JOB_ID=${{ github.job }} SOURCE_OWNER=${{ github.event.pull_request.head.repo.owner.login }} CURRENT_SHA=${{ github.event.pull_request.head.sha }} node node_modules/github-workflow-helpers/test-pass-check-pr.js
pr-run-test-action:
name: Check if "Run tests" action succeeded
timeout-minutes: 60
concurrency:
group: ${{ github.head_ref }}
cancel-in-progress: true
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: node install
run: cd ./.github/helpers && npm i
- name: Calling github API
run: cd ./.github/helpers && GITHUB_TOKEN=${{ github.token }} REPO=${{ github.repository }} RUN_ID=${{ github.run_id }} BRANCH=${{ github.head_ref }} JOB_ID=${{ github.job }} SOURCE_OWNER=${{ github.event.pull_request.head.repo.owner.login }} CURRENT_SHA=${{ github.event.pull_request.head.sha }} node node_modules/github-workflow-helpers/test-pass-check-pr.js
8 changes: 4 additions & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@ on:
inputs:
coreRepoOwnerName:
description: 'supertokens-core repo owner name'
default: supertokens
default: supertokens
required: true
coreRepoBranch:
description: 'supertokens-core repos branch name'
default: master
default: master
required: true
pluginRepoOwnerName:
description: 'supertokens-plugin-interface repo owner name'
default: supertokens
default: supertokens
required: true
pluginInterfaceBranch:
description: 'supertokens-plugin-interface repos branch name'
default: master
default: master
required: true

jobs:
Expand Down
28 changes: 14 additions & 14 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading