valitydev/botkube
14
0
Fork 0
mirror of https://github.com/valitydev/botkube.git synced 2024-11-06 08:25:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cluster name for commands (#438)

Browse Source 
##### ISSUE TYPE
 - Bug fix Pull Request

##### SUMMARY
Checks for the cluster name for the `commands list` command if passed.

Fixes #420 

![2020-12-10-115425_1920x1080_scrot](https://user-images.githubusercontent.com/12135951/101729661-97de2180-3ade-11eb-986b-123398a89a2e.png)
This commit is contained in:
Kuntal Majumder 2020-12-13 19:41:57 +05:30 committed by GitHub
parent 5ad31edb4b
commit 24bdc7e46a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/execute/executor.go
View File

@ -80,6 +80,8 @@ const (
NotifierStartMsg = "Brace yourselves, notifications are coming from cluster '%s'."
// IncompleteCmdMsg incomplete command response message
IncompleteCmdMsg = "You missed to pass options for the command. Please run /botkubehelp to see command options."
// WrongClusterCmdMsg incomplete command response message
WrongClusterCmdMsg = "Sorry, the admin hasn't configured me to do that for the cluster '%s'."
// Custom messages for teams platform
teamsUnsupportedCmdMsg = "Command not supported. Please visit botkube.io/usage to see supported commands."
@ -386,6 +388,11 @@ func (e *DefaultExecutor) runInfoCommand(args []string, isAuthChannel bool) stri
if len(args) < 2 && args[1] != string(infoList) {
return IncompleteCmdMsg
}
if len(args) > 3 && args[2] == ClusterFlag.String() && args[3] != e.ClusterName {
return fmt.Sprintf(WrongClusterCmdMsg, args[3])
}
return makeCommandInfoList()
}

30
test/e2e/command/botkube.go
View File

@ -83,6 +83,32 @@ func (c *context) testBotkubeCommand(t *testing.T) {
" - statefulsets\n" +
" - storageclasses\n",
},
"BotKube commands list with cluster name": {
command: "commands list --cluster-name test-cluster-1",
expected: "allowed verbs:\n" +
" - api-resources\n" +
" - describe\n" +
" - diff\n" +
" - explain\n" +
" - get\n" +
" - logs\n" +
" - api-versions\n" +
" - cluster-info\n" +
" - top\n" +
" - auth\n" +
"allowed resources:\n" +
" - nodes\n" +
" - deployments\n" +
" - pods\n" +
" - namespaces\n" +
" - daemonsets\n" +
" - statefulsets\n" +
" - storageclasses\n",
},
"BotKube command list with wrong cluster name": {
command: "commands list --cluster-name test-cluster-2",
expected: "Sorry, the admin hasn't configured me to do that for the cluster 'test-cluster-2'.",
},
}
for name, test := range tests {
t.Run(name, func(t *testing.T) {
@ -103,6 +129,10 @@ func (c *context) testBotkubeCommand(t *testing.T) {
case "filters list":
fl := compareFilters(strings.Split(test.expected, "\n"), strings.Split(strings.Trim(m.Text, "```"), "\n"))
assert.Equal(t, fl, true)
case "commands list --cluster-name test-cluster-2":
fallthrough
case "commands list --cluster-name test-cluster-1":
fallthrough
case "commands list":
cl := compareFilters(strings.Split(test.expected, "\n"), strings.Split(strings.Trim(m.Text, "```"), "\n"))
assert.Equal(t, cl, true)