For non-cloud plugin settings, set hosting property to on-prem
#269
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…plugin settings
mickmister
added
2: Dev Review
|
Currently WIP since the source code of the plugin still needs to change to support the correct functionality for both hosting environments |
This was referenced Jul 19, 2022
This reverts commit b862b40.
Codecov Report
@@ Coverage Diff @@
## master #269 +/- ##
======================================
Coverage 0.00% 0.00%
======================================
Files 8 8
Lines 882 888 +6
======================================
- Misses 882 888 +6
Continue to review full report at Codecov.
|
mickmister
changed the title
on-prem for non-cloud plugin settingson-prem
mickmister
commented
Jul 21, 2022
| @@ -82,7 +82,7 @@ func findManifest() (*model.Manifest, error) { | |||
| // we don't want to accidentally clobber anything we won't preserve. | |||
| var manifest model.Manifest | |||
| decoder := json.NewDecoder(manifestFile) | |||
| decoder.DisallowUnknownFields() | |||
There was a problem hiding this comment.
This is commented out to support compiling the plugin with an "unknown" property on the plugin settings. Updating the server version to otherwise support this is not trivial because:
- The newer mattermost-server commit to import requires Go 1.18 to compile
- circleci then needs to be updated to use Go 1.18
- Updating circleci's Go image is blocked by Move to cimg/go circleci-orbs#29
- I tried to continue the work on that PR, but getting Go 1.18 working on there was non-trivial
- The
golang:1.18-nodeimage also updates the node version, making it so it is a newer version than this plugin currently compiles with
The reason for this DisallowUnknownFields call is to prevent the manifest field structure from being out of sync, which is something that's occurring in this PR. We are purposely "breaking the rules here", while the circleci update is still underway.
There was a problem hiding this comment.
cc @hanzei for discussion on this
There was a problem hiding this comment.
Details on the error I was getting in CI mattermost/circleci-orbs#29 (comment)
DHaussermann
approved these changes
Jul 21, 2022
There was a problem hiding this comment.
Tested and passed with mattermost/mattermost-webapp#10799 and mattermost/mattermost#20677
- JWT fields are correctly hidden when using a non Cloud license
- Tested upgrade case for servers with cloud license
- Tested that any server with cloud who may have oAuth disabled is seamlessly using oAuth config on upgrade
- As a precaution ensured that oAuth is still functional on upgrade
DHaussermann
added
QA Review Done
catalintomai
approved these changes
Jul 25, 2022
larkox
approved these changes
Jul 26, 2022
| @@ -47,7 +47,8 @@ | |||
| "type": "bool", | |||
| "help_text": "When true, OAuth will be used as the authentication means with Zoom. \n When false, JWT will be used as the authentication means with Zoom. \n If you're currently using a JWT Zoom application and switch to OAuth, all users will need to connect their Zoom account using OAuth the next time they try to start a meeting. [More information](https://mattermost.gitbook.io/plugin-zoom/installation/zoom-configuration).", | |||
| "placeholder": "", | |||
| "default": false | |||
| "default": true, | |||
There was a problem hiding this comment.
Just double checking this default value change is intended.
There was a problem hiding this comment.
@larkox Yes it's intended, since the OAuth feature is now our "main" feature offering, and we want to discourage using the JWT method.
larkox
added
4: Reviews Complete
mickmister
added a commit
that referenced
this pull request
Aug 5, 2022
* set hosting to on-prem for `Enable OAuth`, `APIKey`, and `APISecret` plugin settings * use actual server commit * force oauth to be used when using cloud version of the plugin * bump go mod version * test circleci config * remove references to plugin-ci * bump Go version in circleci * use cimg * add other cimg changes * go mod tidy * revert circleci changes * revert build/go.mod changes so we are using the old server version * extend manifest struct to support hosting field * Revert "extend manifest struct to support hosting field" This reverts commit b862b40. * revert all go mod changes * remove manifest field name restriction * add comment explaining commented out code * reorder conditions for readability
Closed
mickmister
added a commit
that referenced
this pull request
Aug 16, 2022
* Cross-plugin task: Enable the CircleCI "test" job in each plugin repo that has a webapp plugin (#237) Co-authored-by: maisnamrajusingh <[email protected]> * [MM-223] Fixing Post Permissions Access (#233) * For non-cloud plugin settings, set hosting property to `on-prem` (#269) * set hosting to on-prem for `Enable OAuth`, `APIKey`, and `APISecret` plugin settings * use actual server commit * force oauth to be used when using cloud version of the plugin * bump go mod version * test circleci config * remove references to plugin-ci * bump Go version in circleci * use cimg * add other cimg changes * go mod tidy * revert circleci changes * revert build/go.mod changes so we are using the old server version * extend manifest struct to support hosting field * Revert "extend manifest struct to support hosting field" This reverts commit b862b40. * revert all go mod changes * remove manifest field name restriction * add comment explaining commented out code * reorder conditions for readability * Fix OAuth token refresh (#253) * avoid refreshing token if an error occurs while fetching current token * pass in firstConnect bool * lint * explicitly assign firstConnect boolean to local variable * ensure oauth token is decrypted when fetched from the kv store * rename functions * wrap account level token refresh in firstConnect block as well * Cherrypick "Correct docs and cleanup screenshots" * Revert "Cherrypick "Correct docs and cleanup screenshots"" This reverts commit 7164075. * preserve access token when saving encrypted version * use refresh token for check Co-authored-by: Mattermod <[email protected]> Co-authored-by: Ben Schumacher <[email protected]> Co-authored-by: Daniel Espino García <[email protected]> * bump to 1.6.1 * add GetLicense call in test * check nil license features (#277) Co-authored-by: sibasankarnayak <[email protected]> Co-authored-by: maisnamrajusingh <[email protected]> Co-authored-by: Jupri Abel <[email protected]> Co-authored-by: Mattermod <[email protected]> Co-authored-by: Ben Schumacher <[email protected]> Co-authored-by: Daniel Espino García <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR makes uses the
hostingplugin setting property added by mattermost/mattermost#20677, in order to hide these settings on cloud servers.Ticket Link
Fixes https://mattermost.atlassian.net/browse/MM-44843
Related Pull Requests