Store access token in trigger dao #7890
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- non-authenticated with in-memory backend - non-authenticated with database backend - authenticated with in-memory backend - authenticated with database backend changelog_begin changelog_end
cocreature
approved these changes
Nov 5, 2020
...c/main/resources/com/daml/lf/engine/trigger/db/migration/postgres/V2__Add_access_token.sha25
Outdated
Show resolved
Hide resolved
...src/main/resources/com/daml/lf/engine/trigger/db/migration/postgres/V2__Add_access_token.sql
Outdated
Show resolved
Hide resolved
| """ | ||
| insert.update.run.void | ||
| } | ||
|
|
||
| private def queryRunningTrigger(triggerInstance: UUID): ConnectionIO[Option[RunningTrigger]] = { | ||
| val select: Fragment = sql""" | ||
| select (trigger_instance, trigger_name, trigger_party) from running_triggers | ||
| select trigger_instance, full_trigger_name, trigger_party, access_token from running_triggers |
There was a problem hiding this comment.
I’m confused, how did this work before? The column name isn’t changed by this PR.
There was a problem hiding this comment.
It didn't work before, this code was untested so far. See #7750 (comment).
triggers/service/src/main/scala/com/digitalasset/daml/lf/engine/trigger/dao/DbTriggerDao.scala
Show resolved
Hide resolved
Co-authored-by: Moritz Kiefer <moritz.kiefer@purelyfunctional.org>
This was referenced Nov 5, 2020
6 tasks
mergify bot
pushed a commit
that referenced
this pull request
Nov 6, 2020
* Check the trigger dao migrations digest Following the example of the corresponding ledger on SQL tests. The digests had to be updated as both of them had gone out of sync. The init digest presumably due to the change in #7226 and the one for adding the access token during review of #7890. changelog_begin changelog_end * define abstract migrations test * Use abstract migrations test in trigger service tests * use abstract migrations test in ledger on SQL * Retain check for number of .sql resources * Factor out the hash-migrations script * Consistent shell settings Addressing review comment Co-authored-by: Andreas Herrmann <andreas.herrmann@tweag.io>
garyverhaegen-da
pushed a commit
that referenced
this pull request
Nov 6, 2020
* Check the trigger dao migrations digest Following the example of the corresponding ledger on SQL tests. The digests had to be updated as both of them had gone out of sync. The init digest presumably due to the change in #7226 and the one for adding the access token during review of #7890. changelog_begin changelog_end * define abstract migrations test * Use abstract migrations test in trigger service tests * use abstract migrations test in ledger on SQL * Retain check for number of .sql resources * Factor out the hash-migrations script * Consistent shell settings Addressing review comment Co-authored-by: Andreas Herrmann <andreas.herrmann@tweag.io>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
readRunningTriggersusing theGetandPutforPartyandIdentifierCloses #7720 (refresh token is not implemented yet)
Pull Request Checklist
CHANGELOG_BEGINandCHANGELOG_ENDtagsNOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with
/AzurePipelines runtotrigger the build.