(Un-)lock Status for Self-Deleting Messages by battermann · Pull Request #1937 · wireapp/wire-server

battermann · 2021-11-23T11:36:49Z

https://wearezeta.atlassian.net/browse/SQSERVICES-1079

Checklist

json roundtrip test for PaymentStatus C* schema migration for self deleting messages payment status teamstore implementation for self deleting messages payment status removed unnecessary function dynamic lock/unlock payment status added payment status to feature with config models removed redundant description use PaymentStatusValue for API path removed redundant comment added roundtrip test for PaymentStatusValue updated API description make payment status in config optional golden tests include payment status, formatting generic set payment status error for locked payment status validate payment status while setting team feature status fix integration tests comments

…updated C* interpreter

* Fix swagger-1.2. * Simplify.

Co-authored-by: fisx <mf@zerobuzz.net>

…-team-feature-and-configure-team-feature

fisx

Almost there!

I am wondering though if we want to take the "payment" out of all names again. If we have a feature where we want to make the site config overrule the team config, it may make sense to "lock" it when setting a site-wide config, and we may want to use the same thing there as we use here.

Let's discuss this!

libs/wire-api/src/Wire/API/Routes/Public/Galley.hs

libs/wire-api/src/Wire/API/Team/Feature.hs

libs/wire-api/test/unit/Test/Wire/API/Roundtrip/Aeson.hs

services/galley/src/Galley/API/Teams/Features.hs

services/galley/src/Galley/Cassandra/TeamFeatures.hs

services/galley/test/integration/API/Teams/Feature.hs

…and-configure-team-feature' of github.com:wireapp/wire-server into SQSERVICES-960-distinguish-between-unlock-team-feature-and-configure-team-feature

Co-authored-by: fisx <mf@zerobuzz.net>

…and-configure-team-feature' of github.com:wireapp/wire-server into SQSERVICES-960-distinguish-between-unlock-team-feature-and-configure-team-feature

fisx

Now I want to change everything so it doesn't say "payment status" but "lock status". Otherwise I'm happy with everything now, or will be happy to change it in later PRs.

fisx · 2021-11-24T19:40:11Z

services/galley/galley.cabal

    ld-options: -static
  default-language: Haskell2010

-- FUTUREWORK(Leif): rename to galley-tests here and in the package.yaml file


#1942 :) (if you approve that PR, please merge right away.)

fisx · 2021-11-24T19:43:02Z

services/galley/src/Galley/API/Teams/Features.hs

        Public.defaultSelfDeletingMessagesStatus {Public.tfwcapsPaymentStatus = Public.PaymentUnlocked}
-      _ -> Public.defaultSelfDeletingMessagesStatus
+      (Just Public.PaymentLocked, _) -> Public.defaultSelfDeletingMessagesStatus
+      (Nothing, _) -> Public.defaultSelfDeletingMessagesStatus


right, i missed the Nothing. makes it slightly less pretty, but i still prefer the way it reads now. thanks!

