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.

Sign up for GitHub

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

Jump to bottom

DPLT-1049 Fix issues with separate user DB provisioning #139

Merged
merged 2 commits into from
Jul 21, 2023
Merged

DPLT-1049 Fix issues with separate user DB provisioning #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40f4aaa
fix: Add missing argument
morgsmccauley Jul 21, 2023
116e1a2
fix: Add PG environment variables to serverless deployment
morgsmccauley Jul 21, 2023
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
5 changes: 5 additions & 0 deletions .github/workflows/deploy-lambdas.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,8 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
HASURA_ENDPOINT: ${{ vars.HASURA_ENDPOINT }}
HASURA_ADMIN_SECRET: ${{ secrets.HASURA_ADMIN_SECRET }}
PG_ADMIN_USER: ${{ secrets.PG_ADMIN_USER }}
PG_ADMIN_PASSWORD: ${{ secrets.PG_ADMIN_PASSWORD }}
PG_ADMIN_DATABASE: ${{ secrets.PG_ADMIN_DATABASE }}
PG_HOST: ${{ secrets.PG_HOST }}
PG_PORT: ${{ secrets.PG_PORT }}
2 changes: 1 addition & 1 deletion indexer-js-queue-handler/indexer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default class Indexer {

if (options.provision && !indexerFunction["provisioned"]) {
try {
if (!await this.deps.provisioner.isUserApiProvisioned(indexerFunction.account_id)) {
if (!await this.deps.provisioner.isUserApiProvisioned(indexerFunction.account_id, indexerFunction.function_name)) {
await this.setStatus(function_name, block_height, 'PROVISIONING');
simultaneousPromises.push(this.writeLog(function_name, block_height, 'Provisioning endpoint: starting'));

Expand Down
1 change: 1 addition & 0 deletions indexer-js-queue-handler/indexer.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,6 +604,7 @@ mutation _1 { set(functionName: "buildnear.testnet/test", key: "foo2", data: "in
};
await indexer.runFunctions(1, functions, false, { provision: true });

expect(provisioner.isUserApiProvisioned).toHaveBeenCalledWith('morgs.near', 'test');
expect(provisioner.provisionUserApi).toHaveBeenCalledTimes(1);
expect(provisioner.provisionUserApi).toHaveBeenCalledWith(
'morgs.near',
Expand Down
5 changes: 5 additions & 0 deletions indexer-js-queue-handler/serverless.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ provider:
STAGE: ${opt:stage, 'dev'}
HASURA_ENDPOINT: ${env:HASURA_ENDPOINT}
HASURA_ADMIN_SECRET: ${env:HASURA_ADMIN_SECRET}
PG_ADMIN_USER: ${env:PG_ADMIN_USER}
PG_ADMIN_PASSWORD: ${env:PG_ADMIN_PASSWORD}
PG_ADMIN_DATABASE: ${env:PG_ADMIN_DATABASE}
PG_HOST: ${env:PG_HOST}
PG_PORT: ${env:PG_PORT}
tracing:
lambda: true #enable X-Ray tracing
iamRoleStatements:
Expand Down