Add Options field to RemoteClusters (#25771)

* add Option flag to RemoteClusters

* add Options column to RemoteClusters table

server/channels/store/sqlstore/remote_cluster_store.go

@@ -40,6 +40,7 @@ func remoteClusterFields(prefix string) []string {
 		prefix + "Topics",
 		prefix + "CreatorId",
 		prefix + "PluginID",
+		prefix + "Options",
 	}
 }
 
@@ -51,10 +52,10 @@ func (s sqlRemoteClusterStore) Save(remoteCluster *model.RemoteCluster) (*model.
 
 	query := `INSERT INTO RemoteClusters
 				(RemoteId, RemoteTeamId, Name, DisplayName, SiteURL, CreateAt,
-				LastPingAt, Token, RemoteToken, Topics, CreatorId, PluginID)
+				LastPingAt, Token, RemoteToken, Topics, CreatorId, PluginID, Options)
 				VALUES
 				(:RemoteId, :RemoteTeamId, :Name, :DisplayName, :SiteURL, :CreateAt,
-				:LastPingAt, :Token, :RemoteToken, :Topics, :CreatorId, :PluginID)`
+				:LastPingAt, :Token, :RemoteToken, :Topics, :CreatorId, :PluginID, :Options)`
 
 	if _, err := s.GetMasterX().NamedExec(query, remoteCluster); err != nil {
 		return nil, errors.Wrap(err, "failed to save RemoteCluster")
@@ -78,7 +79,8 @@ func (s sqlRemoteClusterStore) Update(remoteCluster *model.RemoteCluster) (*mode
 			DisplayName = :DisplayName,
 			SiteURL = :SiteURL,
 			Topics = :Topics,
-			PluginID = :PluginID
+			PluginID = :PluginID,
+			Options = :Options
 			WHERE RemoteId = :RemoteId AND Name = :Name`
 
 	if _, err := s.GetMasterX().NamedExec(query, remoteCluster); err != nil {

server/channels/store/storetest/remote_cluster_store.go

@@ -44,6 +44,7 @@ func testRemoteClusterSave(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.Equal(t, rc.SiteURL, rcSaved.SiteURL)
 		require.Greater(t, rc.CreateAt, int64(0))
 		require.Equal(t, rc.LastPingAt, int64(0))
+		require.Equal(t, rc.Options, model.Bitmask(0))
 	})
 
 	t.Run("Save missing display name", func(t *testing.T) {
@@ -63,6 +64,32 @@ func testRemoteClusterSave(t *testing.T, rctx request.CTX, ss store.Store) {
 		_, err := ss.RemoteCluster().Save(rc)
 		require.Error(t, err)
 	})
+
+	t.Run("Save for plugin with options", func(t *testing.T) {
+		rc := &model.RemoteCluster{
+			Name:      "plugin_remote",
+			SiteURL:   "plugin.example.com",
+			CreatorId: model.NewId(),
+			PluginID:  testPluginID,
+			Options:   model.BitflagOptionAutoShareDMs,
+		}
+
+		rcSaved, err := ss.RemoteCluster().Save(rc)
+		require.NoError(t, err)
+		require.Equal(t, testPluginID, rcSaved.PluginID)
+		require.Equal(t, model.BitflagOptionAutoShareDMs, rcSaved.Options)
+		require.True(t, rcSaved.IsOptionFlagSet(model.BitflagOptionAutoShareDMs))
+
+		rc.Name = "plugin_remote_2"
+		rc.SiteURL = "plugin2.example.com"
+		rc.UnsetOptionFlag(model.BitflagOptionAutoShareDMs)
+
+		rcSaved, err = ss.RemoteCluster().Save(rc)
+		require.NoError(t, err)
+		require.Equal(t, testPluginID, rcSaved.PluginID)
+		require.Equal(t, model.Bitmask(0), rcSaved.Options)
+		require.False(t, rcSaved.IsOptionFlagSet(model.BitflagOptionAutoShareDMs))
+	})
 }
 
 func testRemoteClusterDelete(t *testing.T, rctx request.CTX, ss store.Store) {
@@ -95,6 +122,7 @@ func testRemoteClusterGet(t *testing.T, rctx request.CTX, ss store.Store) {
 			CreatorId: model.NewId(),
 			PluginID:  testPluginID,
 		}
+		rc.SetOptionFlag(model.BitflagOptionAutoShareDMs)
 		rcSaved, err := ss.RemoteCluster().Save(rc)
 		require.NoError(t, err)
 
@@ -102,6 +130,7 @@ func testRemoteClusterGet(t *testing.T, rctx request.CTX, ss store.Store) {
 		require.NoError(t, err)
 		require.Equal(t, rcSaved.RemoteId, rcGet.RemoteId)
 		require.Equal(t, testPluginID, rcGet.PluginID)
+		require.True(t, rcGet.IsOptionFlagSet(model.BitflagOptionAutoShareDMs))
 	})
 
 	t.Run("Get not found", func(t *testing.T) {