sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-04-18 16:26:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix rename errors and tests

Browse Source
This commit is contained in:
pascal
2026-02-11 22:34:50 +01:00
parent 08ab1e3478
commit 22a3365658
7 changed files with 53 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
management/internals/modules/peers/manager_mock.go
View File

@@ -162,3 +162,17 @@ func (mr *MockManagerMockRecorder) SetNetworkMapController(networkMapController
mr.mock.ctrl.T.Helper() mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetNetworkMapController", reflect.TypeOf((*MockManager)(nil).SetNetworkMapController), networkMapController) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetNetworkMapController", reflect.TypeOf((*MockManager)(nil).SetNetworkMapController), networkMapController)
} }
// CreateProxyPeer mocks base method.
func (m *MockManager) CreateProxyPeer(ctx context.Context, accountID string, peerKey string, cluster string) error {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "CreateProxyPeer", ctx, accountID, peerKey, cluster)
ret0, _ := ret[0].(error)
return ret0
}
// CreateProxyPeer indicates an expected call of CreateProxyPeer.
func (mr *MockManagerMockRecorder) CreateProxyPeer(ctx, accountID, peerKey, cluster interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateProxyPeer", reflect.TypeOf((*MockManager)(nil).CreateProxyPeer), ctx, accountID, peerKey, cluster)
}

12
management/internals/modules/reverseproxy/manager/api.go
View File

