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-36050] Change enterprise license check for installing multiple Jira instances to allow for E20, Professional, and Enterprise #775

Merged
merged 18 commits into from Aug 20, 2021
Merged

[MM-36050] Change enterprise license check for installing multiple Jira instances to allow for E20, Professional, and Enterprise #775

merged 18 commits into from Aug 20, 2021

Conversation

mickmister
Copy link
Member

@mickmister mickmister commented Jun 30, 2021 •
edited

Summary

The license check is now using the same logic as the incident collaboration plugin, which is using logic from mattermost-plugin-api that checks the SKU of the license.

Docs have been updated, as well as the enterprise/LICENSE file, based off of https://github.com/mattermost/mattermost-plugin-incident-collaboration/pull/540/files

Ticket Link

Fixes https://mattermost.atlassian.net/browse/MM-36050

@codecov-commenter
Copy link

codecov-commenter commented Jun 30, 2021 •
edited

Codecov Report

Merging #775 (deb8bc1) into master (99a8136) will decrease coverage by 0.03%.
The diff coverage is 50.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #775      +/-   ##
==========================================
- Coverage   34.97%   34.93%   -0.04%     
==========================================
  Files          52       52              
  Lines        5945     5945              
==========================================
- Hits         2079     2077       -2     
- Misses       3657     3659       +2     
  Partials      209      209
Impacted Files Coverage Δ
server/command.go 18.13% <0.00%> (ø)
server/instances.go 32.60% <100.00%> (ø)
server/subscribe.go 67.10% <0.00%> (-0.38%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 99a8136...deb8bc1. Read the comment docs.

@catalintomai catalintomai added 2: Dev Review Requires review by a core committer 1: PM Review Requires review by a product manager labels Jun 30, 2021
aaronrothschild
aaronrothschild approved these changes Jul 1, 2021
View reviewed changes
readme.md Outdated
@@ -2,7 +2,7 @@

This plugin supports a two-way integration between Mattermost and Jira. Jira Core and Jira Software products, for Server, Data Center, and Cloud platforms are supported. It has been tested with versions 7 and 8.

From v3.0 of this plugin, support for multiple Jira instances is offered for Mattermost Enterprise Edition E20.
From v3.0 of this plugin, one Mattermost instance can use multiple Jira instances at once.
Copy link
Contributor

Choose a reason for hiding this comment

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

@mickmister is it v 3.01 or whatever we are releasing this fix as?

jfrerich
jfrerich approved these changes Jul 6, 2021
View reviewed changes
Copy link
Contributor

@jfrerich jfrerich left a comment

Choose a reason for hiding this comment

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

When was it decided the enterprise license wasn't needed for multi instance?

@jfrerich jfrerich added 4: Reviews Complete All reviewers have approved the pull request and removed 1: PM Review Requires review by a product manager 2: Dev Review Requires review by a core committer labels Jul 6, 2021
@jfrerich jfrerich added 3: QA Review Requires review by a QA tester QA Review Done PR has been approved by QA and removed 4: Reviews Complete All reviewers have approved the pull request QA Review Done PR has been approved by QA labels Jul 6, 2021
@mickmister mickmister changed the base branch from master to remove-workflow-client July 9, 2021 19:44
@mickmister mickmister changed the title [MM-36050] Remove enterprise license check for installing multiple Jira instances [MM-36050] Change enterprise license check for installing multiple Jira instances to allow for E10 Jul 9, 2021
@mickmister
Copy link
Member Author

@aaronrothschild I've changed the docs so it's clear that E20 was required and now only an Enterprise license is required.

@mickmister mickmister added the 1: PM Review Requires review by a product manager label Jul 9, 2021
aaronrothschild
aaronrothschild approved these changes Jul 12, 2021
View reviewed changes
Copy link
Contributor

@aaronrothschild aaronrothschild left a comment

Choose a reason for hiding this comment

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

LGTM

@aaronrothschild aaronrothschild removed the 1: PM Review Requires review by a product manager label Jul 12, 2021
@aaronrothschild
Copy link
Contributor

Just verified: @mickmister The intent is to only offer it to the new Professional SKU, so current E10 customers would NOT get this feature. (They would have to upgrade to Professional or Enterprise in the new SKU or E20 in the old SKU)

@mickmister mickmister changed the title [MM-36050] Change enterprise license check for installing multiple Jira instances to allow for E10 [MM-36050] Change enterprise license check for installing multiple Jira instances to allow for E20, Professional, and Enterprise Jul 12, 2021
Base automatically changed from remove-workflow-client to master July 14, 2021 03:16
@marianunez
Copy link
Member

@DHaussermann I can provide you licenses for the new skus if you need for testing this one - just let me know

@DHaussermann
Copy link

Thank @marianunez that would be much appreciated. Maybe you could DM the license files?

@DHaussermann DHaussermann added this to the v3.1.0 milestone Jul 19, 2021
@mickmister mickmister mentioned this pull request Jul 28, 2021
Merged
@DHaussermann
Copy link

/update-branch

DHaussermann
DHaussermann approved these changes Aug 20, 2021
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
All 9 licenses are working as expected.

  • Tested 3 legacy license types (unchanged)
    • E20 Allows multiple Jira instance installs
    • E10 Does not allow multiple Jira instance installs
    • E0 Does not allow multiple Jira instance installs
  • Tested both new Cloud and On-Prem SKU sets. For both:
    • Enterprise Allows multiple Jira instance installs
    • Professional Allows multiple Jira instance installs
    • Starter Does not allow multiple Jira instance installs

LGTM!
Please merge

@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 Aug 20, 2021
@mickmister mickmister merged commit 6678cae into master Aug 20, 2021
@mickmister mickmister deleted the remove-enterprise-check branch August 20, 2021 15:13
@mickmister mickmister mentioned this pull request Sep 8, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marianunez marianunez marianunez left review comments

@aaronrothschild aaronrothschild aaronrothschild approved these changes

@jfrerich jfrerich jfrerich approved these changes

@DHaussermann DHaussermann DHaussermann approved these changes

@catalintomai catalintomai catalintomai approved these changes

@justinegeffen justinegeffen Awaiting requested review from justinegeffen

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

Successfully merging this pull request may close these issues.

None yet
8 participants
@mickmister @codecov-commenter @aaronrothschild @marianunez @DHaussermann @jfrerich @catalintomai @mattermod