Managerclient as submodule

.github/cfg/integration-test-core.yaml

@@ -127,7 +127,4 @@ jobs:
         run: make pkg-integration-test PKG=./pkg/store
 
       - name: Run migrate tests
-        run: make pkg-integration-test PKG=./pkg/schema/migrate
-
-      - name: Run netwait tests
-        run: make pkg-integration-test PKG=./pkg/util/netwait
+        run: make pkg-integration-test PKG=./pkg/schema/migrate

.github/workflows/integration-tests-2023.1.9-IPV4-raftschema.yaml

@@ -99,8 +99,6 @@ jobs:
               run: make pkg-integration-test PKG=./pkg/store
             - name: Run migrate tests
               run: make pkg-integration-test PKG=./pkg/schema/migrate
-            - name: Run netwait tests
-              run: make pkg-integration-test PKG=./pkg/util/netwait
 name: integration-tests-2023.1.9-IPV4-raftschema
 "on":
     pull_request:

.github/workflows/integration-tests-2023.1.9-IPV4.yaml

@@ -99,8 +99,6 @@ jobs:
               run: make pkg-integration-test PKG=./pkg/store
             - name: Run migrate tests
               run: make pkg-integration-test PKG=./pkg/schema/migrate
-            - name: Run netwait tests
-              run: make pkg-integration-test PKG=./pkg/util/netwait
 name: integration-tests-2023.1.9-IPV4
 "on":
     pull_request:

.github/workflows/integration-tests-2023.1.9-IPV6-raftschema.yaml

@@ -99,8 +99,6 @@ jobs:
               run: make pkg-integration-test PKG=./pkg/store
             - name: Run migrate tests
               run: make pkg-integration-test PKG=./pkg/schema/migrate
-            - name: Run netwait tests
-              run: make pkg-integration-test PKG=./pkg/util/netwait
 name: integration-tests-2023.1.9-IPV6-raftschema
 "on":
     pull_request:

.github/workflows/integration-tests-2024.1.5-IPV4.yaml

@@ -99,8 +99,6 @@ jobs:
               run: make pkg-integration-test PKG=./pkg/store
             - name: Run migrate tests
               run: make pkg-integration-test PKG=./pkg/schema/migrate
-            - name: Run netwait tests
-              run: make pkg-integration-test PKG=./pkg/util/netwait
 name: integration-tests-2024.1.5-IPV4
 "on":
     pull_request:

.github/workflows/integration-tests-2024.1.5-IPV6.yaml

@@ -99,8 +99,6 @@ jobs:
               run: make pkg-integration-test PKG=./pkg/store
             - name: Run migrate tests
               run: make pkg-integration-test PKG=./pkg/schema/migrate
-            - name: Run netwait tests
-              run: make pkg-integration-test PKG=./pkg/util/netwait
 name: integration-tests-2024.1.5-IPV6
 "on":
     pull_request:

.github/workflows/integration-tests-6.0.1-IPV4-tablets.yaml

@@ -99,8 +99,6 @@ jobs:
               run: make pkg-integration-test PKG=./pkg/store
             - name: Run migrate tests
               run: make pkg-integration-test PKG=./pkg/schema/migrate
-            - name: Run netwait tests
-              run: make pkg-integration-test PKG=./pkg/util/netwait
 name: integration-tests-6.0.1-IPV4-tablets
 "on":
     pull_request:

.github/workflows/integration-tests-6.0.1-IPV4.yaml

@@ -99,8 +99,6 @@ jobs:
               run: make pkg-integration-test PKG=./pkg/store
             - name: Run migrate tests
               run: make pkg-integration-test PKG=./pkg/schema/migrate
-            - name: Run netwait tests
-              run: make pkg-integration-test PKG=./pkg/util/netwait
 name: integration-tests-6.0.1-IPV4
 "on":
     pull_request:

.github/workflows/integration-tests-6.0.1-IPV6-tablets.yaml

@@ -99,8 +99,6 @@ jobs:
               run: make pkg-integration-test PKG=./pkg/store
             - name: Run migrate tests
               run: make pkg-integration-test PKG=./pkg/schema/migrate
-            - name: Run netwait tests
-              run: make pkg-integration-test PKG=./pkg/util/netwait
 name: integration-tests-6.0.1-IPV6-tablets
 "on":
     pull_request:

.github/workflows/integration-tests-latest-enterprise-IPV4-tablets.yaml