@@ -26,16 +26,16 @@ func RegisterEndpoints(manager reverseproxy.Manager, domainManager domain.Manage
manager: manager, manager: manager,
} }
domainRouter := router.PathPrefix("/services").Subrouter() domainRouter := router.PathPrefix("/reverse-proxies").Subrouter()
domain.RegisterEndpoints(domainRouter, domainManager) domain.RegisterEndpoints(domainRouter, domainManager)
accesslogsmanager.RegisterEndpoints(router, accessLogsManager) accesslogsmanager.RegisterEndpoints(router, accessLogsManager)
router.HandleFunc("/services", h.getAllServices).Methods("GET", "OPTIONS") router.HandleFunc("/reverse-proxies/services", h.getAllServices).Methods("GET", "OPTIONS")
router.HandleFunc("/services", h.createService).Methods("POST", "OPTIONS") router.HandleFunc("/reverse-proxies/services", h.createService).Methods("POST", "OPTIONS")
router.HandleFunc("/services/{serviceId}", h.getService).Methods("GET", "OPTIONS") router.HandleFunc("/reverse-proxies/services/{serviceId}", h.getService).Methods("GET", "OPTIONS")
router.HandleFunc("/services/{serviceId}", h.updateService).Methods("PUT", "OPTIONS") router.HandleFunc("/reverse-proxies/services/{serviceId}", h.updateService).Methods("PUT", "OPTIONS")
router.HandleFunc("/services/{serviceId}", h.deleteService).Methods("DELETE", "OPTIONS") router.HandleFunc("/reverse-proxies/services/{serviceId}", h.deleteService).Methods("DELETE", "OPTIONS")
} }
func (h *handler) getAllServices(w http.ResponseWriter, r *http.Request) { func (h *handler) getAllServices(w http.ResponseWriter, r *http.Request) {

8
management/internals/shared/grpc/proxy_group_access_test.go
View File

@@ -120,7 +120,7 @@ func TestValidateUserGroupAccess(t *testing.T) {
"user1": {Id: "user1", AccountID: "account1"}, "user1": {Id: "user1", AccountID: "account1"},
}, },
expectErr: true, expectErr: true,
expectErrMsg: "reverse proxy not found", expectErrMsg: "service not found",
}, },
{ {
name: "proxy exists in different account - not accessible", name: "proxy exists in different account - not accessible",
@@ -133,7 +133,7 @@ func TestValidateUserGroupAccess(t *testing.T) {
"user1": {Id: "user1", AccountID: "account1"}, "user1": {Id: "user1", AccountID: "account1"},
}, },
expectErr: true, expectErr: true,
expectErrMsg: "reverse proxy not found", expectErrMsg: "service not found",
}, },
{ {
name: "no bearer auth configured - same account allows access", name: "no bearer auth configured - same account allows access",
@@ -260,7 +260,7 @@ func TestValidateUserGroupAccess(t *testing.T) {
"user1": {Id: "user1", AccountID: "account1"}, "user1": {Id: "user1", AccountID: "account1"},
}, },
expectErr: true, expectErr: true,
expectErrMsg: "get account reverse proxies", expectErrMsg: "get account services",
}, },
{ {
name: "multiple proxies in account - finds correct one", name: "multiple proxies in account - finds correct one",
@@ -366,7 +366,7 @@ func TestGetAccountProxyByDomain(t *testing.T) {
}, },
} }
proxy, err := server.getAccountProxyByDomain(context.Background(), tt.accountID, tt.domain) proxy, err := server.getAccountServiceByDomain(context.Background(), tt.accountID, tt.domain)
if tt.expectErr { if tt.expectErr {
require.Error(t, err) require.Error(t, err)

20
management/server/networks/manager_test.go
View File

@@ -29,7 +29,7 @@ func Test_GetAllNetworksReturnsNetworks(t *testing.T) {
permissionsManager := permissions.NewManager(s) permissionsManager := permissions.NewManager(s)
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
routerManager := routers.NewManagerMock() routerManager := routers.NewManagerMock()
resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am) resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am, nil)
manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am) manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am)
networks, err := manager.GetAllNetworks(ctx, accountID, userID) networks, err := manager.GetAllNetworks(ctx, accountID, userID)
@@ -52,7 +52,7 @@ func Test_GetAllNetworksReturnsPermissionDenied(t *testing.T) {
permissionsManager := permissions.NewManager(s) permissionsManager := permissions.NewManager(s)
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
routerManager := routers.NewManagerMock() routerManager := routers.NewManagerMock()
resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am) resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am, nil)
manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am) manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am)
networks, err := manager.GetAllNetworks(ctx, accountID, userID) networks, err := manager.GetAllNetworks(ctx, accountID, userID)
@@ -75,7 +75,7 @@ func Test_GetNetworkReturnsNetwork(t *testing.T) {
permissionsManager := permissions.NewManager(s) permissionsManager := permissions.NewManager(s)
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
routerManager := routers.NewManagerMock() routerManager := routers.NewManagerMock()
resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am) resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am, nil)
manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am) manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am)
networks, err := manager.GetNetwork(ctx, accountID, userID, networkID) networks, err := manager.GetNetwork(ctx, accountID, userID, networkID)
@@ -98,7 +98,7 @@ func Test_GetNetworkReturnsPermissionDenied(t *testing.T) {
permissionsManager := permissions.NewManager(s) permissionsManager := permissions.NewManager(s)
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
routerManager := routers.NewManagerMock() routerManager := routers.NewManagerMock()
resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am) resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am, nil)
manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am) manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am)
network, err := manager.GetNetwork(ctx, accountID, userID, networkID) network, err := manager.GetNetwork(ctx, accountID, userID, networkID)
@@ -123,7 +123,7 @@ func Test_CreateNetworkSuccessfully(t *testing.T) {
permissionsManager := permissions.NewManager(s) permissionsManager := permissions.NewManager(s)
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
routerManager := routers.NewManagerMock() routerManager := routers.NewManagerMock()
resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am) resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am, nil)
manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am) manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am)
createdNetwork, err := manager.CreateNetwork(ctx, userID, network) createdNetwork, err := manager.CreateNetwork(ctx, userID, network)
@@ -148,7 +148,7 @@ func Test_CreateNetworkFailsWithPermissionDenied(t *testing.T) {
permissionsManager := permissions.NewManager(s) permissionsManager := permissions.NewManager(s)
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
routerManager := routers.NewManagerMock() routerManager := routers.NewManagerMock()
resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am) resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am, nil)
manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am) manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am)
createdNetwork, err := manager.CreateNetwork(ctx, userID, network) createdNetwork, err := manager.CreateNetwork(ctx, userID, network)
@@ -171,7 +171,7 @@ func Test_DeleteNetworkSuccessfully(t *testing.T) {
permissionsManager := permissions.NewManager(s) permissionsManager := permissions.NewManager(s)
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
routerManager := routers.NewManagerMock() routerManager := routers.NewManagerMock()
resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am) resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am, nil)
manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am) manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am)
err = manager.DeleteNetwork(ctx, accountID, userID, networkID) err = manager.DeleteNetwork(ctx, accountID, userID, networkID)
@@ -193,7 +193,7 @@ func Test_DeleteNetworkFailsWithPermissionDenied(t *testing.T) {
permissionsManager := permissions.NewManager(s) permissionsManager := permissions.NewManager(s)
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
routerManager := routers.NewManagerMock() routerManager := routers.NewManagerMock()
resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am) resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am, nil)
manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am) manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am)
err = manager.DeleteNetwork(ctx, accountID, userID, networkID) err = manager.DeleteNetwork(ctx, accountID, userID, networkID)
@@ -218,7 +218,7 @@ func Test_UpdateNetworkSuccessfully(t *testing.T) {
permissionsManager := permissions.NewManager(s) permissionsManager := permissions.NewManager(s)
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
routerManager := routers.NewManagerMock() routerManager := routers.NewManagerMock()
resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am) resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am, nil)
manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am) manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am)
updatedNetwork, err := manager.UpdateNetwork(ctx, userID, network) updatedNetwork, err := manager.UpdateNetwork(ctx, userID, network)
@@ -245,7 +245,7 @@ func Test_UpdateNetworkFailsWithPermissionDenied(t *testing.T) {
permissionsManager := permissions.NewManager(s) permissionsManager := permissions.NewManager(s)
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
routerManager := routers.NewManagerMock() routerManager := routers.NewManagerMock()
resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am) resourcesManager := resources.NewManager(s, permissionsManager, groupsManager, &am, nil)
manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am) manager := NewManager(s, permissionsManager, resourcesManager, routerManager, &am)
updatedNetwork, err := manager.UpdateNetwork(ctx, userID, network) updatedNetwork, err := manager.UpdateNetwork(ctx, userID, network)

32
management/server/networks/resources/manager_test.go
View File

@@ -28,7 +28,7 @@ func Test_GetAllResourcesInNetworkReturnsResources(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
resources, err := manager.GetAllResourcesInNetwork(ctx, accountID, userID, networkID) resources, err := manager.GetAllResourcesInNetwork(ctx, accountID, userID, networkID)
require.NoError(t, err) require.NoError(t, err)
@@ -49,7 +49,7 @@ func Test_GetAllResourcesInNetworkReturnsPermissionDenied(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
resources, err := manager.GetAllResourcesInNetwork(ctx, accountID, userID, networkID) resources, err := manager.GetAllResourcesInNetwork(ctx, accountID, userID, networkID)
require.Error(t, err) require.Error(t, err)
@@ -69,7 +69,7 @@ func Test_GetAllResourcesInAccountReturnsResources(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
resources, err := manager.GetAllResourcesInAccount(ctx, accountID, userID) resources, err := manager.GetAllResourcesInAccount(ctx, accountID, userID)
require.NoError(t, err) require.NoError(t, err)
@@ -89,7 +89,7 @@ func Test_GetAllResourcesInAccountReturnsPermissionDenied(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
resources, err := manager.GetAllResourcesInAccount(ctx, accountID, userID) resources, err := manager.GetAllResourcesInAccount(ctx, accountID, userID)
require.Error(t, err) require.Error(t, err)
@@ -112,7 +112,7 @@ func Test_GetResourceInNetworkReturnsResources(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
resource, err := manager.GetResource(ctx, accountID, userID, networkID, resourceID) resource, err := manager.GetResource(ctx, accountID, userID, networkID, resourceID)
require.NoError(t, err) require.NoError(t, err)
@@ -134,7 +134,7 @@ func Test_GetResourceInNetworkReturnsPermissionDenied(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
resources, err := manager.GetResource(ctx, accountID, userID, networkID, resourceID) resources, err := manager.GetResource(ctx, accountID, userID, networkID, resourceID)
require.Error(t, err) require.Error(t, err)
@@ -161,7 +161,7 @@ func Test_CreateResourceSuccessfully(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
createdResource, err := manager.CreateResource(ctx, userID, resource) createdResource, err := manager.CreateResource(ctx, userID, resource)
require.NoError(t, err) require.NoError(t, err)
@@ -187,7 +187,7 @@ func Test_CreateResourceFailsWithPermissionDenied(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
createdResource, err := manager.CreateResource(ctx, userID, resource) createdResource, err := manager.CreateResource(ctx, userID, resource)
require.Error(t, err) require.Error(t, err)
@@ -214,7 +214,7 @@ func Test_CreateResourceFailsWithInvalidAddress(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
createdResource, err := manager.CreateResource(ctx, userID, resource) createdResource, err := manager.CreateResource(ctx, userID, resource)
require.Error(t, err) require.Error(t, err)
@@ -240,7 +240,7 @@ func Test_CreateResourceFailsWithUsedName(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
createdResource, err := manager.CreateResource(ctx, userID, resource) createdResource, err := manager.CreateResource(ctx, userID, resource)
require.Error(t, err) require.Error(t, err)
@@ -270,7 +270,7 @@ func Test_UpdateResourceSuccessfully(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
updatedResource, err := manager.UpdateResource(ctx, userID, resource) updatedResource, err := manager.UpdateResource(ctx, userID, resource)
require.NoError(t, err) require.NoError(t, err)
@@ -302,7 +302,7 @@ func Test_UpdateResourceFailsWithResourceNotFound(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
updatedResource, err := manager.UpdateResource(ctx, userID, resource) updatedResource, err := manager.UpdateResource(ctx, userID, resource)
require.Error(t, err) require.Error(t, err)
@@ -332,7 +332,7 @@ func Test_UpdateResourceFailsWithNameInUse(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
updatedResource, err := manager.UpdateResource(ctx, userID, resource) updatedResource, err := manager.UpdateResource(ctx, userID, resource)
require.Error(t, err) require.Error(t, err)
@@ -361,7 +361,7 @@ func Test_UpdateResourceFailsWithPermissionDenied(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
updatedResource, err := manager.UpdateResource(ctx, userID, resource) updatedResource, err := manager.UpdateResource(ctx, userID, resource)
require.Error(t, err) require.Error(t, err)
@@ -383,7 +383,7 @@ func Test_DeleteResourceSuccessfully(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
err = manager.DeleteResource(ctx, accountID, userID, networkID, resourceID) err = manager.DeleteResource(ctx, accountID, userID, networkID, resourceID)
require.NoError(t, err) require.NoError(t, err)
@@ -404,7 +404,7 @@ func Test_DeleteResourceFailsWithPermissionDenied(t *testing.T) {
permissionsManager := permissions.NewManager(store) permissionsManager := permissions.NewManager(store)
am := mock_server.MockAccountManager{} am := mock_server.MockAccountManager{}
groupsManager := groups.NewManagerMock() groupsManager := groups.NewManagerMock()
manager := NewManager(store, permissionsManager, groupsManager, &am) manager := NewManager(store, permissionsManager, groupsManager, &am, nil)
err = manager.DeleteResource(ctx, accountID, userID, networkID, resourceID) err = manager.DeleteResource(ctx, accountID, userID, networkID, resourceID)
require.Error(t, err) require.Error(t, err)

2
management/server/store/sql_store.go
View File

@@ -1100,7 +1100,7 @@ func (s *SqlStore) getAccountGorm(ctx context.Context, accountID string) (*types
Preload("NetworkRouters"). Preload("NetworkRouters").
Preload("NetworkResources"). Preload("NetworkResources").
Preload("Onboarding"). Preload("Onboarding").
Preload("ReverseProxies"). Preload("Services").
Take(&account, idQueryCondition, accountID) Take(&account, idQueryCondition, accountID)
if result.Error != nil { if result.Error != nil {
log.WithContext(ctx).Errorf("error when getting account %s from the store: %s", accountID, result.Error) log.WithContext(ctx).Errorf("error when getting account %s from the store: %s", accountID, result.Error)

4
shared/management/http/api/openapi.yml
View File

@@ -7030,7 +7030,7 @@ paths:
"$ref": "#/components/responses/not_found" "$ref": "#/components/responses/not_found"
'500': '500':
"$ref": "#/components/responses/internal_error" "$ref": "#/components/responses/internal_error"
/api/services/domains/{domainId}: /api/reverse-proxies/domains/{domainId}:
delete: delete:
summary: Delete a Custom domain summary: Delete a Custom domain
description: Delete an existing service custom domain description: Delete an existing service custom domain
@@ -7058,7 +7058,7 @@ paths:
"$ref": "#/components/responses/not_found" "$ref": "#/components/responses/not_found"
'500': '500':
"$ref": "#/components/responses/internal_error" "$ref": "#/components/responses/internal_error"
/api/services/domains/{domainId}/validate: /api/reverse-proxies/domains/{domainId}/validate:
get: get:
summary: Validate a custom domain summary: Validate a custom domain
description: Trigger domain ownership validation for a custom domain description: Trigger domain ownership validation for a custom domain