Fixed merge conflicts

Author: abbas-dependable-naqvi

.config/notice-file/README.md

@@ -0,0 +1,28 @@
+# Notice.txt File Configuration
+
+We are automatically generating Notice.txt by using first-level dependencies of the project. The related pipeline uses `config.yaml` stored in this folder.
+
+
+## Configuration
+
+Sample:
+
+```
+title: "Mattermost Playbooks"
+copyright: "©2015-present Mattermost, Inc.  All Rights Reserved.  See LICENSE for license information."
+description: "This document includes a list of open source components used in Mattermost Playbooks, including those that have been modified."
+search:
+  - "go.mod"
+  - "client/go.mod"
+dependencies: []
+devDependencies: []
+```
+
+| Field | Type   | Purpose |
+| :--   | :--    | :--     |
+| title | string | Field content will be used as a title of the application. See first line of `NOTICE.txt` file. |
+| copyright | string | Field content will be used as a copyright message. See second line of `NOTICE.txt` file. |
+| description | string | Field content will be used as notice file description. See third line of `NOTICE.txt` file. |
+| dependencies | array | If any dependency name mentioned, it will be automatically added even if it is not a first-level dependency. |
+| devDependencies | array | If any dependency name mentioned, it will be added when it is referenced in devDependency section. |
+| search | array | Pipeline will search for package.json/go.mod files mentioned here. Globstar format is supported ie. `x/**/go.mod`. |

.config/notice-file/config.yaml

@@ -0,0 +1,9 @@
+---
+title: "Mattermost GitHub Plugin"
+copyright: "©2018-present Mattermost, Inc. All Rights Reserved. See LICENSE.txt for license information."
+description: "This document includes a list of open source components used in the plugin, including those that have been modified."
+search:
+  - "go.mod"
+  - "webapp/package.json"
+dependencies: []
+devDependencies: []

.github/workflows/ci.yml

@@ -11,8 +11,11 @@ on:
 
 permissions:
   contents: read
+  id-token: write
 
 jobs:
   plugin-ci:
     uses: mattermost/actions-workflows/.github/workflows/plugin-ci.yml@main
     secrets: inherit
+    with:
+      golang-version: "1.23"

.gitignore

@@ -15,3 +15,6 @@ server/plugin/manifest.go
 
 # VS Code
 .vscode
+
+# notice
+.notice-work

.golangci.yml

@@ -3,35 +3,34 @@ run:
   modules-download-mode: readonly
 
 linters-settings:
+  goconst:
+    min-len: 2
+    min-occurrences: 2
   gofmt:
     simplify: true
   goimports:
     local-prefixes: github.com/mattermost/mattermost-plugin-github
   govet:
-    check-shadowing: true
     enable-all: true
     disable:
       - fieldalignment
   misspell:
     locale: US
-  revive:
-    rules:
-      - name: error-strings
-        disabled: true
 
 linters:
   disable-all: true
   enable:
     - bodyclose
-    - errcheck
+    # - errcheck
+    # - goconst
     - gocritic
     - gofmt
     - goimports
-    - gosec
+    # - gosec
     - gosimple
     - govet
     - ineffassign
-    - misspell
+    # - misspell
     - nakedret
     - revive
     - staticcheck
@@ -43,11 +42,25 @@ linters:
 
 issues:
   exclude-rules:
+    - path: server/manifest.go
+      linters:
+        - deadcode
+        - unused
+        - varcheck
+    - path: server/configuration.go
+      linters:
+        - unused
+    - linters:
+        - revive
+      text: unused-parameter
+    - linters:
+        - revive
+      text: var-naming
+    - linters:
+        - revive
+      text: error-strings
     - path: _test\.go
       linters:
         - bodyclose
         - goconst
-        - scopelint # https://github.com/kyoh86/scopelint/issues/4
-    - path: server/plugin/webhook.go
-      linters:
-        - goconst
+        - scopelint # https://github.com/kyoh86/scopelint/issues/4

LICENSE LICENSE.txtLICENSE renamed to LICENSE.txt

@@ -158,8 +158,9 @@ apply:
 ## Install go tools
 install-go-tools:
 	@echo Installing go tools
-	$(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.59.1
+	$(GO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.64.7
 	$(GO) install gotest.tools/[email protected]
+	$(GO) install github.com/mattermost/mattermost-govet/v2@3f08281c344327ac09364f196b15f9a81c7eff08
 
 ## Runs eslint and golangci-lint
 .PHONY: check-style
@@ -178,6 +179,7 @@ ifneq ($(HAS_SERVER),)
 	@echo Running golangci-lint
 	$(GO) vet ./...
 	$(GOBIN)/golangci-lint run ./...
+	$(GO) vet -vettool=$(GOBIN)/mattermost-govet -license -license.year=2018 ./...
 endif
 
 ## Builds the server, if it exists, for all supported architectures, unless MM_SERVICESETTINGS_ENABLEDEVELOPER is set
@@ -224,6 +226,12 @@ bundle:
 	rm -rf dist/
 	mkdir -p dist/$(PLUGIN_ID)
 	./build/bin/manifest dist
+ifneq ($(wildcard LICENSE.txt),)
+	cp -r LICENSE.txt dist/$(PLUGIN_ID)/
+endif
+ifneq ($(wildcard NOTICE.txt),)
+	cp -r NOTICE.txt dist/$(PLUGIN_ID)/
+endif
 ifneq ($(wildcard $(ASSETS_DIR)/.),)
 	cp -r $(ASSETS_DIR) dist/$(PLUGIN_ID)/
 endif