Update common files from starter template and fix linter issues #958
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,122 +1,65 @@ | ||
| version: "2" | ||
|
|
||
| run: | ||
| timeout: 5m | ||
| modules-download-mode: readonly | ||
|
|
||
| linters: | ||
| default: none | ||
| enable: | ||
| - bidichk | ||
| - bodyclose | ||
| - errcheck | ||
| - gocritic | ||
| - gosec | ||
| - govet | ||
| - ineffassign | ||
| - makezero | ||
| - misspell | ||
| - modernize | ||
| - nakedret | ||
| - revive | ||
| - staticcheck | ||
| - unconvert | ||
| - unqueryvet | ||
| - unused | ||
| - whitespace | ||
| settings: | ||
| govet: | ||
| enable-all: true | ||
| disable: | ||
| - fieldalignment | ||
| revive: | ||
| rules: | ||
| - name: exported | ||
| disabled: true | ||
| - name: unused-parameter | ||
| disabled: true | ||
| unqueryvet: | ||
| check-sql-builders: true | ||
| exclusions: | ||
| rules: | ||
| - path: server/plugin/manifest.go | ||
| linters: | ||
| - unused | ||
| - path: server/configuration.go | ||
| linters: | ||
| - unused | ||
| - path: _test\.go | ||
| linters: | ||
| - bodyclose | ||
|
|
||
| formatters: | ||
| enable: | ||
| - gofmt | ||
| - gofumpt | ||
| - goimports | ||
| settings: | ||
| gofmt: | ||
| simplify: true | ||
| rewrite-rules: | ||
| - pattern: interface{} | ||
| replacement: any | ||
| goimports: | ||
| local-prefixes: | ||
| - github.com/mattermost/mattermost-plugin-github |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 20.11 |
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,13 +6,11 @@ package main | |
| import ( | ||
| "encoding/json" | ||
| "fmt" | ||
| "os" | ||
| "strings" | ||
|
|
||
| "github.com/mattermost/mattermost/server/public/model" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| const pluginIDGoFileTemplate = `// This file is automatically generated. Do not modify it manually. | ||
|
|
@@ -91,6 +89,11 @@ func main() { | |
| panic("failed to write manifest to dist directory: " + err.Error()) | ||
| } | ||
|
|
||
| case "check": | ||
| if err := manifest.IsValid(); err != nil { | ||
| panic("failed to check manifest: " + err.Error()) | ||
| } | ||
|
|
||
| default: | ||
| panic("unrecognized command: " + cmd) | ||
| } | ||
|
|
@@ -101,11 +104,11 @@ func findManifest() (*model.Manifest, error) { | |
| if err != nil { | ||
| return nil, errors.Wrap(err, "failed to find manifest in current working directory") | ||
| } | ||
| manifestFile, err := os.Open(manifestFilePath) //nolint:gosec | ||
| if err != nil { | ||
| return nil, errors.Wrapf(err, "failed to open %s", manifestFilePath) | ||
| } | ||
| defer func() { _ = manifestFile.Close() }() | ||
|
|
||
| // Re-decode the manifest, disallowing unknown fields. When we write the manifest back out, | ||
| // we don't want to accidentally clobber anything we won't preserve. | ||
|
|
@@ -120,8 +123,8 @@ func findManifest() (*model.Manifest, error) { | |
| // commit, and use the first version we find (to prevent causing errors) | ||
| if manifest.Version == "" { | ||
| var version string | ||
| tags := strings.FieldsSeq(BuildTagCurrent) | ||
| for t := range tags { | ||
| if strings.HasPrefix(t, "v") { | ||
| version = t | ||
| break | ||
|
|
@@ -139,10 +142,7 @@ func findManifest() (*model.Manifest, error) { | |
|
|
||
| // If no release notes specified, generate one from the latest tag, if present. | ||
| if manifest.ReleaseNotesURL == "" && BuildTagLatest != "" { | ||
| manifest.ReleaseNotesURL = manifest.HomepageURL + "releases/tag/" + BuildTagLatest | ||
|
Comment on lines
-142
to
+145
Contributor
Author
There was a problem hiding this comment. That's a bug in the starter template. Submitted mattermost/mattermost-plugin-starter-template#236 |
||
| } | ||
|
|
||
| return &manifest, nil | ||
|
|
@@ -171,8 +171,8 @@ func applyManifest(manifest *model.Manifest) error { | |
| // write generated code to file by using Go file template. | ||
| if err := os.WriteFile( | ||
| "server/plugin/manifest.go", | ||
| fmt.Appendf(nil, pluginIDGoFileTemplate, manifestStr), | ||
| 0o600, | ||
| ); err != nil { | ||
| return errors.Wrap(err, "failed to write server/plugin/manifest.go") | ||
| } | ||
|
|
@@ -194,8 +194,8 @@ func applyManifest(manifest *model.Manifest) error { | |
| // write generated code to file by using JS file template. | ||
| if err := os.WriteFile( | ||
| "webapp/src/manifest.ts", | ||
| fmt.Appendf(nil, pluginIDJSFileTemplate, manifestStr), | ||
| 0o600, | ||
| ); err != nil { | ||
| return errors.Wrap(err, "failed to open webapp/src/manifest.ts") | ||
| } | ||
|
|
@@ -211,7 +211,7 @@ func distManifest(manifest *model.Manifest) error { | |
| return err | ||
| } | ||
|
|
||
| if err := os.WriteFile(fmt.Sprintf("dist/%s/plugin.json", manifest.Id), manifestBytes, 0o600); err != nil { | ||
| return errors.Wrap(err, "failed to write plugin.json") | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should not be doing these changes. The starter template is wrong. See mattermost/mattermost-plugin-starter-template#236