Skip to content

Polysemy: Separate more Cassandra effects from Spar #1792

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
Merged
merged 50 commits into from
Sep 23, 2021
Merged

Polysemy: Separate more Cassandra effects from Spar #1792

merged 50 commits into from
Sep 23, 2021

Conversation

isovector
Copy link
Contributor

@isovector isovector commented Sep 20, 2021 •
edited
Loading

This PR rips out a bunch more effects from Spar for polysemization and eventual unit-testing support:

  • ScimExternalIdStore
  • ScimUserTimesStore
  • ScimTokenStore
  • DefaultSsoCode

Also, it renames SAMLUser to SAMLUserStore.

To be rebased onto develop after #1787 lands.

Checklist

  • The PR Title explains the impact of the change.
  • The PR description provides context as to why the change should occur and what the code contributes to that effect. This could also be a link to a JIRA ticket or a Github issue, if there is one.
  • changelog.d contains the following bits of information:
    • A file with the changelog entry in one or more suitable sub-sections. The sub-sections are marked by directories inside changelog.d.

@isovector
Make sure to actually wrap the action in 'wrapMonadClientSem'
fdf4c61
@isovector
Implement wrapMonadClient in terms of wrapMonadClientSem
b239949
@isovector
Pull out IdP effect
c66961d
@isovector
Push Member IdP constraints throughout
2943335
@isovector
Pull application logic out of Data and into App
18bebc6
@isovector
Use application-level functions instead
d58dc66
@isovector
Remove deleteTeam from Data too
92401dd
@isovector
Get rid of wrapMonadClientWithEnvSem
6564df4
@isovector
Implement wrapSpar
ed760c3
@isovector
Undo accidental formatting
016d39c
@isovector
Update cabal
c93a8c5
@isovector
make format
3c5fb71
@isovector
Update changelog
4173291
@isovector
Merge branch 'wrap-monad-client-sem' into idp-effect
dc159fa
@isovector
Get rid of the untouchable variable in liftSem
55f9ba8
@isovector
Be very careful about wrapping in the same places
4e9ebc5
@isovector
Resort exports
c585b91
@isovector
Changelog
c79130d
@isovector
Merge branch 'develop' into idp-effect
e4a761c
@isovector
DefaultSsoCode effect
6c7ff76
@isovector
ScimTokenStore effect
2e0319c
@isovector
wip BindCookie effect
d1f9158
@isovector
Forgot some callsites
a62a7eb
@isovector
Merge branch 'idp-effect' of github.com:wireapp/wire-server into idp-…
c4d33b7 
…effect
@isovector
Get tests compiling again
29befdb
@isovector
Get everything compiling
dc14528
@isovector
remove runSparCassSem
2de4c63
@isovector
Merge branch 'idp-effect' into misc-effects
1d800f5
@isovector
Change the tests to use IdP
1a708f4
@isovector
Finish all SAMLUser and IdP effects refs in tests
971a581
@isovector isovector requested a review from fisx September 20, 2021 19:40
Base automatically changed from idp-effect to develop September 20, 2021 21:04
fisx
fisx requested changes Sep 20, 2021
View reviewed changes
Copy link
Contributor

@fisx fisx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pls rebase or merge

@fisx fisx self-requested a review September 21, 2021 07:03
@isovector isovector mentioned this pull request Sep 23, 2021
Merged
4 tasks
fisx
fisx approved these changes Sep 23, 2021
View reviewed changes
Copy link
Contributor

@fisx fisx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all good to go!

services/spar/src/Spar/App.hs
scimUserTimesStoreToCassandra $
scimExternalIdStoreToCassandra $
runExceptT $
runReaderT action ctx
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pretty! :)

services/spar/src/Spar/Scim/User.hs
Maybe IdP ->
TeamId ->
Text ->
MaybeT (Scim.ScimHandler (Spar r)) (Scim.StoredUser ST.SparTag)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like that you made the type signature multi-line here (and in some other places).

services/spar/src/Spar/Sem/DefaultSsoCode/Cassandra.hs
embed @m . \case
Get -> Data.getDefaultSsoCode
Store ip -> Data.storeDefaultSsoCode ip
Delete -> Data.deleteDefaultSsoCode
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suppose at some point we can resolve Spar.Data into these intepreter modules, what do you think?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That sounds good to me!

@fisx fisx merged commit 34e693b into develop Sep 23, 2021
@fisx fisx deleted the misc-effects branch September 23, 2021 21:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fisx fisx fisx approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@isovector @fisx