Merge branch 'master' of github.com:mattermost/mattermost-plugin-github into MM-618

Nityanand13 · Nityanand13 · commit 4378034df0ff · 2023-01-31T15:06:36.000+05:30
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -0,0 +1,17 @@
+name: cd
+on:
+  workflow_run:
+    workflows: ["ci"]
+    types:
+      - completed
+  push:
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
+
+permissions:
+  contents: read
+
+jobs:
+  plugin-cd:
+    uses: mattermost/actions-workflows/.github/workflows/plugin-cd.yml@1a3d181953ab3e64bc12d7e3709cb619ab0ddb80
+    secrets: inherit
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,16 @@
+name: ci
+on:
+  push:
+    branches:
+      - master
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+"
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  plugin-ci:
+    uses: mattermost/actions-workflows/.github/workflows/plugin-ci.yml@1a3d181953ab3e64bc12d7e3709cb619ab0ddb80
+    secrets: inherit
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+14.21.1
diff --git a/plugin.json b/plugin.json
@@ -27,7 +27,7 @@
                 "key": "UsePreregisteredApplication",
                 "display_name": "Use Preregistered OAuth Application:",
                 "type": "bool",
-                "help_text": "When true, instructs the plugin to use the preregistered GitHub OAuth application - application registration steps can be skipped. Requires [Chimera Proxy](https://github.com/mattermost/chimera) URL to be configured for the server. Cannot be used with GitHub enterprise. **This setting is intended to be used with Mattermost Cloud instances only.**",
+                "help_text": "Set to false if using GitHub Enterprise. When true, instructs the plugin to use the preregistered GitHub OAuth application - application registration steps can be skipped. Requires [Chimera Proxy](https://github.com/mattermost/chimera) URL to be configured for the server. Cannot be used with GitHub enterprise. **This setting is intended to be used with Mattermost Cloud instances only.**",
                 "default": false
             },
             {
diff --git a/server/plugin/api.go b/server/plugin/api.go
@@ -118,7 +118,7 @@ func (p *Plugin) withRecovery(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		defer func() {
 			if x := recover(); x != nil {
-				p.API.LogError("Recovered from a panic",
+				p.API.LogWarn("Recovered from a panic",
 					"url", r.URL.String(),
 					"error", x,
 					"stack", string(debug.Stack()))
@@ -152,7 +152,7 @@ func (p *Plugin) checkAuth(handler http.HandlerFunc, responseType ResponseType)
 			case ResponseTypePlain:
 				http.Error(w, "Not authorized", http.StatusUnauthorized)
 			default:
-				p.API.LogError("Unknown ResponseType detected")
+				p.API.LogDebug("Unknown ResponseType detected")
 			}
 			return
 		}
diff --git a/server/plugin/api_test.go b/server/plugin/api_test.go
@@ -32,7 +32,7 @@ func TestWithRecovery(t *testing.T) {
 
 	p := NewPlugin()
 	api := &plugintest.API{}
-	api.On("LogError",
+	api.On("LogWarn",
 		"Recovered from a panic",
 		"url", "http://random",
 		"error", "bad handler",
diff --git a/server/plugin/cluster.go b/server/plugin/cluster.go
@@ -44,8 +44,6 @@ func (p *Plugin) sendMessageToCluster(id string, v interface{}) {
 }
 
 func (p *Plugin) HandleClusterEvent(ev model.PluginClusterEvent) {
-	p.API.LogError("received cluster event", "id", ev.Id)
-
 	switch ev.Id {
 	case webHookPingEventID:
 		var event github.PingEvent
diff --git a/server/plugin/mm_34646_token_refresh.go b/server/plugin/mm_34646_token_refresh.go
@@ -66,14 +66,14 @@ func (p *Plugin) forceResetAllMM34646() error {
 
 			info, errResp := p.getGitHubUserInfo(tryInfo.UserID)
 			if errResp != nil {
-				p.API.LogError("failed to retrieve serializer.GitHubUserInfo", "key", key, "user_id", tryInfo.UserID,
+				p.API.LogWarn("failed to retrieve GitHubUserInfo", "key", key, "user_id", tryInfo.UserID,
 					"error", errResp.Error())
 				continue
 			}
 
 			_, err = p.forceResetUserTokenMM34646(ctx, config, info)
 			if err != nil {
-				p.API.LogError("failed to reset GitHub user token", "key", key, "user_id", tryInfo.UserID,
+				p.API.LogWarn("failed to reset GitHub user token", "key", key, "user_id", tryInfo.UserID,
 					"error", err.Error())
 				continue
 			}
diff --git a/server/plugin/permalinks.go b/server/plugin/permalinks.go
@@ -95,7 +95,7 @@ func (p *Plugin) makeReplacements(msg string, replacements []replacement, ghClie
 		r := replacements[i]
 		// quick bailout if the commit hash is not proper.
 		if _, err := hex.DecodeString(r.permalinkInfo.commit); err != nil {
-			p.API.LogError("Bad git commit hash in permalink", "error", err.Error(), "hash", r.permalinkInfo.commit)
+			p.API.LogWarn("Bad git commit hash in permalink", "error", err.Error(), "hash", r.permalinkInfo.commit)
 			continue
 		}
 
@@ -106,7 +106,7 @@ func (p *Plugin) makeReplacements(msg string, replacements []replacement, ghClie
 		if config.EnableCodePreview != "privateAndPublic" {
 			repo, _, err := ghClient.Repositories.Get(ctx, r.permalinkInfo.user, r.permalinkInfo.repo)
 			if err != nil {
-				p.API.LogError("Error while fetching repository information",
+				p.API.LogWarn("Error while fetching repository information",
 					"error", err.Error(),
 					"repo", r.permalinkInfo.repo,
 					"user", r.permalinkInfo.user)
@@ -126,7 +126,7 @@ func (p *Plugin) makeReplacements(msg string, replacements []replacement, ghClie
 		fileContent, _, _, err := ghClient.Repositories.GetContents(ctx,
 			r.permalinkInfo.user, r.permalinkInfo.repo, r.permalinkInfo.path, &opts)
 		if err != nil {
-			p.API.LogError("Error while fetching file contents", "error", err.Error(), "path", r.permalinkInfo.path)
+			p.API.LogWarn("Error while fetching file contents", "error", err.Error(), "path", r.permalinkInfo.path)
 			continue
 		}
 		// this is not a file, ignore.
@@ -136,7 +136,7 @@ func (p *Plugin) makeReplacements(msg string, replacements []replacement, ghClie
 		}
 		decoded, err := fileContent.GetContent()
 		if err != nil {
-			p.API.LogError("Error while decoding file contents", "error", err.Error(), "path", r.permalinkInfo.path)
+			p.API.LogWarn("Error while decoding file contents", "error", err.Error(), "path", r.permalinkInfo.path)
 			continue
 		}
 
@@ -153,10 +153,10 @@ func (p *Plugin) makeReplacements(msg string, replacements []replacement, ghClie
 		}
 		lines, err := filterLines(decoded, start, end)
 		if err != nil {
-			p.API.LogError("Error while filtering lines", "error", err.Error(), "path", r.permalinkInfo.path)
+			p.API.LogWarn("Error while filtering lines", "error", err.Error(), "path", r.permalinkInfo.path)
 		}
 		if lines == "" {
-			p.API.LogError("Line numbers out of range. Skipping.", "file", r.permalinkInfo.path, "start", start, "end", end)
+			p.API.LogWarn("Line numbers out of range. Skipping.", "file", r.permalinkInfo.path, "start", start, "end", end)
 			continue
 		}
 		final := getCodeMarkdown(r.permalinkInfo.user, r.permalinkInfo.repo, r.permalinkInfo.path, r.word, lines, isTruncated)
diff --git a/server/plugin/permalinks_test.go b/server/plugin/permalinks_test.go
@@ -243,7 +243,7 @@ func TestGetReplacements(t *testing.T) {
 func TestMakeReplacements(t *testing.T) {
 	p := NewPlugin()
 	mockPluginAPI := &plugintest.API{}
-	mockPluginAPI.On("LogError", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything)
+	mockPluginAPI.On("LogWarn", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything)
 	mockPluginAPI.On("LogWarn", mock.Anything, mock.Anything)
 	p.SetAPI(mockPluginAPI)
 
@@ -412,8 +412,8 @@ func TestMakeReplacements(t *testing.T) {
 		})
 	}
 
-	mockPluginAPI.AssertCalled(t, "LogError", "Bad git commit hash in permalink", "error", "encoding/hex: invalid byte: U+0068 'h'", "hash", "badhash")
-	mockPluginAPI.AssertCalled(t, "LogError", "Error while fetching file contents", "error", "unmarshalling failed for both file and directory content: unexpected end of JSON input and unexpected end of JSON input", "path", "path/file.go")
+	mockPluginAPI.AssertCalled(t, "LogWarn", "Bad git commit hash in permalink", "error", "encoding/hex: invalid byte: U+0068 'h'", "hash", "badhash")
+	mockPluginAPI.AssertCalled(t, "LogWarn", "Error while fetching file contents", "error", "unmarshalling failed for both file and directory content: unexpected end of JSON input and unexpected end of JSON input", "path", "path/file.go")
 }
 
 const (
diff --git a/server/plugin/plugin.go b/server/plugin/plugin.go
@@ -137,7 +137,7 @@ func (p *Plugin) githubConnectToken(token oauth2.Token) *github.Client {
 
 	client, err := GetGitHubClient(token, config)
 	if err != nil {
-		p.API.LogError("Failed to create GitHub client", "error", err.Error())
+		p.API.LogWarn("Failed to create GitHub client", "error", err.Error())
 		return nil
 	}
 
@@ -294,7 +294,7 @@ func (p *Plugin) MessageWillBePosted(c *plugin.Context, post *model.Post) (*mode
 
 	shouldProcessMessage, err := client.Post.ShouldProcessMessage(post)
 	if err != nil {
-		p.API.LogError("Error while checking if the message should be processed", "error", err.Error())
+		p.API.LogWarn("Error while checking if the message should be processed", "error", err.Error())
 		return nil, ""
 	}
 
@@ -599,7 +599,7 @@ func (p *Plugin) GetToDo(ctx context.Context, username string, githubClient *git
 		}
 
 		if n.GetRepository() == nil {
-			p.API.LogError("Unable to get repository for notification in todo list. Skipping.")
+			p.API.LogWarn("Unable to get repository for notification in todo list. Skipping.")
 			continue
 		}
 
@@ -716,7 +716,7 @@ func (p *Plugin) HasUnreads(info *serializer.GitHubUserInfo) bool {
 		}
 
 		if n.GetRepository() == nil {
-			p.API.LogError("Unable to get repository for notification in todo list. Skipping.")
+			p.API.LogWarn("Unable to get repository for notification in todo list. Skipping.")
 			continue
 		}
 
diff --git a/webapp/package-lock.json b/webapp/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`"key": "UsePreregisteredApplication",`
`28`	`28`	`"display_name": "Use Preregistered OAuth Application:",`
`29`	`29`	`"type": "bool",`
`30`		`- "help_text": "When true, instructs the plugin to use the preregistered GitHub OAuth application - application registration steps can be skipped. Requires [Chimera Proxy](https://github.com/mattermost/chimera) URL to be configured for the server. Cannot be used with GitHub enterprise. This setting is intended to be used with Mattermost Cloud instances only.",`
	`30`	`+ "help_text": "Set to false if using GitHub Enterprise. When true, instructs the plugin to use the preregistered GitHub OAuth application - application registration steps can be skipped. Requires [Chimera Proxy](https://github.com/mattermost/chimera) URL to be configured for the server. Cannot be used with GitHub enterprise. This setting is intended to be used with Mattermost Cloud instances only.",`
`31`	`31`	`"default": false`
`32`	`32`	`},`
`33`	`33`	`{`
Original file line number	Diff line number	Diff line change
`@@ -44,8 +44,6 @@ func (p *Plugin) sendMessageToCluster(id string, v interface{}) {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`func (p *Plugin) HandleClusterEvent(ev model.PluginClusterEvent) {`
`47`		`- p.API.LogError("received cluster event", "id", ev.Id)`
`48`		`-`
`49`	`47`	`switch ev.Id {`
`50`	`48`	`case webHookPingEventID:`
`51`	`49`	`var event github.PingEvent`