From 6e55d65d096e84f29591b3fef278f2df9c52fe12 Mon Sep 17 00:00:00 2001 From: Shaunak Kashyap Date: Thu, 13 Jun 2024 03:05:21 -0700 Subject: [PATCH] Repoint kardianos/service to fork elastic/kardianos-service (#4859) * Repoint kardianos/service to fork elastic/kardianos-service * Adding comment * Rename elastic/kardianos-service to elastic/go-service * Change to github.com/elastic/go-service. * Running mage fmt --------- Co-authored-by: Blake Rouse --- NOTICE.txt | 60 +++++++++---------- go.mod | 2 +- go.sum | 4 +- .../upgrade/service_update_linux.go | 2 +- internal/pkg/agent/install/install.go | 3 +- internal/pkg/agent/install/installed.go | 2 +- internal/pkg/agent/install/svc.go | 2 +- internal/pkg/agent/install/switch.go | 3 +- internal/pkg/agent/install/uninstall.go | 3 +- pkg/component/runtime/service.go | 2 +- testing/integration/upgrade_rollback_test.go | 2 +- 11 files changed, 44 insertions(+), 41 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 0422361ae75..1146edc9d4f 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -2220,6 +2220,36 @@ Contents of probable licence file $GOMODCACHE/github.com/elastic/go-licenser@v0. limitations under the License. +-------------------------------------------------------------------------------- +Dependency : github.com/elastic/go-service +Version: v0.0.0-20240611154109-f44f756f194f +Licence type (autodetected): Zlib +-------------------------------------------------------------------------------- + +Contents of probable licence file $GOMODCACHE/github.com/elastic/go-service@v0.0.0-20240611154109-f44f756f194f/LICENSE: + +Copyright (c) 2015 Daniel Theophanes + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any damages +arising from the use of this software. + +Permission is granted to anyone to use this software for any purpose, +including commercial applications, and to alter it and redistribute it +freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + + 3. This notice may not be removed or altered from any source + distribution. + + -------------------------------------------------------------------------------- Dependency : github.com/elastic/go-sysinfo Version: v1.14.0 @@ -3782,36 +3812,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --------------------------------------------------------------------------------- -Dependency : github.com/kardianos/service -Version: v1.2.1-0.20210728001519-a323c3813bc7 -Licence type (autodetected): Zlib --------------------------------------------------------------------------------- - -Contents of probable licence file $GOMODCACHE/github.com/kardianos/service@v1.2.1-0.20210728001519-a323c3813bc7/LICENSE: - -Copyright (c) 2015 Daniel Theophanes - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - - 1. The origin of this software must not be misrepresented; you must not - claim that you wrote the original software. If you use this software - in a product, an acknowledgment in the product documentation would be - appreciated but is not required. - - 2. Altered source versions must be plainly marked as such, and must not be - misrepresented as being the original software. - - 3. This notice may not be removed or altered from any source - distribution. - - -------------------------------------------------------------------------------- Dependency : github.com/magefile/mage Version: v1.15.0 diff --git a/go.mod b/go.mod index ac556b1f564..986bb0fec68 100644 --- a/go.mod +++ b/go.mod @@ -19,6 +19,7 @@ require ( github.com/elastic/elastic-transport-go/v8 v8.6.0 github.com/elastic/go-elasticsearch/v8 v8.14.0 github.com/elastic/go-licenser v0.4.1 + github.com/elastic/go-service v0.0.0-20240611154109-f44f756f194f github.com/elastic/go-sysinfo v1.14.0 github.com/elastic/go-ucfg v0.8.8 github.com/elastic/mock-es v0.0.0-20240605193845-b5546a703d6f @@ -36,7 +37,6 @@ require ( github.com/jedib0t/go-pretty/v6 v6.4.6 github.com/joeshaw/multierror v0.0.0-20140124173710-69b34d4ec901 github.com/josephspurrier/goversioninfo v0.0.0-20190209210621-63e6d1acd3dd - github.com/kardianos/service v1.2.1-0.20210728001519-a323c3813bc7 github.com/magefile/mage v1.15.0 github.com/mitchellh/gox v1.0.1 github.com/mitchellh/hashstructure v1.1.0 diff --git a/go.sum b/go.sum index 496d02c4e56..4eea8ea793a 100644 --- a/go.sum +++ b/go.sum @@ -816,6 +816,8 @@ github.com/elastic/go-elasticsearch/v8 v8.14.0/go.mod h1:WRvnlGkSuZyp83M2U8El/LG github.com/elastic/go-licenser v0.3.1/go.mod h1:D8eNQk70FOCVBl3smCGQt/lv7meBeQno2eI1S5apiHQ= github.com/elastic/go-licenser v0.4.1 h1:1xDURsc8pL5zYT9R29425J3vkHdt4RT5TNEMeRN48x4= github.com/elastic/go-licenser v0.4.1/go.mod h1:V56wHMpmdURfibNBggaSBfqgPxyT1Tldns1i87iTEvU= +github.com/elastic/go-service v0.0.0-20240611154109-f44f756f194f h1:kMtsJ3zfcBBR6wfbf5yUExmvWLru6R7zSLaJIfSjU3g= +github.com/elastic/go-service v0.0.0-20240611154109-f44f756f194f/go.mod h1:3lVNFcuNMdWJrSpGF5SMPUVuC+qOYobfPIrMQUoizrk= github.com/elastic/go-structform v0.0.10 h1:oy08o/Ih2hHTkNcRY/1HhaYvIp5z6t8si8gnCJPDo1w= github.com/elastic/go-structform v0.0.10/go.mod h1:CZWf9aIRYY5SuKSmOhtXScE5uQiLZNqAFnwKR4OrIM4= github.com/elastic/go-sysinfo v1.1.1/go.mod h1:i1ZYdU10oLNfRzq4vq62BEwD2fH8KaWh6eh0ikPT9F0= @@ -1281,8 +1283,6 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/k0kubun/go-ansi v0.0.0-20180517002512-3bf9e2903213/go.mod h1:vNUNkEQ1e29fT/6vq2aBdFsgNPmy8qMdSay1npru+Sw= -github.com/kardianos/service v1.2.1-0.20210728001519-a323c3813bc7 h1:oohm9Rk9JAxxmp2NLZa7Kebgz9h4+AJDcc64txg3dQ0= -github.com/kardianos/service v1.2.1-0.20210728001519-a323c3813bc7/go.mod h1:CIMRFEJVL+0DS1a3Nx06NaMn4Dz63Ng6O7dl0qH0zVM= github.com/karrick/godirwalk v1.15.6/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= github.com/karrick/godirwalk v1.16.1 h1:DynhcF+bztK8gooS0+NDJFrdNZjJ3gzVzC545UNA9iw= github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= diff --git a/internal/pkg/agent/application/upgrade/service_update_linux.go b/internal/pkg/agent/application/upgrade/service_update_linux.go index 618b632f93a..84e9c80292b 100644 --- a/internal/pkg/agent/application/upgrade/service_update_linux.go +++ b/internal/pkg/agent/application/upgrade/service_update_linux.go @@ -12,7 +12,7 @@ import ( "gopkg.in/ini.v1" - "github.com/kardianos/service" + "github.com/elastic/go-service" "github.com/elastic/elastic-agent/internal/pkg/agent/application/paths" ) diff --git a/internal/pkg/agent/install/install.go b/internal/pkg/agent/install/install.go index ea9e4e350dc..0a63c0d1ac9 100644 --- a/internal/pkg/agent/install/install.go +++ b/internal/pkg/agent/install/install.go @@ -13,8 +13,9 @@ import ( "strings" "time" + "github.com/elastic/go-service" + "github.com/jaypipes/ghw" - "github.com/kardianos/service" "github.com/otiai10/copy" "github.com/schollz/progressbar/v3" diff --git a/internal/pkg/agent/install/installed.go b/internal/pkg/agent/install/installed.go index c415d4e1abe..b2390d81efa 100644 --- a/internal/pkg/agent/install/installed.go +++ b/internal/pkg/agent/install/installed.go @@ -8,7 +8,7 @@ import ( "os" "path/filepath" - "github.com/kardianos/service" + "github.com/elastic/go-service" "github.com/elastic/elastic-agent/internal/pkg/agent/application/paths" "github.com/elastic/elastic-agent/internal/pkg/agent/install/pkgmgr" diff --git a/internal/pkg/agent/install/svc.go b/internal/pkg/agent/install/svc.go index 3fc599fb80a..aadc7f7c190 100644 --- a/internal/pkg/agent/install/svc.go +++ b/internal/pkg/agent/install/svc.go @@ -9,7 +9,7 @@ import ( "path/filepath" "runtime" - "github.com/kardianos/service" + "github.com/elastic/go-service" "github.com/elastic/elastic-agent/internal/pkg/agent/application/paths" ) diff --git a/internal/pkg/agent/install/switch.go b/internal/pkg/agent/install/switch.go index 8412ce28cb2..4e732645037 100644 --- a/internal/pkg/agent/install/switch.go +++ b/internal/pkg/agent/install/switch.go @@ -7,9 +7,10 @@ package install import ( "fmt" - "github.com/kardianos/service" "github.com/schollz/progressbar/v3" + "github.com/elastic/go-service" + "github.com/elastic/elastic-agent/internal/pkg/agent/application/paths" "github.com/elastic/elastic-agent/internal/pkg/agent/perms" "github.com/elastic/elastic-agent/pkg/utils" diff --git a/internal/pkg/agent/install/uninstall.go b/internal/pkg/agent/install/uninstall.go index 8c28eec2341..ad89880852b 100644 --- a/internal/pkg/agent/install/uninstall.go +++ b/internal/pkg/agent/install/uninstall.go @@ -15,9 +15,10 @@ import ( "strings" "time" - "github.com/kardianos/service" "github.com/schollz/progressbar/v3" + "github.com/elastic/go-service" + "github.com/elastic/elastic-agent-libs/logp" "github.com/elastic/elastic-agent/internal/pkg/agent/application/paths" "github.com/elastic/elastic-agent/internal/pkg/agent/application/secret" diff --git a/pkg/component/runtime/service.go b/pkg/component/runtime/service.go index bc683193714..54ce156728f 100644 --- a/pkg/component/runtime/service.go +++ b/pkg/component/runtime/service.go @@ -12,7 +12,7 @@ import ( "runtime" "time" - "github.com/kardianos/service" + "github.com/elastic/go-service" "github.com/elastic/elastic-agent-client/v7/pkg/client" "github.com/elastic/elastic-agent-client/v7/pkg/proto" diff --git a/testing/integration/upgrade_rollback_test.go b/testing/integration/upgrade_rollback_test.go index b27f74d0b22..1d24b05ff23 100644 --- a/testing/integration/upgrade_rollback_test.go +++ b/testing/integration/upgrade_rollback_test.go @@ -15,7 +15,7 @@ import ( "testing" "time" - "github.com/kardianos/service" + "github.com/elastic/go-service" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require"