-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Integrate GolangCI-Lint #19
Merged
Merged
Changes from 3 commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| run: | ||
| timeout: 5m | ||
| modules-download-mode: readonly | ||
|
|
||
| linters-settings: | ||
| goconst: | ||
| min-len: 2 | ||
| min-occurrences: 2 | ||
| gofmt: | ||
| simplify: true | ||
| goimports: | ||
| local-prefixes: github.com/mattermost/mattermost-plugin-aws-SNS | ||
| golint: | ||
| min-confidence: 0 | ||
| govet: | ||
| check-shadowing: true | ||
| enable-all: true | ||
| misspell: | ||
| locale: US | ||
|
|
||
| linters: | ||
| disable-all: true | ||
| enable: | ||
| - bodyclose | ||
| - deadcode | ||
| - errcheck | ||
| - goconst | ||
| - gocritic | ||
| - gofmt | ||
| - goimports | ||
| - golint | ||
| - gosec | ||
| - gosimple | ||
| - govet | ||
| - ineffassign | ||
| - interfacer | ||
| - misspell | ||
| - nakedret | ||
| - staticcheck | ||
| - structcheck | ||
| - stylecheck | ||
| - typecheck | ||
| - unconvert | ||
| - unused | ||
| - varcheck | ||
| - whitespace | ||
|
|
||
| issues: | ||
| exclude-rules: | ||
| - path: server/manifest.go | ||
| linters: | ||
| - deadcode | ||
| - varcheck | ||
| - path: server/fetcher.go | ||
| linters: | ||
| - unused | ||
| - linters: | ||
| - goconst | ||
| text: "Hit rate limit. Please try again later." | ||
hanzei marked this conversation as resolved.
Show resolved
Hide resolved
|
||
This file contains 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 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 |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| # Include custome targets and environment variables here |
This file contains 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 |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| // main handles deployment of the plugin to a development server using either the Client4 API | ||
| // or by copying the plugin bundle into a sibling mattermost-server/plugin directory. | ||
| package main | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "log" | ||
| "os" | ||
| "path/filepath" | ||
|
|
||
| "github.com/mattermost/mattermost-server/v5/model" | ||
| "github.com/mholt/archiver/v3" | ||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| func main() { | ||
| err := deploy() | ||
| if err != nil { | ||
| fmt.Printf("Failed to deploy: %s\n", err.Error()) | ||
| fmt.Println() | ||
| fmt.Println("Usage:") | ||
| fmt.Println(" deploy <plugin id> <bundle path>") | ||
| os.Exit(1) | ||
| } | ||
| } | ||
|
|
||
| // deploy handles deployment of the plugin to a development server. | ||
| func deploy() error { | ||
| if len(os.Args) < 3 { | ||
| return errors.New("invalid number of arguments") | ||
| } | ||
|
|
||
| pluginID := os.Args[1] | ||
| bundlePath := os.Args[2] | ||
|
|
||
| siteURL := os.Getenv("MM_SERVICESETTINGS_SITEURL") | ||
| adminToken := os.Getenv("MM_ADMIN_TOKEN") | ||
| adminUsername := os.Getenv("MM_ADMIN_USERNAME") | ||
| adminPassword := os.Getenv("MM_ADMIN_PASSWORD") | ||
| copyTargetDirectory, _ := filepath.Abs("../mattermost-server") | ||
|
|
||
| if siteURL != "" { | ||
| client := model.NewAPIv4Client(siteURL) | ||
|
|
||
| if adminToken != "" { | ||
| log.Printf("Authenticating using token against %s.", siteURL) | ||
| client.SetToken(adminToken) | ||
|
|
||
| return uploadPlugin(client, pluginID, bundlePath) | ||
| } | ||
|
|
||
| if adminUsername != "" && adminPassword != "" { | ||
| client := model.NewAPIv4Client(siteURL) | ||
| log.Printf("Authenticating as %s against %s.", adminUsername, siteURL) | ||
| _, resp := client.Login(adminUsername, adminPassword) | ||
| if resp.Error != nil { | ||
| return errors.Wrapf(resp.Error, "failed to login as %s", adminUsername) | ||
| } | ||
|
|
||
| return uploadPlugin(client, pluginID, bundlePath) | ||
| } | ||
| } | ||
|
|
||
| _, err := os.Stat(copyTargetDirectory) | ||
| if os.IsNotExist(err) { | ||
| return errors.New("no supported deployment method available, please install plugin manually") | ||
| } else if err != nil { | ||
| return errors.Wrapf(err, "failed to stat %s", copyTargetDirectory) | ||
| } | ||
|
|
||
| log.Printf("Installing plugin to mattermost-server found in %s.", copyTargetDirectory) | ||
| log.Print("Server restart required to load updated plugin.") | ||
| return copyPlugin(pluginID, copyTargetDirectory, bundlePath) | ||
| } | ||
|
|
||
| // uploadPlugin attempts to upload and enable a plugin via the Client4 API. | ||
| // It will fail if plugin uploads are disabled. | ||
| func uploadPlugin(client *model.Client4, pluginID, bundlePath string) error { | ||
| pluginBundle, err := os.Open(bundlePath) | ||
| if err != nil { | ||
| return errors.Wrapf(err, "failed to open %s", bundlePath) | ||
| } | ||
| defer pluginBundle.Close() | ||
|
|
||
| log.Print("Uploading plugin via API.") | ||
| _, resp := client.UploadPluginForced(pluginBundle) | ||
| if resp.Error != nil { | ||
| return errors.Wrap(resp.Error, "failed to upload plugin bundle") | ||
| } | ||
|
|
||
| log.Print("Enabling plugin.") | ||
| _, resp = client.EnablePlugin(pluginID) | ||
| if resp.Error != nil { | ||
| return errors.Wrap(resp.Error, "Failed to enable plugin") | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| // copyPlugin attempts to install a plugin by copying it to a sibling ../mattermost-server/plugin | ||
| // directory. A server restart is required before the plugin will start. | ||
| func copyPlugin(pluginID, targetPath, bundlePath string) error { | ||
| targetPath = filepath.Join(targetPath, "plugins") | ||
|
|
||
| err := os.MkdirAll(targetPath, 0777) | ||
| if err != nil { | ||
| return errors.Wrapf(err, "failed to create %s", targetPath) | ||
| } | ||
|
|
||
| existingPluginPath := filepath.Join(targetPath, pluginID) | ||
| err = os.RemoveAll(existingPluginPath) | ||
| if err != nil { | ||
| return errors.Wrapf(err, "failed to remove existing existing plugin directory %s", existingPluginPath) | ||
| } | ||
|
|
||
| err = archiver.Unarchive(bundlePath, targetPath) | ||
| if err != nil { | ||
| return errors.Wrapf(err, "failed to unarchive %s into %s", bundlePath, targetPath) | ||
| } | ||
|
|
||
| return nil | ||
| } |
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.
You can just remove
fetchOrgMemberinstead. It's not used.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.
Okay I'll fix these, thanks
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.
Ended up making the github rate limit check a separate function to be shared. I see some other areas with some duplication as well and will look at trying to clean some of that up.
From an organization standpoint where should I put
githubErrorHandle()?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.
A new file
github.gowould be a good place.