(it turns out there is more than one reason to lock a feature from configuration, eg., because it is configured for the site and shouldn't be changed by team admins.)

fisx · 2021-11-24T21:08:27Z

If HTTP endpoint paths have been added or renamed, the endpoint / config-flag checklist (see Wire-employee only backend wiki page) has been followed.

Actually, we should grant QA access on staging to the new internal end-point. This is documented in the wiki. I'll push another commit.

If new config options introduced: added usage description under docs/reference/config-options.md

n/a

If new config options introduced: recommended measures to be taken by on-premise instance operators.

n/a

If a cassandra schema migration is backwards incompatible (see also these docs), measures to be taken by on-premise instance operators are explained.

n/a (our migration is backwards compatible, meaning we can run old galley instances on the new schema, it'll just ignore the new column).

If a data migration (not schema migration) introduced: measures to be taken by on-premise instance operators.

n/a (data migration would be eg. "insert 1 into all rows into the new column")

If public end-points have been changed or added: does nginz need un upgrade?

n/a

If internal end-points have been added or changed: which services have to be deployed in a specific order?

no specific order. however, ibis will start using this end-point eventually, but only after we're done deploying. ibis should contain a note in the release notes when it starts using this end-point that it needs galley or newer.

fisx · 2021-11-24T21:18:28Z

Actually, we should grant QA access on staging to the new internal end-point. This is documented in the wiki. I'll push another commit.

correction: I'll make another (private) PR: https://github.com/zinfra/cailleach/pull/734

fisx · 2021-11-25T19:21:55Z

integration tests pass locally.

This reverts commit 39f45ff.

(Un-)lock Status for Self-Deleting Messages (#1937) Co-authored-by: fisx <mf@zerobuzz.net> Co-authored-by: Leif Battermann <leif.battermann@wire.com>

battermann and others added 10 commits November 22, 2021 08:20

removed payment status for app lock team feature from C* schema, and …

a87fe0c

…updated C* interpreter

This is a delta for #1916 (#1935)

9a09469

* Fix swagger-1.2. * Simplify.

improve comment

9982454

Co-authored-by: fisx <mf@zerobuzz.net>

simplification

0a51b92

require HasPaymentStatusCol for setting the payment status

f0f50cc

clean up

c1a1307

FeatureStatus with and without PaymentStatus

17d6c54

integration tests + implementation of business logic

9d419ba

reduce # of db roundtrips

d235a3f

battermann requested a review from fisx November 23, 2021 11:37

battermann and others added 2 commits November 23, 2021 12:51

renamed migration

80b9b8c

Merge branch 'develop' into SQSERVICES-960-distinguish-between-unlock…

f1824ef

…-team-feature-and-configure-team-feature

fisx mentioned this pull request Nov 23, 2021

Lock/Unlock Payment Status for Self Deleting Messages #1916

Closed

12 tasks

fisx changed the title ~~(Un-) Lock Payment Status for Selfdeleting Messages~~ (Un-)lock Payment Status for Selfdeleting Messages [skip ci] Nov 23, 2021

fisx added 2 commits November 23, 2021 21:32

Simplify.

95fc91a

Factor out feature locking function.

187da92

fisx reviewed Nov 23, 2021

View reviewed changes

battermann and others added 9 commits November 24, 2021 11:36

FeatureHasNoConfig with PaymentStatus parameter

1a2b7dc

Merge branch 'SQSERVICES-960-distinguish-between-unlock-team-feature-…

dc9c717

…and-configure-team-feature' of github.com:wireapp/wire-server into SQSERVICES-960-distinguish-between-unlock-team-feature-and-configure-team-feature

remove comment

d37484a

Co-authored-by: fisx <mf@zerobuzz.net>

additional roundtrip test

f3d8cdd

Co-authored-by: fisx <mf@zerobuzz.net>

typo

f1f35f6

Co-authored-by: fisx <mf@zerobuzz.net>

clean up

d401dda

Co-authored-by: fisx <mf@zerobuzz.net>

more explicit pattern match

b268c10

simplify payment status to payment status value

743da2f

typo

151f712

Co-authored-by: fisx <mf@zerobuzz.net>

battermann changed the title ~~(Un-)lock Payment Status for Selfdeleting Messages [skip ci]~~ (Un-)lock Payment Status for Selfdeleting Messages Nov 24, 2021

battermann added 2 commits November 24, 2021 13:13

changelog

fe9fce9

update schema docs

1f0c701

battermann added 2 commits November 24, 2021 13:21

Merge branch 'SQSERVICES-960-distinguish-between-unlock-team-feature-…

4823614

…and-configure-team-feature' of github.com:wireapp/wire-server into SQSERVICES-960-distinguish-between-unlock-team-feature-and-configure-team-feature

typo

43b1be0

battermann requested a review from fisx November 24, 2021 16:10

fisx reviewed Nov 24, 2021

View reviewed changes

s/payment/lock/gi;

e7cbecc

(it turns out there is more than one reason to lock a feature from configuration, eg., because it is configured for the site and shouldn't be changed by team admins.)

fisx changed the title ~~(Un-)lock Payment Status for Selfdeleting Messages~~ (Un-)lock Status for Self-Deleting Messages Nov 24, 2021

fisx approved these changes Nov 24, 2021

View reviewed changes

This was referenced Nov 24, 2021

Feature (un-)locking [skip ci] #1905

Closed

Activate/Deactivate Conference Calling Team Feature for Back Office #1938

Closed

fisx and others added 3 commits November 25, 2021 11:13

Make default behavior on-prem-compatible.

56d787b

fix integrationtest, regenerate cql docs

9cb5dcd

formatting

7369d68

fisx merged commit 39f45ff into develop Nov 25, 2021

fisx deleted the SQSERVICES-960-distinguish-between-unlock-team-feature-and-configure-team-feature branch November 25, 2021 19:22

fisx added a commit that referenced this pull request Nov 26, 2021

Revert "(Un-)lock Status for Self-Deleting Messages (#1937)"

6058c78

This reverts commit 39f45ff.

fisx added a commit that referenced this pull request Nov 26, 2021

Revert "(Un-)lock Status for Self-Deleting Messages (#1937)" (#1946)

f47908c

This reverts commit 39f45ff.

battermann pushed a commit that referenced this pull request Dec 3, 2021

(Un-)lock Status for Self-Deleting Messages (#1937)

3f5a69b

fisx pushed a commit that referenced this pull request Dec 3, 2021

(Un-)lock Status for Self-Deleting Messages (#1937)

0d2ef11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

(Un-)lock Status for Self-Deleting Messages#1937

(Un-)lock Status for Self-Deleting Messages#1937
fisx merged 31 commits intodevelopfrom
SQSERVICES-960-distinguish-between-unlock-team-feature-and-configure-team-feature

battermann commented Nov 23, 2021 •

edited by fisx

Loading

Uh oh!

fisx left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fisx left a comment

Uh oh!

fisx Nov 24, 2021

Uh oh!

fisx Nov 24, 2021

Uh oh!

fisx commented Nov 24, 2021

Uh oh!

fisx commented Nov 24, 2021

Uh oh!

fisx commented Nov 25, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Comments

Conversation

battermann commented Nov 23, 2021 • edited by fisx Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Checklist

Uh oh!

fisx left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

fisx left a comment

Choose a reason for hiding this comment

Uh oh!

fisx Nov 24, 2021

Choose a reason for hiding this comment

Uh oh!

fisx Nov 24, 2021

Choose a reason for hiding this comment

Uh oh!

fisx commented Nov 24, 2021

Uh oh!

fisx commented Nov 24, 2021

Uh oh!

fisx commented Nov 25, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

battermann commented Nov 23, 2021 •

edited by fisx

Loading