fmartingr/mattermost-plugin-attachments-remover
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[MM-26997] Use socket API to deploy plugins, if available (#108)

Browse source 
* Use socket API if available

* Make socket path configurable by env var

* Add local mode docs to README

* Change README wordings

* Add log when using local mode. Change error handling for local mode deploy.

* address requests in pluginctl and update mattermost-server

* check if MM_LOCALSOCKETPATH is present before logging

* update go.sum
This commit is contained in:
Michael Kochell 2020-07-29 05:21:46 -04:00 • committed by GitHub
parent 2d65fe1e26
commit 4523a0a25e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 510 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

27
build/pluginctl/main.go
View file

@ -5,6 +5,7 @@ import (
"errors"
"fmt"
"log"
"net"
"os"
"github.com/mattermost/mattermost-server/v5/model"
@ -55,6 +56,21 @@ func pluginctl() error {
}
func getClient() (*model.Client4, error) {
socketPath := os.Getenv("MM_LOCALSOCKETPATH")
if socketPath == "" {
socketPath = model.LOCAL_MODE_SOCKET_PATH
}
client, connected := getUnixClient(socketPath)
if connected {
log.Printf("Connecting using local mode over %s", socketPath)
return client, nil
}
if os.Getenv("MM_LOCALSOCKETPATH") != "" {
log.Printf("No socket found at %s for local mode deployment. Attempting to authenticate with credentials.", socketPath)
}
siteURL := os.Getenv("MM_SERVICESETTINGS_SITEURL")
adminToken := os.Getenv("MM_ADMIN_TOKEN")
adminUsername := os.Getenv("MM_ADMIN_USERNAME")
@ -64,7 +80,7 @@ func getClient() (*model.Client4, error) {
return nil, errors.New("MM_SERVICESETTINGS_SITEURL is not set")
}
client := model.NewAPIv4Client(siteURL)
client = model.NewAPIv4Client(siteURL)
if adminToken != "" {
log.Printf("Authenticating using token against %s.", siteURL)
@ -85,6 +101,15 @@ func getClient() (*model.Client4, error) {
return nil, errors.New("one of MM_ADMIN_TOKEN or MM_ADMIN_USERNAME/MM_ADMIN_PASSWORD must be defined")
}
func getUnixClient(socketPath string) (*model.Client4, bool) {
_, err := net.Dial("unix", socketPath)
if err != nil {
return nil, false
}
return model.NewAPIv4SocketClient(socketPath), true
}
// deploy attempts to upload and enable a plugin via the Client4 API.
// It will fail if plugin uploads are disabled.
func deploy(client *model.Client4, pluginID, bundlePath string) error {