From f35c9ae8a033082b74dafb0bc5cf0f263afe7591 Mon Sep 17 00:00:00 2001 From: Igor Ranieri Elland <54423+elland@users.noreply.github.com> Date: Wed, 11 Oct 2023 14:44:33 +0200 Subject: [PATCH] [WPB-3138] Split galley-schema into lib and exec (#3639) * Split galley-schema into lib and exec * Removed galley-schema-lib, merged into galley. * Removed dead comment --- services/galley/default.nix | 2 +- services/galley/galley.cabal | 199 ++++++++---------- services/galley/schema/{main.hs => Main.hs} | 2 +- services/galley/schema/src/Run.hs | 182 ---------------- services/galley/src/Galley/Cassandra.hs | 3 +- services/galley/src/Galley/Schema/Run.hs | 185 ++++++++++++++++ .../{schema/src => src/Galley/Schema}/V20.hs | 2 +- .../{schema/src => src/Galley/Schema}/V21.hs | 2 +- .../{schema/src => src/Galley/Schema}/V22.hs | 2 +- .../{schema/src => src/Galley/Schema}/V23.hs | 2 +- .../{schema/src => src/Galley/Schema}/V24.hs | 2 +- .../{schema/src => src/Galley/Schema}/V25.hs | 2 +- .../{schema/src => src/Galley/Schema}/V26.hs | 2 +- .../{schema/src => src/Galley/Schema}/V27.hs | 2 +- .../{schema/src => src/Galley/Schema}/V28.hs | 2 +- .../{schema/src => src/Galley/Schema}/V29.hs | 2 +- .../{schema/src => src/Galley/Schema}/V30.hs | 2 +- .../{schema/src => src/Galley/Schema}/V31.hs | 2 +- .../{schema/src => src/Galley/Schema}/V32.hs | 2 +- .../{schema/src => src/Galley/Schema}/V33.hs | 2 +- .../{schema/src => src/Galley/Schema}/V34.hs | 2 +- .../{schema/src => src/Galley/Schema}/V35.hs | 2 +- .../{schema/src => src/Galley/Schema}/V36.hs | 2 +- .../{schema/src => src/Galley/Schema}/V37.hs | 2 +- .../V38_CreateTableBillingTeamMember.hs | 2 +- .../{schema/src => src/Galley/Schema}/V39.hs | 2 +- .../Schema}/V40_CreateTableDataMigration.hs | 2 +- .../Schema}/V41_TeamNotificationQueue.hs | 2 +- .../V42_TeamFeatureValidateSamlEmails.hs | 2 +- .../V43_TeamFeatureDigitalSignatures.hs | 2 +- .../Schema}/V44_AddRemoteIdentifiers.hs | 2 +- .../Schema}/V45_AddFederationIdMapping.hs | 2 +- .../Galley/Schema}/V46_TeamFeatureAppLock.hs | 2 +- .../Schema}/V47_RemoveFederationIdMapping.hs | 2 +- .../Schema}/V48_DeleteRemoteIdentifiers.hs | 2 +- .../Schema}/V49_ReAddRemoteIdentifiers.hs | 2 +- .../Schema}/V50_AddLegalholdWhitelisted.hs | 2 +- .../Galley/Schema}/V51_FeatureFileSharing.hs | 2 +- .../Schema}/V52_FeatureConferenceCalling.hs | 2 +- .../Galley/Schema}/V53_AddRemoteConvStatus.hs | 2 +- .../V54_TeamFeatureSelfDeletingMessages.hs | 2 +- .../V55_SelfDeletingMessagesLockStatus.hs | 2 +- .../V56_GuestLinksTeamFeatureStatus.hs | 2 +- .../Schema}/V57_GuestLinksLockStatus.hs | 2 +- .../Schema}/V58_ConversationAccessRoleV2.hs | 2 +- .../Schema}/V59_FileSharingLockStatus.hs | 2 +- ...0_TeamFeatureSndFactorPasswordChallenge.hs | 2 +- .../Galley/Schema}/V61_MLSConversation.hs | 2 +- .../V62_TeamFeatureSearchVisibilityInbound.hs | 2 +- .../Schema}/V63_MLSConversationClients.hs | 2 +- .../src => src/Galley/Schema}/V64_Epoch.hs | 2 +- .../Galley/Schema}/V65_MLSRemoteClients.hs | 2 +- .../Galley/Schema}/V66_AddSplashScreen.hs | 2 +- .../Galley/Schema}/V67_MLSFeature.hs | 2 +- .../Galley/Schema}/V68_MLSCommitLock.hs | 2 +- .../Galley/Schema}/V69_MLSProposal.hs | 2 +- .../Galley/Schema}/V70_MLSCipherSuite.hs | 2 +- .../Schema}/V71_MemberClientKeypackage.hs | 2 +- .../Schema}/V72_DropManagedConversations.hs | 2 +- .../Galley/Schema}/V73_MemberClientTable.hs | 2 +- .../V74_ExposeInvitationsToTeamAdmin.hs | 2 +- .../Galley/Schema}/V75_MLSGroupInfo.hs | 2 +- .../Galley/Schema}/V76_ProposalOrigin.hs | 2 +- .../Schema}/V77_MLSGroupMemberClient.hs | 2 +- .../V78_TeamFeatureOutlookCalIntegration.hs | 2 +- .../Galley/Schema}/V79_TeamFeatureMlsE2EId.hs | 2 +- .../V80_AddConversationCodePassword.hs | 2 +- .../Schema}/V81_TeamFeatureMlsE2EIdUpdate.hs | 2 +- .../Galley/Schema}/V82_RemoteDomainIndexes.hs | 2 +- .../Schema}/V83_CreateTableTeamAdmin.hs | 2 +- .../Galley/Schema}/V84_MLSSubconversation.hs | 2 +- .../Galley/Schema}/V85_MLSDraft17.hs | 2 +- .../Schema}/V86_TeamFeatureMlsMigration.hs | 2 +- .../V87_TeamFeatureSupportedProtocols.hs | 2 +- 74 files changed, 347 insertions(+), 362 deletions(-) rename services/galley/schema/{main.hs => Main.hs} (52%) delete mode 100644 services/galley/schema/src/Run.hs create mode 100644 services/galley/src/Galley/Schema/Run.hs rename services/galley/{schema/src => src/Galley/Schema}/V20.hs (99%) rename services/galley/{schema/src => src/Galley/Schema}/V21.hs (99%) rename services/galley/{schema/src => src/Galley/Schema}/V22.hs (97%) rename services/galley/{schema/src => src/Galley/Schema}/V23.hs (97%) rename services/galley/{schema/src => src/Galley/Schema}/V24.hs (97%) rename services/galley/{schema/src => src/Galley/Schema}/V25.hs (98%) rename services/galley/{schema/src => src/Galley/Schema}/V26.hs (97%) rename services/galley/{schema/src => src/Galley/Schema}/V27.hs (97%) rename services/galley/{schema/src => src/Galley/Schema}/V28.hs (97%) rename services/galley/{schema/src => src/Galley/Schema}/V29.hs (97%) rename services/galley/{schema/src => src/Galley/Schema}/V30.hs (97%) rename services/galley/{schema/src => src/Galley/Schema}/V31.hs (98%) rename services/galley/{schema/src => src/Galley/Schema}/V32.hs (97%) rename services/galley/{schema/src => src/Galley/Schema}/V33.hs (98%) rename services/galley/{schema/src => src/Galley/Schema}/V34.hs (98%) rename services/galley/{schema/src => src/Galley/Schema}/V35.hs (97%) rename services/galley/{schema/src => src/Galley/Schema}/V36.hs (97%) rename services/galley/{schema/src => src/Galley/Schema}/V37.hs (97%) rename services/galley/{schema/src => src/Galley/Schema}/V38_CreateTableBillingTeamMember.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V39.hs (97%) rename services/galley/{schema/src => src/Galley/Schema}/V40_CreateTableDataMigration.hs (94%) rename services/galley/{schema/src => src/Galley/Schema}/V41_TeamNotificationQueue.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V42_TeamFeatureValidateSamlEmails.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V43_TeamFeatureDigitalSignatures.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V44_AddRemoteIdentifiers.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V45_AddFederationIdMapping.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V46_TeamFeatureAppLock.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V47_RemoveFederationIdMapping.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V48_DeleteRemoteIdentifiers.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V49_ReAddRemoteIdentifiers.hs (98%) rename services/galley/{schema/src => src/Galley/Schema}/V50_AddLegalholdWhitelisted.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V51_FeatureFileSharing.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V52_FeatureConferenceCalling.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V53_AddRemoteConvStatus.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V54_TeamFeatureSelfDeletingMessages.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V55_SelfDeletingMessagesLockStatus.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V56_GuestLinksTeamFeatureStatus.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V57_GuestLinksLockStatus.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V58_ConversationAccessRoleV2.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V59_FileSharingLockStatus.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V60_TeamFeatureSndFactorPasswordChallenge.hs (94%) rename services/galley/{schema/src => src/Galley/Schema}/V61_MLSConversation.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V62_TeamFeatureSearchVisibilityInbound.hs (94%) rename services/galley/{schema/src => src/Galley/Schema}/V63_MLSConversationClients.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V64_Epoch.hs (97%) rename services/galley/{schema/src => src/Galley/Schema}/V65_MLSRemoteClients.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V66_AddSplashScreen.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V67_MLSFeature.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V68_MLSCommitLock.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V69_MLSProposal.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V70_MLSCipherSuite.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V71_MemberClientKeypackage.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V72_DropManagedConversations.hs (94%) rename services/galley/{schema/src => src/Galley/Schema}/V73_MemberClientTable.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V74_ExposeInvitationsToTeamAdmin.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V75_MLSGroupInfo.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V76_ProposalOrigin.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V77_MLSGroupMemberClient.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V78_TeamFeatureOutlookCalIntegration.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V79_TeamFeatureMlsE2EId.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V80_AddConversationCodePassword.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V81_TeamFeatureMlsE2EIdUpdate.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V82_RemoteDomainIndexes.hs (91%) rename services/galley/{schema/src => src/Galley/Schema}/V83_CreateTableTeamAdmin.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V84_MLSSubconversation.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V85_MLSDraft17.hs (95%) rename services/galley/{schema/src => src/Galley/Schema}/V86_TeamFeatureMlsMigration.hs (96%) rename services/galley/{schema/src => src/Galley/Schema}/V87_TeamFeatureSupportedProtocols.hs (95%) diff --git a/services/galley/default.nix b/services/galley/default.nix index 10d94f415e3..68e29faedeb 100644 --- a/services/galley/default.nix +++ b/services/galley/default.nix @@ -174,6 +174,7 @@ mkDerivation { metrics-core metrics-wai mtl + optparse-applicative pem polysemy polysemy-wire-zoo @@ -269,7 +270,6 @@ mkDerivation { QuickCheck quickcheck-instances random - raw-strings-qq retry saml2-web-sso schema-profunctor diff --git a/services/galley/galley.cabal b/services/galley/galley.cabal index a35b727e888..e6ede83b48e 100644 --- a/services/galley/galley.cabal +++ b/services/galley/galley.cabal @@ -16,7 +16,7 @@ flag static default: False common common-all - default-language: Haskell2010 + default-language: GHC2021 ghc-options: -O2 -Wall -Wincomplete-uni-patterns -Wincomplete-record-updates -Wpartial-fields -fwarn-tabs -optP-Wno-nonportable-include-path @@ -68,7 +68,7 @@ common common-all ViewPatterns library - import: common-all + import: common-all -- cabal-fmt: expand src exposed-modules: @@ -203,14 +203,83 @@ library Galley.Options Galley.Queue Galley.Run + Galley.Schema.Run + Galley.Schema.V20 + Galley.Schema.V21 + Galley.Schema.V22 + Galley.Schema.V23 + Galley.Schema.V24 + Galley.Schema.V25 + Galley.Schema.V26 + Galley.Schema.V27 + Galley.Schema.V28 + Galley.Schema.V29 + Galley.Schema.V30 + Galley.Schema.V31 + Galley.Schema.V32 + Galley.Schema.V33 + Galley.Schema.V34 + Galley.Schema.V35 + Galley.Schema.V36 + Galley.Schema.V37 + Galley.Schema.V38_CreateTableBillingTeamMember + Galley.Schema.V39 + Galley.Schema.V40_CreateTableDataMigration + Galley.Schema.V41_TeamNotificationQueue + Galley.Schema.V42_TeamFeatureValidateSamlEmails + Galley.Schema.V43_TeamFeatureDigitalSignatures + Galley.Schema.V44_AddRemoteIdentifiers + Galley.Schema.V45_AddFederationIdMapping + Galley.Schema.V46_TeamFeatureAppLock + Galley.Schema.V47_RemoveFederationIdMapping + Galley.Schema.V48_DeleteRemoteIdentifiers + Galley.Schema.V49_ReAddRemoteIdentifiers + Galley.Schema.V50_AddLegalholdWhitelisted + Galley.Schema.V51_FeatureFileSharing + Galley.Schema.V52_FeatureConferenceCalling + Galley.Schema.V53_AddRemoteConvStatus + Galley.Schema.V54_TeamFeatureSelfDeletingMessages + Galley.Schema.V55_SelfDeletingMessagesLockStatus + Galley.Schema.V56_GuestLinksTeamFeatureStatus + Galley.Schema.V57_GuestLinksLockStatus + Galley.Schema.V58_ConversationAccessRoleV2 + Galley.Schema.V59_FileSharingLockStatus + Galley.Schema.V60_TeamFeatureSndFactorPasswordChallenge + Galley.Schema.V61_MLSConversation + Galley.Schema.V62_TeamFeatureSearchVisibilityInbound + Galley.Schema.V63_MLSConversationClients + Galley.Schema.V64_Epoch + Galley.Schema.V65_MLSRemoteClients + Galley.Schema.V66_AddSplashScreen + Galley.Schema.V67_MLSFeature + Galley.Schema.V68_MLSCommitLock + Galley.Schema.V69_MLSProposal + Galley.Schema.V70_MLSCipherSuite + Galley.Schema.V71_MemberClientKeypackage + Galley.Schema.V72_DropManagedConversations + Galley.Schema.V73_MemberClientTable + Galley.Schema.V74_ExposeInvitationsToTeamAdmin + Galley.Schema.V75_MLSGroupInfo + Galley.Schema.V76_ProposalOrigin + Galley.Schema.V77_MLSGroupMemberClient + Galley.Schema.V78_TeamFeatureOutlookCalIntegration + Galley.Schema.V79_TeamFeatureMlsE2EId + Galley.Schema.V80_AddConversationCodePassword + Galley.Schema.V81_TeamFeatureMlsE2EIdUpdate + Galley.Schema.V82_RemoteDomainIndexes + Galley.Schema.V83_CreateTableTeamAdmin + Galley.Schema.V84_MLSSubconversation + Galley.Schema.V85_MLSDraft17 + Galley.Schema.V86_TeamFeatureMlsMigration + Galley.Schema.V87_TeamFeatureSupportedProtocols Galley.Types.Clients Galley.Types.ToUserRole Galley.Types.UserList Galley.Validation - ghc-options: -fplugin=TransitiveAnns.Plugin - other-modules: Paths_galley - hs-source-dirs: src + ghc-options: -fplugin=TransitiveAnns.Plugin + other-modules: Paths_galley + hs-source-dirs: src build-depends: , aeson >=2.0.1.0 , amazonka >=1.4.5 @@ -255,6 +324,7 @@ library , metrics-core , metrics-wai >=0.4 , mtl >=2.2 + , optparse-applicative , pem , polysemy , polysemy-wire-zoo @@ -296,13 +366,11 @@ library , wire-api-federation , x509 - default-language: GHC2021 - executable galley - import: common-all - main-is: exec/Main.hs - other-modules: Paths_galley - ghc-options: -threaded -with-rtsopts=-T -rtsopts + import: common-all + main-is: exec/Main.hs + other-modules: Paths_galley + ghc-options: -threaded -with-rtsopts=-T -rtsopts build-depends: , base , galley @@ -313,8 +381,6 @@ executable galley if flag(static) ld-options: -static - default-language: GHC2021 - executable galley-integration import: common-all main-is: ../integration.hs @@ -486,11 +552,9 @@ executable galley-integration , wire-api-federation , yaml - default-language: GHC2021 - executable galley-migrate-data - import: common-all - main-is: ../main.hs + import: common-all + main-is: ../main.hs -- cabal-fmt: expand migrate-data/src other-modules: @@ -502,7 +566,7 @@ executable galley-migrate-data V2_MigrateMLSMembers V3_BackfillTeamAdmins - hs-source-dirs: migrate-data/src + hs-source-dirs: migrate-data/src build-depends: , base , cassandra-util @@ -525,103 +589,22 @@ executable galley-migrate-data if flag(static) ld-options: -static - default-language: GHC2021 - executable galley-schema import: common-all - main-is: ../main.hs - - -- cabal-fmt: expand schema/src - other-modules: - Run - V20 - V21 - V22 - V23 - V24 - V25 - V26 - V27 - V28 - V29 - V30 - V31 - V32 - V33 - V34 - V35 - V36 - V37 - V38_CreateTableBillingTeamMember - V39 - V40_CreateTableDataMigration - V41_TeamNotificationQueue - V42_TeamFeatureValidateSamlEmails - V43_TeamFeatureDigitalSignatures - V44_AddRemoteIdentifiers - V45_AddFederationIdMapping - V46_TeamFeatureAppLock - V47_RemoveFederationIdMapping - V48_DeleteRemoteIdentifiers - V49_ReAddRemoteIdentifiers - V50_AddLegalholdWhitelisted - V51_FeatureFileSharing - V52_FeatureConferenceCalling - V53_AddRemoteConvStatus - V54_TeamFeatureSelfDeletingMessages - V55_SelfDeletingMessagesLockStatus - V56_GuestLinksTeamFeatureStatus - V57_GuestLinksLockStatus - V58_ConversationAccessRoleV2 - V59_FileSharingLockStatus - V60_TeamFeatureSndFactorPasswordChallenge - V61_MLSConversation - V62_TeamFeatureSearchVisibilityInbound - V63_MLSConversationClients - V64_Epoch - V65_MLSRemoteClients - V66_AddSplashScreen - V67_MLSFeature - V68_MLSCommitLock - V69_MLSProposal - V70_MLSCipherSuite - V71_MemberClientKeypackage - V72_DropManagedConversations - V73_MemberClientTable - V74_ExposeInvitationsToTeamAdmin - V75_MLSGroupInfo - V76_ProposalOrigin - V77_MLSGroupMemberClient - V78_TeamFeatureOutlookCalIntegration - V79_TeamFeatureMlsE2EId - V80_AddConversationCodePassword - V81_TeamFeatureMlsE2EIdUpdate - V82_RemoteDomainIndexes - V83_CreateTableTeamAdmin - V84_MLSSubconversation - V85_MLSDraft17 - V86_TeamFeatureMlsMigration - V87_TeamFeatureSupportedProtocols - - hs-source-dirs: schema/src + main-is: Main.hs + hs-source-dirs: schema default-extensions: TemplateHaskell build-depends: - , base - , cassandra-util - , extended + , galley , imports - , optparse-applicative - , raw-strings-qq >=1.0 if flag(static) ld-options: -static - default-language: GHC2021 - test-suite galley-tests - import: common-all - type: exitcode-stdio-1.0 - main-is: ../unit.hs + import: common-all + type: exitcode-stdio-1.0 + main-is: ../unit.hs other-modules: Paths_galley Run @@ -631,8 +614,8 @@ test-suite galley-tests Test.Galley.Intra.User Test.Galley.Mapping - ghc-options: -threaded -with-rtsopts=-N - hs-source-dirs: test/unit + ghc-options: -threaded -with-rtsopts=-N + hs-source-dirs: test/unit build-depends: , base , containers @@ -651,5 +634,3 @@ test-suite galley-tests , uuid-types , wire-api , wire-api-federation - - default-language: GHC2021 diff --git a/services/galley/schema/main.hs b/services/galley/schema/Main.hs similarity index 52% rename from services/galley/schema/main.hs rename to services/galley/schema/Main.hs index d4037ab9cfa..6a175771138 100644 --- a/services/galley/schema/main.hs +++ b/services/galley/schema/Main.hs @@ -1,5 +1,5 @@ +import Galley.Schema.Run qualified as Run import Imports -import qualified Run main :: IO () main = Run.main diff --git a/services/galley/schema/src/Run.hs b/services/galley/schema/src/Run.hs deleted file mode 100644 index 6c134abcb33..00000000000 --- a/services/galley/schema/src/Run.hs +++ /dev/null @@ -1,182 +0,0 @@ --- This file is part of the Wire Server implementation. --- --- Copyright (C) 2022 Wire Swiss GmbH --- --- This program is free software: you can redistribute it and/or modify it under --- the terms of the GNU Affero General Public License as published by the Free --- Software Foundation, either version 3 of the License, or (at your option) any --- later version. --- --- This program is distributed in the hope that it will be useful, but WITHOUT --- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS --- FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more --- details. --- --- You should have received a copy of the GNU Affero General Public License along --- with this program. If not, see . - -module Run where - -import Cassandra.Schema -import Control.Exception (finally) -import Imports -import Options.Applicative -import System.Logger.Extended qualified as Log -import V20 qualified -import V21 qualified -import V22 qualified -import V23 qualified -import V24 qualified -import V25 qualified -import V26 qualified -import V27 qualified -import V28 qualified -import V29 qualified -import V30 qualified -import V31 qualified -import V32 qualified -import V33 qualified -import V34 qualified -import V35 qualified -import V36 qualified -import V37 qualified -import V38_CreateTableBillingTeamMember qualified -import V39 qualified -import V40_CreateTableDataMigration qualified -import V41_TeamNotificationQueue qualified -import V42_TeamFeatureValidateSamlEmails qualified -import V43_TeamFeatureDigitalSignatures qualified -import V44_AddRemoteIdentifiers qualified -import V45_AddFederationIdMapping qualified -import V46_TeamFeatureAppLock qualified -import V47_RemoveFederationIdMapping qualified -import V48_DeleteRemoteIdentifiers qualified -import V49_ReAddRemoteIdentifiers qualified -import V50_AddLegalholdWhitelisted qualified -import V51_FeatureFileSharing qualified -import V52_FeatureConferenceCalling qualified -import V53_AddRemoteConvStatus qualified -import V54_TeamFeatureSelfDeletingMessages qualified -import V55_SelfDeletingMessagesLockStatus qualified -import V56_GuestLinksTeamFeatureStatus qualified -import V57_GuestLinksLockStatus qualified -import V58_ConversationAccessRoleV2 qualified -import V59_FileSharingLockStatus qualified -import V60_TeamFeatureSndFactorPasswordChallenge qualified -import V61_MLSConversation qualified -import V62_TeamFeatureSearchVisibilityInbound qualified -import V63_MLSConversationClients qualified -import V64_Epoch qualified -import V65_MLSRemoteClients qualified -import V66_AddSplashScreen qualified -import V67_MLSFeature qualified -import V68_MLSCommitLock qualified -import V69_MLSProposal qualified -import V70_MLSCipherSuite qualified -import V71_MemberClientKeypackage qualified -import V72_DropManagedConversations qualified -import V73_MemberClientTable qualified -import V74_ExposeInvitationsToTeamAdmin qualified -import V75_MLSGroupInfo qualified -import V76_ProposalOrigin qualified -import V77_MLSGroupMemberClient qualified -import V78_TeamFeatureOutlookCalIntegration qualified -import V79_TeamFeatureMlsE2EId qualified -import V80_AddConversationCodePassword qualified -import V81_TeamFeatureMlsE2EIdUpdate qualified -import V82_RemoteDomainIndexes qualified -import V83_CreateTableTeamAdmin qualified -import V84_MLSSubconversation qualified -import V85_MLSDraft17 qualified -import V86_TeamFeatureMlsMigration qualified -import V87_TeamFeatureSupportedProtocols qualified - -main :: IO () -main = do - o <- execParser (info (helper <*> migrationOptsParser) desc) - l <- Log.mkLogger' - migrateSchema - l - o - [ V20.migration, - V21.migration, - V22.migration, - V23.migration, - V24.migration, - V25.migration, - V26.migration, - V27.migration, - V28.migration, - V29.migration, - V30.migration, - V31.migration, - V32.migration, - V33.migration, - V34.migration, - V35.migration, - V36.migration, - V37.migration, - V38_CreateTableBillingTeamMember.migration, - V39.migration, - V40_CreateTableDataMigration.migration, - V41_TeamNotificationQueue.migration, - V42_TeamFeatureValidateSamlEmails.migration, - V43_TeamFeatureDigitalSignatures.migration, - V44_AddRemoteIdentifiers.migration, - V45_AddFederationIdMapping.migration, - V46_TeamFeatureAppLock.migration, - V47_RemoveFederationIdMapping.migration, - V48_DeleteRemoteIdentifiers.migration, - V49_ReAddRemoteIdentifiers.migration, - V50_AddLegalholdWhitelisted.migration, - V51_FeatureFileSharing.migration, - V52_FeatureConferenceCalling.migration, - V53_AddRemoteConvStatus.migration, - V54_TeamFeatureSelfDeletingMessages.migration, - V55_SelfDeletingMessagesLockStatus.migration, - V56_GuestLinksTeamFeatureStatus.migration, - V57_GuestLinksLockStatus.migration, - V58_ConversationAccessRoleV2.migration, - V59_FileSharingLockStatus.migration, - V60_TeamFeatureSndFactorPasswordChallenge.migration, - V61_MLSConversation.migration, - V62_TeamFeatureSearchVisibilityInbound.migration, - V63_MLSConversationClients.migration, - V64_Epoch.migration, - V65_MLSRemoteClients.migration, - V66_AddSplashScreen.migration, - V67_MLSFeature.migration, - V68_MLSCommitLock.migration, - V69_MLSProposal.migration, - V70_MLSCipherSuite.migration, - V71_MemberClientKeypackage.migration, - V72_DropManagedConversations.migration, - V73_MemberClientTable.migration, - V74_ExposeInvitationsToTeamAdmin.migration, - V75_MLSGroupInfo.migration, - V76_ProposalOrigin.migration, - V77_MLSGroupMemberClient.migration, - V78_TeamFeatureOutlookCalIntegration.migration, - V79_TeamFeatureMlsE2EId.migration, - V80_AddConversationCodePassword.migration, - V81_TeamFeatureMlsE2EIdUpdate.migration, - V82_RemoteDomainIndexes.migration, - V83_CreateTableTeamAdmin.migration, - V84_MLSSubconversation.migration, - V85_MLSDraft17.migration, - V86_TeamFeatureMlsMigration.migration, - V87_TeamFeatureSupportedProtocols.migration - -- When adding migrations here, don't forget to update - -- 'schemaVersion' in Galley.Cassandra - -- (see also docs/developer/cassandra-interaction.md) - -- - -- FUTUREWORK: once #1726 has made its way to master/production, - -- the 'message' field in connections table can be dropped. - -- See also https://github.com/wireapp/wire-server/pull/1747/files - -- for an explanation - -- FUTUREWORK: once #1751 has made its way to master/production, - -- the 'otr_muted' field in the member table can be dropped. - ] - `finally` Log.close l - where - desc = header "Galley Cassandra Schema" <> fullDesc diff --git a/services/galley/src/Galley/Cassandra.hs b/services/galley/src/Galley/Cassandra.hs index b3a7812e932..ab948beca05 100644 --- a/services/galley/src/Galley/Cassandra.hs +++ b/services/galley/src/Galley/Cassandra.hs @@ -17,7 +17,8 @@ module Galley.Cassandra (schemaVersion) where +import Galley.Schema.Run qualified as Migrations import Imports schemaVersion :: Int32 -schemaVersion = 87 +schemaVersion = Migrations.lastSchemaVersion diff --git a/services/galley/src/Galley/Schema/Run.hs b/services/galley/src/Galley/Schema/Run.hs new file mode 100644 index 00000000000..c24f6bb78d4 --- /dev/null +++ b/services/galley/src/Galley/Schema/Run.hs @@ -0,0 +1,185 @@ +-- This file is part of the Wire Server implementation. +-- +-- Copyright (C) 2022 Wire Swiss GmbH +-- +-- This program is free software: you can redistribute it and/or modify it under +-- the terms of the GNU Affero General Public License as published by the Free +-- Software Foundation, either version 3 of the License, or (at your option) any +-- later version. +-- +-- This program is distributed in the hope that it will be useful, but WITHOUT +-- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +-- FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more +-- details. +-- +-- You should have received a copy of the GNU Affero General Public License along +-- with this program. If not, see . + +module Galley.Schema.Run where + +import Cassandra.Schema +import Control.Exception (finally) +import Galley.Schema.V20 qualified as V20 +import Galley.Schema.V21 qualified as V21 +import Galley.Schema.V22 qualified as V22 +import Galley.Schema.V23 qualified as V23 +import Galley.Schema.V24 qualified as V24 +import Galley.Schema.V25 qualified as V25 +import Galley.Schema.V26 qualified as V26 +import Galley.Schema.V27 qualified as V27 +import Galley.Schema.V28 qualified as V28 +import Galley.Schema.V29 qualified as V29 +import Galley.Schema.V30 qualified as V30 +import Galley.Schema.V31 qualified as V31 +import Galley.Schema.V32 qualified as V32 +import Galley.Schema.V33 qualified as V33 +import Galley.Schema.V34 qualified as V34 +import Galley.Schema.V35 qualified as V35 +import Galley.Schema.V36 qualified as V36 +import Galley.Schema.V37 qualified as V37 +import Galley.Schema.V38_CreateTableBillingTeamMember qualified as V38_CreateTableBillingTeamMember +import Galley.Schema.V39 qualified as V39 +import Galley.Schema.V40_CreateTableDataMigration qualified as V40_CreateTableDataMigration +import Galley.Schema.V41_TeamNotificationQueue qualified as V41_TeamNotificationQueue +import Galley.Schema.V42_TeamFeatureValidateSamlEmails qualified as V42_TeamFeatureValidateSamlEmails +import Galley.Schema.V43_TeamFeatureDigitalSignatures qualified as V43_TeamFeatureDigitalSignatures +import Galley.Schema.V44_AddRemoteIdentifiers qualified as V44_AddRemoteIdentifiers +import Galley.Schema.V45_AddFederationIdMapping qualified as V45_AddFederationIdMapping +import Galley.Schema.V46_TeamFeatureAppLock qualified as V46_TeamFeatureAppLock +import Galley.Schema.V47_RemoveFederationIdMapping qualified as V47_RemoveFederationIdMapping +import Galley.Schema.V48_DeleteRemoteIdentifiers qualified as V48_DeleteRemoteIdentifiers +import Galley.Schema.V49_ReAddRemoteIdentifiers qualified as V49_ReAddRemoteIdentifiers +import Galley.Schema.V50_AddLegalholdWhitelisted qualified as V50_AddLegalholdWhitelisted +import Galley.Schema.V51_FeatureFileSharing qualified as V51_FeatureFileSharing +import Galley.Schema.V52_FeatureConferenceCalling qualified as V52_FeatureConferenceCalling +import Galley.Schema.V53_AddRemoteConvStatus qualified as V53_AddRemoteConvStatus +import Galley.Schema.V54_TeamFeatureSelfDeletingMessages qualified as V54_TeamFeatureSelfDeletingMessages +import Galley.Schema.V55_SelfDeletingMessagesLockStatus qualified as V55_SelfDeletingMessagesLockStatus +import Galley.Schema.V56_GuestLinksTeamFeatureStatus qualified as V56_GuestLinksTeamFeatureStatus +import Galley.Schema.V57_GuestLinksLockStatus qualified as V57_GuestLinksLockStatus +import Galley.Schema.V58_ConversationAccessRoleV2 qualified as V58_ConversationAccessRoleV2 +import Galley.Schema.V59_FileSharingLockStatus qualified as V59_FileSharingLockStatus +import Galley.Schema.V60_TeamFeatureSndFactorPasswordChallenge qualified as V60_TeamFeatureSndFactorPasswordChallenge +import Galley.Schema.V61_MLSConversation qualified as V61_MLSConversation +import Galley.Schema.V62_TeamFeatureSearchVisibilityInbound qualified as V62_TeamFeatureSearchVisibilityInbound +import Galley.Schema.V63_MLSConversationClients qualified as V63_MLSConversationClients +import Galley.Schema.V64_Epoch qualified as V64_Epoch +import Galley.Schema.V65_MLSRemoteClients qualified as V65_MLSRemoteClients +import Galley.Schema.V66_AddSplashScreen qualified as V66_AddSplashScreen +import Galley.Schema.V67_MLSFeature qualified as V67_MLSFeature +import Galley.Schema.V68_MLSCommitLock qualified as V68_MLSCommitLock +import Galley.Schema.V69_MLSProposal qualified as V69_MLSProposal +import Galley.Schema.V70_MLSCipherSuite qualified as V70_MLSCipherSuite +import Galley.Schema.V71_MemberClientKeypackage qualified as V71_MemberClientKeypackage +import Galley.Schema.V72_DropManagedConversations qualified as V72_DropManagedConversations +import Galley.Schema.V73_MemberClientTable qualified as V73_MemberClientTable +import Galley.Schema.V74_ExposeInvitationsToTeamAdmin qualified as V74_ExposeInvitationsToTeamAdmin +import Galley.Schema.V75_MLSGroupInfo qualified as V75_MLSGroupInfo +import Galley.Schema.V76_ProposalOrigin qualified as V76_ProposalOrigin +import Galley.Schema.V77_MLSGroupMemberClient qualified as V77_MLSGroupMemberClient +import Galley.Schema.V78_TeamFeatureOutlookCalIntegration qualified as V78_TeamFeatureOutlookCalIntegration +import Galley.Schema.V79_TeamFeatureMlsE2EId qualified as V79_TeamFeatureMlsE2EId +import Galley.Schema.V80_AddConversationCodePassword qualified as V80_AddConversationCodePassword +import Galley.Schema.V81_TeamFeatureMlsE2EIdUpdate qualified as V81_TeamFeatureMlsE2EIdUpdate +import Galley.Schema.V82_RemoteDomainIndexes qualified as V82_RemoteDomainIndexes +import Galley.Schema.V83_CreateTableTeamAdmin qualified as V83_CreateTableTeamAdmin +import Galley.Schema.V84_MLSSubconversation qualified as V84_MLSSubconversation +import Galley.Schema.V85_MLSDraft17 qualified as V85_MLSDraft17 +import Galley.Schema.V86_TeamFeatureMlsMigration qualified as V86_TeamFeatureMlsMigration +import Galley.Schema.V87_TeamFeatureSupportedProtocols qualified as V87_TeamFeatureSupportedProtocols +import Imports +import Options.Applicative +import System.Logger.Extended qualified as Log + +main :: IO () +main = do + o <- execParser (info (helper <*> migrationOptsParser) desc) + l <- Log.mkLogger' + migrateSchema + l + o + migrations + `finally` Log.close l + where + desc = header "Galley Cassandra Schema" <> fullDesc + +lastSchemaVersion :: Int32 +lastSchemaVersion = migVersion $ last migrations + +migrations :: [Migration] +migrations = + [ V20.migration, + V21.migration, + V22.migration, + V23.migration, + V24.migration, + V25.migration, + V26.migration, + V27.migration, + V28.migration, + V29.migration, + V30.migration, + V31.migration, + V32.migration, + V33.migration, + V34.migration, + V35.migration, + V36.migration, + V37.migration, + V38_CreateTableBillingTeamMember.migration, + V39.migration, + V40_CreateTableDataMigration.migration, + V41_TeamNotificationQueue.migration, + V42_TeamFeatureValidateSamlEmails.migration, + V43_TeamFeatureDigitalSignatures.migration, + V44_AddRemoteIdentifiers.migration, + V45_AddFederationIdMapping.migration, + V46_TeamFeatureAppLock.migration, + V47_RemoveFederationIdMapping.migration, + V48_DeleteRemoteIdentifiers.migration, + V49_ReAddRemoteIdentifiers.migration, + V50_AddLegalholdWhitelisted.migration, + V51_FeatureFileSharing.migration, + V52_FeatureConferenceCalling.migration, + V53_AddRemoteConvStatus.migration, + V54_TeamFeatureSelfDeletingMessages.migration, + V55_SelfDeletingMessagesLockStatus.migration, + V56_GuestLinksTeamFeatureStatus.migration, + V57_GuestLinksLockStatus.migration, + V58_ConversationAccessRoleV2.migration, + V59_FileSharingLockStatus.migration, + V60_TeamFeatureSndFactorPasswordChallenge.migration, + V61_MLSConversation.migration, + V62_TeamFeatureSearchVisibilityInbound.migration, + V63_MLSConversationClients.migration, + V64_Epoch.migration, + V65_MLSRemoteClients.migration, + V66_AddSplashScreen.migration, + V67_MLSFeature.migration, + V68_MLSCommitLock.migration, + V69_MLSProposal.migration, + V70_MLSCipherSuite.migration, + V71_MemberClientKeypackage.migration, + V72_DropManagedConversations.migration, + V73_MemberClientTable.migration, + V74_ExposeInvitationsToTeamAdmin.migration, + V75_MLSGroupInfo.migration, + V76_ProposalOrigin.migration, + V77_MLSGroupMemberClient.migration, + V78_TeamFeatureOutlookCalIntegration.migration, + V79_TeamFeatureMlsE2EId.migration, + V80_AddConversationCodePassword.migration, + V81_TeamFeatureMlsE2EIdUpdate.migration, + V82_RemoteDomainIndexes.migration, + V83_CreateTableTeamAdmin.migration, + V84_MLSSubconversation.migration, + V85_MLSDraft17.migration, + V86_TeamFeatureMlsMigration.migration, + V87_TeamFeatureSupportedProtocols.migration + -- FUTUREWORK: once #1726 has made its way to master/production, + -- the 'message' field in connections table can be dropped. + -- See also https://github.com/wireapp/wire-server/pull/1747/files + -- for an explanation + -- FUTUREWORK: once #1751 has made its way to master/production, + -- the 'otr_muted' field in the member table can be dropped. + ] diff --git a/services/galley/schema/src/V20.hs b/services/galley/src/Galley/Schema/V20.hs similarity index 99% rename from services/galley/schema/src/V20.hs rename to services/galley/src/Galley/Schema/V20.hs index a7a0432e58d..2e7db8dd359 100644 --- a/services/galley/schema/src/V20.hs +++ b/services/galley/src/Galley/Schema/V20.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V20 +module Galley.Schema.V20 ( migration, ) where diff --git a/services/galley/schema/src/V21.hs b/services/galley/src/Galley/Schema/V21.hs similarity index 99% rename from services/galley/schema/src/V21.hs rename to services/galley/src/Galley/Schema/V21.hs index 73c38cd9c58..0e9160fa550 100644 --- a/services/galley/schema/src/V21.hs +++ b/services/galley/src/Galley/Schema/V21.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V21 +module Galley.Schema.V21 ( migration, ) where diff --git a/services/galley/schema/src/V22.hs b/services/galley/src/Galley/Schema/V22.hs similarity index 97% rename from services/galley/schema/src/V22.hs rename to services/galley/src/Galley/Schema/V22.hs index fcf8b5a7a7f..313de020a1a 100644 --- a/services/galley/schema/src/V22.hs +++ b/services/galley/src/Galley/Schema/V22.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V22 +module Galley.Schema.V22 ( migration, ) where diff --git a/services/galley/schema/src/V23.hs b/services/galley/src/Galley/Schema/V23.hs similarity index 97% rename from services/galley/schema/src/V23.hs rename to services/galley/src/Galley/Schema/V23.hs index 364f1e801de..2eed13f3c30 100644 --- a/services/galley/schema/src/V23.hs +++ b/services/galley/src/Galley/Schema/V23.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V23 +module Galley.Schema.V23 ( migration, ) where diff --git a/services/galley/schema/src/V24.hs b/services/galley/src/Galley/Schema/V24.hs similarity index 97% rename from services/galley/schema/src/V24.hs rename to services/galley/src/Galley/Schema/V24.hs index c07a7732b83..7ace99b3b71 100644 --- a/services/galley/schema/src/V24.hs +++ b/services/galley/src/Galley/Schema/V24.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V24 +module Galley.Schema.V24 ( migration, ) where diff --git a/services/galley/schema/src/V25.hs b/services/galley/src/Galley/Schema/V25.hs similarity index 98% rename from services/galley/schema/src/V25.hs rename to services/galley/src/Galley/Schema/V25.hs index 2dbec4d4268..420afffec0a 100644 --- a/services/galley/schema/src/V25.hs +++ b/services/galley/src/Galley/Schema/V25.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V25 +module Galley.Schema.V25 ( migration, ) where diff --git a/services/galley/schema/src/V26.hs b/services/galley/src/Galley/Schema/V26.hs similarity index 97% rename from services/galley/schema/src/V26.hs rename to services/galley/src/Galley/Schema/V26.hs index 0e3e89b0ff4..8dc98b98fa1 100644 --- a/services/galley/schema/src/V26.hs +++ b/services/galley/src/Galley/Schema/V26.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V26 +module Galley.Schema.V26 ( migration, ) where diff --git a/services/galley/schema/src/V27.hs b/services/galley/src/Galley/Schema/V27.hs similarity index 97% rename from services/galley/schema/src/V27.hs rename to services/galley/src/Galley/Schema/V27.hs index 178c774cd94..096f210ed6e 100644 --- a/services/galley/schema/src/V27.hs +++ b/services/galley/src/Galley/Schema/V27.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V27 +module Galley.Schema.V27 ( migration, ) where diff --git a/services/galley/schema/src/V28.hs b/services/galley/src/Galley/Schema/V28.hs similarity index 97% rename from services/galley/schema/src/V28.hs rename to services/galley/src/Galley/Schema/V28.hs index 5e125e44d0a..959dee20c7f 100644 --- a/services/galley/schema/src/V28.hs +++ b/services/galley/src/Galley/Schema/V28.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V28 +module Galley.Schema.V28 ( migration, ) where diff --git a/services/galley/schema/src/V29.hs b/services/galley/src/Galley/Schema/V29.hs similarity index 97% rename from services/galley/schema/src/V29.hs rename to services/galley/src/Galley/Schema/V29.hs index b3bbfebac3b..a30664fdc2f 100644 --- a/services/galley/schema/src/V29.hs +++ b/services/galley/src/Galley/Schema/V29.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V29 +module Galley.Schema.V29 ( migration, ) where diff --git a/services/galley/schema/src/V30.hs b/services/galley/src/Galley/Schema/V30.hs similarity index 97% rename from services/galley/schema/src/V30.hs rename to services/galley/src/Galley/Schema/V30.hs index b11c8d3ee24..83f0ce3e372 100644 --- a/services/galley/schema/src/V30.hs +++ b/services/galley/src/Galley/Schema/V30.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V30 +module Galley.Schema.V30 ( migration, ) where diff --git a/services/galley/schema/src/V31.hs b/services/galley/src/Galley/Schema/V31.hs similarity index 98% rename from services/galley/schema/src/V31.hs rename to services/galley/src/Galley/Schema/V31.hs index b41a320f609..6c63e4ee175 100644 --- a/services/galley/schema/src/V31.hs +++ b/services/galley/src/Galley/Schema/V31.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V31 +module Galley.Schema.V31 ( migration, ) where diff --git a/services/galley/schema/src/V32.hs b/services/galley/src/Galley/Schema/V32.hs similarity index 97% rename from services/galley/schema/src/V32.hs rename to services/galley/src/Galley/Schema/V32.hs index 9ecccedcde0..21c23ac466e 100644 --- a/services/galley/schema/src/V32.hs +++ b/services/galley/src/Galley/Schema/V32.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V32 +module Galley.Schema.V32 ( migration, ) where diff --git a/services/galley/schema/src/V33.hs b/services/galley/src/Galley/Schema/V33.hs similarity index 98% rename from services/galley/schema/src/V33.hs rename to services/galley/src/Galley/Schema/V33.hs index 9f97a7af4a0..1445f5c4039 100644 --- a/services/galley/schema/src/V33.hs +++ b/services/galley/src/Galley/Schema/V33.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V33 +module Galley.Schema.V33 ( migration, ) where diff --git a/services/galley/schema/src/V34.hs b/services/galley/src/Galley/Schema/V34.hs similarity index 98% rename from services/galley/schema/src/V34.hs rename to services/galley/src/Galley/Schema/V34.hs index 57d98b84773..b87b5427898 100644 --- a/services/galley/schema/src/V34.hs +++ b/services/galley/src/Galley/Schema/V34.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V34 +module Galley.Schema.V34 ( migration, ) where diff --git a/services/galley/schema/src/V35.hs b/services/galley/src/Galley/Schema/V35.hs similarity index 97% rename from services/galley/schema/src/V35.hs rename to services/galley/src/Galley/Schema/V35.hs index 5b42b57fa2e..6b397865f69 100644 --- a/services/galley/schema/src/V35.hs +++ b/services/galley/src/Galley/Schema/V35.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V35 +module Galley.Schema.V35 ( migration, ) where diff --git a/services/galley/schema/src/V36.hs b/services/galley/src/Galley/Schema/V36.hs similarity index 97% rename from services/galley/schema/src/V36.hs rename to services/galley/src/Galley/Schema/V36.hs index 82c9c046993..19f893134e5 100644 --- a/services/galley/schema/src/V36.hs +++ b/services/galley/src/Galley/Schema/V36.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V36 +module Galley.Schema.V36 ( migration, ) where diff --git a/services/galley/schema/src/V37.hs b/services/galley/src/Galley/Schema/V37.hs similarity index 97% rename from services/galley/schema/src/V37.hs rename to services/galley/src/Galley/Schema/V37.hs index 214f1ef4e79..295b507bd29 100644 --- a/services/galley/schema/src/V37.hs +++ b/services/galley/src/Galley/Schema/V37.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V37 +module Galley.Schema.V37 ( migration, ) where diff --git a/services/galley/schema/src/V38_CreateTableBillingTeamMember.hs b/services/galley/src/Galley/Schema/V38_CreateTableBillingTeamMember.hs similarity index 95% rename from services/galley/schema/src/V38_CreateTableBillingTeamMember.hs rename to services/galley/src/Galley/Schema/V38_CreateTableBillingTeamMember.hs index eb03f182c34..2b28f6b418c 100644 --- a/services/galley/schema/src/V38_CreateTableBillingTeamMember.hs +++ b/services/galley/src/Galley/Schema/V38_CreateTableBillingTeamMember.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V38_CreateTableBillingTeamMember +module Galley.Schema.V38_CreateTableBillingTeamMember ( migration, ) where diff --git a/services/galley/schema/src/V39.hs b/services/galley/src/Galley/Schema/V39.hs similarity index 97% rename from services/galley/schema/src/V39.hs rename to services/galley/src/Galley/Schema/V39.hs index a0e6d85bb2c..66ff7bd5ed0 100644 --- a/services/galley/schema/src/V39.hs +++ b/services/galley/src/Galley/Schema/V39.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V39 +module Galley.Schema.V39 ( migration, ) where diff --git a/services/galley/schema/src/V40_CreateTableDataMigration.hs b/services/galley/src/Galley/Schema/V40_CreateTableDataMigration.hs similarity index 94% rename from services/galley/schema/src/V40_CreateTableDataMigration.hs rename to services/galley/src/Galley/Schema/V40_CreateTableDataMigration.hs index 7d3c0a1f6bc..cef66944912 100644 --- a/services/galley/schema/src/V40_CreateTableDataMigration.hs +++ b/services/galley/src/Galley/Schema/V40_CreateTableDataMigration.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V40_CreateTableDataMigration (migration) where +module Galley.Schema.V40_CreateTableDataMigration (migration) where import Cassandra.Schema import Imports diff --git a/services/galley/schema/src/V41_TeamNotificationQueue.hs b/services/galley/src/Galley/Schema/V41_TeamNotificationQueue.hs similarity index 96% rename from services/galley/schema/src/V41_TeamNotificationQueue.hs rename to services/galley/src/Galley/Schema/V41_TeamNotificationQueue.hs index cde9f8c0935..4a195d1a90e 100644 --- a/services/galley/schema/src/V41_TeamNotificationQueue.hs +++ b/services/galley/src/Galley/Schema/V41_TeamNotificationQueue.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V41_TeamNotificationQueue +module Galley.Schema.V41_TeamNotificationQueue ( migration, ) where diff --git a/services/galley/schema/src/V42_TeamFeatureValidateSamlEmails.hs b/services/galley/src/Galley/Schema/V42_TeamFeatureValidateSamlEmails.hs similarity index 95% rename from services/galley/schema/src/V42_TeamFeatureValidateSamlEmails.hs rename to services/galley/src/Galley/Schema/V42_TeamFeatureValidateSamlEmails.hs index 2232fdeffef..3c5da6ca73a 100644 --- a/services/galley/schema/src/V42_TeamFeatureValidateSamlEmails.hs +++ b/services/galley/src/Galley/Schema/V42_TeamFeatureValidateSamlEmails.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V42_TeamFeatureValidateSamlEmails +module Galley.Schema.V42_TeamFeatureValidateSamlEmails ( migration, ) where diff --git a/services/galley/schema/src/V43_TeamFeatureDigitalSignatures.hs b/services/galley/src/Galley/Schema/V43_TeamFeatureDigitalSignatures.hs similarity index 95% rename from services/galley/schema/src/V43_TeamFeatureDigitalSignatures.hs rename to services/galley/src/Galley/Schema/V43_TeamFeatureDigitalSignatures.hs index 701396655aa..d938a803c66 100644 --- a/services/galley/schema/src/V43_TeamFeatureDigitalSignatures.hs +++ b/services/galley/src/Galley/Schema/V43_TeamFeatureDigitalSignatures.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V43_TeamFeatureDigitalSignatures +module Galley.Schema.V43_TeamFeatureDigitalSignatures ( migration, ) where diff --git a/services/galley/schema/src/V44_AddRemoteIdentifiers.hs b/services/galley/src/Galley/Schema/V44_AddRemoteIdentifiers.hs similarity index 96% rename from services/galley/schema/src/V44_AddRemoteIdentifiers.hs rename to services/galley/src/Galley/Schema/V44_AddRemoteIdentifiers.hs index 07eae794270..b4130f9129b 100644 --- a/services/galley/schema/src/V44_AddRemoteIdentifiers.hs +++ b/services/galley/src/Galley/Schema/V44_AddRemoteIdentifiers.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V44_AddRemoteIdentifiers (migration) where +module Galley.Schema.V44_AddRemoteIdentifiers (migration) where import Cassandra.Schema import Imports diff --git a/services/galley/schema/src/V45_AddFederationIdMapping.hs b/services/galley/src/Galley/Schema/V45_AddFederationIdMapping.hs similarity index 96% rename from services/galley/schema/src/V45_AddFederationIdMapping.hs rename to services/galley/src/Galley/Schema/V45_AddFederationIdMapping.hs index 842aaae4144..0dac30d1ab7 100644 --- a/services/galley/schema/src/V45_AddFederationIdMapping.hs +++ b/services/galley/src/Galley/Schema/V45_AddFederationIdMapping.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V45_AddFederationIdMapping +module Galley.Schema.V45_AddFederationIdMapping ( migration, ) where diff --git a/services/galley/schema/src/V46_TeamFeatureAppLock.hs b/services/galley/src/Galley/Schema/V46_TeamFeatureAppLock.hs similarity index 96% rename from services/galley/schema/src/V46_TeamFeatureAppLock.hs rename to services/galley/src/Galley/Schema/V46_TeamFeatureAppLock.hs index b8ec3c03f81..20e7f98bc22 100644 --- a/services/galley/schema/src/V46_TeamFeatureAppLock.hs +++ b/services/galley/src/Galley/Schema/V46_TeamFeatureAppLock.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V46_TeamFeatureAppLock +module Galley.Schema.V46_TeamFeatureAppLock ( migration, ) where diff --git a/services/galley/schema/src/V47_RemoveFederationIdMapping.hs b/services/galley/src/Galley/Schema/V47_RemoveFederationIdMapping.hs similarity index 95% rename from services/galley/schema/src/V47_RemoveFederationIdMapping.hs rename to services/galley/src/Galley/Schema/V47_RemoveFederationIdMapping.hs index 4f8e0b5a9e0..2cc5a6f530a 100644 --- a/services/galley/schema/src/V47_RemoveFederationIdMapping.hs +++ b/services/galley/src/Galley/Schema/V47_RemoveFederationIdMapping.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V47_RemoveFederationIdMapping +module Galley.Schema.V47_RemoveFederationIdMapping ( migration, ) where diff --git a/services/galley/schema/src/V48_DeleteRemoteIdentifiers.hs b/services/galley/src/Galley/Schema/V48_DeleteRemoteIdentifiers.hs similarity index 96% rename from services/galley/schema/src/V48_DeleteRemoteIdentifiers.hs rename to services/galley/src/Galley/Schema/V48_DeleteRemoteIdentifiers.hs index 3268147ffe8..22ff43ec591 100644 --- a/services/galley/schema/src/V48_DeleteRemoteIdentifiers.hs +++ b/services/galley/src/Galley/Schema/V48_DeleteRemoteIdentifiers.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V48_DeleteRemoteIdentifiers +module Galley.Schema.V48_DeleteRemoteIdentifiers ( migration, ) where diff --git a/services/galley/schema/src/V49_ReAddRemoteIdentifiers.hs b/services/galley/src/Galley/Schema/V49_ReAddRemoteIdentifiers.hs similarity index 98% rename from services/galley/schema/src/V49_ReAddRemoteIdentifiers.hs rename to services/galley/src/Galley/Schema/V49_ReAddRemoteIdentifiers.hs index 91748953c54..946904ccad9 100644 --- a/services/galley/schema/src/V49_ReAddRemoteIdentifiers.hs +++ b/services/galley/src/Galley/Schema/V49_ReAddRemoteIdentifiers.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V49_ReAddRemoteIdentifiers +module Galley.Schema.V49_ReAddRemoteIdentifiers ( migration, ) where diff --git a/services/galley/schema/src/V50_AddLegalholdWhitelisted.hs b/services/galley/src/Galley/Schema/V50_AddLegalholdWhitelisted.hs similarity index 95% rename from services/galley/schema/src/V50_AddLegalholdWhitelisted.hs rename to services/galley/src/Galley/Schema/V50_AddLegalholdWhitelisted.hs index a7111849a06..dae85e18b5d 100644 --- a/services/galley/schema/src/V50_AddLegalholdWhitelisted.hs +++ b/services/galley/src/Galley/Schema/V50_AddLegalholdWhitelisted.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V50_AddLegalholdWhitelisted +module Galley.Schema.V50_AddLegalholdWhitelisted ( migration, ) where diff --git a/services/galley/schema/src/V51_FeatureFileSharing.hs b/services/galley/src/Galley/Schema/V51_FeatureFileSharing.hs similarity index 95% rename from services/galley/schema/src/V51_FeatureFileSharing.hs rename to services/galley/src/Galley/Schema/V51_FeatureFileSharing.hs index 734ef96280a..ae46aeda94d 100644 --- a/services/galley/schema/src/V51_FeatureFileSharing.hs +++ b/services/galley/src/Galley/Schema/V51_FeatureFileSharing.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V51_FeatureFileSharing +module Galley.Schema.V51_FeatureFileSharing ( migration, ) where diff --git a/services/galley/schema/src/V52_FeatureConferenceCalling.hs b/services/galley/src/Galley/Schema/V52_FeatureConferenceCalling.hs similarity index 95% rename from services/galley/schema/src/V52_FeatureConferenceCalling.hs rename to services/galley/src/Galley/Schema/V52_FeatureConferenceCalling.hs index 78e4d9d5f1a..a3c37a8eb52 100644 --- a/services/galley/schema/src/V52_FeatureConferenceCalling.hs +++ b/services/galley/src/Galley/Schema/V52_FeatureConferenceCalling.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V52_FeatureConferenceCalling +module Galley.Schema.V52_FeatureConferenceCalling ( migration, ) where diff --git a/services/galley/schema/src/V53_AddRemoteConvStatus.hs b/services/galley/src/Galley/Schema/V53_AddRemoteConvStatus.hs similarity index 95% rename from services/galley/schema/src/V53_AddRemoteConvStatus.hs rename to services/galley/src/Galley/Schema/V53_AddRemoteConvStatus.hs index 2db8a204b00..674a14273df 100644 --- a/services/galley/schema/src/V53_AddRemoteConvStatus.hs +++ b/services/galley/src/Galley/Schema/V53_AddRemoteConvStatus.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V53_AddRemoteConvStatus (migration) where +module Galley.Schema.V53_AddRemoteConvStatus (migration) where import Cassandra.Schema import Imports diff --git a/services/galley/schema/src/V54_TeamFeatureSelfDeletingMessages.hs b/services/galley/src/Galley/Schema/V54_TeamFeatureSelfDeletingMessages.hs similarity index 95% rename from services/galley/schema/src/V54_TeamFeatureSelfDeletingMessages.hs rename to services/galley/src/Galley/Schema/V54_TeamFeatureSelfDeletingMessages.hs index ab36ce3cb99..17bfa279795 100644 --- a/services/galley/schema/src/V54_TeamFeatureSelfDeletingMessages.hs +++ b/services/galley/src/Galley/Schema/V54_TeamFeatureSelfDeletingMessages.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V54_TeamFeatureSelfDeletingMessages +module Galley.Schema.V54_TeamFeatureSelfDeletingMessages ( migration, ) where diff --git a/services/galley/schema/src/V55_SelfDeletingMessagesLockStatus.hs b/services/galley/src/Galley/Schema/V55_SelfDeletingMessagesLockStatus.hs similarity index 95% rename from services/galley/schema/src/V55_SelfDeletingMessagesLockStatus.hs rename to services/galley/src/Galley/Schema/V55_SelfDeletingMessagesLockStatus.hs index 888fde95d81..12094c97e11 100644 --- a/services/galley/schema/src/V55_SelfDeletingMessagesLockStatus.hs +++ b/services/galley/src/Galley/Schema/V55_SelfDeletingMessagesLockStatus.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V55_SelfDeletingMessagesLockStatus +module Galley.Schema.V55_SelfDeletingMessagesLockStatus ( migration, ) where diff --git a/services/galley/schema/src/V56_GuestLinksTeamFeatureStatus.hs b/services/galley/src/Galley/Schema/V56_GuestLinksTeamFeatureStatus.hs similarity index 95% rename from services/galley/schema/src/V56_GuestLinksTeamFeatureStatus.hs rename to services/galley/src/Galley/Schema/V56_GuestLinksTeamFeatureStatus.hs index d8b07ed2764..d1341779ff3 100644 --- a/services/galley/schema/src/V56_GuestLinksTeamFeatureStatus.hs +++ b/services/galley/src/Galley/Schema/V56_GuestLinksTeamFeatureStatus.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V56_GuestLinksTeamFeatureStatus +module Galley.Schema.V56_GuestLinksTeamFeatureStatus ( migration, ) where diff --git a/services/galley/schema/src/V57_GuestLinksLockStatus.hs b/services/galley/src/Galley/Schema/V57_GuestLinksLockStatus.hs similarity index 95% rename from services/galley/schema/src/V57_GuestLinksLockStatus.hs rename to services/galley/src/Galley/Schema/V57_GuestLinksLockStatus.hs index f347e3de81e..385d4c31456 100644 --- a/services/galley/schema/src/V57_GuestLinksLockStatus.hs +++ b/services/galley/src/Galley/Schema/V57_GuestLinksLockStatus.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V57_GuestLinksLockStatus +module Galley.Schema.V57_GuestLinksLockStatus ( migration, ) where diff --git a/services/galley/schema/src/V58_ConversationAccessRoleV2.hs b/services/galley/src/Galley/Schema/V58_ConversationAccessRoleV2.hs similarity index 95% rename from services/galley/schema/src/V58_ConversationAccessRoleV2.hs rename to services/galley/src/Galley/Schema/V58_ConversationAccessRoleV2.hs index a477e9b152d..7c7e2f2c175 100644 --- a/services/galley/schema/src/V58_ConversationAccessRoleV2.hs +++ b/services/galley/src/Galley/Schema/V58_ConversationAccessRoleV2.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V58_ConversationAccessRoleV2 +module Galley.Schema.V58_ConversationAccessRoleV2 ( migration, ) where diff --git a/services/galley/schema/src/V59_FileSharingLockStatus.hs b/services/galley/src/Galley/Schema/V59_FileSharingLockStatus.hs similarity index 95% rename from services/galley/schema/src/V59_FileSharingLockStatus.hs rename to services/galley/src/Galley/Schema/V59_FileSharingLockStatus.hs index d1b83924828..2064df5c938 100644 --- a/services/galley/schema/src/V59_FileSharingLockStatus.hs +++ b/services/galley/src/Galley/Schema/V59_FileSharingLockStatus.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V59_FileSharingLockStatus +module Galley.Schema.V59_FileSharingLockStatus ( migration, ) where diff --git a/services/galley/schema/src/V60_TeamFeatureSndFactorPasswordChallenge.hs b/services/galley/src/Galley/Schema/V60_TeamFeatureSndFactorPasswordChallenge.hs similarity index 94% rename from services/galley/schema/src/V60_TeamFeatureSndFactorPasswordChallenge.hs rename to services/galley/src/Galley/Schema/V60_TeamFeatureSndFactorPasswordChallenge.hs index f71ab44871f..bcfdce48328 100644 --- a/services/galley/schema/src/V60_TeamFeatureSndFactorPasswordChallenge.hs +++ b/services/galley/src/Galley/Schema/V60_TeamFeatureSndFactorPasswordChallenge.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V60_TeamFeatureSndFactorPasswordChallenge +module Galley.Schema.V60_TeamFeatureSndFactorPasswordChallenge ( migration, ) where diff --git a/services/galley/schema/src/V61_MLSConversation.hs b/services/galley/src/Galley/Schema/V61_MLSConversation.hs similarity index 96% rename from services/galley/schema/src/V61_MLSConversation.hs rename to services/galley/src/Galley/Schema/V61_MLSConversation.hs index 7d7c06af66a..97673bdf309 100644 --- a/services/galley/schema/src/V61_MLSConversation.hs +++ b/services/galley/src/Galley/Schema/V61_MLSConversation.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V61_MLSConversation +module Galley.Schema.V61_MLSConversation ( migration, ) where diff --git a/services/galley/schema/src/V62_TeamFeatureSearchVisibilityInbound.hs b/services/galley/src/Galley/Schema/V62_TeamFeatureSearchVisibilityInbound.hs similarity index 94% rename from services/galley/schema/src/V62_TeamFeatureSearchVisibilityInbound.hs rename to services/galley/src/Galley/Schema/V62_TeamFeatureSearchVisibilityInbound.hs index c2112899ca7..6bc46dd5cbf 100644 --- a/services/galley/schema/src/V62_TeamFeatureSearchVisibilityInbound.hs +++ b/services/galley/src/Galley/Schema/V62_TeamFeatureSearchVisibilityInbound.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V62_TeamFeatureSearchVisibilityInbound +module Galley.Schema.V62_TeamFeatureSearchVisibilityInbound ( migration, ) where diff --git a/services/galley/schema/src/V63_MLSConversationClients.hs b/services/galley/src/Galley/Schema/V63_MLSConversationClients.hs similarity index 95% rename from services/galley/schema/src/V63_MLSConversationClients.hs rename to services/galley/src/Galley/Schema/V63_MLSConversationClients.hs index 4b3a80c350b..1a82ab231b6 100644 --- a/services/galley/schema/src/V63_MLSConversationClients.hs +++ b/services/galley/src/Galley/Schema/V63_MLSConversationClients.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V63_MLSConversationClients where +module Galley.Schema.V63_MLSConversationClients where import Cassandra.Schema import Imports diff --git a/services/galley/schema/src/V64_Epoch.hs b/services/galley/src/Galley/Schema/V64_Epoch.hs similarity index 97% rename from services/galley/schema/src/V64_Epoch.hs rename to services/galley/src/Galley/Schema/V64_Epoch.hs index 7bec37d3d2b..70cd8e8e617 100644 --- a/services/galley/schema/src/V64_Epoch.hs +++ b/services/galley/src/Galley/Schema/V64_Epoch.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V64_Epoch +module Galley.Schema.V64_Epoch ( migration, ) where diff --git a/services/galley/schema/src/V65_MLSRemoteClients.hs b/services/galley/src/Galley/Schema/V65_MLSRemoteClients.hs similarity index 95% rename from services/galley/schema/src/V65_MLSRemoteClients.hs rename to services/galley/src/Galley/Schema/V65_MLSRemoteClients.hs index c772b84ec45..c2a7deb9795 100644 --- a/services/galley/schema/src/V65_MLSRemoteClients.hs +++ b/services/galley/src/Galley/Schema/V65_MLSRemoteClients.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V65_MLSRemoteClients where +module Galley.Schema.V65_MLSRemoteClients where import Cassandra.Schema import Imports diff --git a/services/galley/schema/src/V66_AddSplashScreen.hs b/services/galley/src/Galley/Schema/V66_AddSplashScreen.hs similarity index 95% rename from services/galley/schema/src/V66_AddSplashScreen.hs rename to services/galley/src/Galley/Schema/V66_AddSplashScreen.hs index 04fc5bb90c0..b5e9c31c327 100644 --- a/services/galley/schema/src/V66_AddSplashScreen.hs +++ b/services/galley/src/Galley/Schema/V66_AddSplashScreen.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V66_AddSplashScreen where +module Galley.Schema.V66_AddSplashScreen where import Cassandra.Schema import Imports diff --git a/services/galley/schema/src/V67_MLSFeature.hs b/services/galley/src/Galley/Schema/V67_MLSFeature.hs similarity index 96% rename from services/galley/schema/src/V67_MLSFeature.hs rename to services/galley/src/Galley/Schema/V67_MLSFeature.hs index b3c5a3066a0..5391d1967ed 100644 --- a/services/galley/schema/src/V67_MLSFeature.hs +++ b/services/galley/src/Galley/Schema/V67_MLSFeature.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V67_MLSFeature where +module Galley.Schema.V67_MLSFeature where import Cassandra.Schema import Imports diff --git a/services/galley/schema/src/V68_MLSCommitLock.hs b/services/galley/src/Galley/Schema/V68_MLSCommitLock.hs similarity index 96% rename from services/galley/schema/src/V68_MLSCommitLock.hs rename to services/galley/src/Galley/Schema/V68_MLSCommitLock.hs index 33edb236735..24380e5d914 100644 --- a/services/galley/schema/src/V68_MLSCommitLock.hs +++ b/services/galley/src/Galley/Schema/V68_MLSCommitLock.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V68_MLSCommitLock where +module Galley.Schema.V68_MLSCommitLock where import Cassandra.Schema import Imports diff --git a/services/galley/schema/src/V69_MLSProposal.hs b/services/galley/src/Galley/Schema/V69_MLSProposal.hs similarity index 96% rename from services/galley/schema/src/V69_MLSProposal.hs rename to services/galley/src/Galley/Schema/V69_MLSProposal.hs index 5b0e0c9ab1f..e0730ce253a 100644 --- a/services/galley/schema/src/V69_MLSProposal.hs +++ b/services/galley/src/Galley/Schema/V69_MLSProposal.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V69_MLSProposal +module Galley.Schema.V69_MLSProposal ( migration, ) where diff --git a/services/galley/schema/src/V70_MLSCipherSuite.hs b/services/galley/src/Galley/Schema/V70_MLSCipherSuite.hs similarity index 96% rename from services/galley/schema/src/V70_MLSCipherSuite.hs rename to services/galley/src/Galley/Schema/V70_MLSCipherSuite.hs index 637b8ea7c4d..d445270b99d 100644 --- a/services/galley/schema/src/V70_MLSCipherSuite.hs +++ b/services/galley/src/Galley/Schema/V70_MLSCipherSuite.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V70_MLSCipherSuite +module Galley.Schema.V70_MLSCipherSuite ( migration, ) where diff --git a/services/galley/schema/src/V71_MemberClientKeypackage.hs b/services/galley/src/Galley/Schema/V71_MemberClientKeypackage.hs similarity index 96% rename from services/galley/schema/src/V71_MemberClientKeypackage.hs rename to services/galley/src/Galley/Schema/V71_MemberClientKeypackage.hs index 1695957905c..21e9903ca77 100644 --- a/services/galley/schema/src/V71_MemberClientKeypackage.hs +++ b/services/galley/src/Galley/Schema/V71_MemberClientKeypackage.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V71_MemberClientKeypackage where +module Galley.Schema.V71_MemberClientKeypackage where import Cassandra.Schema import Imports diff --git a/services/galley/schema/src/V72_DropManagedConversations.hs b/services/galley/src/Galley/Schema/V72_DropManagedConversations.hs similarity index 94% rename from services/galley/schema/src/V72_DropManagedConversations.hs rename to services/galley/src/Galley/Schema/V72_DropManagedConversations.hs index acb633fe5e9..92d25c6928a 100644 --- a/services/galley/schema/src/V72_DropManagedConversations.hs +++ b/services/galley/src/Galley/Schema/V72_DropManagedConversations.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V72_DropManagedConversations where +module Galley.Schema.V72_DropManagedConversations where import Cassandra.Schema import Imports diff --git a/services/galley/schema/src/V73_MemberClientTable.hs b/services/galley/src/Galley/Schema/V73_MemberClientTable.hs similarity index 96% rename from services/galley/schema/src/V73_MemberClientTable.hs rename to services/galley/src/Galley/Schema/V73_MemberClientTable.hs index 15f642018b9..9f18e360520 100644 --- a/services/galley/schema/src/V73_MemberClientTable.hs +++ b/services/galley/src/Galley/Schema/V73_MemberClientTable.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V73_MemberClientTable where +module Galley.Schema.V73_MemberClientTable where import Cassandra.Schema import Imports diff --git a/services/galley/schema/src/V74_ExposeInvitationsToTeamAdmin.hs b/services/galley/src/Galley/Schema/V74_ExposeInvitationsToTeamAdmin.hs similarity index 95% rename from services/galley/schema/src/V74_ExposeInvitationsToTeamAdmin.hs rename to services/galley/src/Galley/Schema/V74_ExposeInvitationsToTeamAdmin.hs index f3df5766d9c..d6b5c56037b 100644 --- a/services/galley/schema/src/V74_ExposeInvitationsToTeamAdmin.hs +++ b/services/galley/src/Galley/Schema/V74_ExposeInvitationsToTeamAdmin.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V74_ExposeInvitationsToTeamAdmin +module Galley.Schema.V74_ExposeInvitationsToTeamAdmin ( migration, ) where diff --git a/services/galley/schema/src/V75_MLSGroupInfo.hs b/services/galley/src/Galley/Schema/V75_MLSGroupInfo.hs similarity index 96% rename from services/galley/schema/src/V75_MLSGroupInfo.hs rename to services/galley/src/Galley/Schema/V75_MLSGroupInfo.hs index 4615c73954e..84b6df1504b 100644 --- a/services/galley/schema/src/V75_MLSGroupInfo.hs +++ b/services/galley/src/Galley/Schema/V75_MLSGroupInfo.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V75_MLSGroupInfo +module Galley.Schema.V75_MLSGroupInfo ( migration, ) where diff --git a/services/galley/schema/src/V76_ProposalOrigin.hs b/services/galley/src/Galley/Schema/V76_ProposalOrigin.hs similarity index 96% rename from services/galley/schema/src/V76_ProposalOrigin.hs rename to services/galley/src/Galley/Schema/V76_ProposalOrigin.hs index c47ffc4d490..3324af00cb8 100644 --- a/services/galley/schema/src/V76_ProposalOrigin.hs +++ b/services/galley/src/Galley/Schema/V76_ProposalOrigin.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V76_ProposalOrigin +module Galley.Schema.V76_ProposalOrigin ( migration, ) where diff --git a/services/galley/schema/src/V77_MLSGroupMemberClient.hs b/services/galley/src/Galley/Schema/V77_MLSGroupMemberClient.hs similarity index 95% rename from services/galley/schema/src/V77_MLSGroupMemberClient.hs rename to services/galley/src/Galley/Schema/V77_MLSGroupMemberClient.hs index 8847b53c22c..ed22adf2768 100644 --- a/services/galley/schema/src/V77_MLSGroupMemberClient.hs +++ b/services/galley/src/Galley/Schema/V77_MLSGroupMemberClient.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V77_MLSGroupMemberClient (migration) where +module Galley.Schema.V77_MLSGroupMemberClient (migration) where import Cassandra.Schema import Imports diff --git a/services/galley/schema/src/V78_TeamFeatureOutlookCalIntegration.hs b/services/galley/src/Galley/Schema/V78_TeamFeatureOutlookCalIntegration.hs similarity index 95% rename from services/galley/schema/src/V78_TeamFeatureOutlookCalIntegration.hs rename to services/galley/src/Galley/Schema/V78_TeamFeatureOutlookCalIntegration.hs index cd52a49ec43..808f49a1407 100644 --- a/services/galley/schema/src/V78_TeamFeatureOutlookCalIntegration.hs +++ b/services/galley/src/Galley/Schema/V78_TeamFeatureOutlookCalIntegration.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V78_TeamFeatureOutlookCalIntegration +module Galley.Schema.V78_TeamFeatureOutlookCalIntegration ( migration, ) where diff --git a/services/galley/schema/src/V79_TeamFeatureMlsE2EId.hs b/services/galley/src/Galley/Schema/V79_TeamFeatureMlsE2EId.hs similarity index 96% rename from services/galley/schema/src/V79_TeamFeatureMlsE2EId.hs rename to services/galley/src/Galley/Schema/V79_TeamFeatureMlsE2EId.hs index 9a544ab9b15..704b3ea6a3a 100644 --- a/services/galley/schema/src/V79_TeamFeatureMlsE2EId.hs +++ b/services/galley/src/Galley/Schema/V79_TeamFeatureMlsE2EId.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V79_TeamFeatureMlsE2EId +module Galley.Schema.V79_TeamFeatureMlsE2EId ( migration, ) where diff --git a/services/galley/schema/src/V80_AddConversationCodePassword.hs b/services/galley/src/Galley/Schema/V80_AddConversationCodePassword.hs similarity index 95% rename from services/galley/schema/src/V80_AddConversationCodePassword.hs rename to services/galley/src/Galley/Schema/V80_AddConversationCodePassword.hs index 34c67a42538..24ae8e2faf4 100644 --- a/services/galley/schema/src/V80_AddConversationCodePassword.hs +++ b/services/galley/src/Galley/Schema/V80_AddConversationCodePassword.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V80_AddConversationCodePassword +module Galley.Schema.V80_AddConversationCodePassword ( migration, ) where diff --git a/services/galley/schema/src/V81_TeamFeatureMlsE2EIdUpdate.hs b/services/galley/src/Galley/Schema/V81_TeamFeatureMlsE2EIdUpdate.hs similarity index 95% rename from services/galley/schema/src/V81_TeamFeatureMlsE2EIdUpdate.hs rename to services/galley/src/Galley/Schema/V81_TeamFeatureMlsE2EIdUpdate.hs index d5b22b2adba..c7804d59c50 100644 --- a/services/galley/schema/src/V81_TeamFeatureMlsE2EIdUpdate.hs +++ b/services/galley/src/Galley/Schema/V81_TeamFeatureMlsE2EIdUpdate.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V81_TeamFeatureMlsE2EIdUpdate +module Galley.Schema.V81_TeamFeatureMlsE2EIdUpdate ( migration, ) where diff --git a/services/galley/schema/src/V82_RemoteDomainIndexes.hs b/services/galley/src/Galley/Schema/V82_RemoteDomainIndexes.hs similarity index 91% rename from services/galley/schema/src/V82_RemoteDomainIndexes.hs rename to services/galley/src/Galley/Schema/V82_RemoteDomainIndexes.hs index fcc5fca6128..25b8f9f6f07 100644 --- a/services/galley/schema/src/V82_RemoteDomainIndexes.hs +++ b/services/galley/src/Galley/Schema/V82_RemoteDomainIndexes.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE QuasiQuotes #-} -module V82_RemoteDomainIndexes +module Galley.Schema.V82_RemoteDomainIndexes ( migration, ) where diff --git a/services/galley/schema/src/V83_CreateTableTeamAdmin.hs b/services/galley/src/Galley/Schema/V83_CreateTableTeamAdmin.hs similarity index 96% rename from services/galley/schema/src/V83_CreateTableTeamAdmin.hs rename to services/galley/src/Galley/Schema/V83_CreateTableTeamAdmin.hs index f52cd0cebc4..e5fd7a4a5cf 100644 --- a/services/galley/schema/src/V83_CreateTableTeamAdmin.hs +++ b/services/galley/src/Galley/Schema/V83_CreateTableTeamAdmin.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V83_CreateTableTeamAdmin +module Galley.Schema.V83_CreateTableTeamAdmin ( migration, ) where diff --git a/services/galley/schema/src/V84_MLSSubconversation.hs b/services/galley/src/Galley/Schema/V84_MLSSubconversation.hs similarity index 95% rename from services/galley/schema/src/V84_MLSSubconversation.hs rename to services/galley/src/Galley/Schema/V84_MLSSubconversation.hs index 73dc617091b..e9e70252c22 100644 --- a/services/galley/schema/src/V84_MLSSubconversation.hs +++ b/services/galley/src/Galley/Schema/V84_MLSSubconversation.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V84_MLSSubconversation (migration) where +module Galley.Schema.V84_MLSSubconversation (migration) where import Cassandra.Schema import Imports diff --git a/services/galley/schema/src/V85_MLSDraft17.hs b/services/galley/src/Galley/Schema/V85_MLSDraft17.hs similarity index 95% rename from services/galley/schema/src/V85_MLSDraft17.hs rename to services/galley/src/Galley/Schema/V85_MLSDraft17.hs index 75ca5200eeb..958c8c629d9 100644 --- a/services/galley/schema/src/V85_MLSDraft17.hs +++ b/services/galley/src/Galley/Schema/V85_MLSDraft17.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V85_MLSDraft17 (migration) where +module Galley.Schema.V85_MLSDraft17 (migration) where import Cassandra.Schema import Imports diff --git a/services/galley/schema/src/V86_TeamFeatureMlsMigration.hs b/services/galley/src/Galley/Schema/V86_TeamFeatureMlsMigration.hs similarity index 96% rename from services/galley/schema/src/V86_TeamFeatureMlsMigration.hs rename to services/galley/src/Galley/Schema/V86_TeamFeatureMlsMigration.hs index 00a1e04f6fc..431a93b4d38 100644 --- a/services/galley/schema/src/V86_TeamFeatureMlsMigration.hs +++ b/services/galley/src/Galley/Schema/V86_TeamFeatureMlsMigration.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V86_TeamFeatureMlsMigration +module Galley.Schema.V86_TeamFeatureMlsMigration ( migration, ) where diff --git a/services/galley/schema/src/V87_TeamFeatureSupportedProtocols.hs b/services/galley/src/Galley/Schema/V87_TeamFeatureSupportedProtocols.hs similarity index 95% rename from services/galley/schema/src/V87_TeamFeatureSupportedProtocols.hs rename to services/galley/src/Galley/Schema/V87_TeamFeatureSupportedProtocols.hs index 4b8d447734c..03f57315705 100644 --- a/services/galley/schema/src/V87_TeamFeatureSupportedProtocols.hs +++ b/services/galley/src/Galley/Schema/V87_TeamFeatureSupportedProtocols.hs @@ -15,7 +15,7 @@ -- You should have received a copy of the GNU Affero General Public License along -- with this program. If not, see . -module V87_TeamFeatureSupportedProtocols +module Galley.Schema.V87_TeamFeatureSupportedProtocols ( migration, ) where