Remove deprecated spar table in cassandra.

cassandra-schema.cql

@@ -1623,24 +1623,6 @@ CREATE TABLE brig_test.service_prefix (
 
 CREATE KEYSPACE spar_test WITH replication = {'class': 'SimpleStrategy', 'replication_factor': '1'}  AND durable_writes = true;
 
-CREATE TABLE spar_test.scim_external_ids (
-    external text PRIMARY KEY,
-    user uuid
-) WITH bloom_filter_fp_chance = 0.1
-    AND caching = {'keys': 'ALL', 'rows_per_partition': 'NONE'}
-    AND comment = ''
-    AND compaction = {'class': 'org.apache.cassandra.db.compaction.LeveledCompactionStrategy'}
-    AND compression = {'chunk_length_in_kb': '64', 'class': 'org.apache.cassandra.io.compress.LZ4Compressor'}
-    AND crc_check_chance = 1.0
-    AND dclocal_read_repair_chance = 0.1
-    AND default_time_to_live = 0
-    AND gc_grace_seconds = 864000
-    AND max_index_interval = 2048
-    AND memtable_flush_period_in_ms = 0
-    AND min_index_interval = 128
-    AND read_repair_chance = 0.0
-    AND speculative_retry = '99PERCENTILE';
-
 CREATE TABLE spar_test.bind_cookie (
     cookie text PRIMARY KEY,
     session_owner uuid
@@ -2010,4 +1992,3 @@ CREATE TABLE spar_test.user (
     AND min_index_interval = 128
     AND read_repair_chance = 0.0
     AND speculative_retry = '99PERCENTILE';
-

changelog.d/5-internal/cleanup-cassandra-schema

@@ -0,0 +1,3 @@
+Remove deprecated table for storing scim external_ids.
+
+Data has been migrated away in [release 2021-03-21](https://github.com/wireapp/wire-server/releases/tag/v2021-03-21) (see `/services/spar/migrate-data/src/Spar/DataMigration/V1_ExternalIds.hs`); last time it has been touched in production is before upgrade to [release 2021-03-23 (Chart Release 2.104.0)](https://github.com/wireapp/wire-server/releases/tag/v2021-03-23).

services/spar/migrate-data/src/Spar/DataMigration/Run.hs

@@ -29,7 +29,6 @@ import Imports
 import qualified Options.Applicative as Opts
 import Spar.DataMigration.Options (settingsParser)
 import Spar.DataMigration.Types
-import qualified Spar.DataMigration.V1_ExternalIds as V1
 import qualified Spar.DataMigration.V2_UserV2 as V2
 import qualified System.Logger as Log
 
@@ -38,7 +37,8 @@ main = do
   settings <- Opts.execParser (Opts.info (Opts.helper <*> settingsParser) desc)
   migrate
     settings
-    [ V1.migration,
+    [ -- V1.migration has been deleted in https://github.com/wireapp/wire-server/pull/2768
+      -- (because the deprecated source table has been removed).
       V2.migration
     ]
   where

services/spar/schema/src/Run.hs

@@ -31,6 +31,7 @@ import qualified V13
 import qualified V14
 import qualified V15
 import qualified V16
+import qualified V17
 import qualified V2
 import qualified V3
 import qualified V4
@@ -65,7 +66,8 @@ main = do
       V13.migration,
       V14.migration,
       V15.migration,
-      V16.migration
+      V16.migration,
+      V17.migration
       -- When adding migrations here, don't forget to update
       -- 'schemaVersion' in Spar.Data
 

services/spar/schema/src/V17.hs

@@ -0,0 +1,33 @@
+-- This file is part of the Wire Server implementation.
+--
+-- Copyright (C) 2022 Wire Swiss GmbH <opensource@wire.com>
+--
+-- 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 <https://www.gnu.org/licenses/>.
+
+module V17
+  ( migration,
+  )
+where
+
+import Cassandra.Schema
+import Imports
+import Text.RawString.QQ
+
+migration :: Migration
+migration = Migration 17 "Remove table `scim_external_ids` (from db migration V10, deprecated in favor of `scim_external`, data migrated in `/services/spar/migrate-data/src/Spar/DataMigration/V1_ExternalIds.hs`)" $ do
+  void $
+    schema'
+      [r|
+        DROP TABLE if exists scim_external_ids;
+      |]

services/spar/spar.cabal

@@ -474,7 +474,6 @@ executable spar-migrate-data
     Spar.DataMigration.RIO
     Spar.DataMigration.Run
     Spar.DataMigration.Types
-    Spar.DataMigration.V1_ExternalIds
     Spar.DataMigration.V2_UserV2
 
   hs-source-dirs:     migrate-data/src
@@ -611,6 +610,7 @@ executable spar-schema
     V14
     V15
     V16
+    V17
     V2
     V3
     V4

services/spar/src/Spar/Data.hs

@@ -48,7 +48,7 @@ import Wire.API.User.Saml
 
 -- | A lower bound: @schemaVersion <= whatWeFoundOnCassandra@, not @==@.
 schemaVersion :: Int32
-schemaVersion = 16
+schemaVersion = 17
 
 ----------------------------------------------------------------------
 -- helpers