Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move database and similar packages to components #8148

Merged
merged 1 commit into from
Dec 18, 2024
Merged

Move database and similar packages to components #8148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/generate.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ generate-controller-gen-installed:
.PHONY: generate-ucp-crd
generate-ucp-crd: generate-controller-gen-installed ## Generates the CRDs for UCP APIServer store.
@echo "$(ARROW) Generating CRDs for ucp.dev..."
controller-gen object:headerFile=./boilerplate.go.txt paths=./pkg/ucp/database/apiserverstore/api/ucp.dev/v1alpha1/...
controller-gen crd paths=./pkg/ucp/database/apiserverstore/api/ucp.dev/v1alpha1/... output:crd:dir=./deploy/Chart/crds/ucpd
controller-gen object:headerFile=./boilerplate.go.txt paths=./pkg/components/database/apiserverstore/api/ucp.dev/v1alpha1/...
controller-gen crd paths=./pkg/components/database/apiserverstore/api/ucp.dev/v1alpha1/... output:crd:dir=./deploy/Chart/crds/ucpd

.PHONY: generate-controller
generate-controller: generate-controller-gen-installed ## Generates the CRDs for the Radius controller.
Expand Down
2 changes: 1 addition & 1 deletion cmd/applications-rp/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
"github.com/radius-project/radius/pkg/server"
"github.com/radius-project/radius/pkg/trace"

"github.com/radius-project/radius/pkg/components/database/databaseprovider"
"github.com/radius-project/radius/pkg/ucp/data"
"github.com/radius-project/radius/pkg/ucp/databaseprovider"
"github.com/radius-project/radius/pkg/ucp/hosting"
"github.com/radius-project/radius/pkg/ucp/ucplog"

Expand Down
2 changes: 1 addition & 1 deletion cmd/ucpd/cmd/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
runtimelog "sigs.k8s.io/controller-runtime/pkg/log"

"github.com/radius-project/radius/pkg/armrpc/hostoptions"
"github.com/radius-project/radius/pkg/ucp/databaseprovider"
"github.com/radius-project/radius/pkg/components/database/databaseprovider"
"github.com/radius-project/radius/pkg/ucp/hosting"
"github.com/radius-project/radius/pkg/ucp/server"
"github.com/radius-project/radius/pkg/ucp/ucplog"
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/asyncoperation/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"context"
"errors"

"github.com/radius-project/radius/pkg/components/database"
"github.com/radius-project/radius/pkg/corerp/backend/deployment"
"github.com/radius-project/radius/pkg/ucp/database"

runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/armrpc/asyncoperation/statusmanager/statusmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ import (

v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
ctrl "github.com/radius-project/radius/pkg/armrpc/asyncoperation/controller"
"github.com/radius-project/radius/pkg/components/database"
"github.com/radius-project/radius/pkg/components/queue"
"github.com/radius-project/radius/pkg/metrics"
"github.com/radius-project/radius/pkg/trace"
"github.com/radius-project/radius/pkg/ucp/database"
queue "github.com/radius-project/radius/pkg/ucp/queue/client"
"github.com/radius-project/radius/pkg/ucp/resources"

"github.com/google/uuid"
Expand Down
4 changes: 2 additions & 2 deletions pkg/armrpc/asyncoperation/statusmanager/statusmanager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
"github.com/google/uuid"
v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
"github.com/radius-project/radius/pkg/armrpc/rpctest"
"github.com/radius-project/radius/pkg/ucp/database"
queue "github.com/radius-project/radius/pkg/ucp/queue/client"
"github.com/radius-project/radius/pkg/components/database"
"github.com/radius-project/radius/pkg/components/queue"
"github.com/radius-project/radius/pkg/ucp/resources"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/asyncoperation/worker/registry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (

v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
ctrl "github.com/radius-project/radius/pkg/armrpc/asyncoperation/controller"
"github.com/radius-project/radius/pkg/components/database/inmemory"
"github.com/radius-project/radius/pkg/corerp/backend/deployment"
"github.com/radius-project/radius/pkg/ucp/database/inmemory"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
)
Expand Down
6 changes: 3 additions & 3 deletions pkg/armrpc/asyncoperation/worker/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (

manager "github.com/radius-project/radius/pkg/armrpc/asyncoperation/statusmanager"
"github.com/radius-project/radius/pkg/armrpc/hostoptions"
"github.com/radius-project/radius/pkg/ucp/databaseprovider"
queue "github.com/radius-project/radius/pkg/ucp/queue/client"
"github.com/radius-project/radius/pkg/ucp/queue/queueprovider"
"github.com/radius-project/radius/pkg/components/database/databaseprovider"
"github.com/radius-project/radius/pkg/components/queue"
"github.com/radius-project/radius/pkg/components/queue/queueprovider"
"github.com/radius-project/radius/pkg/ucp/ucplog"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/armrpc/asyncoperation/worker/worker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import (
v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
ctrl "github.com/radius-project/radius/pkg/armrpc/asyncoperation/controller"
manager "github.com/radius-project/radius/pkg/armrpc/asyncoperation/statusmanager"
"github.com/radius-project/radius/pkg/components/database"
"github.com/radius-project/radius/pkg/components/queue"
"github.com/radius-project/radius/pkg/logging"
"github.com/radius-project/radius/pkg/metrics"
"github.com/radius-project/radius/pkg/trace"
"github.com/radius-project/radius/pkg/ucp/database"
queue "github.com/radius-project/radius/pkg/ucp/queue/client"
"github.com/radius-project/radius/pkg/ucp/resources"
"github.com/radius-project/radius/pkg/ucp/ucplog"

Expand Down
8 changes: 4 additions & 4 deletions pkg/armrpc/asyncoperation/worker/worker_runoperation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import (
v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
ctrl "github.com/radius-project/radius/pkg/armrpc/asyncoperation/controller"
manager "github.com/radius-project/radius/pkg/armrpc/asyncoperation/statusmanager"
"github.com/radius-project/radius/pkg/components/database"
inmemorystore "github.com/radius-project/radius/pkg/components/database/inmemory"
"github.com/radius-project/radius/pkg/components/queue"
"github.com/radius-project/radius/pkg/components/queue/inmemory"
"github.com/radius-project/radius/pkg/corerp/backend/deployment"
"github.com/radius-project/radius/pkg/ucp/database"
inmemorystore "github.com/radius-project/radius/pkg/ucp/database/inmemory"
queue "github.com/radius-project/radius/pkg/ucp/queue/client"
"github.com/radius-project/radius/pkg/ucp/queue/inmemory"
"github.com/radius-project/radius/pkg/ucp/resources"
"github.com/stretchr/testify/require"
"go.uber.org/atomic"
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/asyncoperation/worker/worker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"time"

v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/builder/builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
"github.com/radius-project/radius/pkg/armrpc/asyncoperation/worker"
apictrl "github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rpctest"
"github.com/radius-project/radius/pkg/ucp/database/inmemory"
"github.com/radius-project/radius/pkg/components/database/inmemory"
"github.com/radius-project/radius/test/testcontext"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/builder/namespace_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
apictrl "github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rest"
"github.com/radius-project/radius/pkg/armrpc/rpctest"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/controller/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
sm "github.com/radius-project/radius/pkg/armrpc/asyncoperation/statusmanager"
"github.com/radius-project/radius/pkg/armrpc/hostoptions"
"github.com/radius-project/radius/pkg/armrpc/rest"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"

runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/controller/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
"github.com/radius-project/radius/pkg/armrpc/asyncoperation/statusmanager"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"
"github.com/stretchr/testify/require"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/controller/operation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
sm "github.com/radius-project/radius/pkg/armrpc/asyncoperation/statusmanager"
"github.com/radius-project/radius/pkg/armrpc/rest"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"
"github.com/radius-project/radius/pkg/ucp/resources"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/defaultoperation/defaultasyncdelete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
ctrl "github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rest"
"github.com/radius-project/radius/pkg/armrpc/rpctest"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"

"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/defaultoperation/defaultasyncput_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (
"github.com/radius-project/radius/pkg/armrpc/asyncoperation/statusmanager"
ctrl "github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rpctest"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"
"github.com/radius-project/radius/test/testutil"

"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/defaultoperation/defaultsyncdelete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
ctrl "github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rest"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"
)

// DefaultSyncDelete is the controller implementation to delete resource synchronously.
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/defaultoperation/defaultsyncdelete_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
ctrl "github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rest"
"github.com/radius-project/radius/pkg/armrpc/rpctest"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"

"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/defaultoperation/defaultsyncput_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
ctrl "github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rpctest"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"
"github.com/radius-project/radius/test/testutil"

"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/defaultoperation/getoperationresult.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
manager "github.com/radius-project/radius/pkg/armrpc/asyncoperation/statusmanager"
ctrl "github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rest"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"
"github.com/radius-project/radius/pkg/ucp/resources"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/defaultoperation/getoperationresult_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
manager "github.com/radius-project/radius/pkg/armrpc/asyncoperation/statusmanager"
ctrl "github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rpctest"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"
"github.com/radius-project/radius/test/testcontext"
"github.com/radius-project/radius/test/testutil"

Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/defaultoperation/getoperationstatus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
manager "github.com/radius-project/radius/pkg/armrpc/asyncoperation/statusmanager"
ctrl "github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rest"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"
)

var _ ctrl.Controller = (*GetOperationStatus)(nil)
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/defaultoperation/getoperationstatus_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
manager "github.com/radius-project/radius/pkg/armrpc/asyncoperation/statusmanager"
ctrl "github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rpctest"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"
"github.com/radius-project/radius/test/testutil"

"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/defaultoperation/getresource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
ctrl "github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rpctest"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"

"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/defaultoperation/listresources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
ctrl "github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rest"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"
)

// ListResources is the controller implementation to get the list of resources in resource group.
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/defaultoperation/listresources_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
ctrl "github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rpctest"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"

"github.com/google/uuid"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/defaultoperation/resource_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"github.com/radius-project/radius/pkg/armrpc/asyncoperation/statusmanager"
"github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rest"
"github.com/radius-project/radius/pkg/components/database"
"github.com/radius-project/radius/pkg/to"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/test/testutil"

"go.uber.org/mock/gomock"
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/frontend/server/handler_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ import (
ctrl "github.com/radius-project/radius/pkg/armrpc/frontend/controller"
"github.com/radius-project/radius/pkg/armrpc/rest"
"github.com/radius-project/radius/pkg/armrpc/rpctest"
"github.com/radius-project/radius/pkg/components/database/inmemory"
"github.com/radius-project/radius/pkg/middleware"
"github.com/radius-project/radius/pkg/ucp/database/inmemory"
"github.com/radius-project/radius/test/testcontext"
"github.com/stretchr/testify/require"
"go.uber.org/mock/gomock"
Expand Down
4 changes: 2 additions & 2 deletions pkg/armrpc/frontend/server/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import (
manager "github.com/radius-project/radius/pkg/armrpc/asyncoperation/statusmanager"
"github.com/radius-project/radius/pkg/armrpc/authentication"
"github.com/radius-project/radius/pkg/armrpc/hostoptions"
"github.com/radius-project/radius/pkg/components/database/databaseprovider"
"github.com/radius-project/radius/pkg/components/queue/queueprovider"
"github.com/radius-project/radius/pkg/kubeutil"
"github.com/radius-project/radius/pkg/ucp/databaseprovider"
"github.com/radius-project/radius/pkg/ucp/queue/queueprovider"
"github.com/radius-project/radius/pkg/ucp/ucplog"
controller_runtime "sigs.k8s.io/controller-runtime/pkg/client"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/hostoptions/hostoptions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ import (
v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
"github.com/radius-project/radius/pkg/azure/armauth"
aztoken "github.com/radius-project/radius/pkg/azure/tokencredentials"
sprovider "github.com/radius-project/radius/pkg/components/secret/secretprovider"
"github.com/radius-project/radius/pkg/kubeutil"
"github.com/radius-project/radius/pkg/sdk"
"github.com/radius-project/radius/pkg/ucp/config"
sdk_cred "github.com/radius-project/radius/pkg/ucp/credentials"
sprovider "github.com/radius-project/radius/pkg/ucp/secret/secretprovider"

"gopkg.in/yaml.v3"
corev1 "k8s.io/api/core/v1"
Expand Down
6 changes: 3 additions & 3 deletions pkg/armrpc/hostoptions/providerconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ limitations under the License.
package hostoptions

import (
"github.com/radius-project/radius/pkg/components/database/databaseprovider"
"github.com/radius-project/radius/pkg/components/queue/queueprovider"
"github.com/radius-project/radius/pkg/components/secret/secretprovider"
metricsprovider "github.com/radius-project/radius/pkg/metrics/provider"
profilerprovider "github.com/radius-project/radius/pkg/profiler/provider"
"github.com/radius-project/radius/pkg/trace"
"github.com/radius-project/radius/pkg/ucp/config"
"github.com/radius-project/radius/pkg/ucp/databaseprovider"
"github.com/radius-project/radius/pkg/ucp/queue/queueprovider"
"github.com/radius-project/radius/pkg/ucp/secret/secretprovider"
"github.com/radius-project/radius/pkg/ucp/ucplog"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/armrpc/rpctest/controllers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"testing"

v1 "github.com/radius-project/radius/pkg/armrpc/api/v1"
"github.com/radius-project/radius/pkg/ucp/database"
"github.com/radius-project/radius/pkg/components/database"
"go.uber.org/mock/gomock"
)

Expand Down
0 ...api/ucp.dev/v1alpha1/groupversion_info.go → ...api/ucp.dev/v1alpha1/groupversion_info.go
View file
Open in desktop
File renamed without changes.
0 ...pi/ucp.dev/v1alpha1/queuemessage_types.go → ...pi/ucp.dev/v1alpha1/queuemessage_types.go
View file
Open in desktop
File renamed without changes.
0 ...re/api/ucp.dev/v1alpha1/resource_types.go → ...re/api/ucp.dev/v1alpha1/resource_types.go
View file
Open in desktop
File renamed without changes.
0 ...ucp.dev/v1alpha1/zz_generated.deepcopy.go → ...ucp.dev/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions ...atabase/apiserverstore/apiserverclient.go → ...atabase/apiserverstore/apiserverclient.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ import (
"strings"
"unicode"

"github.com/radius-project/radius/pkg/ucp/database"
ucpv1alpha1 "github.com/radius-project/radius/pkg/ucp/database/apiserverstore/api/ucp.dev/v1alpha1"
"github.com/radius-project/radius/pkg/ucp/database/databaseutil"
"github.com/radius-project/radius/pkg/components/database"
ucpv1alpha1 "github.com/radius-project/radius/pkg/components/database/apiserverstore/api/ucp.dev/v1alpha1"
"github.com/radius-project/radius/pkg/components/database/databaseutil"
"github.com/radius-project/radius/pkg/ucp/resources"
"github.com/radius-project/radius/pkg/ucp/ucplog"
"github.com/radius-project/radius/pkg/ucp/util/etag"
Expand Down
4 changes: 2 additions & 2 deletions ...se/apiserverstore/apiserverclient_test.go → ...se/apiserverstore/apiserverclient_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"k8s.io/apimachinery/pkg/runtime"
runtimeclient "sigs.k8s.io/controller-runtime/pkg/client"

"github.com/radius-project/radius/pkg/ucp/database"
ucpv1alpha1 "github.com/radius-project/radius/pkg/ucp/database/apiserverstore/api/ucp.dev/v1alpha1"
"github.com/radius-project/radius/pkg/components/database"
ucpv1alpha1 "github.com/radius-project/radius/pkg/components/database/apiserverstore/api/ucp.dev/v1alpha1"
"github.com/radius-project/radius/pkg/ucp/resources"
"github.com/radius-project/radius/pkg/ucp/util/etag"
"github.com/radius-project/radius/test/testcontext"
Expand Down
2 changes: 1 addition & 1 deletion pkg/ucp/database/client.go → pkg/components/database/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var jsonPropertyPattern = "[a-zA-Z$_][a-zA-Z0-9$_]*"
// - Multople properties separated by a '.'
var fieldRegex = regexp.MustCompile(fmt.Sprintf(`^(%s)(\.%s)*$`, jsonPropertyPattern, jsonPropertyPattern))

//go:generate mockgen -typed -destination=./mock_client.go -package=database -self_package github.com/radius-project/radius/pkg/ucp/database github.com/radius-project/radius/pkg/ucp/database Client
//go:generate mockgen -typed -destination=./mock_client.go -package=database -self_package github.com/radius-project/radius/pkg/components/database github.com/radius-project/radius/pkg/components/database Client

// Client is the interface for persisting and querying resource data.
//
Expand Down
0 pkg/ucp/database/client_test.go → pkg/components/database/client_test.go
View file
Open in desktop
File renamed without changes.
Loading
Loading