From 22c93ac7b2eb154bc832b24b24a6e25728fae9e9 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 14 Aug 2025 09:01:24 +0000 Subject: [PATCH 1/5] Initial plan From 40fc3c00345a6d40ed2d3879f5033f8eb4392609 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 14 Aug 2025 09:07:46 +0000 Subject: [PATCH 2/5] Initial repository exploration and dependency setup Co-authored-by: knopers8 <14327588+knopers8@users.noreply.github.com> --- apricot/protos/apricot.pb.go | 4 +-- apricot/protos/apricot_grpc.pb.go | 2 +- coconut/protos/o2control.pb.go | 4 +-- coconut/protos/o2control_grpc.pb.go | 2 +- common/protos/common.pb.go | 4 +-- common/protos/events.pb.go | 4 +-- .../bookkeeping/protos/bkcommon.pb.go | 4 +-- .../bookkeeping/protos/environment.pb.go | 4 +-- .../bookkeeping/protos/environment_grpc.pb.go | 2 +- core/integration/bookkeeping/protos/flp.pb.go | 4 +-- .../bookkeeping/protos/flp_grpc.pb.go | 2 +- .../bookkeeping/protos/lhcFill.pb.go | 4 +-- .../bookkeeping/protos/lhcFill_grpc.pb.go | 2 +- core/integration/bookkeeping/protos/log.pb.go | 4 +-- .../bookkeeping/protos/log_grpc.pb.go | 2 +- core/integration/bookkeeping/protos/run.pb.go | 4 +-- .../bookkeeping/protos/run_grpc.pb.go | 2 +- core/integration/dcs/protos/dcs.pb.go | 4 +-- core/integration/dcs/protos/dcs_grpc.pb.go | 2 +- core/integration/ddsched/protos/ddsched.pb.go | 4 +-- .../ddsched/protos/ddsched_grpc.pb.go | 2 +- core/integration/kafka/protos/kafka.pb.go | 4 +-- core/integration/odc/protos/odc.pb.go | 4 +-- core/integration/odc/protos/odc_grpc.pb.go | 2 +- core/integration/trg/protos/ctpecs.pb.go | 4 +-- core/integration/trg/protos/ctpecs_grpc.pb.go | 2 +- core/protos/o2control.pb.go | 4 +-- core/protos/o2control_grpc.pb.go | 2 +- executor/protos/occ.pb.go | 4 +-- executor/protos/occ_grpc.pb.go | 2 +- go.mod | 7 +---- go.sum | 28 +------------------ 32 files changed, 49 insertions(+), 80 deletions(-) diff --git a/apricot/protos/apricot.pb.go b/apricot/protos/apricot.pb.go index 27a6b18f..83d68aa2 100644 --- a/apricot/protos/apricot.pb.go +++ b/apricot/protos/apricot.pb.go @@ -23,8 +23,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/apricot.proto package apricotpb diff --git a/apricot/protos/apricot_grpc.pb.go b/apricot/protos/apricot_grpc.pb.go index b9b6e1ee..cdb11983 100644 --- a/apricot/protos/apricot_grpc.pb.go +++ b/apricot/protos/apricot_grpc.pb.go @@ -24,7 +24,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v6.31.1 +// - protoc v3.21.12 // source: protos/apricot.proto package apricotpb diff --git a/coconut/protos/o2control.pb.go b/coconut/protos/o2control.pb.go index 5736c718..74c664cb 100644 --- a/coconut/protos/o2control.pb.go +++ b/coconut/protos/o2control.pb.go @@ -23,8 +23,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/o2control.proto package pb diff --git a/coconut/protos/o2control_grpc.pb.go b/coconut/protos/o2control_grpc.pb.go index 491e21d2..c4b6c116 100644 --- a/coconut/protos/o2control_grpc.pb.go +++ b/coconut/protos/o2control_grpc.pb.go @@ -24,7 +24,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v6.31.1 +// - protoc v3.21.12 // source: protos/o2control.proto package pb diff --git a/common/protos/common.pb.go b/common/protos/common.pb.go index a59816e2..70507478 100644 --- a/common/protos/common.pb.go +++ b/common/protos/common.pb.go @@ -23,8 +23,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/common.proto package pb diff --git a/common/protos/events.pb.go b/common/protos/events.pb.go index 781ab111..d19d384b 100644 --- a/common/protos/events.pb.go +++ b/common/protos/events.pb.go @@ -23,8 +23,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/events.proto package pb diff --git a/core/integration/bookkeeping/protos/bkcommon.pb.go b/core/integration/bookkeeping/protos/bkcommon.pb.go index 3dfdfec7..be965cca 100644 --- a/core/integration/bookkeeping/protos/bkcommon.pb.go +++ b/core/integration/bookkeeping/protos/bkcommon.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/bkcommon.proto package bkpb diff --git a/core/integration/bookkeeping/protos/environment.pb.go b/core/integration/bookkeeping/protos/environment.pb.go index 8a9ef373..66e515a1 100644 --- a/core/integration/bookkeeping/protos/environment.pb.go +++ b/core/integration/bookkeeping/protos/environment.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/environment.proto package bkpb diff --git a/core/integration/bookkeeping/protos/environment_grpc.pb.go b/core/integration/bookkeeping/protos/environment_grpc.pb.go index 6a5e4ac6..793d2de6 100644 --- a/core/integration/bookkeeping/protos/environment_grpc.pb.go +++ b/core/integration/bookkeeping/protos/environment_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v6.31.1 +// - protoc v3.21.12 // source: protos/environment.proto package bkpb diff --git a/core/integration/bookkeeping/protos/flp.pb.go b/core/integration/bookkeeping/protos/flp.pb.go index b2158c08..79d49be2 100644 --- a/core/integration/bookkeeping/protos/flp.pb.go +++ b/core/integration/bookkeeping/protos/flp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/flp.proto package bkpb diff --git a/core/integration/bookkeeping/protos/flp_grpc.pb.go b/core/integration/bookkeeping/protos/flp_grpc.pb.go index 9e03d15e..d04cd631 100644 --- a/core/integration/bookkeeping/protos/flp_grpc.pb.go +++ b/core/integration/bookkeeping/protos/flp_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v6.31.1 +// - protoc v3.21.12 // source: protos/flp.proto package bkpb diff --git a/core/integration/bookkeeping/protos/lhcFill.pb.go b/core/integration/bookkeeping/protos/lhcFill.pb.go index f1da1126..f7f9e9a4 100644 --- a/core/integration/bookkeeping/protos/lhcFill.pb.go +++ b/core/integration/bookkeeping/protos/lhcFill.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/lhcFill.proto package bkpb diff --git a/core/integration/bookkeeping/protos/lhcFill_grpc.pb.go b/core/integration/bookkeeping/protos/lhcFill_grpc.pb.go index 5d62f07b..6df4ef8a 100644 --- a/core/integration/bookkeeping/protos/lhcFill_grpc.pb.go +++ b/core/integration/bookkeeping/protos/lhcFill_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v6.31.1 +// - protoc v3.21.12 // source: protos/lhcFill.proto package bkpb diff --git a/core/integration/bookkeeping/protos/log.pb.go b/core/integration/bookkeeping/protos/log.pb.go index 0ca547fe..82067224 100644 --- a/core/integration/bookkeeping/protos/log.pb.go +++ b/core/integration/bookkeeping/protos/log.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/log.proto package bkpb diff --git a/core/integration/bookkeeping/protos/log_grpc.pb.go b/core/integration/bookkeeping/protos/log_grpc.pb.go index 7660e714..0e4eb75e 100644 --- a/core/integration/bookkeeping/protos/log_grpc.pb.go +++ b/core/integration/bookkeeping/protos/log_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v6.31.1 +// - protoc v3.21.12 // source: protos/log.proto package bkpb diff --git a/core/integration/bookkeeping/protos/run.pb.go b/core/integration/bookkeeping/protos/run.pb.go index c223e515..dbaf11a6 100644 --- a/core/integration/bookkeeping/protos/run.pb.go +++ b/core/integration/bookkeeping/protos/run.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/run.proto package bkpb diff --git a/core/integration/bookkeeping/protos/run_grpc.pb.go b/core/integration/bookkeeping/protos/run_grpc.pb.go index e2150795..3d9aa532 100644 --- a/core/integration/bookkeeping/protos/run_grpc.pb.go +++ b/core/integration/bookkeeping/protos/run_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v6.31.1 +// - protoc v3.21.12 // source: protos/run.proto package bkpb diff --git a/core/integration/dcs/protos/dcs.pb.go b/core/integration/dcs/protos/dcs.pb.go index 12d6a118..56cbc611 100644 --- a/core/integration/dcs/protos/dcs.pb.go +++ b/core/integration/dcs/protos/dcs.pb.go @@ -24,8 +24,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/dcs.proto package dcspb diff --git a/core/integration/dcs/protos/dcs_grpc.pb.go b/core/integration/dcs/protos/dcs_grpc.pb.go index b4dda5e3..d11d07b4 100644 --- a/core/integration/dcs/protos/dcs_grpc.pb.go +++ b/core/integration/dcs/protos/dcs_grpc.pb.go @@ -25,7 +25,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v6.31.1 +// - protoc v3.21.12 // source: protos/dcs.proto package dcspb diff --git a/core/integration/ddsched/protos/ddsched.pb.go b/core/integration/ddsched/protos/ddsched.pb.go index d2dd6e74..ebf77560 100644 --- a/core/integration/ddsched/protos/ddsched.pb.go +++ b/core/integration/ddsched/protos/ddsched.pb.go @@ -13,8 +13,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/ddsched.proto // Changelog: diff --git a/core/integration/ddsched/protos/ddsched_grpc.pb.go b/core/integration/ddsched/protos/ddsched_grpc.pb.go index 123b564b..bd664aa8 100644 --- a/core/integration/ddsched/protos/ddsched_grpc.pb.go +++ b/core/integration/ddsched/protos/ddsched_grpc.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v6.31.1 +// - protoc v3.21.12 // source: protos/ddsched.proto // Changelog: diff --git a/core/integration/kafka/protos/kafka.pb.go b/core/integration/kafka/protos/kafka.pb.go index baf618b9..73e2e2e9 100644 --- a/core/integration/kafka/protos/kafka.pb.go +++ b/core/integration/kafka/protos/kafka.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/kafka.proto package kafka diff --git a/core/integration/odc/protos/odc.pb.go b/core/integration/odc/protos/odc.pb.go index cfaf4dc5..1e44145a 100644 --- a/core/integration/odc/protos/odc.pb.go +++ b/core/integration/odc/protos/odc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/odc.proto package odc diff --git a/core/integration/odc/protos/odc_grpc.pb.go b/core/integration/odc/protos/odc_grpc.pb.go index c2355ed1..0cd4b582 100644 --- a/core/integration/odc/protos/odc_grpc.pb.go +++ b/core/integration/odc/protos/odc_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v6.31.1 +// - protoc v3.21.12 // source: protos/odc.proto package odc diff --git a/core/integration/trg/protos/ctpecs.pb.go b/core/integration/trg/protos/ctpecs.pb.go index 664af7a4..e28ea387 100644 --- a/core/integration/trg/protos/ctpecs.pb.go +++ b/core/integration/trg/protos/ctpecs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/ctpecs.proto package ctpecs diff --git a/core/integration/trg/protos/ctpecs_grpc.pb.go b/core/integration/trg/protos/ctpecs_grpc.pb.go index 1e33ddc3..4c290dc8 100644 --- a/core/integration/trg/protos/ctpecs_grpc.pb.go +++ b/core/integration/trg/protos/ctpecs_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v6.31.1 +// - protoc v3.21.12 // source: protos/ctpecs.proto package ctpecs diff --git a/core/protos/o2control.pb.go b/core/protos/o2control.pb.go index 5736c718..74c664cb 100644 --- a/core/protos/o2control.pb.go +++ b/core/protos/o2control.pb.go @@ -23,8 +23,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/o2control.proto package pb diff --git a/core/protos/o2control_grpc.pb.go b/core/protos/o2control_grpc.pb.go index 491e21d2..c4b6c116 100644 --- a/core/protos/o2control_grpc.pb.go +++ b/core/protos/o2control_grpc.pb.go @@ -24,7 +24,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v6.31.1 +// - protoc v3.21.12 // source: protos/o2control.proto package pb diff --git a/executor/protos/occ.pb.go b/executor/protos/occ.pb.go index dc11b2a9..3965414e 100644 --- a/executor/protos/occ.pb.go +++ b/executor/protos/occ.pb.go @@ -23,8 +23,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.33.0 -// protoc v6.31.1 +// protoc-gen-go v1.34.1 +// protoc v3.21.12 // source: protos/occ.proto package pb diff --git a/executor/protos/occ_grpc.pb.go b/executor/protos/occ_grpc.pb.go index 67fb65b1..3a766c7a 100644 --- a/executor/protos/occ_grpc.pb.go +++ b/executor/protos/occ_grpc.pb.go @@ -24,7 +24,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v6.31.1 +// - protoc v3.21.12 // source: protos/occ.proto package pb diff --git a/go.mod b/go.mod index 5cf831e2..a407656f 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,6 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16 replace github.com/armon/go-metrics => github.com/hashicorp/go-metrics v0.5.3 require ( - github.com/AlecAivazis/survey/v2 v2.3.7 github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver v1.5.0 // indirect github.com/Masterminds/sprig v2.22.0+incompatible // indirect @@ -58,7 +57,6 @@ require ( github.com/spf13/viper v1.18.2 github.com/teo/logrus-prefixed-formatter v0.5.3-0.20230717095749-669d57324f0a github.com/valyala/fasttemplate v1.2.2 - github.com/xeipuuv/gojsonschema v1.2.0 github.com/xlab/treeprint v1.2.0 golang.org/x/crypto v0.36.0 golang.org/x/net v0.38.0 @@ -76,6 +74,7 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/hashicorp/go-multierror v1.1.1 github.com/iancoleman/strcase v0.3.0 + github.com/influxdata/line-protocol/v2 v2.2.1 github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.34.1 github.com/swaggo/http-swagger/v2 v2.0.2 @@ -118,11 +117,9 @@ require ( github.com/huandu/xstrings v1.4.0 // indirect github.com/imdario/mergo v0.3.4 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/influxdata/line-protocol/v2 v2.2.1 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect - github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/kylelemons/godebug v1.1.0 // indirect @@ -162,8 +159,6 @@ require ( github.com/urfave/cli/v2 v2.3.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect - github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect - github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/mod v0.23.0 // indirect golang.org/x/sync v0.12.0 // indirect diff --git a/go.sum b/go.sum index e63fcbbf..c1e6d6b9 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= -github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ= -github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= @@ -15,8 +13,6 @@ github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuN github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= -github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s= -github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w= github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk= github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -49,8 +45,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI= -github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo= github.com/cyphar/filepath-securejoin v0.2.5/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -59,8 +53,6 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisbrodbeck/machineid v1.0.1 h1:geKr9qtkB876mXguW2X6TU4ZynleN6ezuMSRhl4D7AQ= github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbjJCrnectwCyxcUSI= -github.com/dmarkham/enumer v1.5.8 h1:fIF11F9l5jyD++YYvxcSH5WgHfeaSGPaN/T4kOQ4qEM= -github.com/dmarkham/enumer v1.5.8/go.mod h1:d10o8R3t/gROm2p3BXqTkMt2+HMuxEmWCXzorAruYak= github.com/dmarkham/enumer v1.5.11 h1:quorLCaEfzjJ23Pf7PB9lyyaHseh91YfTM/sAD/4Mbo= github.com/dmarkham/enumer v1.5.11/go.mod h1:yixql+kDDQRYqcuBM2n9Vlt7NoT9ixgXhaXry8vmRg8= github.com/elazarl/goproxy v1.2.1 h1:njjgvO6cRG9rIqN2ebkqy6cQz2Njkx7Fsfv/zIZqgug= @@ -195,8 +187,6 @@ github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= -github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog= -github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68= github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= @@ -206,6 +196,7 @@ github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+h github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/line-protocol-corpus v0.0.0-20210519164801-ca6fa5da0184/go.mod h1:03nmhxzZ7Xk2pdG+lmMd7mHDfeVOYFyhOgwO61qWU98= +github.com/influxdata/line-protocol-corpus v0.0.0-20210922080147-aa28ccfb8937 h1:MHJNQ+p99hFATQm6ORoLmpUCF7ovjwEFshs/NHzAbig= github.com/influxdata/line-protocol-corpus v0.0.0-20210922080147-aa28ccfb8937/go.mod h1:BKR9c0uHSmRgM/se9JhFHtTT7JTO67X23MtKMHtZcpo= github.com/influxdata/line-protocol/v2 v2.0.0-20210312151457-c52fdecb625a/go.mod h1:6+9Xt5Sq1rWx+glMgxhcg2c0DUaehK+5TDcPZ76GypY= github.com/influxdata/line-protocol/v2 v2.1.0/go.mod h1:QKw43hdUBg3GTk2iC3iyCxksNj7PX9aUSeYOYE/ceHY= @@ -224,8 +215,6 @@ github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQ github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/k0kubun/pp v3.0.1+incompatible h1:3tqvf7QgUnZ5tXO6pNAZlrvHgl6DvifjDrd9g2S9Z40= github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg= -github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= -github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= @@ -255,7 +244,6 @@ github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3v github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= -github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -276,7 +264,6 @@ github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mesos/mesos-go v0.0.11 h1:jMp9+W3zLu46g8EuP2su2Sjj7ipBh4N/g65c0kzGl/8= github.com/mesos/mesos-go v0.0.11/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4= -github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= @@ -416,7 +403,6 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= -github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= @@ -449,13 +435,6 @@ github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= -github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= -github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= -github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= -github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= -github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ= github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -479,8 +458,6 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= -golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM= golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -558,7 +535,6 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= @@ -573,8 +549,6 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= -golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY= golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From d4187a6bb6002edf40a89d4fc6c928ed5cdc34a3 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 14 Aug 2025 09:12:24 +0000 Subject: [PATCH 3/5] Fix DCS plugin to reconnect even after initialization failure - Move subscription logic into goroutine to enable continuous retry - Always start reconnection goroutine regardless of initial connection state - Plugin initialization now succeeds even if DCS gateway is unavailable - Add comprehensive test for unavailable gateway scenario - Resolves issue where plugin never attempted reconnection after init failure Co-authored-by: knopers8 <14327588+knopers8@users.noreply.github.com> --- core/integration/dcs/plugin.go | 45 ++++++++++++------- core/integration/dcs/plugin_reconnect_test.go | 44 ++++++++++++++++++ 2 files changed, 73 insertions(+), 16 deletions(-) create mode 100644 core/integration/dcs/plugin_reconnect_test.go diff --git a/core/integration/dcs/plugin.go b/core/integration/dcs/plugin.go index 9a5b253e..05b6fe74 100644 --- a/core/integration/dcs/plugin.go +++ b/core/integration/dcs/plugin.go @@ -287,12 +287,33 @@ func (p *Plugin) Init(instanceId string) error { in := &dcspb.SubscriptionRequest{ InstanceId: instanceId, } - evStream, err := p.dcsClient.Subscribe(context.Background(), in, grpc.EmptyCallOption{}) - if err != nil { - return fmt.Errorf("failed to subscribe to DCS service on %s, possible network issue or DCS gateway malfunction", viper.GetString("dcsServiceEndpoint")) - } + + // Always start the goroutine, even if initial subscription fails go func() { + var evStream dcspb.Configurator_SubscribeClient + var err error + for { + // Try to establish subscription if we don't have one + if evStream == nil { + log.WithField("endpoint", viper.GetString("dcsServiceEndpoint")). + Debug("attempting to subscribe to DCS service") + + evStream, err = p.dcsClient.Subscribe(context.Background(), in, grpc.EmptyCallOption{}) + if err != nil { + log.WithField("endpoint", viper.GetString("dcsServiceEndpoint")). + WithError(err). + Warnf("failed to subscribe to DCS service, possible network issue or DCS gateway malfunction") + time.Sleep(3 * time.Second) + continue + } else { + log.WithField("endpoint", viper.GetString("dcsServiceEndpoint")). + WithField("level", infologger.IL_Support). + Info("successfully subscribed to DCS service") + } + } + + // Process events from the stream for { if evStream == nil { break @@ -300,12 +321,14 @@ func (p *Plugin) Init(instanceId string) error { ev, streamErr := evStream.Recv() if streamErr == io.EOF { log.Info("unexpected EOF from DCS service, possible DCS gateway malfunction") + evStream = nil break } if streamErr != nil { log.WithError(streamErr). Error("stream error or bad event from DCS service, dropping stream") + evStream = nil time.Sleep(3 * time.Second) break } @@ -330,20 +353,10 @@ func (p *Plugin) Init(instanceId string) error { Debug("received DCS event") } + // If we reach here, the stream was dropped and evStream is nil + // The loop will continue and try to reestablish the subscription log.WithField("endpoint", viper.GetString("dcsServiceEndpoint")). Info("DCS stream dropped, attempting reconnect") - - evStream, err = p.dcsClient.Subscribe(context.Background(), in, grpc.EmptyCallOption{}) - if err != nil { - log.WithField("endpoint", viper.GetString("dcsServiceEndpoint")). - WithError(err). - Warnf("failed to resubscribe to DCS service, possible network issue or DCS gateway malfunction") - time.Sleep(3 * time.Second) - } else { - log.WithField("endpoint", viper.GetString("dcsServiceEndpoint")). - WithField("level", infologger.IL_Support). - Info("successfully resubscribed to DCS service") - } } }() } diff --git a/core/integration/dcs/plugin_reconnect_test.go b/core/integration/dcs/plugin_reconnect_test.go new file mode 100644 index 00000000..3ca3bcac --- /dev/null +++ b/core/integration/dcs/plugin_reconnect_test.go @@ -0,0 +1,44 @@ +package dcs + +import ( + "testing" + + "github.com/spf13/viper" +) + +// TestPluginInitWithUnavailableGateway tests that the plugin can initialize +// even if the DCS gateway is unavailable, and that it starts a reconnection +// goroutine that keeps trying to connect. +func TestPluginInitWithUnavailableGateway(t *testing.T) { + // Save original endpoint + originalEndpoint := viper.GetString("dcsServiceEndpoint") + defer viper.Set("dcsServiceEndpoint", originalEndpoint) + + // Set an unreachable endpoint + viper.Set("dcsServiceEndpoint", "localhost:99999") + + plugin := NewPlugin("localhost:99999").(*Plugin) + + // Initialize should succeed even with unavailable gateway + err := plugin.Init("test-instance") + if err != nil { + t.Fatalf("Plugin.Init() should succeed even with unavailable gateway, got error: %v", err) + } + + // Verify the plugin thinks it's initialized + if plugin.GetName() != "dcs" { + t.Errorf("Plugin should be properly initialized") + } + + // The connection state should reflect the fact that we can't connect + // but the plugin should still be functional + connState := plugin.GetConnectionState() + if connState == "READY" { + t.Errorf("Connection state should not be READY with unavailable gateway, got: %s", connState) + } + + // Clean up + if plugin.dcsClient != nil { + plugin.dcsClient.Close() + } +} \ No newline at end of file From 22d031330946138b123685c694268c3cf64890a5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 14 Aug 2025 09:29:38 +0000 Subject: [PATCH 4/5] Remove unrelated proto-generated files from DCS plugin fix PR Co-authored-by: knopers8 <14327588+knopers8@users.noreply.github.com> --- apricot/protos/apricot.pb.go | 4 +-- apricot/protos/apricot_grpc.pb.go | 2 +- coconut/protos/o2control.pb.go | 4 +-- coconut/protos/o2control_grpc.pb.go | 2 +- common/protos/common.pb.go | 4 +-- common/protos/events.pb.go | 4 +-- .../bookkeeping/protos/bkcommon.pb.go | 4 +-- .../bookkeeping/protos/environment.pb.go | 4 +-- .../bookkeeping/protos/environment_grpc.pb.go | 2 +- core/integration/bookkeeping/protos/flp.pb.go | 4 +-- .../bookkeeping/protos/flp_grpc.pb.go | 2 +- .../bookkeeping/protos/lhcFill.pb.go | 4 +-- .../bookkeeping/protos/lhcFill_grpc.pb.go | 2 +- core/integration/bookkeeping/protos/log.pb.go | 4 +-- .../bookkeeping/protos/log_grpc.pb.go | 2 +- core/integration/bookkeeping/protos/run.pb.go | 4 +-- .../bookkeeping/protos/run_grpc.pb.go | 2 +- core/integration/dcs/protos/dcs.pb.go | 4 +-- core/integration/dcs/protos/dcs_grpc.pb.go | 2 +- core/integration/ddsched/protos/ddsched.pb.go | 4 +-- .../ddsched/protos/ddsched_grpc.pb.go | 2 +- core/integration/kafka/protos/kafka.pb.go | 4 +-- core/integration/odc/protos/odc.pb.go | 4 +-- core/integration/odc/protos/odc_grpc.pb.go | 2 +- core/integration/trg/protos/ctpecs.pb.go | 4 +-- core/integration/trg/protos/ctpecs_grpc.pb.go | 2 +- core/protos/o2control.pb.go | 4 +-- core/protos/o2control_grpc.pb.go | 2 +- executor/protos/occ.pb.go | 4 +-- executor/protos/occ_grpc.pb.go | 2 +- go.mod | 7 ++++- go.sum | 28 ++++++++++++++++++- 32 files changed, 80 insertions(+), 49 deletions(-) diff --git a/apricot/protos/apricot.pb.go b/apricot/protos/apricot.pb.go index 83d68aa2..27a6b18f 100644 --- a/apricot/protos/apricot.pb.go +++ b/apricot/protos/apricot.pb.go @@ -23,8 +23,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/apricot.proto package apricotpb diff --git a/apricot/protos/apricot_grpc.pb.go b/apricot/protos/apricot_grpc.pb.go index cdb11983..b9b6e1ee 100644 --- a/apricot/protos/apricot_grpc.pb.go +++ b/apricot/protos/apricot_grpc.pb.go @@ -24,7 +24,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v3.21.12 +// - protoc v6.31.1 // source: protos/apricot.proto package apricotpb diff --git a/coconut/protos/o2control.pb.go b/coconut/protos/o2control.pb.go index 74c664cb..5736c718 100644 --- a/coconut/protos/o2control.pb.go +++ b/coconut/protos/o2control.pb.go @@ -23,8 +23,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/o2control.proto package pb diff --git a/coconut/protos/o2control_grpc.pb.go b/coconut/protos/o2control_grpc.pb.go index c4b6c116..491e21d2 100644 --- a/coconut/protos/o2control_grpc.pb.go +++ b/coconut/protos/o2control_grpc.pb.go @@ -24,7 +24,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v3.21.12 +// - protoc v6.31.1 // source: protos/o2control.proto package pb diff --git a/common/protos/common.pb.go b/common/protos/common.pb.go index 70507478..a59816e2 100644 --- a/common/protos/common.pb.go +++ b/common/protos/common.pb.go @@ -23,8 +23,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/common.proto package pb diff --git a/common/protos/events.pb.go b/common/protos/events.pb.go index d19d384b..781ab111 100644 --- a/common/protos/events.pb.go +++ b/common/protos/events.pb.go @@ -23,8 +23,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/events.proto package pb diff --git a/core/integration/bookkeeping/protos/bkcommon.pb.go b/core/integration/bookkeeping/protos/bkcommon.pb.go index be965cca..3dfdfec7 100644 --- a/core/integration/bookkeeping/protos/bkcommon.pb.go +++ b/core/integration/bookkeeping/protos/bkcommon.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/bkcommon.proto package bkpb diff --git a/core/integration/bookkeeping/protos/environment.pb.go b/core/integration/bookkeeping/protos/environment.pb.go index 66e515a1..8a9ef373 100644 --- a/core/integration/bookkeeping/protos/environment.pb.go +++ b/core/integration/bookkeeping/protos/environment.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/environment.proto package bkpb diff --git a/core/integration/bookkeeping/protos/environment_grpc.pb.go b/core/integration/bookkeeping/protos/environment_grpc.pb.go index 793d2de6..6a5e4ac6 100644 --- a/core/integration/bookkeeping/protos/environment_grpc.pb.go +++ b/core/integration/bookkeeping/protos/environment_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v3.21.12 +// - protoc v6.31.1 // source: protos/environment.proto package bkpb diff --git a/core/integration/bookkeeping/protos/flp.pb.go b/core/integration/bookkeeping/protos/flp.pb.go index 79d49be2..b2158c08 100644 --- a/core/integration/bookkeeping/protos/flp.pb.go +++ b/core/integration/bookkeeping/protos/flp.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/flp.proto package bkpb diff --git a/core/integration/bookkeeping/protos/flp_grpc.pb.go b/core/integration/bookkeeping/protos/flp_grpc.pb.go index d04cd631..9e03d15e 100644 --- a/core/integration/bookkeeping/protos/flp_grpc.pb.go +++ b/core/integration/bookkeeping/protos/flp_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v3.21.12 +// - protoc v6.31.1 // source: protos/flp.proto package bkpb diff --git a/core/integration/bookkeeping/protos/lhcFill.pb.go b/core/integration/bookkeeping/protos/lhcFill.pb.go index f7f9e9a4..f1da1126 100644 --- a/core/integration/bookkeeping/protos/lhcFill.pb.go +++ b/core/integration/bookkeeping/protos/lhcFill.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/lhcFill.proto package bkpb diff --git a/core/integration/bookkeeping/protos/lhcFill_grpc.pb.go b/core/integration/bookkeeping/protos/lhcFill_grpc.pb.go index 6df4ef8a..5d62f07b 100644 --- a/core/integration/bookkeeping/protos/lhcFill_grpc.pb.go +++ b/core/integration/bookkeeping/protos/lhcFill_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v3.21.12 +// - protoc v6.31.1 // source: protos/lhcFill.proto package bkpb diff --git a/core/integration/bookkeeping/protos/log.pb.go b/core/integration/bookkeeping/protos/log.pb.go index 82067224..0ca547fe 100644 --- a/core/integration/bookkeeping/protos/log.pb.go +++ b/core/integration/bookkeeping/protos/log.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/log.proto package bkpb diff --git a/core/integration/bookkeeping/protos/log_grpc.pb.go b/core/integration/bookkeeping/protos/log_grpc.pb.go index 0e4eb75e..7660e714 100644 --- a/core/integration/bookkeeping/protos/log_grpc.pb.go +++ b/core/integration/bookkeeping/protos/log_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v3.21.12 +// - protoc v6.31.1 // source: protos/log.proto package bkpb diff --git a/core/integration/bookkeeping/protos/run.pb.go b/core/integration/bookkeeping/protos/run.pb.go index dbaf11a6..c223e515 100644 --- a/core/integration/bookkeeping/protos/run.pb.go +++ b/core/integration/bookkeeping/protos/run.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/run.proto package bkpb diff --git a/core/integration/bookkeeping/protos/run_grpc.pb.go b/core/integration/bookkeeping/protos/run_grpc.pb.go index 3d9aa532..e2150795 100644 --- a/core/integration/bookkeeping/protos/run_grpc.pb.go +++ b/core/integration/bookkeeping/protos/run_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v3.21.12 +// - protoc v6.31.1 // source: protos/run.proto package bkpb diff --git a/core/integration/dcs/protos/dcs.pb.go b/core/integration/dcs/protos/dcs.pb.go index 56cbc611..12d6a118 100644 --- a/core/integration/dcs/protos/dcs.pb.go +++ b/core/integration/dcs/protos/dcs.pb.go @@ -24,8 +24,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/dcs.proto package dcspb diff --git a/core/integration/dcs/protos/dcs_grpc.pb.go b/core/integration/dcs/protos/dcs_grpc.pb.go index d11d07b4..b4dda5e3 100644 --- a/core/integration/dcs/protos/dcs_grpc.pb.go +++ b/core/integration/dcs/protos/dcs_grpc.pb.go @@ -25,7 +25,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v3.21.12 +// - protoc v6.31.1 // source: protos/dcs.proto package dcspb diff --git a/core/integration/ddsched/protos/ddsched.pb.go b/core/integration/ddsched/protos/ddsched.pb.go index ebf77560..d2dd6e74 100644 --- a/core/integration/ddsched/protos/ddsched.pb.go +++ b/core/integration/ddsched/protos/ddsched.pb.go @@ -13,8 +13,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/ddsched.proto // Changelog: diff --git a/core/integration/ddsched/protos/ddsched_grpc.pb.go b/core/integration/ddsched/protos/ddsched_grpc.pb.go index bd664aa8..123b564b 100644 --- a/core/integration/ddsched/protos/ddsched_grpc.pb.go +++ b/core/integration/ddsched/protos/ddsched_grpc.pb.go @@ -14,7 +14,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v3.21.12 +// - protoc v6.31.1 // source: protos/ddsched.proto // Changelog: diff --git a/core/integration/kafka/protos/kafka.pb.go b/core/integration/kafka/protos/kafka.pb.go index 73e2e2e9..baf618b9 100644 --- a/core/integration/kafka/protos/kafka.pb.go +++ b/core/integration/kafka/protos/kafka.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/kafka.proto package kafka diff --git a/core/integration/odc/protos/odc.pb.go b/core/integration/odc/protos/odc.pb.go index 1e44145a..cfaf4dc5 100644 --- a/core/integration/odc/protos/odc.pb.go +++ b/core/integration/odc/protos/odc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/odc.proto package odc diff --git a/core/integration/odc/protos/odc_grpc.pb.go b/core/integration/odc/protos/odc_grpc.pb.go index 0cd4b582..c2355ed1 100644 --- a/core/integration/odc/protos/odc_grpc.pb.go +++ b/core/integration/odc/protos/odc_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v3.21.12 +// - protoc v6.31.1 // source: protos/odc.proto package odc diff --git a/core/integration/trg/protos/ctpecs.pb.go b/core/integration/trg/protos/ctpecs.pb.go index e28ea387..664af7a4 100644 --- a/core/integration/trg/protos/ctpecs.pb.go +++ b/core/integration/trg/protos/ctpecs.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/ctpecs.proto package ctpecs diff --git a/core/integration/trg/protos/ctpecs_grpc.pb.go b/core/integration/trg/protos/ctpecs_grpc.pb.go index 4c290dc8..1e33ddc3 100644 --- a/core/integration/trg/protos/ctpecs_grpc.pb.go +++ b/core/integration/trg/protos/ctpecs_grpc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v3.21.12 +// - protoc v6.31.1 // source: protos/ctpecs.proto package ctpecs diff --git a/core/protos/o2control.pb.go b/core/protos/o2control.pb.go index 74c664cb..5736c718 100644 --- a/core/protos/o2control.pb.go +++ b/core/protos/o2control.pb.go @@ -23,8 +23,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/o2control.proto package pb diff --git a/core/protos/o2control_grpc.pb.go b/core/protos/o2control_grpc.pb.go index c4b6c116..491e21d2 100644 --- a/core/protos/o2control_grpc.pb.go +++ b/core/protos/o2control_grpc.pb.go @@ -24,7 +24,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v3.21.12 +// - protoc v6.31.1 // source: protos/o2control.proto package pb diff --git a/executor/protos/occ.pb.go b/executor/protos/occ.pb.go index 3965414e..dc11b2a9 100644 --- a/executor/protos/occ.pb.go +++ b/executor/protos/occ.pb.go @@ -23,8 +23,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v3.21.12 +// protoc-gen-go v1.33.0 +// protoc v6.31.1 // source: protos/occ.proto package pb diff --git a/executor/protos/occ_grpc.pb.go b/executor/protos/occ_grpc.pb.go index 3a766c7a..67fb65b1 100644 --- a/executor/protos/occ_grpc.pb.go +++ b/executor/protos/occ_grpc.pb.go @@ -24,7 +24,7 @@ // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: // - protoc-gen-go-grpc v1.3.0 -// - protoc v3.21.12 +// - protoc v6.31.1 // source: protos/occ.proto package pb diff --git a/go.mod b/go.mod index a407656f..5cf831e2 100644 --- a/go.mod +++ b/go.mod @@ -21,6 +21,7 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16 replace github.com/armon/go-metrics => github.com/hashicorp/go-metrics v0.5.3 require ( + github.com/AlecAivazis/survey/v2 v2.3.7 github.com/Masterminds/goutils v1.1.1 // indirect github.com/Masterminds/semver v1.5.0 // indirect github.com/Masterminds/sprig v2.22.0+incompatible // indirect @@ -57,6 +58,7 @@ require ( github.com/spf13/viper v1.18.2 github.com/teo/logrus-prefixed-formatter v0.5.3-0.20230717095749-669d57324f0a github.com/valyala/fasttemplate v1.2.2 + github.com/xeipuuv/gojsonschema v1.2.0 github.com/xlab/treeprint v1.2.0 golang.org/x/crypto v0.36.0 golang.org/x/net v0.38.0 @@ -74,7 +76,6 @@ require ( github.com/gogo/protobuf v1.3.2 github.com/hashicorp/go-multierror v1.1.1 github.com/iancoleman/strcase v0.3.0 - github.com/influxdata/line-protocol/v2 v2.2.1 github.com/onsi/ginkgo/v2 v2.19.0 github.com/onsi/gomega v1.34.1 github.com/swaggo/http-swagger/v2 v2.0.2 @@ -117,9 +118,11 @@ require ( github.com/huandu/xstrings v1.4.0 // indirect github.com/imdario/mergo v0.3.4 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/influxdata/line-protocol/v2 v2.2.1 // indirect github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect + github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect github.com/kevinburke/ssh_config v1.2.0 // indirect github.com/klauspost/compress v1.17.7 // indirect github.com/kylelemons/godebug v1.1.0 // indirect @@ -159,6 +162,8 @@ require ( github.com/urfave/cli/v2 v2.3.0 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/xanzy/ssh-agent v0.3.3 // indirect + github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/mod v0.23.0 // indirect golang.org/x/sync v0.12.0 // indirect diff --git a/go.sum b/go.sum index c1e6d6b9..e63fcbbf 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s= dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk= +github.com/AlecAivazis/survey/v2 v2.3.7 h1:6I/u8FvytdGsgonrYsVn2t8t4QiRnh6QSTqkkhIiSjQ= +github.com/AlecAivazis/survey/v2 v2.3.7/go.mod h1:xUTIdE4KCOIjsBAE1JYsUPoCqYdZ1reCfTwbto0Fduo= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= @@ -13,6 +15,8 @@ github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuN github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= +github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s= +github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w= github.com/ProtonMail/go-crypto v1.1.3 h1:nRBOetoydLeUb4nHajyO2bKqMLfWQ/ZPwkXqXxPxCFk= github.com/ProtonMail/go-crypto v1.1.3/go.mod h1:rA3QumHc/FZ8pAHreoekgiAbzpNsfQAosU5td4SnOrE= github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= @@ -45,6 +49,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t github.com/cpuguy83/go-md2man/v2 v2.0.4 h1:wfIWP927BUkWJb2NmU/kNDYIBTh/ziUX91+lVfRxZq4= github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI= +github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= github.com/cyphar/filepath-securejoin v0.2.5 h1:6iR5tXJ/e6tJZzzdMc1km3Sa7RRIVBKAK32O2s7AYfo= github.com/cyphar/filepath-securejoin v0.2.5/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -53,6 +59,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/denisbrodbeck/machineid v1.0.1 h1:geKr9qtkB876mXguW2X6TU4ZynleN6ezuMSRhl4D7AQ= github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbjJCrnectwCyxcUSI= +github.com/dmarkham/enumer v1.5.8 h1:fIF11F9l5jyD++YYvxcSH5WgHfeaSGPaN/T4kOQ4qEM= +github.com/dmarkham/enumer v1.5.8/go.mod h1:d10o8R3t/gROm2p3BXqTkMt2+HMuxEmWCXzorAruYak= github.com/dmarkham/enumer v1.5.11 h1:quorLCaEfzjJ23Pf7PB9lyyaHseh91YfTM/sAD/4Mbo= github.com/dmarkham/enumer v1.5.11/go.mod h1:yixql+kDDQRYqcuBM2n9Vlt7NoT9ixgXhaXry8vmRg8= github.com/elazarl/goproxy v1.2.1 h1:njjgvO6cRG9rIqN2ebkqy6cQz2Njkx7Fsfv/zIZqgug= @@ -187,6 +195,8 @@ github.com/hashicorp/memberlist v0.5.0 h1:EtYPN8DpAURiapus508I4n9CzHs2W+8NZGbmmR github.com/hashicorp/memberlist v0.5.0/go.mod h1:yvyXLpo0QaGE59Y7hDTsTzDD25JYBZ4mHgHUZ8lrOI0= github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY= github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4= +github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec h1:qv2VnGeEQHchGaZ/u7lxST/RaJw+cv273q79D81Xbog= +github.com/hinshun/vt10x v0.0.0-20220119200601-820417d04eec/go.mod h1:Q48J4R4DvxnHolD5P8pOtXigYlRuPLGl6moFx3ulM68= github.com/huandu/xstrings v1.4.0 h1:D17IlohoQq4UcpqD7fDk80P7l+lwAmlFaBHgOipl2FU= github.com/huandu/xstrings v1.4.0/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/iancoleman/strcase v0.3.0 h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI= @@ -196,7 +206,6 @@ github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+h github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/line-protocol-corpus v0.0.0-20210519164801-ca6fa5da0184/go.mod h1:03nmhxzZ7Xk2pdG+lmMd7mHDfeVOYFyhOgwO61qWU98= -github.com/influxdata/line-protocol-corpus v0.0.0-20210922080147-aa28ccfb8937 h1:MHJNQ+p99hFATQm6ORoLmpUCF7ovjwEFshs/NHzAbig= github.com/influxdata/line-protocol-corpus v0.0.0-20210922080147-aa28ccfb8937/go.mod h1:BKR9c0uHSmRgM/se9JhFHtTT7JTO67X23MtKMHtZcpo= github.com/influxdata/line-protocol/v2 v2.0.0-20210312151457-c52fdecb625a/go.mod h1:6+9Xt5Sq1rWx+glMgxhcg2c0DUaehK+5TDcPZ76GypY= github.com/influxdata/line-protocol/v2 v2.1.0/go.mod h1:QKw43hdUBg3GTk2iC3iyCxksNj7PX9aUSeYOYE/ceHY= @@ -215,6 +224,8 @@ github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQ github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/k0kubun/pp v3.0.1+incompatible h1:3tqvf7QgUnZ5tXO6pNAZlrvHgl6DvifjDrd9g2S9Z40= github.com/k0kubun/pp v3.0.1+incompatible/go.mod h1:GWse8YhT0p8pT4ir3ZgBbfZild3tgzSScAn6HmfYukg= +github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 h1:Z9n2FFNUXsshfwJMBgNA0RU6/i7WVaAegv3PtuIHPMs= +github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51/go.mod h1:CzGEWj7cYgsdH8dAjBGEr58BoE7ScuLd+fwFZ44+/x8= github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4= github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= @@ -244,6 +255,7 @@ github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3v github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -264,6 +276,7 @@ github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/mesos/mesos-go v0.0.11 h1:jMp9+W3zLu46g8EuP2su2Sjj7ipBh4N/g65c0kzGl/8= github.com/mesos/mesos-go v0.0.11/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4= +github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= @@ -403,6 +416,7 @@ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpE github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= @@ -435,6 +449,13 @@ github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo= +github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ= github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -458,6 +479,8 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8= +golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM= golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -535,6 +558,7 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= +golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= @@ -549,6 +573,8 @@ golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roY golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= +golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg= +golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI= golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY= golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= From e2ba0d00a6c30948c0ad9f099e2997e2c8e90676 Mon Sep 17 00:00:00 2001 From: Piotr Konopka Date: Mon, 18 Aug 2025 18:14:11 +0200 Subject: [PATCH 5/5] remove test which tests almost nothing --- core/integration/dcs/plugin_reconnect_test.go | 44 ------------------- 1 file changed, 44 deletions(-) delete mode 100644 core/integration/dcs/plugin_reconnect_test.go diff --git a/core/integration/dcs/plugin_reconnect_test.go b/core/integration/dcs/plugin_reconnect_test.go deleted file mode 100644 index 3ca3bcac..00000000 --- a/core/integration/dcs/plugin_reconnect_test.go +++ /dev/null @@ -1,44 +0,0 @@ -package dcs - -import ( - "testing" - - "github.com/spf13/viper" -) - -// TestPluginInitWithUnavailableGateway tests that the plugin can initialize -// even if the DCS gateway is unavailable, and that it starts a reconnection -// goroutine that keeps trying to connect. -func TestPluginInitWithUnavailableGateway(t *testing.T) { - // Save original endpoint - originalEndpoint := viper.GetString("dcsServiceEndpoint") - defer viper.Set("dcsServiceEndpoint", originalEndpoint) - - // Set an unreachable endpoint - viper.Set("dcsServiceEndpoint", "localhost:99999") - - plugin := NewPlugin("localhost:99999").(*Plugin) - - // Initialize should succeed even with unavailable gateway - err := plugin.Init("test-instance") - if err != nil { - t.Fatalf("Plugin.Init() should succeed even with unavailable gateway, got error: %v", err) - } - - // Verify the plugin thinks it's initialized - if plugin.GetName() != "dcs" { - t.Errorf("Plugin should be properly initialized") - } - - // The connection state should reflect the fact that we can't connect - // but the plugin should still be functional - connState := plugin.GetConnectionState() - if connState == "READY" { - t.Errorf("Connection state should not be READY with unavailable gateway, got: %s", connState) - } - - // Clean up - if plugin.dcsClient != nil { - plugin.dcsClient.Close() - } -} \ No newline at end of file