diff --git a/src/internal/m365/collection/groups/handler.go b/src/internal/m365/collection/groups/handler.go index d4e963d16..bebdc4d98 100644 --- a/src/internal/m365/collection/groups/handler.go +++ b/src/internal/m365/collection/groups/handler.go @@ -11,7 +11,7 @@ import ( type BackupMessagesHandler interface { GetMessage(ctx context.Context, teamID, channelID, itemID string) (models.ChatMessageable, error) - NewMessagePager(teamID, channelID string) api.MessageItemDeltaEnumerator + NewMessagePager(teamID, channelID string) api.ChannelMessageDeltaEnumerator GetChannel(ctx context.Context, teamID, channelID string) (models.Channelable, error) GetReply(ctx context.Context, teamID, channelID, messageID string) (serialization.Parsable, error) } diff --git a/src/internal/tester/tconfig/config.go b/src/internal/tester/tconfig/config.go index 387caff08..eb001fda9 100644 --- a/src/internal/tester/tconfig/config.go +++ b/src/internal/tester/tconfig/config.go @@ -28,7 +28,6 @@ const ( TestCfgSiteURL = "m365siteurl" TestCfgTeamID = "m365teamid" TestCfgGroupID = "m365groupid" - TestCfgChannelID = "m365channelid" TestCfgUserID = "m365userid" TestCfgSecondaryUserID = "secondarym365userid" TestCfgSecondaryGroupID = "secondarym365groupid" @@ -169,12 +168,6 @@ func ReadTestConfig() (map[string]string, error) { os.Getenv(EnvCorsoM365TestGroupID), vpr.GetString(TestCfgGroupID), "6f24b40d-b13d-4752-980f-f5fb9fba7aa0") - fallbackTo( - testEnv, - TestCfgChannelID, - os.Getenv(EnvCorsoM365TestChannelID), - vpr.GetString(TestCfgChannelID), - "19:nY6QHZ3hnHJ6ylarBxPjCOLRJNvrL3oKI5iW15QxTPA1@thread.tacv2") fallbackTo( testEnv, TestCfgSiteURL, diff --git a/src/internal/tester/tconfig/protected_resources.go b/src/internal/tester/tconfig/protected_resources.go index 6a0a46783..26c0187ac 100644 --- a/src/internal/tester/tconfig/protected_resources.go +++ b/src/internal/tester/tconfig/protected_resources.go @@ -246,14 +246,3 @@ func M365GroupID(t *testing.T) string { return strings.ToLower(cfg[TestCfgTeamID]) } - -// M365ChannelID returns a channelID string representing the m365TeamsID described -// by either the env var CORSO_M365_TEST_CHANNEL_ID, the corso_test.toml config -// file or the default value (in that order of priority). The default is a -// last-attempt fallback that will only work on alcion's testing org. -func M365ChannelID(t *testing.T) string { - cfg, err := ReadTestConfig() - require.NoError(t, err, "retrieving m365 channel id from test configuration: %+v", clues.ToCore(err)) - - return cfg[TestCfgChannelID] -}