From 185d319c6afa09e13e91da1cf0592675ae82d537 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 22 Sep 2025 16:43:05 +0200 Subject: [PATCH 1/2] allow running auth-bearer as part of the runtime MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- opencloud/pkg/runtime/service/service.go | 6 ++++++ services/auth-bearer/pkg/command/server.go | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/opencloud/pkg/runtime/service/service.go b/opencloud/pkg/runtime/service/service.go index d4281bf11f..08b1760728 100644 --- a/opencloud/pkg/runtime/service/service.go +++ b/opencloud/pkg/runtime/service/service.go @@ -28,6 +28,7 @@ import ( audit "github.com/opencloud-eu/opencloud/services/audit/pkg/command" authapp "github.com/opencloud-eu/opencloud/services/auth-app/pkg/command" authbasic "github.com/opencloud-eu/opencloud/services/auth-basic/pkg/command" + authbearer "github.com/opencloud-eu/opencloud/services/auth-bearer/pkg/command" authmachine "github.com/opencloud-eu/opencloud/services/auth-machine/pkg/command" authservice "github.com/opencloud-eu/opencloud/services/auth-service/pkg/command" clientlog "github.com/opencloud-eu/opencloud/services/clientlog/pkg/command" @@ -329,6 +330,11 @@ func NewService(ctx context.Context, options ...Option) (*Service, error) { cfg.Audit.Commons = cfg.Commons return audit.Execute(cfg.Audit) }) + areg(opts.Config.AuthBearer.Service.Name, func(ctx context.Context, cfg *occfg.Config) error { + cfg.AuthBearer.Context = ctx + cfg.AuthBearer.Commons = cfg.Commons + return authbearer.Execute(cfg.AuthBearer) + }) areg(opts.Config.Policies.Service.Name, func(ctx context.Context, cfg *occfg.Config) error { cfg.Policies.Context = ctx cfg.Policies.Commons = cfg.Commons diff --git a/services/auth-bearer/pkg/command/server.go b/services/auth-bearer/pkg/command/server.go index d78b93bbbc..776bdb6748 100644 --- a/services/auth-bearer/pkg/command/server.go +++ b/services/auth-bearer/pkg/command/server.go @@ -70,7 +70,7 @@ func Server(cfg *config.Config) *cli.Command { debug.Config(cfg), ) if err != nil { - logger.Info().Err(err).Str("server", "debug").Msg("Failed to initialize server") + logger.Error().Err(err).Str("server", "debug").Msg("Failed to initialize server") return err } From c3a439190702da0a7187326b54c04552b04adac3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= Date: Mon, 22 Sep 2025 17:23:46 +0200 Subject: [PATCH 2/2] adjust expected failures MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jörn Friedrich Dreyer --- .../expected-failures-localAPI-on-decomposed-storage.md | 2 +- tests/acceptance/expected-failures-localAPI-on-posix-storage.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md b/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md index d3062aaa94..b2c803ee53 100644 --- a/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md +++ b/tests/acceptance/expected-failures-localAPI-on-decomposed-storage.md @@ -190,7 +190,7 @@ #### [Readiness check for some services returns 500 status code](https://github.com/owncloud/ocis/issues/10661) - [apiServiceAvailability/serviceAvailabilityCheck.feature:116](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiServiceAvailability/serviceAvailabilityCheck.feature#L116) -- [apiServiceAvailability/serviceAvailabilityCheck.feature:125](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiServiceAvailability/serviceAvailabilityCheck.feature#L125) + #### [Skip tests for different languages](https://github.com/opencloud-eu/opencloud/issues/183) - [apiActivities/activities.feature:2598](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiActivities/activities.feature#L2598) diff --git a/tests/acceptance/expected-failures-localAPI-on-posix-storage.md b/tests/acceptance/expected-failures-localAPI-on-posix-storage.md index 0f516d03dd..c0705d5226 100644 --- a/tests/acceptance/expected-failures-localAPI-on-posix-storage.md +++ b/tests/acceptance/expected-failures-localAPI-on-posix-storage.md @@ -190,7 +190,7 @@ #### [Readiness check for some services returns 500 status code](https://github.com/owncloud/ocis/issues/10661) - [apiServiceAvailability/serviceAvailabilityCheck.feature:116](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiServiceAvailability/serviceAvailabilityCheck.feature#L116) -- [apiServiceAvailability/serviceAvailabilityCheck.feature:125](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiServiceAvailability/serviceAvailabilityCheck.feature#L125) + #### [Skip tests for different languages](https://github.com/opencloud-eu/opencloud/issues/183) - [apiActivities/activities.feature:2598](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/apiActivities/activities.feature#L2598)