@@ -99,8 +99,6 @@ jobs:
               run: make pkg-integration-test PKG=./pkg/store
             - name: Run migrate tests
               run: make pkg-integration-test PKG=./pkg/schema/migrate
-            - name: Run netwait tests
-              run: make pkg-integration-test PKG=./pkg/util/netwait
 name: integration-tests-latest-enterprise-IPV4-tablets
 "on":
     pull_request:

.github/workflows/integration-tests-latest-enterprise-IPV4.yaml

@@ -99,8 +99,6 @@ jobs:
               run: make pkg-integration-test PKG=./pkg/store
             - name: Run migrate tests
               run: make pkg-integration-test PKG=./pkg/schema/migrate
-            - name: Run netwait tests
-              run: make pkg-integration-test PKG=./pkg/util/netwait
 name: integration-tests-latest-enterprise-IPV4
 "on":
     pull_request:

Makefile

@@ -105,7 +105,6 @@ integration-test:
 	@$(MAKE) pkg-integration-test PKG=./pkg/service/scheduler
 	@$(MAKE) pkg-integration-test PKG=./pkg/store
 	@$(MAKE) pkg-integration-test PKG=./pkg/schema/migrate
-	@$(MAKE) pkg-integration-test PKG=./pkg/util/netwait
 
 # Load Minio config for INTEGRATION_TEST_ARGS
 include testing/.env

go.mod

@@ -1,117 +1,126 @@
 module github.com/scylladb/scylla-manager/v3
 
