Merge pull request #531 from OdyseeTeam/change-uploads-config

Upgrade reflector.go for configurable endpoint
OdyseeTeam · Dec 19, 2024 · ebf1fe6 · ebf1fe6
2 parents fb82bb1 + e714feb
commit ebf1fe6
Show file tree

Hide file tree

Showing 50 changed files with 250 additions and 345 deletions.
diff --git a/api/benchmarks_test.go b/api/benchmarks_test.go
@@ -24,7 +24,7 @@ import (
 	"github.com/OdyseeTeam/odysee-api/pkg/migrator"
 
 	"github.com/stretchr/testify/require"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 const proxySuffix = "/api/v1/proxy"

diff --git a/app/arweave/arweave_test.go b/app/arweave/arweave_test.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 func TestReplaceAssetUrls(t *testing.T) {

diff --git a/app/asynquery/asynquery.go b/app/asynquery/asynquery.go
@@ -23,7 +23,7 @@ import (
 	"github.com/volatiletech/null"
 	"github.com/volatiletech/sqlboiler/boil"
 	"github.com/volatiletech/sqlboiler/queries/qm"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 const FilePathParam = "file_path"

diff --git a/app/asynquery/asynquery_test.go b/app/asynquery/asynquery_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/OdyseeTeam/odysee-api/models"
 	"github.com/OdyseeTeam/odysee-api/pkg/logging/zapadapter"
 	"github.com/Pallinder/go-randomdata"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 
 	"github.com/stretchr/testify/suite"
 )

diff --git a/app/asynquery/http_handlers.go b/app/asynquery/http_handlers.go
@@ -17,7 +17,7 @@ import (
 	"github.com/OdyseeTeam/odysee-api/pkg/logging"
 	"github.com/OdyseeTeam/odysee-api/pkg/rpcerrors"
 	"github.com/mitchellh/mapstructure"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 
 	"github.com/gorilla/mux"
 )

diff --git a/app/asynquery/http_handlers_test.go b/app/asynquery/http_handlers_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/Pallinder/go-randomdata"
 	"github.com/gorilla/mux"
 	"github.com/volatiletech/sqlboiler/queries/qm"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 
 	"github.com/stretchr/testify/suite"
 )

diff --git a/app/geopublish/db.go b/app/geopublish/db.go
@@ -17,7 +17,7 @@ import (
 	"github.com/volatiletech/null"
 	"github.com/volatiletech/sqlboiler/boil"
 	"github.com/volatiletech/sqlboiler/queries/qm"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 type UploadsDB struct {

diff --git a/app/geopublish/forklift/carriage.go b/app/geopublish/forklift/carriage.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/hibiken/asynq"
 	"github.com/volatiletech/sqlboiler/queries/qm"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 // A list of task types.

diff --git a/app/geopublish/forklift/carriage_test.go b/app/geopublish/forklift/carriage_test.go
@@ -16,7 +16,7 @@ import (
 	"github.com/OdyseeTeam/odysee-api/internal/test"
 
 	"github.com/stretchr/testify/suite"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 type carriageSuite struct {

diff --git a/app/geopublish/geopublish.go b/app/geopublish/geopublish.go
@@ -25,7 +25,7 @@ import (
 	"github.com/sirupsen/logrus"
 	tusd "github.com/tus/tusd/pkg/handler"
 	"github.com/volatiletech/sqlboiler/boil"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 var logger = monitor.NewModuleLogger("geopublish")

diff --git a/app/proxy/accounts_test.go b/app/proxy/accounts_test.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 const testSetupWait = 200 * time.Millisecond

diff --git a/app/proxy/proxy.go b/app/proxy/proxy.go
@@ -27,7 +27,7 @@ import (
 	"github.com/OdyseeTeam/odysee-api/pkg/rpcerrors"
 	"github.com/sirupsen/logrus"
 
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 var logger = monitor.NewModuleLogger("proxy")

diff --git a/app/proxy/proxy_test.go b/app/proxy/proxy_test.go
@@ -15,7 +15,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 func TestProxyNilQuery(t *testing.T) {

diff --git a/app/publish/handler_test.go b/app/publish/handler_test.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 type DummyPublisher struct {

diff --git a/app/publish/publish.go b/app/publish/publish.go
@@ -26,7 +26,7 @@ import (
 	"github.com/hashicorp/go-retryablehttp"
 	werrors "github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 var logger = monitor.NewModuleLogger("publish")

diff --git a/app/publish/tus.go b/app/publish/tus.go
@@ -26,7 +26,7 @@ import (
 	werrors "github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	tusd "github.com/tus/tusd/pkg/handler"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 const module = "publish.tus"

diff --git a/app/query/cache.go b/app/query/cache.go
@@ -18,7 +18,7 @@ import (
 	"github.com/eko/gocache/lib/v4/cache"
 	"github.com/eko/gocache/lib/v4/marshaler"
 	"github.com/eko/gocache/lib/v4/store"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 	"golang.org/x/sync/singleflight"
 )
 

diff --git a/app/query/cache/cache.go b/app/query/cache/cache.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/OdyseeTeam/odysee-api/internal/metrics"
 	"github.com/OdyseeTeam/odysee-api/internal/monitor"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 
 	"github.com/dgraph-io/ristretto"
 	"github.com/sirupsen/logrus"

diff --git a/app/query/cache/cache_test.go b/app/query/cache/cache_test.go
@@ -10,7 +10,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 func TestCache(t *testing.T) {

diff --git a/app/query/cache_test.go b/app/query/cache_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 func TestGetCacheKey(t *testing.T) {

diff --git a/app/query/caller.go b/app/query/caller.go
@@ -19,7 +19,7 @@ import (
 
 	ljsonrpc "github.com/lbryio/lbry.go/v2/extras/jsonrpc"
 	"github.com/sirupsen/logrus"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 const (

diff --git a/app/query/caller_test.go b/app/query/caller_test.go
@@ -24,7 +24,7 @@ import (
 	logrusTest "github.com/sirupsen/logrus/hooks/test"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 var bgctx = func() context.Context { return context.Background() }

diff --git a/app/query/context.go b/app/query/context.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/sirupsen/logrus"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 type contextKey string

diff --git a/app/query/paid_test.go b/app/query/paid_test.go
@@ -26,7 +26,7 @@ import (
 	ljsonrpc "github.com/lbryio/lbry.go/v2/extras/jsonrpc"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 const (

diff --git a/app/query/processors.go b/app/query/processors.go
@@ -23,7 +23,7 @@ import (
 	ljsonrpc "github.com/lbryio/lbry.go/v2/extras/jsonrpc"
 
 	"github.com/mitchellh/mapstructure"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 const (

diff --git a/app/query/query.go b/app/query/query.go
@@ -8,7 +8,7 @@ import (
 	"github.com/OdyseeTeam/odysee-api/internal/monitor"
 	"github.com/OdyseeTeam/odysee-api/pkg/rpcerrors"
 
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 var logger = monitor.NewModuleLogger("query")

diff --git a/app/query/query_test.go b/app/query/query_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 func TestQueryParamsAsMap(t *testing.T) {

diff --git a/app/query/testing.go b/app/query/testing.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/ybbus/jsonrpc"
+	"github.com/ybbus/jsonrpc/v2"
 )
 
 func decodeResponse(r string) (*jsonrpc.RPCResponse, error) {

diff --git a/docker/oapi.yml b/docker/oapi.yml
@@ -71,6 +71,7 @@ SturdyCache:
 
 ReflectorUpstream:
   DatabaseDSN: 'user:password@tcp(localhost:3306)/blobs'
+  Endpoint: http://localhost:1337
   Region: us-east-1
   Bucket: blobs'
   Key: key