From 1122ae46e0cac372ac9bed3a8f5afbdc12ffdc61 Mon Sep 17 00:00:00 2001 From: Mateusz Szostok Date: Mon, 19 Feb 2024 12:54:38 +0100 Subject: [PATCH] Bump botkube dependency --- cmd/executor/ai-face/main.go | 2 +- cmd/executor/exec/main.go | 2 +- cmd/executor/gh/main.go | 2 +- cmd/executor/thread-mate/main.go | 2 +- go.mod | 5 +---- go.sum | 4 ++-- internal/executor/doctor/executor.go | 2 +- internal/executor/flux/commands.go | 2 +- internal/executor/flux/config.go | 2 +- internal/executor/flux/diff_cmd.go | 2 +- internal/executor/flux/executor.go | 2 +- internal/executor/flux/gh_cmd.go | 2 +- internal/executor/helm/config.go | 2 +- internal/executor/helm/executor.go | 2 +- internal/executor/helm/executor_test.go | 2 +- .../executor/helm/testdata/TestExecutorHelmInstallHelp.txt | 3 +-- internal/executor/thread-mate/config.go | 2 +- internal/executor/x/config.go | 2 +- internal/executor/x/run.go | 2 +- internal/executor/x/run_test.go | 2 +- internal/source/ai-brain/config.go | 2 +- internal/source/argocd/argocd.go | 2 +- internal/source/argocd/config.go | 2 +- internal/source/github_events/config.go | 2 +- internal/source/keptn/config.go | 2 +- internal/source/prometheus/config.go | 2 +- 26 files changed, 27 insertions(+), 31 deletions(-) diff --git a/cmd/executor/ai-face/main.go b/cmd/executor/ai-face/main.go index 6158779f..ced5ec39 100644 --- a/cmd/executor/ai-face/main.go +++ b/cmd/executor/ai-face/main.go @@ -16,7 +16,7 @@ import ( "github.com/kubeshop/botkube/pkg/config" "github.com/kubeshop/botkube/pkg/httpx" "github.com/kubeshop/botkube/pkg/loggerx" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) var ( diff --git a/cmd/executor/exec/main.go b/cmd/executor/exec/main.go index 22942565..95c95568 100644 --- a/cmd/executor/exec/main.go +++ b/cmd/executor/exec/main.go @@ -18,7 +18,7 @@ import ( "github.com/kubeshop/botkube/pkg/api/executor" "github.com/kubeshop/botkube/pkg/formatx" "github.com/kubeshop/botkube/pkg/loggerx" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) // version is set via ldflags by GoReleaser. diff --git a/cmd/executor/gh/main.go b/cmd/executor/gh/main.go index 9715e9a6..61821b5b 100644 --- a/cmd/executor/gh/main.go +++ b/cmd/executor/gh/main.go @@ -13,7 +13,7 @@ import ( "github.com/kubeshop/botkube/pkg/api/executor" "github.com/kubeshop/botkube/pkg/config" "github.com/kubeshop/botkube/pkg/loggerx" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) const ( diff --git a/cmd/executor/thread-mate/main.go b/cmd/executor/thread-mate/main.go index 0adc3ab5..dddc2b90 100644 --- a/cmd/executor/thread-mate/main.go +++ b/cmd/executor/thread-mate/main.go @@ -14,7 +14,7 @@ import ( thmate "github.com/kubeshop/botkube-cloud-plugins/internal/executor/thread-mate" "github.com/kubeshop/botkube/pkg/api" "github.com/kubeshop/botkube/pkg/api/executor" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) const pluginName = "thread-mate" diff --git a/go.mod b/go.mod index 9386dbba..aa0dc604 100644 --- a/go.mod +++ b/go.mod @@ -23,7 +23,7 @@ require ( github.com/hashicorp/go-plugin v1.4.10 github.com/huandu/xstrings v1.4.0 github.com/keptn/go-utils v0.20.4 - github.com/kubeshop/botkube v0.13.1-0.20240208094725-f6ec67a58bef + github.com/kubeshop/botkube v0.13.1-0.20240219113106-577e1e800cff github.com/muesli/reflow v0.3.0 github.com/olekukonko/tablewriter v0.0.5 github.com/prometheus/client_golang v1.16.0 @@ -190,6 +190,3 @@ require ( sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect ) - -// will be removed after merging: https://github.com/kubeshop/botkube/pull/1385 -replace github.com/kubeshop/botkube => github.com/mszostok/botkube v1.3.1-0.20240215091237-e7ea884691ef diff --git a/go.sum b/go.sum index 0f1dbf01..cc4dc75b 100644 --- a/go.sum +++ b/go.sum @@ -662,6 +662,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kubeshop/botkube v0.13.1-0.20240219113106-577e1e800cff h1:gBRJRfolQnK8zfl7FwCU+C/fql4DS3srBV/F2TF5prs= +github.com/kubeshop/botkube v0.13.1-0.20240219113106-577e1e800cff/go.mod h1:r/Xka9JVhEFx36XN+vDyKlD7TrMb51ucM9HGoob4vEM= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.4 h1:XlAE/cm/ms7TE/VMVoduSpNBoyc2dOxHs5MZSwAN63Q= github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4= @@ -733,8 +735,6 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/2gBQ3RWajuToeY6ZtZTIKv2v7ThUy5KKusIT0yc0= github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4= -github.com/mszostok/botkube v1.3.1-0.20240215091237-e7ea884691ef h1:6dI3qE3laar9ekwAXo9Gc4PqHvR8YFzwI6yCb8wRJsg= -github.com/mszostok/botkube v1.3.1-0.20240215091237-e7ea884691ef/go.mod h1:r/Xka9JVhEFx36XN+vDyKlD7TrMb51ucM9HGoob4vEM= github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s= github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= diff --git a/internal/executor/doctor/executor.go b/internal/executor/doctor/executor.go index 51088985..6a750281 100644 --- a/internal/executor/doctor/executor.go +++ b/internal/executor/doctor/executor.go @@ -17,7 +17,7 @@ import ( "github.com/kubeshop/botkube/pkg/api/executor" "github.com/kubeshop/botkube/pkg/config" "github.com/kubeshop/botkube/pkg/loggerx" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) const ( diff --git a/internal/executor/flux/commands.go b/internal/executor/flux/commands.go index f1249aa6..825248af 100644 --- a/internal/executor/flux/commands.go +++ b/internal/executor/flux/commands.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/kubeshop/botkube/pkg/formatx" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) // deleteConfirmPhase represent a confirmation phase for deletion. Taken from flux: v2.0.1. diff --git a/internal/executor/flux/config.go b/internal/executor/flux/config.go index 39d8d6b1..3af82f3f 100644 --- a/internal/executor/flux/config.go +++ b/internal/executor/flux/config.go @@ -2,7 +2,7 @@ package flux import ( "github.com/kubeshop/botkube/pkg/config" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) // Config holds Flux executor configuration. diff --git a/internal/executor/flux/diff_cmd.go b/internal/executor/flux/diff_cmd.go index 5abe3555..fed4a2d3 100644 --- a/internal/executor/flux/diff_cmd.go +++ b/internal/executor/flux/diff_cmd.go @@ -26,7 +26,7 @@ import ( "github.com/kubeshop/botkube/pkg/api" "github.com/kubeshop/botkube/pkg/api/executor" "github.com/kubeshop/botkube/pkg/formatx" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) const ( diff --git a/internal/executor/flux/executor.go b/internal/executor/flux/executor.go index 49bc8f1a..b2ea20b1 100644 --- a/internal/executor/flux/executor.go +++ b/internal/executor/flux/executor.go @@ -14,7 +14,7 @@ import ( "github.com/kubeshop/botkube/pkg/api" "github.com/kubeshop/botkube/pkg/api/executor" "github.com/kubeshop/botkube/pkg/loggerx" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) var ( diff --git a/internal/executor/flux/gh_cmd.go b/internal/executor/flux/gh_cmd.go index b0082b58..89485e5e 100644 --- a/internal/executor/flux/gh_cmd.go +++ b/internal/executor/flux/gh_cmd.go @@ -9,7 +9,7 @@ import ( "github.com/kubeshop/botkube/pkg/api" "github.com/kubeshop/botkube/pkg/api/executor" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) type ( diff --git a/internal/executor/helm/config.go b/internal/executor/helm/config.go index 8cb27559..a9692517 100644 --- a/internal/executor/helm/config.go +++ b/internal/executor/helm/config.go @@ -4,7 +4,7 @@ import ( "fmt" "github.com/kubeshop/botkube/pkg/api/executor" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) const defaultNamespace = "default" diff --git a/internal/executor/helm/executor.go b/internal/executor/helm/executor.go index e6e97dd9..5adb67cd 100644 --- a/internal/executor/helm/executor.go +++ b/internal/executor/helm/executor.go @@ -10,7 +10,7 @@ import ( "github.com/kubeshop/botkube/pkg/api" "github.com/kubeshop/botkube/pkg/api/executor" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) const ( diff --git a/internal/executor/helm/executor_test.go b/internal/executor/helm/executor_test.go index 03148441..8a3a0a09 100644 --- a/internal/executor/helm/executor_test.go +++ b/internal/executor/helm/executor_test.go @@ -13,7 +13,7 @@ import ( "github.com/kubeshop/botkube/pkg/api" "github.com/kubeshop/botkube/pkg/api/executor" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) const kc = "KUBECONFIG" diff --git a/internal/executor/helm/testdata/TestExecutorHelmInstallHelp.txt b/internal/executor/helm/testdata/TestExecutorHelmInstallHelp.txt index 53c580fd..b604ce09 100644 --- a/internal/executor/helm/testdata/TestExecutorHelmInstallHelp.txt +++ b/internal/executor/helm/testdata/TestExecutorHelmInstallHelp.txt @@ -3,6 +3,5 @@ "baseBody": { "codeBlock": "Installs a chart archive.\n\nThere are two different ways you to install a Helm chart:\n1. By absolute URL: helm install mynginx https://example.com/charts/nginx-1.2.3.tgz\n2. By chart reference and repo url: helm install --repo https://example.com/charts/ mynginx nginx\n\nUsage:\n helm install [NAME] [CHART] [flags]\n\nFlags:\n --create-namespace\n --generate-name,-g\n --dependency-update\n --description\n --devel\n --disable-openapi-validation\n --dry-run\n --insecure-skip-tls-verify\n --name-template\n --no-hooks\n --pass-credentials\n --password\n --post-renderer\n --post-renderer-args\n --render-subchart-notes\n --replace\n --repo\n --set\n --set-json\n --set-string\n --skip-crds\n --timeout\n --username\n --verify\n --version\n -o,--output\n" }, - "timestamp": "0001-01-01T00:00:00Z", - "parentActivityId": "" + "timestamp": "0001-01-01T00:00:00Z" } \ No newline at end of file diff --git a/internal/executor/thread-mate/config.go b/internal/executor/thread-mate/config.go index c33c02ea..a5c1e638 100644 --- a/internal/executor/thread-mate/config.go +++ b/internal/executor/thread-mate/config.go @@ -9,7 +9,7 @@ import ( "github.com/kubeshop/botkube/pkg/api/executor" "github.com/kubeshop/botkube/pkg/config" "github.com/kubeshop/botkube/pkg/multierror" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) var ( diff --git a/internal/executor/x/config.go b/internal/executor/x/config.go index fa0a2fc5..11f39dcd 100644 --- a/internal/executor/x/config.go +++ b/internal/executor/x/config.go @@ -3,7 +3,7 @@ package x import ( _ "embed" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" "github.com/kubeshop/botkube-cloud-plugins/internal/executor/x/getter" "github.com/kubeshop/botkube/pkg/api" diff --git a/internal/executor/x/run.go b/internal/executor/x/run.go index c7264c2c..4b00edaf 100644 --- a/internal/executor/x/run.go +++ b/internal/executor/x/run.go @@ -12,7 +12,7 @@ import ( "github.com/kubeshop/botkube-cloud-plugins/internal/executor/x/template" "github.com/kubeshop/botkube/pkg/api" "github.com/kubeshop/botkube/pkg/api/executor" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) // Runner runs command and parse its output if needed. diff --git a/internal/executor/x/run_test.go b/internal/executor/x/run_test.go index 339e3300..68484a8f 100644 --- a/internal/executor/x/run_test.go +++ b/internal/executor/x/run_test.go @@ -6,7 +6,7 @@ import ( "path/filepath" "testing" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/source/ai-brain/config.go b/internal/source/ai-brain/config.go index 4e76b56e..f53e146c 100644 --- a/internal/source/ai-brain/config.go +++ b/internal/source/ai-brain/config.go @@ -5,7 +5,7 @@ import ( "github.com/kubeshop/botkube/pkg/api/source" "github.com/kubeshop/botkube/pkg/config" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) var ( diff --git a/internal/source/argocd/argocd.go b/internal/source/argocd/argocd.go index 01b72978..e975e8e6 100644 --- a/internal/source/argocd/argocd.go +++ b/internal/source/argocd/argocd.go @@ -18,7 +18,7 @@ import ( "github.com/kubeshop/botkube/pkg/config" "github.com/kubeshop/botkube/pkg/formatx" "github.com/kubeshop/botkube/pkg/loggerx" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) var _ source.Source = (*Source)(nil) diff --git a/internal/source/argocd/config.go b/internal/source/argocd/config.go index 2b2c6987..f2a238f5 100644 --- a/internal/source/argocd/config.go +++ b/internal/source/argocd/config.go @@ -7,7 +7,7 @@ import ( "github.com/kubeshop/botkube/pkg/api/source" "github.com/kubeshop/botkube/pkg/config" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) // Config contains configuration for ArgoCD source plugin. diff --git a/internal/source/github_events/config.go b/internal/source/github_events/config.go index da525ad9..a325a7d4 100644 --- a/internal/source/github_events/config.go +++ b/internal/source/github_events/config.go @@ -10,7 +10,7 @@ import ( "github.com/kubeshop/botkube-cloud-plugins/internal/source/github_events/templates" "github.com/kubeshop/botkube/pkg/api/source" "github.com/kubeshop/botkube/pkg/config" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) type ( diff --git a/internal/source/keptn/config.go b/internal/source/keptn/config.go index 39bb0f92..f8ab490d 100644 --- a/internal/source/keptn/config.go +++ b/internal/source/keptn/config.go @@ -5,7 +5,7 @@ import ( "github.com/kubeshop/botkube/pkg/api/source" "github.com/kubeshop/botkube/pkg/config" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" ) // Config prometheus configuration diff --git a/internal/source/prometheus/config.go b/internal/source/prometheus/config.go index 9c18e41f..4cbced4a 100644 --- a/internal/source/prometheus/config.go +++ b/internal/source/prometheus/config.go @@ -7,7 +7,7 @@ import ( "github.com/kubeshop/botkube/pkg/api/source" "github.com/kubeshop/botkube/pkg/config" - "github.com/kubeshop/botkube/pkg/pluginx" + pluginx "github.com/kubeshop/botkube/pkg/plugin" "github.com/kubeshop/botkube/pkg/ptr" )