From 759cefd94c135c0bfc34ec4320f9538b2682889d Mon Sep 17 00:00:00 2001 From: Charandas Date: Fri, 15 Mar 2024 00:18:11 -0700 Subject: [PATCH] ExtSvcAccounts: FIX tests that accidently depended on enterprise (#84535) * ExtSvcAccounts: FIX tests that accidently depended on enterprise * fix --- pkg/services/serviceaccounts/manager/service_test.go | 4 ++-- pkg/services/serviceaccounts/manager/stats_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/services/serviceaccounts/manager/service_test.go b/pkg/services/serviceaccounts/manager/service_test.go index 39744123bfa..c7175f480c8 100644 --- a/pkg/services/serviceaccounts/manager/service_test.go +++ b/pkg/services/serviceaccounts/manager/service_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" + "github.com/grafana/grafana/pkg/services/accesscontrol/actest" "github.com/stretchr/testify/require" - "github.com/grafana/grafana/pkg/extensions/accesscontrol/actest" "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/services/apikey" "github.com/grafana/grafana/pkg/services/org" @@ -117,8 +117,8 @@ func (f *SecretsCheckerFake) CheckTokens(ctx context.Context) error { } func TestProvideServiceAccount_DeleteServiceAccount(t *testing.T) { - acSvc := &actest.FakeService{} storeMock := newServiceAccountStoreFake() + acSvc := actest.FakeService{} svc := ServiceAccountsService{acSvc, storeMock, log.New("test"), log.New("background.test"), &SecretsCheckerFake{}, false, 0} testOrgId := 1 diff --git a/pkg/services/serviceaccounts/manager/stats_test.go b/pkg/services/serviceaccounts/manager/stats_test.go index 7dff6d52447..e85e9adb129 100644 --- a/pkg/services/serviceaccounts/manager/stats_test.go +++ b/pkg/services/serviceaccounts/manager/stats_test.go @@ -4,16 +4,16 @@ import ( "context" "testing" + "github.com/grafana/grafana/pkg/services/accesscontrol/actest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/grafana/grafana/pkg/extensions/accesscontrol/actest" "github.com/grafana/grafana/pkg/infra/log" "github.com/grafana/grafana/pkg/services/serviceaccounts" ) func Test_UsageStats(t *testing.T) { - acSvc := &actest.FakeService{} + acSvc := actest.FakeService{} storeMock := newServiceAccountStoreFake() svc := ServiceAccountsService{acSvc, storeMock, log.New("test"), log.New("background-test"), &SecretsCheckerFake{}, true, 5} err := svc.DeleteServiceAccount(context.Background(), 1, 1)