From b3f23f71a3634f718dbd2ea12793aeaf6ae50817 Mon Sep 17 00:00:00 2001 From: Gaius Date: Thu, 20 Jul 2023 23:17:57 +0800 Subject: [PATCH] feat: update dy7.io/api to v2 (#2558) Signed-off-by: Gaius --- client/config/dynconfig.go | 2 +- client/config/dynconfig_local.go | 2 +- client/config/dynconfig_manager.go | 2 +- client/config/dynconfig_manager_test.go | 2 +- client/config/dynconfig_test.go | 2 +- client/config/mocks/dynconfig_mock.go | 2 +- client/config/peerhost.go | 2 +- client/daemon/announcer/announcer.go | 4 ++-- client/daemon/daemon.go | 2 +- client/daemon/networktopology/network_topology.go | 4 ++-- .../networktopology/network_topology_test.go | 6 +++--- client/daemon/objectstorage/objectstorage.go | 2 +- client/daemon/peer/peertask_conductor.go | 6 +++--- client/daemon/peer/peertask_dummy.go | 4 ++-- client/daemon/peer/peertask_file.go | 4 ++-- client/daemon/peer/peertask_manager.go | 4 ++-- client/daemon/peer/peertask_manager_mock.go | 4 ++-- client/daemon/peer/peertask_manager_test.go | 10 +++++----- .../daemon/peer/peertask_piecetask_synchronizer.go | 6 +++--- .../peer/peertask_piecetask_synchronizer_test.go | 4 ++-- client/daemon/peer/peertask_reuse.go | 2 +- client/daemon/peer/peertask_reuse_test.go | 4 ++-- client/daemon/peer/peertask_seed.go | 2 +- client/daemon/peer/peertask_stream.go | 4 ++-- .../peertask_stream_backsource_partial_test.go | 10 +++++----- client/daemon/peer/peertask_stream_resume_test.go | 6 +++--- client/daemon/peer/piece_dispatcher_test.go | 2 +- client/daemon/peer/piece_downloader.go | 2 +- client/daemon/peer/piece_downloader_test.go | 2 +- client/daemon/peer/piece_manager.go | 8 ++++---- client/daemon/peer/piece_manager_mock.go | 4 ++-- client/daemon/peer/piece_manager_test.go | 4 ++-- client/daemon/peer/traffic_shaper_test.go | 10 +++++----- client/daemon/proxy/proxy.go | 4 ++-- client/daemon/proxy/proxy_manager.go | 2 +- client/daemon/rpcserver/mocks/rpcserver_mock.go | 2 +- client/daemon/rpcserver/rpcserver.go | 8 ++++---- client/daemon/rpcserver/rpcserver_test.go | 6 +++--- client/daemon/rpcserver/seeder.go | 6 +++--- client/daemon/rpcserver/seeder_test.go | 6 +++--- client/daemon/rpcserver/subscriber.go | 4 ++-- client/daemon/storage/local_storage.go | 2 +- client/daemon/storage/local_storage_subtask.go | 2 +- client/daemon/storage/local_storage_test.go | 2 +- client/daemon/storage/metadata.go | 2 +- .../daemon/storage/mocks/stroage_manager_mock.go | 2 +- client/daemon/storage/storage_manager.go | 2 +- client/daemon/transport/transport.go | 4 ++-- client/dfcache/dfcache.go | 4 ++-- client/dfget/dfget.go | 4 ++-- go.mod | 4 ++-- go.sum | 10 +++++----- internal/dferrors/error.go | 2 +- manager/middlewares/error.go | 2 +- manager/rpcserver/manager_server_v1.go | 6 +++--- manager/rpcserver/manager_server_v2.go | 6 +++--- manager/rpcserver/rpcserver.go | 2 +- manager/rpcserver/security_server_v1.go | 2 +- manager/rpcserver/security_server_v1_test.go | 2 +- manager/service/model.go | 2 +- pkg/idgen/task_id.go | 2 +- pkg/idgen/task_id_test.go | 2 +- pkg/issuer/dragonfly.go | 2 +- pkg/rpc/cdnsystem/client/client.go | 4 ++-- pkg/rpc/cdnsystem/client/mocks/client_mock.go | 4 ++-- pkg/rpc/cdnsystem/server/server.go | 2 +- pkg/rpc/dfdaemon/client/client_v1.go | 4 ++-- pkg/rpc/dfdaemon/client/client_v2.go | 4 ++-- pkg/rpc/dfdaemon/client/mocks/client_v1_mock.go | 4 ++-- pkg/rpc/dfdaemon/client/mocks/client_v2_mock.go | 4 ++-- pkg/rpc/dfdaemon/server/server.go | 2 +- pkg/rpc/inference/client/client_v1.go | 2 +- pkg/rpc/inference/client/mocks/client_v1_mock.go | 2 +- pkg/rpc/manager/client/client_v1.go | 4 ++-- pkg/rpc/manager/client/client_v2.go | 4 ++-- pkg/rpc/manager/client/mocks/client_v1_mock.go | 2 +- pkg/rpc/manager/client/mocks/client_v2_mock.go | 2 +- pkg/rpc/manager/server/server.go | 6 +++--- pkg/rpc/scheduler/client/client_v1.go | 4 ++-- pkg/rpc/scheduler/client/client_v2.go | 4 ++-- pkg/rpc/scheduler/client/mocks/client_v1_mock.go | 2 +- pkg/rpc/scheduler/client/mocks/client_v2_mock.go | 4 ++-- pkg/rpc/scheduler/server/server.go | 4 ++-- pkg/rpc/security/client/client_v1.go | 2 +- pkg/rpc/security/client/mocks/client_v1_mock.go | 2 +- pkg/rpc/trainer/client/client_v1.go | 2 +- pkg/rpc/trainer/client/mocks/client_v1_mock.go | 2 +- pkg/rpc/trainer/server/server.go | 2 +- .../clients/orasprotocol/oras_source_client.go | 2 +- pkg/source/source_client_builder.go | 2 +- pkg/types/types.go | 4 ++-- scheduler/announcer/announcer.go | 4 ++-- scheduler/announcer/announcer_test.go | 6 +++--- scheduler/config/dynconfig.go | 2 +- scheduler/config/dynconfig_test.go | 4 ++-- scheduler/config/mocks/dynconfig_mock.go | 2 +- scheduler/job/job.go | 4 ++-- scheduler/resource/host_manager_test.go | 2 +- scheduler/resource/host_test.go | 2 +- scheduler/resource/peer.go | 8 ++++---- scheduler/resource/peer_manager_test.go | 2 +- scheduler/resource/peer_test.go | 12 ++++++------ scheduler/resource/piece.go | 2 +- scheduler/resource/resource_test.go | 2 +- scheduler/resource/seed_peer.go | 8 ++++---- scheduler/resource/seed_peer_client.go | 2 +- scheduler/resource/seed_peer_client_mock.go | 4 ++-- scheduler/resource/seed_peer_client_test.go | 2 +- scheduler/resource/seed_peer_mock.go | 2 +- scheduler/resource/seed_peer_test.go | 4 ++-- scheduler/resource/task.go | 6 +++--- scheduler/resource/task_manager_test.go | 2 +- scheduler/resource/task_test.go | 12 ++++++------ scheduler/rpcserver/scheduler_server_v1.go | 4 ++-- scheduler/rpcserver/scheduler_server_v2.go | 4 ++-- .../scheduling/evaluator/evaluator_base_test.go | 2 +- scheduler/scheduling/scheduling.go | 8 ++++---- scheduler/scheduling/scheduling_test.go | 12 ++++++------ scheduler/service/service_v1.go | 8 ++++---- scheduler/service/service_v1_test.go | 14 +++++++------- scheduler/service/service_v2.go | 4 ++-- scheduler/service/service_v2_test.go | 8 ++++---- test/e2e/manager/preheat.go | 2 +- test/tools/download-grpc-test/main.go | 4 ++-- trainer/rpcserver/trainer_server_v1.go | 2 +- trainer/service/service_v1.go | 2 +- trainer/service/service_v1_test.go | 4 ++-- 127 files changed, 249 insertions(+), 249 deletions(-) diff --git a/client/config/dynconfig.go b/client/config/dynconfig.go index b71278050..8c5356fb1 100644 --- a/client/config/dynconfig.go +++ b/client/config/dynconfig.go @@ -25,7 +25,7 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/resolver" - managerv1 "d7y.io/api/pkg/apis/manager/v1" + managerv1 "d7y.io/api/v2/pkg/apis/manager/v1" managerclient "d7y.io/dragonfly/v2/pkg/rpc/manager/client" ) diff --git a/client/config/dynconfig_local.go b/client/config/dynconfig_local.go index 6f2ab0cfc..b8ca73840 100644 --- a/client/config/dynconfig_local.go +++ b/client/config/dynconfig_local.go @@ -29,7 +29,7 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/resolver" - managerv1 "d7y.io/api/pkg/apis/manager/v1" + managerv1 "d7y.io/api/v2/pkg/apis/manager/v1" logger "d7y.io/dragonfly/v2/internal/dflog" healthclient "d7y.io/dragonfly/v2/pkg/rpc/health/client" diff --git a/client/config/dynconfig_manager.go b/client/config/dynconfig_manager.go index 41e91271a..4812d6b7a 100644 --- a/client/config/dynconfig_manager.go +++ b/client/config/dynconfig_manager.go @@ -31,7 +31,7 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/resolver" - managerv1 "d7y.io/api/pkg/apis/manager/v1" + managerv1 "d7y.io/api/v2/pkg/apis/manager/v1" logger "d7y.io/dragonfly/v2/internal/dflog" internaldynconfig "d7y.io/dragonfly/v2/internal/dynconfig" diff --git a/client/config/dynconfig_manager_test.go b/client/config/dynconfig_manager_test.go index 60742b6e8..4b3948cd0 100644 --- a/client/config/dynconfig_manager_test.go +++ b/client/config/dynconfig_manager_test.go @@ -33,7 +33,7 @@ import ( "google.golang.org/grpc/resolver" "google.golang.org/grpc/status" - managerv1 "d7y.io/api/pkg/apis/manager/v1" + managerv1 "d7y.io/api/v2/pkg/apis/manager/v1" "d7y.io/dragonfly/v2/pkg/rpc/manager/client/mocks" ) diff --git a/client/config/dynconfig_test.go b/client/config/dynconfig_test.go index d0490e3a0..e61e71246 100644 --- a/client/config/dynconfig_test.go +++ b/client/config/dynconfig_test.go @@ -28,7 +28,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - managerv1 "d7y.io/api/pkg/apis/manager/v1" + managerv1 "d7y.io/api/v2/pkg/apis/manager/v1" "d7y.io/dragonfly/v2/pkg/rpc/manager/client/mocks" ) diff --git a/client/config/mocks/dynconfig_mock.go b/client/config/mocks/dynconfig_mock.go index c0d4b3bb3..d693cf2b7 100644 --- a/client/config/mocks/dynconfig_mock.go +++ b/client/config/mocks/dynconfig_mock.go @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - manager "d7y.io/api/pkg/apis/manager/v1" + manager "d7y.io/api/v2/pkg/apis/manager/v1" config "d7y.io/dragonfly/v2/client/config" gomock "github.com/golang/mock/gomock" resolver "google.golang.org/grpc/resolver" diff --git a/client/config/peerhost.go b/client/config/peerhost.go index a72b397aa..6b69aa49d 100644 --- a/client/config/peerhost.go +++ b/client/config/peerhost.go @@ -32,7 +32,7 @@ import ( "gopkg.in/yaml.v3" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" "d7y.io/dragonfly/v2/client/util" "d7y.io/dragonfly/v2/cmd/dependency/base" diff --git a/client/daemon/announcer/announcer.go b/client/daemon/announcer/announcer.go index f69a0ec93..45a765230 100644 --- a/client/daemon/announcer/announcer.go +++ b/client/daemon/announcer/announcer.go @@ -30,8 +30,8 @@ import ( gopsutilnet "github.com/shirou/gopsutil/v3/net" "github.com/shirou/gopsutil/v3/process" - managerv1 "d7y.io/api/pkg/apis/manager/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + managerv1 "d7y.io/api/v2/pkg/apis/manager/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" logger "d7y.io/dragonfly/v2/internal/dflog" diff --git a/client/daemon/daemon.go b/client/daemon/daemon.go index e4acac391..3a61b7548 100644 --- a/client/daemon/daemon.go +++ b/client/daemon/daemon.go @@ -41,7 +41,7 @@ import ( "google.golang.org/grpc/credentials/insecure" zapadapter "logur.dev/adapter/zap" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/announcer" diff --git a/client/daemon/networktopology/network_topology.go b/client/daemon/networktopology/network_topology.go index af007d533..f7e4263d6 100644 --- a/client/daemon/networktopology/network_topology.go +++ b/client/daemon/networktopology/network_topology.go @@ -27,8 +27,8 @@ import ( "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/timestamppb" - v1 "d7y.io/api/pkg/apis/common/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + v1 "d7y.io/api/v2/pkg/apis/common/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" logger "d7y.io/dragonfly/v2/internal/dflog" diff --git a/client/daemon/networktopology/network_topology_test.go b/client/daemon/networktopology/network_topology_test.go index 127b862df..2187356ad 100644 --- a/client/daemon/networktopology/network_topology_test.go +++ b/client/daemon/networktopology/network_topology_test.go @@ -28,9 +28,9 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - v1 "d7y.io/api/pkg/apis/common/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" - schedulerv1mocks "d7y.io/api/pkg/apis/scheduler/v1/mocks" + v1 "d7y.io/api/v2/pkg/apis/common/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" + schedulerv1mocks "d7y.io/api/v2/pkg/apis/scheduler/v1/mocks" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/pkg/idgen" diff --git a/client/daemon/objectstorage/objectstorage.go b/client/daemon/objectstorage/objectstorage.go index 552f975a1..28b8b708b 100644 --- a/client/daemon/objectstorage/objectstorage.go +++ b/client/daemon/objectstorage/objectstorage.go @@ -39,7 +39,7 @@ import ( ginprometheus "github.com/mcuadros/go-gin-prometheus" "go.opentelemetry.io/contrib/instrumentation/github.com/gin-gonic/gin/otelgin" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/peer" diff --git a/client/daemon/peer/peertask_conductor.go b/client/daemon/peer/peertask_conductor.go index 93f066c1f..e53e16967 100644 --- a/client/daemon/peer/peertask_conductor.go +++ b/client/daemon/peer/peertask_conductor.go @@ -34,9 +34,9 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/grpc/status" - commonv1 "d7y.io/api/pkg/apis/common/v1" - errordetailsv1 "d7y.io/api/pkg/apis/errordetails/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + errordetailsv1 "d7y.io/api/v2/pkg/apis/errordetails/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/metrics" diff --git a/client/daemon/peer/peertask_dummy.go b/client/daemon/peer/peertask_dummy.go index e3c5006a6..7aa4a6565 100644 --- a/client/daemon/peer/peertask_dummy.go +++ b/client/daemon/peer/peertask_dummy.go @@ -21,8 +21,8 @@ import ( "google.golang.org/grpc" - commonv1 "d7y.io/api/pkg/apis/common/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/internal/dferrors" "d7y.io/dragonfly/v2/pkg/dfnet" diff --git a/client/daemon/peer/peertask_file.go b/client/daemon/peer/peertask_file.go index 311bac609..1e917db5b 100644 --- a/client/daemon/peer/peertask_file.go +++ b/client/daemon/peer/peertask_file.go @@ -23,8 +23,8 @@ import ( "go.opentelemetry.io/otel/trace" "golang.org/x/time/rate" - commonv1 "d7y.io/api/pkg/apis/common/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/metrics" diff --git a/client/daemon/peer/peertask_manager.go b/client/daemon/peer/peertask_manager.go index 0415b4537..639e39c19 100644 --- a/client/daemon/peer/peertask_manager.go +++ b/client/daemon/peer/peertask_manager.go @@ -31,8 +31,8 @@ import ( "golang.org/x/time/rate" "google.golang.org/grpc/status" - commonv1 "d7y.io/api/pkg/apis/common/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/daemon/metrics" "d7y.io/dragonfly/v2/client/daemon/storage" diff --git a/client/daemon/peer/peertask_manager_mock.go b/client/daemon/peer/peertask_manager_mock.go index 382a6bae1..c140e9dbd 100644 --- a/client/daemon/peer/peertask_manager_mock.go +++ b/client/daemon/peer/peertask_manager_mock.go @@ -9,8 +9,8 @@ import ( io "io" reflect "reflect" - v1 "d7y.io/api/pkg/apis/common/v1" - v10 "d7y.io/api/pkg/apis/scheduler/v1" + v1 "d7y.io/api/v2/pkg/apis/common/v1" + v10 "d7y.io/api/v2/pkg/apis/scheduler/v1" storage "d7y.io/dragonfly/v2/client/daemon/storage" dflog "d7y.io/dragonfly/v2/internal/dflog" gomock "github.com/golang/mock/gomock" diff --git a/client/daemon/peer/peertask_manager_test.go b/client/daemon/peer/peertask_manager_test.go index 7af5d9277..9a5ff72c7 100644 --- a/client/daemon/peer/peertask_manager_test.go +++ b/client/daemon/peer/peertask_manager_test.go @@ -44,11 +44,11 @@ import ( "google.golang.org/grpc/health" "google.golang.org/grpc/status" - commonv1 "d7y.io/api/pkg/apis/common/v1" - dfdaemonv1 "d7y.io/api/pkg/apis/dfdaemon/v1" - dfdaemonv1mocks "d7y.io/api/pkg/apis/dfdaemon/v1/mocks" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" - schedulerv1mocks "d7y.io/api/pkg/apis/scheduler/v1/mocks" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + dfdaemonv1 "d7y.io/api/v2/pkg/apis/dfdaemon/v1" + dfdaemonv1mocks "d7y.io/api/v2/pkg/apis/dfdaemon/v1/mocks" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" + schedulerv1mocks "d7y.io/api/v2/pkg/apis/scheduler/v1/mocks" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/storage" diff --git a/client/daemon/peer/peertask_piecetask_synchronizer.go b/client/daemon/peer/peertask_piecetask_synchronizer.go index 6566bd244..1ff7cfdc5 100644 --- a/client/daemon/peer/peertask_piecetask_synchronizer.go +++ b/client/daemon/peer/peertask_piecetask_synchronizer.go @@ -30,9 +30,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - commonv1 "d7y.io/api/pkg/apis/common/v1" - dfdaemonv1 "d7y.io/api/pkg/apis/dfdaemon/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + dfdaemonv1 "d7y.io/api/v2/pkg/apis/dfdaemon/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" logger "d7y.io/dragonfly/v2/internal/dflog" diff --git a/client/daemon/peer/peertask_piecetask_synchronizer_test.go b/client/daemon/peer/peertask_piecetask_synchronizer_test.go index ac6beee2a..c51d9ab67 100644 --- a/client/daemon/peer/peertask_piecetask_synchronizer_test.go +++ b/client/daemon/peer/peertask_piecetask_synchronizer_test.go @@ -25,8 +25,8 @@ import ( testifyassert "github.com/stretchr/testify/assert" "go.uber.org/atomic" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" - "d7y.io/api/pkg/apis/scheduler/v1/mocks" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" + "d7y.io/api/v2/pkg/apis/scheduler/v1/mocks" logger "d7y.io/dragonfly/v2/internal/dflog" ) diff --git a/client/daemon/peer/peertask_reuse.go b/client/daemon/peer/peertask_reuse.go index 5cb662aad..8504a829c 100644 --- a/client/daemon/peer/peertask_reuse.go +++ b/client/daemon/peer/peertask_reuse.go @@ -27,7 +27,7 @@ import ( semconv "go.opentelemetry.io/otel/semconv/v1.7.0" "go.opentelemetry.io/otel/trace" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/storage" diff --git a/client/daemon/peer/peertask_reuse_test.go b/client/daemon/peer/peertask_reuse_test.go index 828212757..478ffdc24 100644 --- a/client/daemon/peer/peertask_reuse_test.go +++ b/client/daemon/peer/peertask_reuse_test.go @@ -31,8 +31,8 @@ import ( testifyassert "github.com/stretchr/testify/assert" "google.golang.org/grpc/credentials/insecure" - commonv1 "d7y.io/api/pkg/apis/common/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/daemon/storage" "d7y.io/dragonfly/v2/client/daemon/storage/mocks" diff --git a/client/daemon/peer/peertask_seed.go b/client/daemon/peer/peertask_seed.go index d428fe400..e0e2e3af2 100644 --- a/client/daemon/peer/peertask_seed.go +++ b/client/daemon/peer/peertask_seed.go @@ -22,7 +22,7 @@ import ( "go.opentelemetry.io/otel/trace" "golang.org/x/time/rate" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/pkg/idgen" diff --git a/client/daemon/peer/peertask_stream.go b/client/daemon/peer/peertask_stream.go index 03ce75709..fc07597ac 100644 --- a/client/daemon/peer/peertask_stream.go +++ b/client/daemon/peer/peertask_stream.go @@ -25,8 +25,8 @@ import ( "go.opentelemetry.io/otel/trace" "golang.org/x/time/rate" - commonv1 "d7y.io/api/pkg/apis/common/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/metrics" diff --git a/client/daemon/peer/peertask_stream_backsource_partial_test.go b/client/daemon/peer/peertask_stream_backsource_partial_test.go index b0940419e..817f82c70 100644 --- a/client/daemon/peer/peertask_stream_backsource_partial_test.go +++ b/client/daemon/peer/peertask_stream_backsource_partial_test.go @@ -38,11 +38,11 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/health" - commonv1 "d7y.io/api/pkg/apis/common/v1" - dfdaemonv1 "d7y.io/api/pkg/apis/dfdaemon/v1" - dfdaemonv1mocks "d7y.io/api/pkg/apis/dfdaemon/v1/mocks" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" - schedulerv1mocks "d7y.io/api/pkg/apis/scheduler/v1/mocks" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + dfdaemonv1 "d7y.io/api/v2/pkg/apis/dfdaemon/v1" + dfdaemonv1mocks "d7y.io/api/v2/pkg/apis/dfdaemon/v1/mocks" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" + schedulerv1mocks "d7y.io/api/v2/pkg/apis/scheduler/v1/mocks" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/storage" diff --git a/client/daemon/peer/peertask_stream_resume_test.go b/client/daemon/peer/peertask_stream_resume_test.go index 43740b377..4d613dfc3 100644 --- a/client/daemon/peer/peertask_stream_resume_test.go +++ b/client/daemon/peer/peertask_stream_resume_test.go @@ -32,9 +32,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - commonv1 "d7y.io/api/pkg/apis/common/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" - schedulerv1mocks "d7y.io/api/pkg/apis/scheduler/v1/mocks" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" + schedulerv1mocks "d7y.io/api/v2/pkg/apis/scheduler/v1/mocks" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/storage" diff --git a/client/daemon/peer/piece_dispatcher_test.go b/client/daemon/peer/piece_dispatcher_test.go index 3ab2fc0c9..eb3471ec3 100644 --- a/client/daemon/peer/piece_dispatcher_test.go +++ b/client/daemon/peer/piece_dispatcher_test.go @@ -25,7 +25,7 @@ import ( "golang.org/x/exp/maps" "golang.org/x/exp/slices" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" logger "d7y.io/dragonfly/v2/internal/dflog" ) diff --git a/client/daemon/peer/piece_downloader.go b/client/daemon/peer/piece_downloader.go index d01b32890..e7d629ceb 100644 --- a/client/daemon/peer/piece_downloader.go +++ b/client/daemon/peer/piece_downloader.go @@ -33,7 +33,7 @@ import ( "go.opentelemetry.io/otel/propagation" "google.golang.org/grpc/status" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" "d7y.io/dragonfly/v2/client/daemon/storage" logger "d7y.io/dragonfly/v2/internal/dflog" diff --git a/client/daemon/peer/piece_downloader_test.go b/client/daemon/peer/piece_downloader_test.go index 406af1213..a470ceeda 100644 --- a/client/daemon/peer/piece_downloader_test.go +++ b/client/daemon/peer/piece_downloader_test.go @@ -34,7 +34,7 @@ import ( testifyassert "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" "d7y.io/dragonfly/v2/client/daemon/test" logger "d7y.io/dragonfly/v2/internal/dflog" diff --git a/client/daemon/peer/piece_manager.go b/client/daemon/peer/piece_manager.go index 932323bc8..48604e49e 100644 --- a/client/daemon/peer/piece_manager.go +++ b/client/daemon/peer/piece_manager.go @@ -37,10 +37,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - commonv1 "d7y.io/api/pkg/apis/common/v1" - dfdaemonv1 "d7y.io/api/pkg/apis/dfdaemon/v1" - errordetailsv1 "d7y.io/api/pkg/apis/errordetails/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + dfdaemonv1 "d7y.io/api/v2/pkg/apis/dfdaemon/v1" + errordetailsv1 "d7y.io/api/v2/pkg/apis/errordetails/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/storage" diff --git a/client/daemon/peer/piece_manager_mock.go b/client/daemon/peer/piece_manager_mock.go index 1411507fe..6aad5da6e 100644 --- a/client/daemon/peer/piece_manager_mock.go +++ b/client/daemon/peer/piece_manager_mock.go @@ -9,8 +9,8 @@ import ( io "io" reflect "reflect" - v1 "d7y.io/api/pkg/apis/dfdaemon/v1" - v10 "d7y.io/api/pkg/apis/scheduler/v1" + v1 "d7y.io/api/v2/pkg/apis/dfdaemon/v1" + v10 "d7y.io/api/v2/pkg/apis/scheduler/v1" storage "d7y.io/dragonfly/v2/client/daemon/storage" http "d7y.io/dragonfly/v2/pkg/net/http" gomock "github.com/golang/mock/gomock" diff --git a/client/daemon/peer/piece_manager_test.go b/client/daemon/peer/piece_manager_test.go index b273590a9..79cf7996e 100644 --- a/client/daemon/peer/piece_manager_test.go +++ b/client/daemon/peer/piece_manager_test.go @@ -36,8 +36,8 @@ import ( "go.uber.org/atomic" "golang.org/x/time/rate" - commonv1 "d7y.io/api/pkg/apis/common/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/storage" diff --git a/client/daemon/peer/traffic_shaper_test.go b/client/daemon/peer/traffic_shaper_test.go index 853cd1550..1c2985f66 100644 --- a/client/daemon/peer/traffic_shaper_test.go +++ b/client/daemon/peer/traffic_shaper_test.go @@ -39,11 +39,11 @@ import ( "google.golang.org/grpc/health" "google.golang.org/grpc/status" - commonv1 "d7y.io/api/pkg/apis/common/v1" - dfdaemonv1 "d7y.io/api/pkg/apis/dfdaemon/v1" - dfdaemonv1mocks "d7y.io/api/pkg/apis/dfdaemon/v1/mocks" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" - schedulerv1mocks "d7y.io/api/pkg/apis/scheduler/v1/mocks" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + dfdaemonv1 "d7y.io/api/v2/pkg/apis/dfdaemon/v1" + dfdaemonv1mocks "d7y.io/api/v2/pkg/apis/dfdaemon/v1/mocks" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" + schedulerv1mocks "d7y.io/api/v2/pkg/apis/scheduler/v1/mocks" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/storage" diff --git a/client/daemon/proxy/proxy.go b/client/daemon/proxy/proxy.go index 6e998fd49..cccf8f77c 100644 --- a/client/daemon/proxy/proxy.go +++ b/client/daemon/proxy/proxy.go @@ -39,8 +39,8 @@ import ( "go.uber.org/atomic" "golang.org/x/sync/semaphore" - commonv1 "d7y.io/api/pkg/apis/common/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/metrics" diff --git a/client/daemon/proxy/proxy_manager.go b/client/daemon/proxy/proxy_manager.go index b4242ac6e..8c7c3ca7d 100644 --- a/client/daemon/proxy/proxy_manager.go +++ b/client/daemon/proxy/proxy_manager.go @@ -32,7 +32,7 @@ import ( "github.com/spf13/viper" "gopkg.in/yaml.v3" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/peer" diff --git a/client/daemon/rpcserver/mocks/rpcserver_mock.go b/client/daemon/rpcserver/mocks/rpcserver_mock.go index dbe22eba2..59864c169 100644 --- a/client/daemon/rpcserver/mocks/rpcserver_mock.go +++ b/client/daemon/rpcserver/mocks/rpcserver_mock.go @@ -9,7 +9,7 @@ import ( reflect "reflect" time "time" - dfdaemon "d7y.io/api/pkg/apis/dfdaemon/v1" + dfdaemon "d7y.io/api/v2/pkg/apis/dfdaemon/v1" config "d7y.io/dragonfly/v2/client/config" gomock "github.com/golang/mock/gomock" ) diff --git a/client/daemon/rpcserver/rpcserver.go b/client/daemon/rpcserver/rpcserver.go index 40d0cee90..cf7122e38 100644 --- a/client/daemon/rpcserver/rpcserver.go +++ b/client/daemon/rpcserver/rpcserver.go @@ -49,10 +49,10 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" - cdnsystemv1 "d7y.io/api/pkg/apis/cdnsystem/v1" - commonv1 "d7y.io/api/pkg/apis/common/v1" - dfdaemonv1 "d7y.io/api/pkg/apis/dfdaemon/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + cdnsystemv1 "d7y.io/api/v2/pkg/apis/cdnsystem/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + dfdaemonv1 "d7y.io/api/v2/pkg/apis/dfdaemon/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/peer" diff --git a/client/daemon/rpcserver/rpcserver_test.go b/client/daemon/rpcserver/rpcserver_test.go index 3120aeb7e..5cf255398 100644 --- a/client/daemon/rpcserver/rpcserver_test.go +++ b/client/daemon/rpcserver/rpcserver_test.go @@ -32,9 +32,9 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/health" - commonv1 "d7y.io/api/pkg/apis/common/v1" - dfdaemonv1 "d7y.io/api/pkg/apis/dfdaemon/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + dfdaemonv1 "d7y.io/api/v2/pkg/apis/dfdaemon/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/daemon/peer" "d7y.io/dragonfly/v2/client/daemon/storage" diff --git a/client/daemon/rpcserver/seeder.go b/client/daemon/rpcserver/seeder.go index de736ca3c..a9d370c1b 100644 --- a/client/daemon/rpcserver/seeder.go +++ b/client/daemon/rpcserver/seeder.go @@ -25,9 +25,9 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - cdnsystemv1 "d7y.io/api/pkg/apis/cdnsystem/v1" - commonv1 "d7y.io/api/pkg/apis/common/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + cdnsystemv1 "d7y.io/api/v2/pkg/apis/cdnsystem/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/metrics" diff --git a/client/daemon/rpcserver/seeder_test.go b/client/daemon/rpcserver/seeder_test.go index cc26db97c..2fe2a5178 100644 --- a/client/daemon/rpcserver/seeder_test.go +++ b/client/daemon/rpcserver/seeder_test.go @@ -33,9 +33,9 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/health" - cdnsystemv1 "d7y.io/api/pkg/apis/cdnsystem/v1" - commonv1 "d7y.io/api/pkg/apis/common/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + cdnsystemv1 "d7y.io/api/v2/pkg/apis/cdnsystem/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/peer" diff --git a/client/daemon/rpcserver/subscriber.go b/client/daemon/rpcserver/subscriber.go index 4c76bcf7e..4028a9dd0 100644 --- a/client/daemon/rpcserver/subscriber.go +++ b/client/daemon/rpcserver/subscriber.go @@ -25,8 +25,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - commonv1 "d7y.io/api/pkg/apis/common/v1" - dfdaemonv1 "d7y.io/api/pkg/apis/dfdaemon/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + dfdaemonv1 "d7y.io/api/v2/pkg/apis/dfdaemon/v1" "d7y.io/dragonfly/v2/client/daemon/peer" "d7y.io/dragonfly/v2/internal/dferrors" diff --git a/client/daemon/storage/local_storage.go b/client/daemon/storage/local_storage.go index 0aee2efeb..e631be158 100644 --- a/client/daemon/storage/local_storage.go +++ b/client/daemon/storage/local_storage.go @@ -32,7 +32,7 @@ import ( "github.com/go-http-utils/headers" "go.uber.org/atomic" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/internal/util" diff --git a/client/daemon/storage/local_storage_subtask.go b/client/daemon/storage/local_storage_subtask.go index baf3989c3..4f7c1c0ee 100644 --- a/client/daemon/storage/local_storage_subtask.go +++ b/client/daemon/storage/local_storage_subtask.go @@ -24,7 +24,7 @@ import ( "go.uber.org/atomic" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/digest" diff --git a/client/daemon/storage/local_storage_test.go b/client/daemon/storage/local_storage_test.go index 1c50210ec..b2234364b 100644 --- a/client/daemon/storage/local_storage_test.go +++ b/client/daemon/storage/local_storage_test.go @@ -32,7 +32,7 @@ import ( testifyassert "github.com/stretchr/testify/assert" "go.uber.org/atomic" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/test" diff --git a/client/daemon/storage/metadata.go b/client/daemon/storage/metadata.go index bc0ec1046..5d8a952a1 100644 --- a/client/daemon/storage/metadata.go +++ b/client/daemon/storage/metadata.go @@ -19,7 +19,7 @@ package storage import ( "io" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" "d7y.io/dragonfly/v2/pkg/net/http" "d7y.io/dragonfly/v2/pkg/source" diff --git a/client/daemon/storage/mocks/stroage_manager_mock.go b/client/daemon/storage/mocks/stroage_manager_mock.go index cc19423bb..e17af27a4 100644 --- a/client/daemon/storage/mocks/stroage_manager_mock.go +++ b/client/daemon/storage/mocks/stroage_manager_mock.go @@ -10,7 +10,7 @@ import ( reflect "reflect" time "time" - common "d7y.io/api/pkg/apis/common/v1" + common "d7y.io/api/v2/pkg/apis/common/v1" storage "d7y.io/dragonfly/v2/client/daemon/storage" http "d7y.io/dragonfly/v2/pkg/net/http" gomock "github.com/golang/mock/gomock" diff --git a/client/daemon/storage/storage_manager.go b/client/daemon/storage/storage_manager.go index c51ae6e41..1d2e28979 100644 --- a/client/daemon/storage/storage_manager.go +++ b/client/daemon/storage/storage_manager.go @@ -40,7 +40,7 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/trace" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/gc" diff --git a/client/daemon/transport/transport.go b/client/daemon/transport/transport.go index 58684e18a..bd4233873 100644 --- a/client/daemon/transport/transport.go +++ b/client/daemon/transport/transport.go @@ -37,8 +37,8 @@ import ( "go.opentelemetry.io/otel/trace" "google.golang.org/grpc/status" - commonv1 "d7y.io/api/pkg/apis/common/v1" - errordetailsv1 "d7y.io/api/pkg/apis/errordetails/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + errordetailsv1 "d7y.io/api/v2/pkg/apis/errordetails/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/client/daemon/metrics" diff --git a/client/dfcache/dfcache.go b/client/dfcache/dfcache.go index ce2ebc44b..d1502f353 100644 --- a/client/dfcache/dfcache.go +++ b/client/dfcache/dfcache.go @@ -24,8 +24,8 @@ import ( "os" "time" - commonv1 "d7y.io/api/pkg/apis/common/v1" - dfdaemonv1 "d7y.io/api/pkg/apis/dfdaemon/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + dfdaemonv1 "d7y.io/api/v2/pkg/apis/dfdaemon/v1" "d7y.io/dragonfly/v2/client/config" "d7y.io/dragonfly/v2/internal/dferrors" diff --git a/client/dfget/dfget.go b/client/dfget/dfget.go index 4236c96ac..0ceb007a7 100644 --- a/client/dfget/dfget.go +++ b/client/dfget/dfget.go @@ -33,8 +33,8 @@ import ( "github.com/go-http-utils/headers" "github.com/schollz/progressbar/v3" - commonv1 "d7y.io/api/pkg/apis/common/v1" - dfdaemonv1 "d7y.io/api/pkg/apis/dfdaemon/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + dfdaemonv1 "d7y.io/api/v2/pkg/apis/dfdaemon/v1" "d7y.io/dragonfly/v2/client/config" logger "d7y.io/dragonfly/v2/internal/dflog" diff --git a/go.mod b/go.mod index b5fad8700..29a788c8a 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module d7y.io/dragonfly/v2 go 1.20 require ( - d7y.io/api v1.9.7 + d7y.io/api/v2 v2.0.3 github.com/MysteriousPotato/go-lockable v1.0.0 github.com/RichardKnop/machinery v1.10.6 github.com/Showmax/go-fqdn v1.0.0 @@ -79,7 +79,7 @@ require ( golang.org/x/sys v0.10.0 golang.org/x/time v0.3.0 google.golang.org/api v0.131.0 - google.golang.org/grpc v1.57.0-dev + google.golang.org/grpc v1.58.0-dev google.golang.org/protobuf v1.31.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/yaml.v3 v3.0.1 diff --git a/go.sum b/go.sum index 6cd21f76b..2b3fd22aa 100644 --- a/go.sum +++ b/go.sum @@ -50,8 +50,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= -d7y.io/api v1.9.7 h1:bHgCpAIP99dbMxn7Nv/1FRWiJXpeZXVMfaUDYKIhwFY= -d7y.io/api v1.9.7/go.mod h1:cvI0E7xUfVbl1FhdIi4vUPzbYl9sG9u7pUZykqKOGTc= +d7y.io/api/v2 v2.0.3 h1:xvLyYJJvZr/U5oX0MFsAaZEDb8/EX+ScSfXD30HhNaQ= +d7y.io/api/v2 v2.0.3/go.mod h1:lwCvFjtRVsyTKsiXfh2W0Jdv+5tQGR/vFj+TknwnusY= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U= @@ -177,7 +177,7 @@ github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= -github.com/cncf/xds/go v0.0.0-20230310173818-32f1caf87195 h1:58f1tJ1ra+zFINPlwLWvQsR9CzAKt2e+EWV2yX9oXQ4= +github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+gqO04wryn5h75LSazbRlnya1k= github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ= github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:zn76sxSg3SzpJ0PPJaLDCu+Bu0Lg3sKTORVIj19EIF8= github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI= @@ -1674,8 +1674,8 @@ google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= -google.golang.org/grpc v1.57.0-dev h1:XCvzqke2TBzQUs3a1MO1VsqVkWeAdJ/KmxHCAVtPpe8= -google.golang.org/grpc v1.57.0-dev/go.mod h1:ZPf89/axrdgRDfHqb7fa0GF5t4VUER0vWnqnPNuRP7k= +google.golang.org/grpc v1.58.0-dev h1:BggFp6joqwbgXlqFIogQr6r35o+BnzYw54An5wzoSLA= +google.golang.org/grpc v1.58.0-dev/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/internal/dferrors/error.go b/internal/dferrors/error.go index 546ecdbea..0d314116e 100644 --- a/internal/dferrors/error.go +++ b/internal/dferrors/error.go @@ -22,7 +22,7 @@ import ( "google.golang.org/grpc/status" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" ) // common and framework errors diff --git a/manager/middlewares/error.go b/manager/middlewares/error.go index 0ac17e10a..5f247f971 100644 --- a/manager/middlewares/error.go +++ b/manager/middlewares/error.go @@ -28,7 +28,7 @@ import ( "golang.org/x/crypto/bcrypt" "gorm.io/gorm" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" "d7y.io/dragonfly/v2/internal/dferrors" ) diff --git a/manager/rpcserver/manager_server_v1.go b/manager/rpcserver/manager_server_v1.go index 13f3a2409..322e8cd34 100644 --- a/manager/rpcserver/manager_server_v1.go +++ b/manager/rpcserver/manager_server_v1.go @@ -33,9 +33,9 @@ import ( "google.golang.org/protobuf/types/known/emptypb" "gorm.io/gorm" - commonv1 "d7y.io/api/pkg/apis/common/v1" - inferencev1 "d7y.io/api/pkg/apis/inference/v1" - managerv1 "d7y.io/api/pkg/apis/manager/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + inferencev1 "d7y.io/api/v2/pkg/apis/inference/v1" + managerv1 "d7y.io/api/v2/pkg/apis/manager/v1" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/manager/cache" diff --git a/manager/rpcserver/manager_server_v2.go b/manager/rpcserver/manager_server_v2.go index eded0989d..2f4084f41 100644 --- a/manager/rpcserver/manager_server_v2.go +++ b/manager/rpcserver/manager_server_v2.go @@ -33,9 +33,9 @@ import ( "google.golang.org/protobuf/types/known/emptypb" "gorm.io/gorm" - commonv2 "d7y.io/api/pkg/apis/common/v2" - inferencev1 "d7y.io/api/pkg/apis/inference/v1" - managerv2 "d7y.io/api/pkg/apis/manager/v2" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + inferencev1 "d7y.io/api/v2/pkg/apis/inference/v1" + managerv2 "d7y.io/api/v2/pkg/apis/manager/v2" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/manager/cache" diff --git a/manager/rpcserver/rpcserver.go b/manager/rpcserver/rpcserver.go index 59bcb35a5..520675529 100644 --- a/manager/rpcserver/rpcserver.go +++ b/manager/rpcserver/rpcserver.go @@ -25,7 +25,7 @@ import ( "google.golang.org/grpc" "gorm.io/gorm" - managerv1 "d7y.io/api/pkg/apis/manager/v1" + managerv1 "d7y.io/api/v2/pkg/apis/manager/v1" "d7y.io/dragonfly/v2/manager/cache" "d7y.io/dragonfly/v2/manager/config" diff --git a/manager/rpcserver/security_server_v1.go b/manager/rpcserver/security_server_v1.go index bc9537eb4..9b580c015 100644 --- a/manager/rpcserver/security_server_v1.go +++ b/manager/rpcserver/security_server_v1.go @@ -29,7 +29,7 @@ import ( "google.golang.org/grpc/peer" "google.golang.org/grpc/status" - securityv1 "d7y.io/api/pkg/apis/security/v1" + securityv1 "d7y.io/api/v2/pkg/apis/security/v1" logger "d7y.io/dragonfly/v2/internal/dflog" ) diff --git a/manager/rpcserver/security_server_v1_test.go b/manager/rpcserver/security_server_v1_test.go index 85d0cfc33..b55d84228 100644 --- a/manager/rpcserver/security_server_v1_test.go +++ b/manager/rpcserver/security_server_v1_test.go @@ -35,7 +35,7 @@ import ( "google.golang.org/grpc/peer" "google.golang.org/protobuf/types/known/durationpb" - securityv1 "d7y.io/api/pkg/apis/security/v1" + securityv1 "d7y.io/api/v2/pkg/apis/security/v1" ) func TestIssueCertificate(t *testing.T) { diff --git a/manager/service/model.go b/manager/service/model.go index c049155fc..1b6a933f2 100644 --- a/manager/service/model.go +++ b/manager/service/model.go @@ -25,7 +25,7 @@ import ( "strconv" "strings" - inferencev1 "d7y.io/api/pkg/apis/inference/v1" + inferencev1 "d7y.io/api/v2/pkg/apis/inference/v1" "d7y.io/dragonfly/v2/manager/models" "d7y.io/dragonfly/v2/manager/types" diff --git a/pkg/idgen/task_id.go b/pkg/idgen/task_id.go index 311f29a9b..7a2883270 100644 --- a/pkg/idgen/task_id.go +++ b/pkg/idgen/task_id.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" pkgdigest "d7y.io/dragonfly/v2/pkg/digest" neturl "d7y.io/dragonfly/v2/pkg/net/url" diff --git a/pkg/idgen/task_id_test.go b/pkg/idgen/task_id_test.go index 8f411608c..5f86e134d 100644 --- a/pkg/idgen/task_id_test.go +++ b/pkg/idgen/task_id_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" ) func TestTaskIDV1(t *testing.T) { diff --git a/pkg/issuer/dragonfly.go b/pkg/issuer/dragonfly.go index a66340faf..e33bb01d5 100644 --- a/pkg/issuer/dragonfly.go +++ b/pkg/issuer/dragonfly.go @@ -28,7 +28,7 @@ import ( "github.com/johanbrandhorst/certify" "google.golang.org/protobuf/types/known/durationpb" - securityv1 "d7y.io/api/pkg/apis/security/v1" + securityv1 "d7y.io/api/v2/pkg/apis/security/v1" logger "d7y.io/dragonfly/v2/internal/dflog" securityclient "d7y.io/dragonfly/v2/pkg/rpc/security/client" diff --git a/pkg/rpc/cdnsystem/client/client.go b/pkg/rpc/cdnsystem/client/client.go index 1a7deee41..5435a4c39 100644 --- a/pkg/rpc/cdnsystem/client/client.go +++ b/pkg/rpc/cdnsystem/client/client.go @@ -30,8 +30,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/balancer" - cdnsystemv1 "d7y.io/api/pkg/apis/cdnsystem/v1" - commonv1 "d7y.io/api/pkg/apis/common/v1" + cdnsystemv1 "d7y.io/api/v2/pkg/apis/cdnsystem/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" logger "d7y.io/dragonfly/v2/internal/dflog" pkgbalancer "d7y.io/dragonfly/v2/pkg/balancer" diff --git a/pkg/rpc/cdnsystem/client/mocks/client_mock.go b/pkg/rpc/cdnsystem/client/mocks/client_mock.go index e60c099fc..b527e3b9c 100644 --- a/pkg/rpc/cdnsystem/client/mocks/client_mock.go +++ b/pkg/rpc/cdnsystem/client/mocks/client_mock.go @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" - cdnsystem "d7y.io/api/pkg/apis/cdnsystem/v1" - common "d7y.io/api/pkg/apis/common/v1" + cdnsystem "d7y.io/api/v2/pkg/apis/cdnsystem/v1" + common "d7y.io/api/v2/pkg/apis/common/v1" gomock "github.com/golang/mock/gomock" grpc "google.golang.org/grpc" ) diff --git a/pkg/rpc/cdnsystem/server/server.go b/pkg/rpc/cdnsystem/server/server.go index d018664c5..2b623b465 100644 --- a/pkg/rpc/cdnsystem/server/server.go +++ b/pkg/rpc/cdnsystem/server/server.go @@ -32,7 +32,7 @@ import ( "google.golang.org/grpc/keepalive" "google.golang.org/grpc/reflection" - cdnsystemv1 "d7y.io/api/pkg/apis/cdnsystem/v1" + cdnsystemv1 "d7y.io/api/v2/pkg/apis/cdnsystem/v1" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/rpc" diff --git a/pkg/rpc/dfdaemon/client/client_v1.go b/pkg/rpc/dfdaemon/client/client_v1.go index 75388a587..67a328e85 100644 --- a/pkg/rpc/dfdaemon/client/client_v1.go +++ b/pkg/rpc/dfdaemon/client/client_v1.go @@ -31,8 +31,8 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/protobuf/types/known/emptypb" - commonv1 "d7y.io/api/pkg/apis/common/v1" - dfdaemonv1 "d7y.io/api/pkg/apis/dfdaemon/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + dfdaemonv1 "d7y.io/api/v2/pkg/apis/dfdaemon/v1" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/rpc" diff --git a/pkg/rpc/dfdaemon/client/client_v2.go b/pkg/rpc/dfdaemon/client/client_v2.go index 3cc60cc8e..7d2c6d00e 100644 --- a/pkg/rpc/dfdaemon/client/client_v2.go +++ b/pkg/rpc/dfdaemon/client/client_v2.go @@ -28,8 +28,8 @@ import ( "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" - commonv2 "d7y.io/api/pkg/apis/common/v2" - dfdaemonv2 "d7y.io/api/pkg/apis/dfdaemon/v2" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + dfdaemonv2 "d7y.io/api/v2/pkg/apis/dfdaemon/v2" logger "d7y.io/dragonfly/v2/internal/dflog" ) diff --git a/pkg/rpc/dfdaemon/client/mocks/client_v1_mock.go b/pkg/rpc/dfdaemon/client/mocks/client_v1_mock.go index 7692a0bc6..09a5fd83d 100644 --- a/pkg/rpc/dfdaemon/client/mocks/client_v1_mock.go +++ b/pkg/rpc/dfdaemon/client/mocks/client_v1_mock.go @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" - common "d7y.io/api/pkg/apis/common/v1" - dfdaemon "d7y.io/api/pkg/apis/dfdaemon/v1" + common "d7y.io/api/v2/pkg/apis/common/v1" + dfdaemon "d7y.io/api/v2/pkg/apis/dfdaemon/v1" gomock "github.com/golang/mock/gomock" grpc "google.golang.org/grpc" ) diff --git a/pkg/rpc/dfdaemon/client/mocks/client_v2_mock.go b/pkg/rpc/dfdaemon/client/mocks/client_v2_mock.go index 961ec8d82..a788a0676 100644 --- a/pkg/rpc/dfdaemon/client/mocks/client_v2_mock.go +++ b/pkg/rpc/dfdaemon/client/mocks/client_v2_mock.go @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" - common "d7y.io/api/pkg/apis/common/v2" - dfdaemon "d7y.io/api/pkg/apis/dfdaemon/v2" + common "d7y.io/api/v2/pkg/apis/common/v2" + dfdaemon "d7y.io/api/v2/pkg/apis/dfdaemon/v2" gomock "github.com/golang/mock/gomock" grpc "google.golang.org/grpc" ) diff --git a/pkg/rpc/dfdaemon/server/server.go b/pkg/rpc/dfdaemon/server/server.go index 56886bba6..771e0cb19 100644 --- a/pkg/rpc/dfdaemon/server/server.go +++ b/pkg/rpc/dfdaemon/server/server.go @@ -31,7 +31,7 @@ import ( "google.golang.org/grpc/keepalive" "google.golang.org/grpc/reflection" - dfdaemonv1 "d7y.io/api/pkg/apis/dfdaemon/v1" + dfdaemonv1 "d7y.io/api/v2/pkg/apis/dfdaemon/v1" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/rpc" diff --git a/pkg/rpc/inference/client/client_v1.go b/pkg/rpc/inference/client/client_v1.go index a331af10b..ac3008da6 100644 --- a/pkg/rpc/inference/client/client_v1.go +++ b/pkg/rpc/inference/client/client_v1.go @@ -29,7 +29,7 @@ import ( "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" - inferencev1 "d7y.io/api/pkg/apis/inference/v1" + inferencev1 "d7y.io/api/v2/pkg/apis/inference/v1" logger "d7y.io/dragonfly/v2/internal/dflog" ) diff --git a/pkg/rpc/inference/client/mocks/client_v1_mock.go b/pkg/rpc/inference/client/mocks/client_v1_mock.go index 7593833a2..be28322cb 100644 --- a/pkg/rpc/inference/client/mocks/client_v1_mock.go +++ b/pkg/rpc/inference/client/mocks/client_v1_mock.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - inference "d7y.io/api/pkg/apis/inference/v1" + inference "d7y.io/api/v2/pkg/apis/inference/v1" gomock "github.com/golang/mock/gomock" grpc "google.golang.org/grpc" ) diff --git a/pkg/rpc/manager/client/client_v1.go b/pkg/rpc/manager/client/client_v1.go index e89506150..0fdfeeb7a 100644 --- a/pkg/rpc/manager/client/client_v1.go +++ b/pkg/rpc/manager/client/client_v1.go @@ -32,8 +32,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - managerv1 "d7y.io/api/pkg/apis/manager/v1" - securityv1 "d7y.io/api/pkg/apis/security/v1" + managerv1 "d7y.io/api/v2/pkg/apis/manager/v1" + securityv1 "d7y.io/api/v2/pkg/apis/security/v1" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/dfnet" diff --git a/pkg/rpc/manager/client/client_v2.go b/pkg/rpc/manager/client/client_v2.go index 225638864..066c0813c 100644 --- a/pkg/rpc/manager/client/client_v2.go +++ b/pkg/rpc/manager/client/client_v2.go @@ -32,8 +32,8 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - managerv2 "d7y.io/api/pkg/apis/manager/v2" - securityv1 "d7y.io/api/pkg/apis/security/v1" + managerv2 "d7y.io/api/v2/pkg/apis/manager/v2" + securityv1 "d7y.io/api/v2/pkg/apis/security/v1" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/dfnet" diff --git a/pkg/rpc/manager/client/mocks/client_v1_mock.go b/pkg/rpc/manager/client/mocks/client_v1_mock.go index 0b00ffd46..3cf1a9afa 100644 --- a/pkg/rpc/manager/client/mocks/client_v1_mock.go +++ b/pkg/rpc/manager/client/mocks/client_v1_mock.go @@ -9,7 +9,7 @@ import ( reflect "reflect" time "time" - manager "d7y.io/api/pkg/apis/manager/v1" + manager "d7y.io/api/v2/pkg/apis/manager/v1" gomock "github.com/golang/mock/gomock" grpc "google.golang.org/grpc" ) diff --git a/pkg/rpc/manager/client/mocks/client_v2_mock.go b/pkg/rpc/manager/client/mocks/client_v2_mock.go index cde1c11f1..5154fca23 100644 --- a/pkg/rpc/manager/client/mocks/client_v2_mock.go +++ b/pkg/rpc/manager/client/mocks/client_v2_mock.go @@ -9,7 +9,7 @@ import ( reflect "reflect" time "time" - manager "d7y.io/api/pkg/apis/manager/v2" + manager "d7y.io/api/v2/pkg/apis/manager/v2" gomock "github.com/golang/mock/gomock" grpc "google.golang.org/grpc" ) diff --git a/pkg/rpc/manager/server/server.go b/pkg/rpc/manager/server/server.go index 584e19abf..88ba43504 100644 --- a/pkg/rpc/manager/server/server.go +++ b/pkg/rpc/manager/server/server.go @@ -32,9 +32,9 @@ import ( "google.golang.org/grpc/keepalive" "google.golang.org/grpc/reflection" - managerv1 "d7y.io/api/pkg/apis/manager/v1" - managerv2 "d7y.io/api/pkg/apis/manager/v2" - securityv1 "d7y.io/api/pkg/apis/security/v1" + managerv1 "d7y.io/api/v2/pkg/apis/manager/v1" + managerv2 "d7y.io/api/v2/pkg/apis/manager/v2" + securityv1 "d7y.io/api/v2/pkg/apis/security/v1" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/rpc" diff --git a/pkg/rpc/scheduler/client/client_v1.go b/pkg/rpc/scheduler/client/client_v1.go index e732678f3..bea284cd9 100644 --- a/pkg/rpc/scheduler/client/client_v1.go +++ b/pkg/rpc/scheduler/client/client_v1.go @@ -30,8 +30,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/balancer" - commonv1 "d7y.io/api/pkg/apis/common/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/client/config" logger "d7y.io/dragonfly/v2/internal/dflog" diff --git a/pkg/rpc/scheduler/client/client_v2.go b/pkg/rpc/scheduler/client/client_v2.go index 82a0b11e8..634635b51 100644 --- a/pkg/rpc/scheduler/client/client_v2.go +++ b/pkg/rpc/scheduler/client/client_v2.go @@ -30,8 +30,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/balancer" - commonv2 "d7y.io/api/pkg/apis/common/v2" - schedulerv2 "d7y.io/api/pkg/apis/scheduler/v2" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + schedulerv2 "d7y.io/api/v2/pkg/apis/scheduler/v2" "d7y.io/dragonfly/v2/client/config" logger "d7y.io/dragonfly/v2/internal/dflog" diff --git a/pkg/rpc/scheduler/client/mocks/client_v1_mock.go b/pkg/rpc/scheduler/client/mocks/client_v1_mock.go index 8a4e97a20..1ec27295b 100644 --- a/pkg/rpc/scheduler/client/mocks/client_v1_mock.go +++ b/pkg/rpc/scheduler/client/mocks/client_v1_mock.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - scheduler "d7y.io/api/pkg/apis/scheduler/v1" + scheduler "d7y.io/api/v2/pkg/apis/scheduler/v1" gomock "github.com/golang/mock/gomock" grpc "google.golang.org/grpc" ) diff --git a/pkg/rpc/scheduler/client/mocks/client_v2_mock.go b/pkg/rpc/scheduler/client/mocks/client_v2_mock.go index a2da2fedf..137bff569 100644 --- a/pkg/rpc/scheduler/client/mocks/client_v2_mock.go +++ b/pkg/rpc/scheduler/client/mocks/client_v2_mock.go @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" - common "d7y.io/api/pkg/apis/common/v2" - scheduler "d7y.io/api/pkg/apis/scheduler/v2" + common "d7y.io/api/v2/pkg/apis/common/v2" + scheduler "d7y.io/api/v2/pkg/apis/scheduler/v2" gomock "github.com/golang/mock/gomock" grpc "google.golang.org/grpc" ) diff --git a/pkg/rpc/scheduler/server/server.go b/pkg/rpc/scheduler/server/server.go index ae4a7b490..c3301acab 100644 --- a/pkg/rpc/scheduler/server/server.go +++ b/pkg/rpc/scheduler/server/server.go @@ -32,8 +32,8 @@ import ( "google.golang.org/grpc/keepalive" "google.golang.org/grpc/reflection" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" - schedulerv2 "d7y.io/api/pkg/apis/scheduler/v2" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" + schedulerv2 "d7y.io/api/v2/pkg/apis/scheduler/v2" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/rpc" diff --git a/pkg/rpc/security/client/client_v1.go b/pkg/rpc/security/client/client_v1.go index 6ed6de07e..2ceba0030 100644 --- a/pkg/rpc/security/client/client_v1.go +++ b/pkg/rpc/security/client/client_v1.go @@ -30,7 +30,7 @@ import ( "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" - securityv1 "d7y.io/api/pkg/apis/security/v1" + securityv1 "d7y.io/api/v2/pkg/apis/security/v1" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/dfnet" diff --git a/pkg/rpc/security/client/mocks/client_v1_mock.go b/pkg/rpc/security/client/mocks/client_v1_mock.go index 1a674bd5e..0f7f6cbca 100644 --- a/pkg/rpc/security/client/mocks/client_v1_mock.go +++ b/pkg/rpc/security/client/mocks/client_v1_mock.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - security "d7y.io/api/pkg/apis/security/v1" + security "d7y.io/api/v2/pkg/apis/security/v1" gomock "github.com/golang/mock/gomock" grpc "google.golang.org/grpc" ) diff --git a/pkg/rpc/trainer/client/client_v1.go b/pkg/rpc/trainer/client/client_v1.go index 56536f12f..562470ca8 100644 --- a/pkg/rpc/trainer/client/client_v1.go +++ b/pkg/rpc/trainer/client/client_v1.go @@ -29,7 +29,7 @@ import ( "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" - trainerv1 "d7y.io/api/pkg/apis/trainer/v1" + trainerv1 "d7y.io/api/v2/pkg/apis/trainer/v1" logger "d7y.io/dragonfly/v2/internal/dflog" ) diff --git a/pkg/rpc/trainer/client/mocks/client_v1_mock.go b/pkg/rpc/trainer/client/mocks/client_v1_mock.go index 80fbe31e0..cdf903f69 100644 --- a/pkg/rpc/trainer/client/mocks/client_v1_mock.go +++ b/pkg/rpc/trainer/client/mocks/client_v1_mock.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - trainer "d7y.io/api/pkg/apis/trainer/v1" + trainer "d7y.io/api/v2/pkg/apis/trainer/v1" gomock "github.com/golang/mock/gomock" grpc "google.golang.org/grpc" ) diff --git a/pkg/rpc/trainer/server/server.go b/pkg/rpc/trainer/server/server.go index 0be92fb3b..b0981c88c 100644 --- a/pkg/rpc/trainer/server/server.go +++ b/pkg/rpc/trainer/server/server.go @@ -32,7 +32,7 @@ import ( "google.golang.org/grpc/keepalive" "google.golang.org/grpc/reflection" - trainerv1 "d7y.io/api/pkg/apis/trainer/v1" + trainerv1 "d7y.io/api/v2/pkg/apis/trainer/v1" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/rpc" diff --git a/pkg/source/clients/orasprotocol/oras_source_client.go b/pkg/source/clients/orasprotocol/oras_source_client.go index 6ba097bfe..0f326cdaf 100644 --- a/pkg/source/clients/orasprotocol/oras_source_client.go +++ b/pkg/source/clients/orasprotocol/oras_source_client.go @@ -28,7 +28,7 @@ import ( "regexp" "strings" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/source" diff --git a/pkg/source/source_client_builder.go b/pkg/source/source_client_builder.go index 1bc99fcf5..0a86c60b0 100644 --- a/pkg/source/source_client_builder.go +++ b/pkg/source/source_client_builder.go @@ -22,7 +22,7 @@ import ( "gopkg.in/yaml.v3" - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" ) var ( diff --git a/pkg/types/types.go b/pkg/types/types.go index 91d3e200c..f6a42a4e6 100644 --- a/pkg/types/types.go +++ b/pkg/types/types.go @@ -24,8 +24,8 @@ import ( "gopkg.in/yaml.v3" - commonv1 "d7y.io/api/pkg/apis/common/v1" - commonv2 "d7y.io/api/pkg/apis/common/v2" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" ) // PEMContent supports load PEM format from file or just inline PEM format content diff --git a/scheduler/announcer/announcer.go b/scheduler/announcer/announcer.go index 3440ece55..ca4d39c9f 100644 --- a/scheduler/announcer/announcer.go +++ b/scheduler/announcer/announcer.go @@ -25,8 +25,8 @@ import ( "golang.org/x/sync/errgroup" - managerv2 "d7y.io/api/pkg/apis/manager/v2" - trainerv1 "d7y.io/api/pkg/apis/trainer/v1" + managerv2 "d7y.io/api/v2/pkg/apis/manager/v2" + trainerv1 "d7y.io/api/v2/pkg/apis/trainer/v1" logger "d7y.io/dragonfly/v2/internal/dflog" managerclient "d7y.io/dragonfly/v2/pkg/rpc/manager/client" diff --git a/scheduler/announcer/announcer_test.go b/scheduler/announcer/announcer_test.go index 4397b013c..270c4dff5 100644 --- a/scheduler/announcer/announcer_test.go +++ b/scheduler/announcer/announcer_test.go @@ -28,9 +28,9 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - managerv2 "d7y.io/api/pkg/apis/manager/v2" - trainerv1 "d7y.io/api/pkg/apis/trainer/v1" - trainerv1mocks "d7y.io/api/pkg/apis/trainer/v1/mocks" + managerv2 "d7y.io/api/v2/pkg/apis/manager/v2" + trainerv1 "d7y.io/api/v2/pkg/apis/trainer/v1" + trainerv1mocks "d7y.io/api/v2/pkg/apis/trainer/v1/mocks" managerclientmocks "d7y.io/dragonfly/v2/pkg/rpc/manager/client/mocks" trainerclientmocks "d7y.io/dragonfly/v2/pkg/rpc/trainer/client/mocks" diff --git a/scheduler/config/dynconfig.go b/scheduler/config/dynconfig.go index 4a1c9edda..6ba996b74 100644 --- a/scheduler/config/dynconfig.go +++ b/scheduler/config/dynconfig.go @@ -35,7 +35,7 @@ import ( "google.golang.org/grpc/resolver" "google.golang.org/grpc/status" - managerv2 "d7y.io/api/pkg/apis/manager/v2" + managerv2 "d7y.io/api/v2/pkg/apis/manager/v2" logger "d7y.io/dragonfly/v2/internal/dflog" dc "d7y.io/dragonfly/v2/internal/dynconfig" diff --git a/scheduler/config/dynconfig_test.go b/scheduler/config/dynconfig_test.go index fd2b5655f..572c111b0 100644 --- a/scheduler/config/dynconfig_test.go +++ b/scheduler/config/dynconfig_test.go @@ -26,8 +26,8 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - commonv2 "d7y.io/api/pkg/apis/common/v2" - managerv2 "d7y.io/api/pkg/apis/manager/v2" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + managerv2 "d7y.io/api/v2/pkg/apis/manager/v2" "d7y.io/dragonfly/v2/pkg/rpc/manager/client/mocks" "d7y.io/dragonfly/v2/pkg/types" diff --git a/scheduler/config/mocks/dynconfig_mock.go b/scheduler/config/mocks/dynconfig_mock.go index d63b3921f..78272744b 100644 --- a/scheduler/config/mocks/dynconfig_mock.go +++ b/scheduler/config/mocks/dynconfig_mock.go @@ -7,7 +7,7 @@ package mocks import ( reflect "reflect" - manager "d7y.io/api/pkg/apis/manager/v2" + manager "d7y.io/api/v2/pkg/apis/manager/v2" types "d7y.io/dragonfly/v2/manager/types" config "d7y.io/dragonfly/v2/scheduler/config" gomock "github.com/golang/mock/gomock" diff --git a/scheduler/job/job.go b/scheduler/job/job.go index a4453ac56..834db3675 100644 --- a/scheduler/job/job.go +++ b/scheduler/job/job.go @@ -28,8 +28,8 @@ import ( "github.com/go-http-utils/headers" "github.com/go-playground/validator/v10" - cdnsystemv1 "d7y.io/api/pkg/apis/cdnsystem/v1" - commonv1 "d7y.io/api/pkg/apis/common/v1" + cdnsystemv1 "d7y.io/api/v2/pkg/apis/cdnsystem/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" logger "d7y.io/dragonfly/v2/internal/dflog" internaljob "d7y.io/dragonfly/v2/internal/job" diff --git a/scheduler/resource/host_manager_test.go b/scheduler/resource/host_manager_test.go index a8bb2ef72..4fb647cfe 100644 --- a/scheduler/resource/host_manager_test.go +++ b/scheduler/resource/host_manager_test.go @@ -25,7 +25,7 @@ import ( gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - commonv2 "d7y.io/api/pkg/apis/common/v2" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" "d7y.io/dragonfly/v2/pkg/container/set" "d7y.io/dragonfly/v2/pkg/gc" diff --git a/scheduler/resource/host_test.go b/scheduler/resource/host_test.go index e0c8ec1a9..7392e75f0 100644 --- a/scheduler/resource/host_test.go +++ b/scheduler/resource/host_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/atomic" - commonv2 "d7y.io/api/pkg/apis/common/v2" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" "d7y.io/dragonfly/v2/pkg/idgen" "d7y.io/dragonfly/v2/pkg/types" diff --git a/scheduler/resource/peer.go b/scheduler/resource/peer.go index ea3b5e68a..31e9a39e6 100644 --- a/scheduler/resource/peer.go +++ b/scheduler/resource/peer.go @@ -31,10 +31,10 @@ import ( "github.com/looplab/fsm" "go.uber.org/atomic" - commonv2 "d7y.io/api/pkg/apis/common/v2" - managerv2 "d7y.io/api/pkg/apis/manager/v2" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" - schedulerv2 "d7y.io/api/pkg/apis/scheduler/v2" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + managerv2 "d7y.io/api/v2/pkg/apis/manager/v2" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" + schedulerv2 "d7y.io/api/v2/pkg/apis/scheduler/v2" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/container/set" diff --git a/scheduler/resource/peer_manager_test.go b/scheduler/resource/peer_manager_test.go index ac62f779d..f5397c364 100644 --- a/scheduler/resource/peer_manager_test.go +++ b/scheduler/resource/peer_manager_test.go @@ -25,7 +25,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - commonv2 "d7y.io/api/pkg/apis/common/v2" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" "d7y.io/dragonfly/v2/pkg/gc" "d7y.io/dragonfly/v2/pkg/idgen" diff --git a/scheduler/resource/peer_test.go b/scheduler/resource/peer_test.go index c0e29af34..e462cf788 100644 --- a/scheduler/resource/peer_test.go +++ b/scheduler/resource/peer_test.go @@ -31,12 +31,12 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - commonv2 "d7y.io/api/pkg/apis/common/v2" - managerv2 "d7y.io/api/pkg/apis/manager/v2" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" - v1mocks "d7y.io/api/pkg/apis/scheduler/v1/mocks" - schedulerv2 "d7y.io/api/pkg/apis/scheduler/v2" - v2mocks "d7y.io/api/pkg/apis/scheduler/v2/mocks" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + managerv2 "d7y.io/api/v2/pkg/apis/manager/v2" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" + v1mocks "d7y.io/api/v2/pkg/apis/scheduler/v1/mocks" + schedulerv2 "d7y.io/api/v2/pkg/apis/scheduler/v2" + v2mocks "d7y.io/api/v2/pkg/apis/scheduler/v2/mocks" "d7y.io/dragonfly/v2/pkg/idgen" nethttp "d7y.io/dragonfly/v2/pkg/net/http" diff --git a/scheduler/resource/piece.go b/scheduler/resource/piece.go index ccb17b5cc..752b04965 100644 --- a/scheduler/resource/piece.go +++ b/scheduler/resource/piece.go @@ -19,7 +19,7 @@ package resource import ( "time" - commonv2 "d7y.io/api/pkg/apis/common/v2" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" "d7y.io/dragonfly/v2/pkg/digest" ) diff --git a/scheduler/resource/resource_test.go b/scheduler/resource/resource_test.go index 0d5c2689b..2ac9039ee 100644 --- a/scheduler/resource/resource_test.go +++ b/scheduler/resource/resource_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/grpc/resolver" - managerv2 "d7y.io/api/pkg/apis/manager/v2" + managerv2 "d7y.io/api/v2/pkg/apis/manager/v2" "d7y.io/dragonfly/v2/pkg/gc" "d7y.io/dragonfly/v2/scheduler/config" diff --git a/scheduler/resource/seed_peer.go b/scheduler/resource/seed_peer.go index 2c382f274..fed004a2a 100644 --- a/scheduler/resource/seed_peer.go +++ b/scheduler/resource/seed_peer.go @@ -24,10 +24,10 @@ import ( "strings" "time" - cdnsystemv1 "d7y.io/api/pkg/apis/cdnsystem/v1" - commonv1 "d7y.io/api/pkg/apis/common/v1" - commonv2 "d7y.io/api/pkg/apis/common/v2" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + cdnsystemv1 "d7y.io/api/v2/pkg/apis/cdnsystem/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/pkg/digest" "d7y.io/dragonfly/v2/pkg/idgen" diff --git a/scheduler/resource/seed_peer_client.go b/scheduler/resource/seed_peer_client.go index 73770cf9b..0874f4ce2 100644 --- a/scheduler/resource/seed_peer_client.go +++ b/scheduler/resource/seed_peer_client.go @@ -25,7 +25,7 @@ import ( "google.golang.org/grpc" - managerv2 "d7y.io/api/pkg/apis/manager/v2" + managerv2 "d7y.io/api/v2/pkg/apis/manager/v2" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/dfnet" diff --git a/scheduler/resource/seed_peer_client_mock.go b/scheduler/resource/seed_peer_client_mock.go index 696cbf966..cf8654f10 100644 --- a/scheduler/resource/seed_peer_client_mock.go +++ b/scheduler/resource/seed_peer_client_mock.go @@ -8,8 +8,8 @@ import ( context "context" reflect "reflect" - cdnsystem "d7y.io/api/pkg/apis/cdnsystem/v1" - common "d7y.io/api/pkg/apis/common/v1" + cdnsystem "d7y.io/api/v2/pkg/apis/cdnsystem/v1" + common "d7y.io/api/v2/pkg/apis/common/v1" config "d7y.io/dragonfly/v2/scheduler/config" gomock "github.com/golang/mock/gomock" grpc "google.golang.org/grpc" diff --git a/scheduler/resource/seed_peer_client_test.go b/scheduler/resource/seed_peer_client_test.go index 1a20ed1d9..c12f317fc 100644 --- a/scheduler/resource/seed_peer_client_test.go +++ b/scheduler/resource/seed_peer_client_test.go @@ -27,7 +27,7 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/resolver" - managerv2 "d7y.io/api/pkg/apis/manager/v2" + managerv2 "d7y.io/api/v2/pkg/apis/manager/v2" "d7y.io/dragonfly/v2/pkg/dfnet" pkgtypes "d7y.io/dragonfly/v2/pkg/types" diff --git a/scheduler/resource/seed_peer_mock.go b/scheduler/resource/seed_peer_mock.go index d6731d5ed..5425a59eb 100644 --- a/scheduler/resource/seed_peer_mock.go +++ b/scheduler/resource/seed_peer_mock.go @@ -8,7 +8,7 @@ import ( context "context" reflect "reflect" - v1 "d7y.io/api/pkg/apis/scheduler/v1" + v1 "d7y.io/api/v2/pkg/apis/scheduler/v1" http "d7y.io/dragonfly/v2/pkg/net/http" types "d7y.io/dragonfly/v2/pkg/types" gomock "github.com/golang/mock/gomock" diff --git a/scheduler/resource/seed_peer_test.go b/scheduler/resource/seed_peer_test.go index 0234bbe48..372080ad8 100644 --- a/scheduler/resource/seed_peer_test.go +++ b/scheduler/resource/seed_peer_test.go @@ -25,8 +25,8 @@ import ( gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - commonv2 "d7y.io/api/pkg/apis/common/v2" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" ) func TestSeedPeer_newSeedPeer(t *testing.T) { diff --git a/scheduler/resource/task.go b/scheduler/resource/task.go index 00c81afeb..43b7aed93 100644 --- a/scheduler/resource/task.go +++ b/scheduler/resource/task.go @@ -26,9 +26,9 @@ import ( "github.com/looplab/fsm" "go.uber.org/atomic" - commonv2 "d7y.io/api/pkg/apis/common/v2" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" - schedulerv2 "d7y.io/api/pkg/apis/scheduler/v2" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" + schedulerv2 "d7y.io/api/v2/pkg/apis/scheduler/v2" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/container/set" diff --git a/scheduler/resource/task_manager_test.go b/scheduler/resource/task_manager_test.go index 149053cd3..f1de9456f 100644 --- a/scheduler/resource/task_manager_test.go +++ b/scheduler/resource/task_manager_test.go @@ -25,7 +25,7 @@ import ( "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - commonv2 "d7y.io/api/pkg/apis/common/v2" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" "d7y.io/dragonfly/v2/pkg/gc" "d7y.io/dragonfly/v2/scheduler/config" diff --git a/scheduler/resource/task_test.go b/scheduler/resource/task_test.go index d71020a94..3e792802d 100644 --- a/scheduler/resource/task_test.go +++ b/scheduler/resource/task_test.go @@ -24,12 +24,12 @@ import ( gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - commonv1 "d7y.io/api/pkg/apis/common/v1" - commonv2 "d7y.io/api/pkg/apis/common/v2" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" - v1mocks "d7y.io/api/pkg/apis/scheduler/v1/mocks" - schedulerv2 "d7y.io/api/pkg/apis/scheduler/v2" - v2mocks "d7y.io/api/pkg/apis/scheduler/v2/mocks" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" + v1mocks "d7y.io/api/v2/pkg/apis/scheduler/v1/mocks" + schedulerv2 "d7y.io/api/v2/pkg/apis/scheduler/v2" + v2mocks "d7y.io/api/v2/pkg/apis/scheduler/v2/mocks" "d7y.io/dragonfly/v2/pkg/container/set" "d7y.io/dragonfly/v2/pkg/digest" diff --git a/scheduler/rpcserver/scheduler_server_v1.go b/scheduler/rpcserver/scheduler_server_v1.go index bf1154a09..82568b578 100644 --- a/scheduler/rpcserver/scheduler_server_v1.go +++ b/scheduler/rpcserver/scheduler_server_v1.go @@ -21,8 +21,8 @@ import ( "google.golang.org/protobuf/types/known/emptypb" - commonv1 "d7y.io/api/pkg/apis/common/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/pkg/idgen" "d7y.io/dragonfly/v2/pkg/types" diff --git a/scheduler/rpcserver/scheduler_server_v2.go b/scheduler/rpcserver/scheduler_server_v2.go index 387fbacfd..f0cee1cb1 100644 --- a/scheduler/rpcserver/scheduler_server_v2.go +++ b/scheduler/rpcserver/scheduler_server_v2.go @@ -21,8 +21,8 @@ import ( emptypb "google.golang.org/protobuf/types/known/emptypb" - commonv2 "d7y.io/api/pkg/apis/common/v2" - schedulerv2 "d7y.io/api/pkg/apis/scheduler/v2" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + schedulerv2 "d7y.io/api/v2/pkg/apis/scheduler/v2" "d7y.io/dragonfly/v2/scheduler/config" "d7y.io/dragonfly/v2/scheduler/metrics" diff --git a/scheduler/scheduling/evaluator/evaluator_base_test.go b/scheduler/scheduling/evaluator/evaluator_base_test.go index c8f419271..d4243fb1d 100644 --- a/scheduler/scheduling/evaluator/evaluator_base_test.go +++ b/scheduler/scheduling/evaluator/evaluator_base_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/atomic" - commonv2 "d7y.io/api/pkg/apis/common/v2" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" "d7y.io/dragonfly/v2/pkg/digest" "d7y.io/dragonfly/v2/pkg/idgen" diff --git a/scheduler/scheduling/scheduling.go b/scheduler/scheduling/scheduling.go index c96a7defc..9beaa4338 100644 --- a/scheduler/scheduling/scheduling.go +++ b/scheduler/scheduling/scheduling.go @@ -29,10 +29,10 @@ import ( "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/timestamppb" - commonv1 "d7y.io/api/pkg/apis/common/v1" - commonv2 "d7y.io/api/pkg/apis/common/v2" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" - schedulerv2 "d7y.io/api/pkg/apis/scheduler/v2" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" + schedulerv2 "d7y.io/api/v2/pkg/apis/scheduler/v2" "d7y.io/dragonfly/v2/pkg/container/set" "d7y.io/dragonfly/v2/pkg/types" diff --git a/scheduler/scheduling/scheduling_test.go b/scheduler/scheduling/scheduling_test.go index 33de08094..e301931a2 100644 --- a/scheduler/scheduling/scheduling_test.go +++ b/scheduler/scheduling/scheduling_test.go @@ -33,12 +33,12 @@ import ( "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/timestamppb" - commonv1 "d7y.io/api/pkg/apis/common/v1" - commonv2 "d7y.io/api/pkg/apis/common/v2" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" - schedulerv1mocks "d7y.io/api/pkg/apis/scheduler/v1/mocks" - schedulerv2 "d7y.io/api/pkg/apis/scheduler/v2" - schedulerv2mocks "d7y.io/api/pkg/apis/scheduler/v2/mocks" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" + schedulerv1mocks "d7y.io/api/v2/pkg/apis/scheduler/v1/mocks" + schedulerv2 "d7y.io/api/v2/pkg/apis/scheduler/v2" + schedulerv2mocks "d7y.io/api/v2/pkg/apis/scheduler/v2/mocks" "d7y.io/dragonfly/v2/manager/types" "d7y.io/dragonfly/v2/pkg/container/set" diff --git a/scheduler/service/service_v1.go b/scheduler/service/service_v1.go index 7c7c359f8..ba2dfa54d 100644 --- a/scheduler/service/service_v1.go +++ b/scheduler/service/service_v1.go @@ -29,10 +29,10 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - commonv1 "d7y.io/api/pkg/apis/common/v1" - commonv2 "d7y.io/api/pkg/apis/common/v2" - errordetailsv1 "d7y.io/api/pkg/apis/errordetails/v1" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + errordetailsv1 "d7y.io/api/v2/pkg/apis/errordetails/v1" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" "d7y.io/dragonfly/v2/internal/dferrors" logger "d7y.io/dragonfly/v2/internal/dflog" diff --git a/scheduler/service/service_v1_test.go b/scheduler/service/service_v1_test.go index 4632ec9c4..e5ddd4e52 100644 --- a/scheduler/service/service_v1_test.go +++ b/scheduler/service/service_v1_test.go @@ -39,13 +39,13 @@ import ( "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/timestamppb" - commonv1 "d7y.io/api/pkg/apis/common/v1" - commonv2 "d7y.io/api/pkg/apis/common/v2" - errordetailsv1 "d7y.io/api/pkg/apis/errordetails/v1" - managerv2 "d7y.io/api/pkg/apis/manager/v2" - schedulerv1 "d7y.io/api/pkg/apis/scheduler/v1" - schedulerv1mocks "d7y.io/api/pkg/apis/scheduler/v1/mocks" - schedulerv2 "d7y.io/api/pkg/apis/scheduler/v2" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + errordetailsv1 "d7y.io/api/v2/pkg/apis/errordetails/v1" + managerv2 "d7y.io/api/v2/pkg/apis/manager/v2" + schedulerv1 "d7y.io/api/v2/pkg/apis/scheduler/v1" + schedulerv1mocks "d7y.io/api/v2/pkg/apis/scheduler/v1/mocks" + schedulerv2 "d7y.io/api/v2/pkg/apis/scheduler/v2" "d7y.io/dragonfly/v2/internal/dferrors" "d7y.io/dragonfly/v2/manager/types" diff --git a/scheduler/service/service_v2.go b/scheduler/service/service_v2.go index 6433ea079..7fe026e53 100644 --- a/scheduler/service/service_v2.go +++ b/scheduler/service/service_v2.go @@ -27,8 +27,8 @@ import ( "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/timestamppb" - commonv2 "d7y.io/api/pkg/apis/common/v2" - schedulerv2 "d7y.io/api/pkg/apis/scheduler/v2" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + schedulerv2 "d7y.io/api/v2/pkg/apis/scheduler/v2" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/container/set" diff --git a/scheduler/service/service_v2_test.go b/scheduler/service/service_v2_test.go index 753343144..b19be255b 100644 --- a/scheduler/service/service_v2_test.go +++ b/scheduler/service/service_v2_test.go @@ -36,10 +36,10 @@ import ( "google.golang.org/protobuf/types/known/durationpb" "google.golang.org/protobuf/types/known/timestamppb" - commonv2 "d7y.io/api/pkg/apis/common/v2" - managerv2 "d7y.io/api/pkg/apis/manager/v2" - schedulerv2 "d7y.io/api/pkg/apis/scheduler/v2" - schedulerv2mocks "d7y.io/api/pkg/apis/scheduler/v2/mocks" + commonv2 "d7y.io/api/v2/pkg/apis/common/v2" + managerv2 "d7y.io/api/v2/pkg/apis/manager/v2" + schedulerv2 "d7y.io/api/v2/pkg/apis/scheduler/v2" + schedulerv2mocks "d7y.io/api/v2/pkg/apis/scheduler/v2/mocks" managertypes "d7y.io/dragonfly/v2/manager/types" nethttp "d7y.io/dragonfly/v2/pkg/net/http" diff --git a/test/e2e/manager/preheat.go b/test/e2e/manager/preheat.go index 5974c76bd..a033453e5 100644 --- a/test/e2e/manager/preheat.go +++ b/test/e2e/manager/preheat.go @@ -28,7 +28,7 @@ import ( . "github.com/onsi/ginkgo/v2" //nolint . "github.com/onsi/gomega" //nolint - commonv1 "d7y.io/api/pkg/apis/common/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" internaljob "d7y.io/dragonfly/v2/internal/job" "d7y.io/dragonfly/v2/manager/models" diff --git a/test/tools/download-grpc-test/main.go b/test/tools/download-grpc-test/main.go index 8dfa75c7b..b677f91ad 100644 --- a/test/tools/download-grpc-test/main.go +++ b/test/tools/download-grpc-test/main.go @@ -12,8 +12,8 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - commonv1 "d7y.io/api/pkg/apis/common/v1" - dfdaemonv1 "d7y.io/api/pkg/apis/dfdaemon/v1" + commonv1 "d7y.io/api/v2/pkg/apis/common/v1" + dfdaemonv1 "d7y.io/api/v2/pkg/apis/dfdaemon/v1" ) var ( diff --git a/trainer/rpcserver/trainer_server_v1.go b/trainer/rpcserver/trainer_server_v1.go index 8733aac58..da30e29f0 100644 --- a/trainer/rpcserver/trainer_server_v1.go +++ b/trainer/rpcserver/trainer_server_v1.go @@ -17,7 +17,7 @@ package rpcserver import ( - trainerv1 "d7y.io/api/pkg/apis/trainer/v1" + trainerv1 "d7y.io/api/v2/pkg/apis/trainer/v1" "d7y.io/dragonfly/v2/trainer/config" "d7y.io/dragonfly/v2/trainer/metrics" diff --git a/trainer/service/service_v1.go b/trainer/service/service_v1.go index bfc7991ec..af4e828e6 100644 --- a/trainer/service/service_v1.go +++ b/trainer/service/service_v1.go @@ -25,7 +25,7 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" - trainerv1 "d7y.io/api/pkg/apis/trainer/v1" + trainerv1 "d7y.io/api/v2/pkg/apis/trainer/v1" logger "d7y.io/dragonfly/v2/internal/dflog" "d7y.io/dragonfly/v2/pkg/idgen" diff --git a/trainer/service/service_v1_test.go b/trainer/service/service_v1_test.go index bebdcd306..6a005ac68 100644 --- a/trainer/service/service_v1_test.go +++ b/trainer/service/service_v1_test.go @@ -31,8 +31,8 @@ import ( "github.com/stretchr/testify/assert" "google.golang.org/protobuf/types/known/emptypb" - trainerv1 "d7y.io/api/pkg/apis/trainer/v1" - trainerv1mocks "d7y.io/api/pkg/apis/trainer/v1/mocks" + trainerv1 "d7y.io/api/v2/pkg/apis/trainer/v1" + trainerv1mocks "d7y.io/api/v2/pkg/apis/trainer/v1/mocks" "d7y.io/dragonfly/v2/pkg/idgen" "d7y.io/dragonfly/v2/trainer/config"