-go 1.21
+go 1.21.1
 
 require (
 	github.com/aws/aws-sdk-go v1.35.17
-	github.com/cenkalti/backoff/v4 v4.2.1
-	github.com/cespare/xxhash/v2 v2.2.0
-	github.com/go-chi/chi/v5 v5.0.0
+	github.com/cenkalti/backoff/v4 v4.3.0
+	github.com/cespare/xxhash/v2 v2.3.0
+	github.com/go-chi/chi/v5 v5.1.0
 	github.com/go-chi/render v1.0.0
-	github.com/go-openapi/errors v0.19.6
-	github.com/go-openapi/runtime v0.19.20
-	github.com/go-openapi/strfmt v0.19.5
-	github.com/go-openapi/swag v0.19.9
-	github.com/go-openapi/validate v0.19.10
-	github.com/gobwas/glob v0.2.3
-	github.com/gocql/gocql v1.5.2
+	github.com/go-openapi/runtime v0.28.0
+	github.com/go-openapi/strfmt v0.23.0
+	github.com/gocql/gocql v1.6.0
 	github.com/golang/mock v1.6.0
-	github.com/google/go-cmp v0.5.9
-	github.com/google/uuid v1.3.0
+	github.com/google/go-cmp v0.6.0
+	github.com/google/uuid v1.6.0
 	github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed
-	github.com/hashicorp/go-version v1.2.0
-	github.com/hbollon/go-edlib v1.5.0
-	github.com/json-iterator/go v1.1.11
-	github.com/lnquy/cron v1.1.1
-	github.com/mitchellh/mapstructure v1.3.2
+	github.com/hashicorp/go-version v1.7.0
+	github.com/json-iterator/go v1.1.12
+	github.com/mitchellh/mapstructure v1.5.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.11.1
-	github.com/prometheus/client_model v0.3.0
-	github.com/prometheus/common v0.26.0
-	github.com/prometheus/procfs v0.6.0
+	github.com/prometheus/client_golang v1.20.0
+	github.com/prometheus/client_model v0.6.1
+	github.com/prometheus/common v0.57.0
+	github.com/prometheus/procfs v0.15.1
 	github.com/rclone/rclone v1.51.0
 	github.com/robfig/cron/v3 v3.0.1
 	github.com/scylladb/go-log v0.0.7
 	github.com/scylladb/go-reflectx v1.0.1
 	github.com/scylladb/go-set v1.0.2
 	github.com/scylladb/gocqlx/v2 v2.8.0
-	github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4
+	github.com/scylladb/scylla-manager/v3/pkg/managerclient v0.0.0-20240902123022-df2d6812cdb0
+	github.com/scylladb/scylla-manager/v3/pkg/util v0.0.0-20240902115944-7914bb0d3b80
+	github.com/scylladb/scylla-manager/v3/swagger v0.0.0-20240902115944-7914bb0d3b80
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stoewer/go-strcase v1.3.0
-	go.uber.org/atomic v1.7.0
-	go.uber.org/config v1.4.0
+	go.uber.org/atomic v1.11.0
 	go.uber.org/goleak v1.1.11
-	go.uber.org/multierr v1.6.0
+	go.uber.org/multierr v1.11.0
 	go.uber.org/zap v1.21.0
-	golang.org/x/crypto v0.21.0
-	golang.org/x/mod v0.10.0
-	golang.org/x/sync v0.2.0
-	golang.org/x/sys v0.18.0
-	golang.org/x/tools v0.9.3
+	golang.org/x/crypto v0.26.0
+	golang.org/x/mod v0.20.0
+	golang.org/x/sync v0.8.0
+	golang.org/x/sys v0.24.0
 	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
-	cloud.google.com/go/compute v1.19.1 // indirect
-	cloud.google.com/go/compute/metadata v0.2.3 // indirect
+	cloud.google.com/go/compute/metadata v0.3.0 // indirect
 	github.com/Azure/azure-pipeline-go v0.2.3 // indirect
 	github.com/Azure/azure-storage-blob-go v0.13.0 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
 	github.com/Azure/go-autorest/autorest/adal v0.9.8 // indirect
 	github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
 	github.com/Azure/go-autorest/tracing v0.6.0 // indirect
-	github.com/PuerkitoBio/purell v1.1.1 // indirect
-	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/Unknwon/goconfig v0.0.0-20200908083735-df7de6a44db8 // indirect
 	github.com/aalpar/deheap v0.0.0-20200318053559-9a0c2883bd56 // indirect
 	github.com/abbot/go-http-auth v0.4.0 // indirect
-	github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
+	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
 	github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect
-	github.com/go-openapi/analysis v0.19.10 // indirect
-	github.com/go-openapi/jsonpointer v0.19.3 // indirect
-	github.com/go-openapi/jsonreference v0.19.4 // indirect
-	github.com/go-openapi/loads v0.19.5 // indirect
-	github.com/go-openapi/spec v0.19.8 // indirect
-	github.com/go-stack/stack v1.8.0 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-openapi/analysis v0.23.0 // indirect
+	github.com/go-openapi/errors v0.22.0 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/jsonreference v0.21.0 // indirect
+	github.com/go-openapi/loads v0.22.0 // indirect
+	github.com/go-openapi/spec v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/go-openapi/validate v0.24.0 // indirect
+	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/googleapis/gax-go/v2 v2.7.1 // indirect
+	github.com/hbollon/go-edlib v1.6.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/jzelinskie/whirlpool v0.0.0-20201016144138-0675e54bb004 // indirect
-	github.com/mailru/easyjson v0.7.1 // indirect
+	github.com/klauspost/compress v1.17.9 // indirect
+	github.com/lnquy/cron v1.1.1 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/mattn/go-ieproxy v0.0.1 // indirect
 	github.com/mattn/go-isatty v0.0.16 // indirect
-	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/ncw/swift v1.0.52 // indirect
+	github.com/oklog/ulid v1.3.1 // indirect
+	github.com/opentracing/opentracing-go v1.2.0 // indirect
 	github.com/rfjakob/eme v1.1.1 // indirect
+	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/scylladb/termtables v0.0.0-20191203121021-c4c0b6d42ff4 // indirect
 	github.com/sirupsen/logrus v1.7.0 // indirect
 	github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
 	github.com/smartystreets/goconvey v1.8.1 // indirect
-	go.mongodb.org/mongo-driver v1.5.1 // indirect
+	go.mongodb.org/mongo-driver v1.14.0 // indirect
 	go.opencensus.io v0.24.0 // indirect
+	go.opentelemetry.io/otel v1.24.0 // indirect
+	go.opentelemetry.io/otel/metric v1.24.0 // indirect
+	go.opentelemetry.io/otel/trace v1.24.0 // indirect
+	go.uber.org/config v1.4.0 // indirect
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
-	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/oauth2 v0.7.0 // indirect
-	golang.org/x/term v0.18.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
+	golang.org/x/net v0.28.0 // indirect
+	golang.org/x/oauth2 v0.21.0 // indirect
+	golang.org/x/term v0.23.0 // indirect
+	golang.org/x/text v0.17.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
+	golang.org/x/tools v0.24.0 // indirect
 	google.golang.org/api v0.114.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
 	google.golang.org/grpc v1.56.3 // indirect
-	google.golang.org/protobuf v1.33.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )