Skip to content

Commit

Permalink
Update Help and Version output
Browse files Browse the repository at this point in the history
 - Moved license to version to improve readability of the help
 - Added version/commit/date pattern to version output
  • Loading branch information
martialblog committed Feb 27, 2023
1 parent 883a8e2 commit cc28e1a
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 28 deletions.
6 changes: 3 additions & 3 deletions check.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,11 @@ func (c *Config) Run() (rc int, output string, err error) {

// Add summary on top
output = fmt.Sprintf("%d threats found, %d not mitigated\n", total, notMitigated) + output
if (c.SiteName != "" && c.ComputerName == "") {
if c.SiteName != "" && c.ComputerName == "" {
output = fmt.Sprintf("site %s - ", c.SiteName) + output
} else if (c.ComputerName != ""){
} else if c.ComputerName != "" {
output = fmt.Sprintf("Computer %s - ", c.ComputerName) + output
}
}

// Add perfdata
output += "|"
Expand Down
20 changes: 1 addition & 19 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,7 @@ You need to provide the URL of your instance and an authentication token, which
It is recommended to create a new user with "Viewer" permissions only.
Threats will be listed until their incident state has been resolved, or with the
--ignore-in-progress flag, is no longer "unresolved". Mitigated threats appear as warning.
https://github.com/NETWAYS/check_sentinelone
Copyright (c) 2020 NETWAYS GmbH <info@netways.de>
Copyright (c) 2020 Markus Frosch <markus.frosch@netways.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see [gnu.org/licenses](https://www.gnu.org/licenses/).`
--ignore-in-progress flag, is no longer "unresolved". Mitigated threats appear as warning.`

func main() {
defer check.CatchPanic()
Expand Down
45 changes: 39 additions & 6 deletions version.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,47 @@
package main

const Version = "0.1.0"
import (
"fmt"
)

var GitCommit string
const license = `
Copyright (c) 2020 NETWAYS GmbH <info@netways.de>
Copyright (c) 2020 Markus Frosch <markus.frosch@netways.de
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see [gnu.org/licenses](https://www.gnu.org/licenses/).`

// nolint: gochecknoglobals
var (
// These get filled at build time with the proper vaules
version = "development"
commit = "HEAD"
date = "latest"
)

//goland:noinspection GoBoolExpressions
func buildVersion() string {
version := Version
if GitCommit != "" {
version += " - " + GitCommit
result := version

if commit != "" {
result = fmt.Sprintf("%s\ncommit: %s", result, commit)
}

if date != "" {
result = fmt.Sprintf("%s\ndate: %s", result, date)
}

return version
result += "\n" + license

return result
}

0 comments on commit cc28e1a

Please sign in to comment.