Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MM-46644] Auto respond message #20900

Merged
merged 8 commits into from Oct 7, 2022
Merged

[MM-46644] Auto respond message #20900

merged 8 commits into from Oct 7, 2022

Conversation

vish9812
Copy link
Contributor

Summary

Fix auto-respond message

Ticket Link

JIRA - https://mattermost.atlassian.net/browse/MM-46644

Release Note

NONE

@vish9812 vish9812 added the 2: Dev Review Requires review by a developer label Aug 29, 2022
@mm-cloud-bot mm-cloud-bot added the release-note-none Denotes a PR that doesn't merit a release note. label Aug 29, 2022
Copy link
Contributor

@ashishbhate ashishbhate left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should add a unit test

@amyblais amyblais added 3: QA Review Requires review by a QA tester. May occur at the same time as Dev Review CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Aug 29, 2022
@mattermod
Copy link
Contributor

E2E tests not automatically triggered, because PR has no approval yet. Please ask a developer to review and then try again to attach the QA label.

Copy link
Contributor

@srkgupta srkgupta left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see that the validation is in place only while creating a user & importing a user. Can we also add this check in other places, for example:

func (us SqlUserStore) Update(user *model.User, trustedUpdateData bool) (*model.UserUpdate, error) {
func (us SqlUserStore) 
(userID string, props map[string]string) error {

@vish9812
Copy link
Contributor Author

vish9812 commented Aug 30, 2022

@srkgupta Validation is already added in the funcs, you have mentioned.

@ashishbhate Added tests and logging

@srkgupta
Copy link
Contributor

srkgupta commented Sep 7, 2022

Additional changes requested. Please check the channel for more details.

@ashishbhate ashishbhate self-requested a review September 7, 2022 08:52
store/sqlstore/user_store.go Show resolved Hide resolved
model/utils.go Outdated Show resolved Hide resolved
model/utils.go Show resolved Hide resolved
@vish9812
Copy link
Contributor Author

/update-branch

Copy link
Member

@agnivade agnivade left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Lovely!

@agnivade
Copy link
Member

/e2e-test

@mattermod
Copy link
Contributor

@vish9812
Copy link
Contributor Author

@srkgupta @ashishbhate It's up for review.

@amyblais amyblais added 4: Reviews Complete All reviewers have approved the pull request AutoMerge Used by Mattermod to merge PR automatically and removed 3: QA Review Requires review by a QA tester. May occur at the same time as Dev Review labels Oct 7, 2022
@mattermod
Copy link
Contributor

Will try to auto merge this PR once all tests and checks are passing. This might take up to an hour.

@amyblais amyblais added this to the v7.4.0 milestone Oct 7, 2022
@mattermod
Copy link
Contributor

Trying to auto merge this PR.

@mattermod mattermod merged commit 6e9b808 into master Oct 7, 2022
@mattermod mattermod deleted the MM-46644_size branch October 7, 2022 13:02
@mattermod
Copy link
Contributor

Pull Request successfully merged
SHA: 6e9b808

@mattermod
Copy link
Contributor

Cherry pick is scheduled.

@mattermod mattermod removed AutoMerge Used by Mattermod to merge PR automatically Setup Cloud Test Server Setup an on-prem test server labels Oct 7, 2022
@mattermod
Copy link
Contributor

mattermod commented Oct 7, 2022

Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
Failed to add the RSA host key for IP address '140.82.113.4' to the list of known hosts (/app/.ssh/known_hosts).
From github.com:mattermost/mattermost-server
   da03fbb05..f6c7d99a2  MM-43850_separate_leave_team_events -> upstream/MM-43850_separate_leave_team_events
   9cf76e319..018684039  MM-45066-move-app-methods-to-the-context-logger -> upstream/MM-45066-move-app-methods-to-the-context-logger
   168151600..9a11b694b  MM-46275_production-mpa -> upstream/MM-46275_production-mpa
   138edf0d6..5b0051221  MM-47228-restrict-guest-invitation-flow -> upstream/MM-47228-restrict-guest-invitation-flow
   70c74fc10..b68461f71  cloud        -> upstream/cloud
   040087677..59eb063d9  lev-Scopes-2 -> upstream/lev-Scopes-2
   5a4cac43a..6e9b808ef  master       -> upstream/master
   43cbd0333..dbf5cb24a  release-7.4  -> upstream/release-7.4
Fetching origin
Failed to add the RSA host key for IP address '140.82.114.3' to the list of known hosts (/app/.ssh/known_hosts).
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-server-#20900-upstream-release-7.4-1665147734
Switched to a new branch 'automated-cherry-pick-of-mattermost-server-#20900-upstream-release-7.4-1665147734'
Branch 'automated-cherry-pick-of-mattermost-server-#20900-upstream-release-7.4-1665147734' set up to track remote branch 'release-7.4' from 'upstream'.

+++ About to attempt cherry pick of PR #20900 with merge commit 6e9b808efd7f6ded8d4de20bac98e087d82e0252.

error: could not apply 6e9b808ef... [MM-46644] Auto respond message (#20900)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

+++ Conflicts detected:

UU store/storetest/user_store.go
Aborting.

+++ Aborting in-progress git cherry-pick.

+++ Returning you to the master branch and cleaning up.

@mm-cloud-bot
Copy link

Test server destroyed

@amyblais
Copy link
Member

amyblais commented Oct 7, 2022

/cherry-pick cloud

@mattermod
Copy link
Contributor

Cherry pick is scheduled.

mattermost-build pushed a commit to mattermost-build/mattermost that referenced this pull request Oct 7, 2022
Automatic Merge

(cherry picked from commit 6e9b808)
@mattermod mattermod added CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone and removed CherryPick/Approved Meant for the quality or patch release tracked in the milestone labels Oct 7, 2022
@amyblais
Copy link
Member

amyblais commented Oct 7, 2022

/cherry-pick release-7.3

@mattermod
Copy link
Contributor

Cherry pick is scheduled.

@mattermod
Copy link
Contributor

mattermod commented Oct 7, 2022

Error trying doing the automated Cherry picking. Please do this manually

+++ Updating remotes...
Fetching upstream
Failed to add the RSA host key for IP address '140.82.114.3' to the list of known hosts (/app/.ssh/known_hosts).
Fetching origin
Failed to add the RSA host key for IP address '140.82.114.3' to the list of known hosts (/app/.ssh/known_hosts).
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-mattermost-server-#20900-upstream-release-7.3-1665147920
Switched to a new branch 'automated-cherry-pick-of-mattermost-server-#20900-upstream-release-7.3-1665147920'
Branch 'automated-cherry-pick-of-mattermost-server-#20900-upstream-release-7.3-1665147920' set up to track remote branch 'release-7.3' from 'upstream'.

+++ About to attempt cherry pick of PR #20900 with merge commit 6e9b808efd7f6ded8d4de20bac98e087d82e0252.

error: could not apply 6e9b808ef... [MM-46644] Auto respond message (#20900)
hint: after resolving the conflicts, mark the corrected paths
hint: with 'git add <paths>' or 'git rm <paths>'
hint: and commit the result with 'git commit'

+++ Conflicts detected:

UU model/utils.go
UU store/storetest/user_store.go
Aborting.

+++ Aborting in-progress git cherry-pick.

+++ Returning you to the master branch and cleaning up.

amyblais pushed a commit that referenced this pull request Oct 7, 2022
Automatic Merge

(cherry picked from commit 6e9b808)

Co-authored-by: Vishal <vish9812@gmail.com>
@amyblais amyblais added Changelog/Not Needed Does not require a changelog entry Docs/Not Needed Does not require documentation labels Oct 7, 2022
vish9812 added a commit that referenced this pull request Oct 11, 2022
Automatic Merge

(cherry picked from commit 6e9b808)
vish9812 added a commit that referenced this pull request Oct 11, 2022
Automatic Merge

(cherry picked from commit 6e9b808)
vish9812 added a commit that referenced this pull request Oct 11, 2022
Automatic Merge

(cherry picked from commit 6e9b808)
vish9812 added a commit that referenced this pull request Oct 11, 2022
Automatic Merge

(cherry picked from commit 6e9b808)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4: Reviews Complete All reviewers have approved the pull request Changelog/Not Needed Does not require a changelog entry CherryPick/Done Successfully cherry-picked to the quality or patch release tracked in the milestone Docs/Not Needed Does not require documentation release-note-none Denotes a PR that doesn't merit a release note.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants