Skip to content

Only set auth and permissions clients when private endpoints are enabled #646

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

Merged
franmoore05 merged 2 commits into from
Dec 12, 2025
Merged

Only set auth and permissions clients when private endpoints are enabled #646

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa6fdb0
Only set auth and permissions clients when private endpoints are enabled
franmoore05 Dec 11, 2025
4035556
Amending how auth client is instantiated
franmoore05 Dec 11, 2025
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
29 changes: 15 additions & 14 deletions service/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,9 +281,24 @@ func (svc *Service) Run(ctx context.Context, buildTime, gitCommit, version strin
models.Filterable: downloadGeneratorCMD,
}

var authorisation auth.Middleware
var permissionChecker *permissions.Checker
// Get Identity Client (only if private endpoints are enabled)
if svc.config.EnablePrivateEndpoints {
svc.identityClient = clientsidentity.New(svc.config.ZebedeeURL)
// Get Permissions
authorisation, err = svc.serviceList.GetAuthorisationMiddleware(ctx, svc.config.AuthConfig)
if err != nil {
log.Fatal(ctx, "could not instantiate authorisation middleware", err)
return err
}

permissionChecker = permissions.NewChecker(
ctx,
svc.config.AuthConfig.PermissionsAPIURL,
svc.config.AuthConfig.PermissionsCacheUpdateInterval,
svc.config.AuthConfig.PermissionsMaxCacheTime,
)
}

// Get HealthCheck
Expand Down Expand Up @@ -319,20 +334,6 @@ func (svc *Service) Run(ctx context.Context, buildTime, gitCommit, version strin
log.Info(ctx, "URL rewriting enabled")
}

// Get Permissions
authorisation, err := svc.serviceList.Init.DoGetAuthorisationMiddleware(ctx, svc.config.AuthConfig)
if err != nil {
log.Fatal(ctx, "could not instantiate authorisation middleware", err)
return err
}

permissionChecker := permissions.NewChecker(
ctx,
svc.config.AuthConfig.PermissionsAPIURL,
svc.config.AuthConfig.PermissionsCacheUpdateInterval,
svc.config.AuthConfig.PermissionsMaxCacheTime,
)

// Log kafka producer errors in parallel go-routine
if svc.config.EnablePrivateEndpoints {
svc.generateCMDDownloadsProducer.LogErrors(ctx)
Expand Down
21 changes: 11 additions & 10 deletions service/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,12 @@ func TestRun(t *testing.T) {

Convey("Given that initialising Healthcheck returns an error", func() {
initMock := &serviceMock.InitialiserMock{
DoGetMongoDBFunc: funcDoGetMongoDBOk,
DoGetGraphDBFunc: funcDoGetGraphDBOk,
DoGetFilesAPIClientFunc: funcDoGetFilesAPIClientOk,
DoGetKafkaProducerFunc: funcDoGetKafkaProducerOk,
DoGetHealthCheckFunc: funcDoGetHealthcheckErr,
DoGetMongoDBFunc: funcDoGetMongoDBOk,
DoGetGraphDBFunc: funcDoGetGraphDBOk,
DoGetFilesAPIClientFunc: funcDoGetFilesAPIClientOk,
DoGetKafkaProducerFunc: funcDoGetKafkaProducerOk,
DoGetHealthCheckFunc: funcDoGetHealthcheckErr,
DoGetAuthorisationMiddlewareFunc: funcDoGetAuthOk,
}
svcErrors := make(chan error, 1)
svcList := service.NewServiceList(initMock)
Expand Down Expand Up @@ -257,6 +258,7 @@ func TestRun(t *testing.T) {
DoGetHealthCheckFunc: func(*config.Configuration, string, string, string) (service.HealthChecker, error) {
return hcMockAddFail, nil
},
DoGetAuthorisationMiddlewareFunc: funcDoGetAuthOk,
}
svcErrors := make(chan error, 1)
svcList := service.NewServiceList(initMock)
Expand Down Expand Up @@ -326,11 +328,10 @@ func TestRun(t *testing.T) {
Convey("Given that all dependencies are successfully initialised, private endpoints are disabled", func() {
cfg.EnablePrivateEndpoints = false
initMock := &serviceMock.InitialiserMock{
DoGetMongoDBFunc: funcDoGetMongoDBOk,
DoGetKafkaProducerFunc: funcDoGetKafkaProducerOk,
DoGetHealthCheckFunc: funcDoGetHealthcheckOk,
DoGetHTTPServerFunc: funcDoGetHTTPServer,
DoGetAuthorisationMiddlewareFunc: funcDoGetAuthOk,
DoGetMongoDBFunc: funcDoGetMongoDBOk,
DoGetKafkaProducerFunc: funcDoGetKafkaProducerOk,
DoGetHealthCheckFunc: funcDoGetHealthcheckOk,
DoGetHTTPServerFunc: funcDoGetHTTPServer,
}
svcErrors := make(chan error, 1)
svcList := service.NewServiceList(initMock)
Expand Down