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

App-Lock follow-up #1253

Merged
merged 12 commits into from
Nov 23, 2020
Merged

App-Lock follow-up #1253

merged 12 commits into from
Nov 23, 2020

Conversation

smatting
Copy link
Contributor

@smatting smatting commented Nov 23, 2020

@fisx
Copy link
Contributor

fisx commented Nov 23, 2020

can you please make config changes optional? this makes migration easier in general, and will help us get this to staging more quickly.

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.

actually, not sure about the config thing i said any more. your approach is very elegant. i'll leave in my comments for now, let's fight over this! :)

services/galley/src/Galley/Data/TeamFeatures.hs Outdated Show resolved Hide resolved
services/galley/src/Galley/API/Internal.hs Outdated Show resolved Hide resolved
services/galley/src/Galley/API/Internal.hs Outdated Show resolved Hide resolved
services/galley/src/Galley/API/Public.hs Show resolved Hide resolved
services/galley/src/Galley/API/Teams.hs Outdated Show resolved Hide resolved
services/galley/src/Galley/API/Teams.hs Outdated Show resolved Hide resolved
services/galley/src/Galley/API/Teams.hs Outdated Show resolved Hide resolved
deploy/services-demo/conf/galley.demo.yaml Outdated Show resolved Hide resolved
libs/galley-types/src/Galley/Types/Teams.hs Outdated Show resolved Hide resolved
libs/galley-types/src/Galley/Types/Teams.hs Outdated Show resolved Hide resolved
@fisx
Copy link
Contributor

fisx commented Nov 23, 2020

ah, and please run all the test. or at least compile everything. :)

galley-types                > /home/mf/src/wire-server/libs/galley-types/test/unit/Test/Galley/Types.hs:63:5: error:
galley-types                >     • Couldn't match type ‘Defaults
galley-types                >                              (Wire.API.Team.Feature.TeamFeatureStatus
galley-types                >                                 'Wire.API.Team.Feature.TeamFeatureAppLock)
galley-types                >                            -> FeatureFlags’
galley-types                >                      with ‘FeatureFlags’
galley-types                >       Expected type: FeatureSSO  
galley-types                >                      -> FeatureLegalHold -> FeatureTeamSearchVisibility -> FeatureFlags
galley-types                >         Actual type: FeatureSSO  
galley-types                >                      -> FeatureLegalHold
galley-types                >                      -> FeatureTeamSearchVisibility
galley-types                >                      -> Defaults 
galley-types                >                           (Wire.API.Team.Feature.TeamFeatureStatus
galley-types                >                              'Wire.API.Team.Feature.TeamFeatureAppLock)
galley-types                >                      -> FeatureFlags
galley-types                >     • Probable cause: ‘FeatureFlags’ is applied to too few arguments
galley-types                >       In the first argument of ‘(<$>)’, namely ‘FeatureFlags’
galley-types                >       In the first argument of ‘(<*>)’, namely
galley-types                >         ‘FeatureFlags <$> QC.elements [minBound .. ]’
galley-types                >       In the first argument of ‘(<*>)’, namely
galley-types                >         ‘FeatureFlags <$> QC.elements [minBound .. ]
galley-types                >            <*> QC.elements [minBound .. ]’
galley-types                >    |                             
galley-types                > 63 |     FeatureFlags            
galley-types                >    |     ^^^^^^^^^^^^            

@smatting
Copy link
Contributor Author

@fisx approved

@smatting smatting merged commit aca893a into develop Nov 23, 2020
@smatting smatting deleted the smatting/applock-followup branch November 23, 2020 16:13
@jschaul jschaul mentioned this pull request Nov 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants