dragonflyoss
/
dragonfly
mirror of https://github.com/dragonflyoss/dragonfly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: update dy7.io/api to v2 (#2558) 

Signed-off-by: Gaius <gaius.qi@gmail.com>
This commit is contained in:
Gaius 2023-07-20 23:17:57 +08:00 committed by GitHub
parent 7bc0a0f71e
commit b3f23f71a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
127 changed files with 249 additions and 249 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/config/dynconfig.go
View File

@ -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"
)

2
client/config/dynconfig_local.go
View File

@ -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"

2
client/config/dynconfig_manager.go
View File

@ -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"

2
client/config/dynconfig_manager_test.go
View File

@ -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"
)

2
client/config/dynconfig_test.go
View File

@ -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"
)

2
client/config/mocks/dynconfig_mock.go
View File

@ -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"

2
client/config/peerhost.go
View File

@ -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"

4
client/daemon/announcer/announcer.go
View File

@ -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"

2
client/daemon/daemon.go
View File

@ -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"

4
client/daemon/networktopology/network_topology.go
View File

@ -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"

6
client/daemon/networktopology/network_topology_test.go
View File

@ -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"

2
client/daemon/objectstorage/objectstorage.go
View File

@ -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"

6
client/daemon/peer/peertask_conductor.go
View File

@ -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"

4
client/daemon/peer/peertask_dummy.go
View File

@ -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"

4
client/daemon/peer/peertask_file.go
View File

@ -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"

4
client/daemon/peer/peertask_manager.go
View File

@ -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"

4
client/daemon/peer/peertask_manager_mock.go
View File

@ -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"

10
client/daemon/peer/peertask_manager_test.go
View File

@ -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"

6
client/daemon/peer/peertask_piecetask_synchronizer.go
View File

@ -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"

4
client/daemon/peer/peertask_piecetask_synchronizer_test.go
View File

@ -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"
)

2
client/daemon/peer/peertask_reuse.go
View File

@ -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"

4
client/daemon/peer/peertask_reuse_test.go
View File

@ -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"

2
client/daemon/peer/peertask_seed.go
View File

@ -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"

4
client/daemon/peer/peertask_stream.go
View File

@ -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"

10
client/daemon/peer/peertask_stream_backsource_partial_test.go
View File

@ -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"

6
client/daemon/peer/peertask_stream_resume_test.go
View File

@ -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"

2
client/daemon/peer/piece_dispatcher_test.go
View File

@ -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"
)

2
client/daemon/peer/piece_downloader.go
View File

@ -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"

2
client/daemon/peer/piece_downloader_test.go
View File

@ -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"

8
client/daemon/peer/piece_manager.go
View File

@ -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"

4
client/daemon/peer/piece_manager_mock.go
View File

@ -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"

4
client/daemon/peer/piece_manager_test.go
View File

@ -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"

10
client/daemon/peer/traffic_shaper_test.go
View File

@ -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"

4
client/daemon/proxy/proxy.go
View File

@ -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"

2
client/daemon/proxy/proxy_manager.go
View File

@ -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"

2
client/daemon/rpcserver/mocks/rpcserver_mock.go
View File

@ -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"
)

8
client/daemon/rpcserver/rpcserver.go
View File

@ -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"

6
client/daemon/rpcserver/rpcserver_test.go
View File

@ -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"

6
client/daemon/rpcserver/seeder.go
View File

@ -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"

6
client/daemon/rpcserver/seeder_test.go
View File

@ -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"

4
client/daemon/rpcserver/subscriber.go
View File

@ -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"

2
client/daemon/storage/local_storage.go
View File

@ -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"

2
client/daemon/storage/local_storage_subtask.go
View File

@ -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"

2
client/daemon/storage/local_storage_test.go
View File

@ -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"

2
client/daemon/storage/metadata.go
View File

@ -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"

2
client/daemon/storage/mocks/stroage_manager_mock.go
View File

@ -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"

2
client/daemon/storage/storage_manager.go
View File

@ -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"

4
client/daemon/transport/transport.go
View File

@ -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"

