[MI-3616] Fix failing ci (mattermost#189)

Brightscout · Oct 12, 2023 · 0d23ed8 · 0d23ed8
1 parent bd58e0b
commit 0d23ed8
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 21 deletions.
diff --git a/server/plugin/api.go b/server/plugin/api.go
@@ -693,7 +693,7 @@ func (p *Plugin) handleOpenStateModal(w http.ResponseWriter, r *http.Request) {
 	p.returnPostActionIntegrationResponse(w, response)
 }
 
-func (p *Plugin) handleGetUsers(w http.ResponseWriter, r *http.Request) {
+func (p *Plugin) handleGetUsers(w http.ResponseWriter, _ *http.Request) {
 	users, err := p.store.GetAllUsers()
 	if err != nil {
 		p.API.LogError(constants.ErrorGetUsers, "Error", err.Error())

diff --git a/server/plugin/auth_token_test.go b/server/plugin/auth_token_test.go
@@ -27,9 +27,9 @@ func (a *mockAesgcm) NonceSize() int { return 1 }
 
 func (a *mockAesgcm) Overhead() int { return 0 }
 
-func (a *mockAesgcm) Seal(dst, nonce, plaintext, additionalData []byte) []byte { return []byte("mock") }
+func (a *mockAesgcm) Seal(_, _, _, _ []byte) []byte { return []byte("mock") }
 
-func (a *mockAesgcm) Open(dst, nonce, ciphertext, additionalData []byte) ([]byte, error) {
+func (a *mockAesgcm) Open(_, _, _, _ []byte) ([]byte, error) {
 	return []byte("mock"), nil
 }
 

diff --git a/server/plugin/command.go b/server/plugin/command.go
@@ -246,7 +246,7 @@ func (p *Plugin) HandleCreateIncident(args *model.CommandArgs) string {
 	return ""
 }
 
-func (p *Plugin) handleSubscribe(_ *plugin.Context, args *model.CommandArgs, params []string, client Client, _ bool) string {
+func (p *Plugin) handleSubscribe(_ *plugin.Context, args *model.CommandArgs, _ []string, _ Client, _ bool) string {
 	p.API.PublishWebSocketEvent(
 		constants.WSEventOpenAddSubscriptionModal,
 		nil,
@@ -256,7 +256,7 @@ func (p *Plugin) handleSubscribe(_ *plugin.Context, args *model.CommandArgs, par
 	return ""
 }
 
-func (p *Plugin) handleSearchAndShare(_ *plugin.Context, args *model.CommandArgs, params []string, client Client, _ bool) string {
+func (p *Plugin) handleSearchAndShare(_ *plugin.Context, args *model.CommandArgs, _ []string, _ Client, _ bool) string {
 	p.API.PublishWebSocketEvent(
 		constants.WSEventOpenSearchAndShareRecordsModal,
 		nil,

diff --git a/server/plugin/kv.go b/server/plugin/kv.go
@@ -63,11 +63,8 @@ func (s *pluginStore) LoadUser(mattermostUserID string) (*serializer.User, error
 }
 
 func (s *pluginStore) StoreUser(user *serializer.User) error {
-	if err := kvstore.StoreJSON(s.userKV, user.MattermostUserID, user); err != nil {
-		return err
-	}
-
-	return nil
+	err := kvstore.StoreJSON(s.userKV, user.MattermostUserID, user)
+	return err
 }
 
 func (s *pluginStore) DeleteUser(mattermostUserID string) error {
@@ -76,11 +73,8 @@ func (s *pluginStore) DeleteUser(mattermostUserID string) error {
 		return err
 	}
 
-	if err = s.userKV.Delete(u.MattermostUserID); err != nil {
-		return err
-	}
-
-	return nil
+	err = s.userKV.Delete(u.MattermostUserID)
+	return err
 }
 
 func (s *pluginStore) GetAllUsers() ([]*serializer.IncidentCaller, error) {

diff --git a/server/plugin/plugin.go b/server/plugin/plugin.go
@@ -53,7 +53,7 @@ func NewPlugin() *Plugin {
 }
 
 // ServeHTTP demonstrates a plugin that handles HTTP requests
-func (p *Plugin) ServeHTTP(c *plugin.Context, w http.ResponseWriter, r *http.Request) {
+func (p *Plugin) ServeHTTP(_ *plugin.Context, w http.ResponseWriter, r *http.Request) {
 	p.router.ServeHTTP(w, r)
 }
 

diff --git a/server/plugin/user.go b/server/plugin/user.go
@@ -92,9 +92,6 @@ func (p *Plugin) GetUser(mattermostUserID string) (*serializer.User, error) {
 }
 
 func (p *Plugin) DisconnectUser(mattermostUserID string) error {
-	if err := p.store.DeleteUser(mattermostUserID); err != nil {
-		return err
-	}
-
-	return nil
+	err := p.store.DeleteUser(mattermostUserID)
+	return err
 }