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.

Sign up for GitHub

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

Jump to bottom

MM-49610 - Merge master into production #337

Merged
merged 36 commits into from
Mar 15, 2023
Merged

MM-49610 - Merge master into production #337

merged 36 commits into from
Mar 15, 2023

Conversation

cpoile
Copy link
Member

@cpoile cpoile commented Jan 27, 2023 •
edited
Loading

Summary

  • Related to MM-49609 - Update mattermost-server version #333 , merge master into production because we (calls) run the generator cmd on the production branch
  • After all the commits from Master, there are two new ones: the merge commit b248b8f, and the plugins.json diff ea51c3e
  • ea51c3e is updating the existing plugins to the new manifest (an empty hosting field). This way the next person to run the generator won't see all this in their diff.
  • I don't think this will cause any troubles with the marketplace, but correct me if I'm wrong please.

Ticket Link

hanzei and others added 26 commits November 25, 2020 12:02
@hanzei
Programmatically add labels (#137)
c12f501
@hanzei
Add notice about Looker to plugin checklist (#151)
d9650fd
@hanzei
Add Experimental and Partner label (#145)
1aeabc6 
* Add experimental and partner label

* Update generator add

* Apply labels before sending a response
@hanzei
[MM-32593] Update golangci-lint to v1.33.2 (#165)
999760f
@hanzei
[MM-32278] Change "E20 Only" tag on listings to "E20 and Cloud" (#161)
c08643a
@hanzei
Change EE label name (#168)
c36b23d
@hanzei
[MM-33116] Use embed package to include Marketplace plugin list for l…
f828534 
…ambda (#170)
@hanzei @lieut-data
@crspeller @larkox @agarciamontoro @cpoile @mickmister
Merge production into master (#184)
273ee0e 
Co-authored-by: Ben Schumacher <ben.schumacher@mattermost.com>
Co-authored-by: Jesse Hallam <jesse.hallam@gmail.com>
Co-authored-by: Christopher Speller <crspeller@gmail.com>
Co-authored-by: Daniel Espino García <larkox@gmail.com>
Co-authored-by: Alejandro García Montoro <alejandro.garciamontoro@gmail.com>
Co-authored-by: Christopher Poile <cpoile@gmail.com>
Co-authored-by: Michael Kochell <6913320+mickmister@users.noreply.github.com>
@justinegeffen
Update add_plugin.md
ad3c4b8
@justinegeffen
Update add_plugin.md
1a844a6
@justinegeffen
Update add_plugin.md
5f3b027
@hanzei
[MM-39133] Update Marketplace labels for new SKUs (#224)
b03d543
@justinegeffen
Merge branch 'master' into justinegeffen-patch-1
fe78293
@justinegeffen
Update add_plugin.md
1b140fd
@justinegeffen
Update add_plugin.md
eba7a02
@justinegeffen
Merge pull request #210 from mattermost/justinegeffen-patch-1
ac7ff39 
Update add_plugin.md
@hanzei
Update icon URL from mattermost.org to mattermost.com (#269)
1dee9d5
@mickmister
change "Enterprise and Cloud" to "Professional/Enterprise"
3be3aaf
@mickmister
gofmt
521b7d2
@mickmister @jasonblais
Change "license to run" to "subscription"
b4f4540 
Co-authored-by: Jason Blais <13119842+jasonblais@users.noreply.github.com>
@mickmister
Merge pull request #273 from mickmister/enterprise-professional-label
0d886c1
@hanzei
Use mattermost-server/v6 (#283)
4786ed8
@hanzei
Correctly set ReturnAllVersions and PluginID for upstream requests (#268
7bb045e 
)
@cpoile
MM-49609 - Update mattermost-server version (#333)
0747a57 
* update mattermost-server version

* remove ioutil

* remove deprecated linters, add revive

* experimenting with go and node circleci upgrades

* fix

* fix

* go 1.19, revive, fix new linter errors

* fix golangci-lint-version to match dep orb

* fix comment

* use same golangci-lint as plugins

* fix failing build?

* testing...

* remove unneeded gotest/tools

* fix
@cpoile
Merge branch 'master' into production
b248b8f 
# Conflicts:
#	.circleci/config.yml
#	go.mod
#	go.sum
#	internal/model/label.go
#	plugins.json
@cpoile
commit the plugins.json differences now, so next update doesn't have to
ea51c3e
@cpoile cpoile added the 2: Dev Review Requires review by a core committer label Jan 27, 2023
@hanzei
Copy link
Collaborator

hanzei commented Feb 16, 2023

@cpoile Would you please merge master into MM-49610-update-production-branch?

@cpoile
Copy link
Member Author

cpoile commented Feb 16, 2023

@hanzei done

hanzei
hanzei previously approved these changes Feb 16, 2023
View reviewed changes
@hanzei hanzei added the 3: QA Review Requires review by a QA tester label Feb 16, 2023
@hanzei
Copy link
Collaborator

hanzei commented Feb 16, 2023

@DHaussermann Could you please done some smoke testing around the Marketplace to ensure nothing breaks with this update?

streamer45
streamer45 previously approved these changes Feb 16, 2023
View reviewed changes
Copy link
Contributor

@streamer45 streamer45 left a comment

Choose a reason for hiding this comment

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

Nice 👍

@hanzei hanzei dismissed stale reviews from streamer45 and themself via 291ee5f February 18, 2023 17:37
@hanzei hanzei removed the 2: Dev Review Requires review by a core committer label Feb 18, 2023
@cpoile
Copy link
Member Author

cpoile commented Mar 7, 2023

Gentle ping on this @DHaussermann, thank you!

@cpoile cpoile mentioned this pull request Mar 9, 2023
Merged
@DHaussermann
Copy link

Sorry for the delay on this @cpoile I can make time to test this today or Monday.

Can you clarify the scope and expected behavior here? I can regression test that Calls is installable. But, the rest of the scope is unclear to me.
I see a couple changes of github.com/mattermost/mattermost-server/v6/model but mostly I'm curious about the hosting value in the manifest. Are we changing the way this works?

Please let me know if you can provide some high level test guidance.
cc @hanzei

@cpoile
Copy link
Member Author

cpoile commented Mar 10, 2023

@DHaussermann No worries. From my point of view, I think we just need to test that the production marketplace will still work after this merge. The updates to model allows us to generate the hosting value, which was added to allow plugins to specify settings that are only for self hosted or only for cloud.

@hanzei Do you have anything specific you'd like to see tested?

DHaussermann
DHaussermann approved these changes Mar 15, 2023
View reviewed changes
Copy link

@DHaussermann DHaussermann left a comment

Choose a reason for hiding this comment

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

Tested and passed

  • Can use Marketplace to install Calls
  • Can use Marketplace to upgrade Calls from an earlier version
  • Tested that hosting is still respected ex: Antivirus is not listed if licence is of type Cloud
  • Tested that SKU for Proffesional/Enterprise check is still respected
  • Other various regression testing (searching, installs, theming and labels, surfacing an error if the plugin cannot start etc...)

LGTM!

@DHaussermann DHaussermann added 4: Reviews Complete All reviewers have approved the pull request and removed 3: QA Review Requires review by a QA tester labels Mar 15, 2023
@cpoile
Copy link
Member Author

cpoile commented Mar 15, 2023

Thanks @DHaussermann for the work!

@cpoile cpoile merged commit 48d943e into production Mar 15, 2023
@cpoile cpoile deleted the MM-49610-update-production-branch branch March 15, 2023 18:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mickmister mickmister mickmister approved these changes

@hanzei hanzei hanzei approved these changes

@DHaussermann DHaussermann DHaussermann approved these changes

@streamer45 streamer45 streamer45 left review comments

Assignees
No one assigned
Labels
4: Reviews Complete All reviewers have approved the pull request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@cpoile @lieut-data @hanzei @DHaussermann @streamer45 @mickmister @justinegeffen