4
client/dfcache/dfcache.go
View File

@ -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"

4
client/dfget/dfget.go
View File

@ -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"

4
go.mod
View File

@ -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

10
go.sum
View File

@ -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=

2
internal/dferrors/error.go
View File

@ -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

2
manager/middlewares/error.go
View File

@ -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"
)

6
manager/rpcserver/manager_server_v1.go
View File

@ -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"

6
manager/rpcserver/manager_server_v2.go
View File

@ -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"

2
manager/rpcserver/rpcserver.go
View File

@ -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"

2
manager/rpcserver/security_server_v1.go
View File

@ -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"
)

2
manager/rpcserver/security_server_v1_test.go
View File

@ -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) {

2
manager/service/model.go
View File

@ -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"

2
pkg/idgen/task_id.go
View File

@ -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"

2
pkg/idgen/task_id_test.go
View File

@ -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) {

2
pkg/issuer/dragonfly.go
View File

@ -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"

4
pkg/rpc/cdnsystem/client/client.go
View File

@ -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"

4
pkg/rpc/cdnsystem/client/mocks/client_mock.go
View File

@ -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"
)

2
pkg/rpc/cdnsystem/server/server.go
View File

@ -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"

4
pkg/rpc/dfdaemon/client/client_v1.go
View File

@ -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"

4
pkg/rpc/dfdaemon/client/client_v2.go
View File

@ -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"
)

4
pkg/rpc/dfdaemon/client/mocks/client_v1_mock.go
View File

@ -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"
)

4
pkg/rpc/dfdaemon/client/mocks/client_v2_mock.go
View File

@ -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"
)

2
pkg/rpc/dfdaemon/server/server.go
View File

@ -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"

2
pkg/rpc/inference/client/client_v1.go
View File

@ -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"
)

2
pkg/rpc/inference/client/mocks/client_v1_mock.go
View File

@ -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"
)

4
pkg/rpc/manager/client/client_v1.go
View File

@ -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"

4
pkg/rpc/manager/client/client_v2.go
View File

@ -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"

2
pkg/rpc/manager/client/mocks/client_v1_mock.go
View File

@ -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"
)

2
pkg/rpc/manager/client/mocks/client_v2_mock.go
View File

@ -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"
)

6
pkg/rpc/manager/server/server.go
View File

@ -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"

4
pkg/rpc/scheduler/client/client_v1.go
View File

@ -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"

4
pkg/rpc/scheduler/client/client_v2.go
View File

@ -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"

2
pkg/rpc/scheduler/client/mocks/client_v1_mock.go
View File

@ -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"
)

4
pkg/rpc/scheduler/client/mocks/client_v2_mock.go
View File

@ -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"
)

4
pkg/rpc/scheduler/server/server.go
View File

@ -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"

2
pkg/rpc/security/client/client_v1.go
View File

@ -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"

2
pkg/rpc/security/client/mocks/client_v1_mock.go
View File

@ -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"
)

2
pkg/rpc/trainer/client/client_v1.go
View File

@ -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"
)

2
pkg/rpc/trainer/client/mocks/client_v1_mock.go
View File

@ -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"
)

2
pkg/rpc/trainer/server/server.go
View File

@ -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"

2
pkg/source/clients/orasprotocol/oras_source_client.go
View File

@ -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"

2
pkg/source/source_client_builder.go
View File

@ -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 (

4
pkg/types/types.go
View File

@ -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

4
scheduler/announcer/announcer.go
View File

@ -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"

6
scheduler/announcer/announcer_test.go
View File

@ -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"

2
scheduler/config/dynconfig.go
View File

@ -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"

4
scheduler/config/dynconfig_test.go
View File

@ -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"

2
scheduler/config/mocks/dynconfig_mock.go
View File

@ -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"

4
scheduler/job/job.go
View File

@ -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"

2
scheduler/resource/host_manager_test.go
View File

@ -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"

2
scheduler/resource/host_test.go
View File

@ -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"

8
scheduler/resource/peer.go
View File

@ -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"

Some files were not shown because too many files have changed in this diff Show More