From 3dd3b2f5982f17799613031f69b232babf2c725a Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Thu, 3 Mar 2022 20:27:57 +0100 Subject: [PATCH 1/9] bump version, prepare changelog --- .../add-ordering-list-drives.md | 0 changelog/{unreleased => 1.18.0_2022-03-03}/changeNatsPort.md | 0 .../enhancement-web-cache-control.md | 0 .../enhancement-web-spa-fileserver.md | 0 .../fix-capabilities-for-public-links.md | 0 .../{unreleased => 1.18.0_2022-03-03}/fix-events-config.md | 0 .../fix-storage-metadata-env-var-name.md | 0 .../{unreleased => 1.18.0_2022-03-03}/notifications-service.md | 0 .../{unreleased => 1.18.0_2022-03-03}/spaces-thumbnails.md | 0 changelog/{unreleased => 1.18.0_2022-03-03}/unify-file-ids.md | 0 changelog/{unreleased => 1.18.0_2022-03-03}/update-reva.md | 0 changelog/{unreleased => 1.18.0_2022-03-03}/update-web-5.2.0.md | 0 sonar-project.properties | 2 +- 13 files changed, 1 insertion(+), 1 deletion(-) rename changelog/{unreleased => 1.18.0_2022-03-03}/add-ordering-list-drives.md (100%) rename changelog/{unreleased => 1.18.0_2022-03-03}/changeNatsPort.md (100%) rename changelog/{unreleased => 1.18.0_2022-03-03}/enhancement-web-cache-control.md (100%) rename changelog/{unreleased => 1.18.0_2022-03-03}/enhancement-web-spa-fileserver.md (100%) rename changelog/{unreleased => 1.18.0_2022-03-03}/fix-capabilities-for-public-links.md (100%) rename changelog/{unreleased => 1.18.0_2022-03-03}/fix-events-config.md (100%) rename changelog/{unreleased => 1.18.0_2022-03-03}/fix-storage-metadata-env-var-name.md (100%) rename changelog/{unreleased => 1.18.0_2022-03-03}/notifications-service.md (100%) rename changelog/{unreleased => 1.18.0_2022-03-03}/spaces-thumbnails.md (100%) rename changelog/{unreleased => 1.18.0_2022-03-03}/unify-file-ids.md (100%) rename changelog/{unreleased => 1.18.0_2022-03-03}/update-reva.md (100%) rename changelog/{unreleased => 1.18.0_2022-03-03}/update-web-5.2.0.md (100%) diff --git a/changelog/unreleased/add-ordering-list-drives.md b/changelog/1.18.0_2022-03-03/add-ordering-list-drives.md similarity index 100% rename from changelog/unreleased/add-ordering-list-drives.md rename to changelog/1.18.0_2022-03-03/add-ordering-list-drives.md diff --git a/changelog/unreleased/changeNatsPort.md b/changelog/1.18.0_2022-03-03/changeNatsPort.md similarity index 100% rename from changelog/unreleased/changeNatsPort.md rename to changelog/1.18.0_2022-03-03/changeNatsPort.md diff --git a/changelog/unreleased/enhancement-web-cache-control.md b/changelog/1.18.0_2022-03-03/enhancement-web-cache-control.md similarity index 100% rename from changelog/unreleased/enhancement-web-cache-control.md rename to changelog/1.18.0_2022-03-03/enhancement-web-cache-control.md diff --git a/changelog/unreleased/enhancement-web-spa-fileserver.md b/changelog/1.18.0_2022-03-03/enhancement-web-spa-fileserver.md similarity index 100% rename from changelog/unreleased/enhancement-web-spa-fileserver.md rename to changelog/1.18.0_2022-03-03/enhancement-web-spa-fileserver.md diff --git a/changelog/unreleased/fix-capabilities-for-public-links.md b/changelog/1.18.0_2022-03-03/fix-capabilities-for-public-links.md similarity index 100% rename from changelog/unreleased/fix-capabilities-for-public-links.md rename to changelog/1.18.0_2022-03-03/fix-capabilities-for-public-links.md diff --git a/changelog/unreleased/fix-events-config.md b/changelog/1.18.0_2022-03-03/fix-events-config.md similarity index 100% rename from changelog/unreleased/fix-events-config.md rename to changelog/1.18.0_2022-03-03/fix-events-config.md diff --git a/changelog/unreleased/fix-storage-metadata-env-var-name.md b/changelog/1.18.0_2022-03-03/fix-storage-metadata-env-var-name.md similarity index 100% rename from changelog/unreleased/fix-storage-metadata-env-var-name.md rename to changelog/1.18.0_2022-03-03/fix-storage-metadata-env-var-name.md diff --git a/changelog/unreleased/notifications-service.md b/changelog/1.18.0_2022-03-03/notifications-service.md similarity index 100% rename from changelog/unreleased/notifications-service.md rename to changelog/1.18.0_2022-03-03/notifications-service.md diff --git a/changelog/unreleased/spaces-thumbnails.md b/changelog/1.18.0_2022-03-03/spaces-thumbnails.md similarity index 100% rename from changelog/unreleased/spaces-thumbnails.md rename to changelog/1.18.0_2022-03-03/spaces-thumbnails.md diff --git a/changelog/unreleased/unify-file-ids.md b/changelog/1.18.0_2022-03-03/unify-file-ids.md similarity index 100% rename from changelog/unreleased/unify-file-ids.md rename to changelog/1.18.0_2022-03-03/unify-file-ids.md diff --git a/changelog/unreleased/update-reva.md b/changelog/1.18.0_2022-03-03/update-reva.md similarity index 100% rename from changelog/unreleased/update-reva.md rename to changelog/1.18.0_2022-03-03/update-reva.md diff --git a/changelog/unreleased/update-web-5.2.0.md b/changelog/1.18.0_2022-03-03/update-web-5.2.0.md similarity index 100% rename from changelog/unreleased/update-web-5.2.0.md rename to changelog/1.18.0_2022-03-03/update-web-5.2.0.md diff --git a/sonar-project.properties b/sonar-project.properties index ef6f15411a..00ae76b142 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -2,7 +2,7 @@ sonar.projectKey=owncloud_ocis sonar.organization=owncloud-1 sonar.projectName=ocis -sonar.projectVersion=1.17.0 +sonar.projectVersion=1.18.0 sonar.host.url=https://sonarcloud.io # ===================================================== From 4306c22860065dd215c8f7c78a124142a3363264 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Thu, 17 Feb 2022 16:26:37 +0100 Subject: [PATCH 2/9] check running nats server for errors --- nats/pkg/command/server.go | 129 ++++++++++++++++---------------- nats/pkg/logging/nats.go | 52 +++++++++++++ nats/pkg/server/nats/nats.go | 17 +++++ nats/pkg/server/nats/options.go | 37 +++++++++ 4 files changed, 172 insertions(+), 63 deletions(-) create mode 100644 nats/pkg/logging/nats.go create mode 100644 nats/pkg/server/nats/nats.go create mode 100644 nats/pkg/server/nats/options.go diff --git a/nats/pkg/command/server.go b/nats/pkg/command/server.go index 1535e51f94..f12538ab64 100644 --- a/nats/pkg/command/server.go +++ b/nats/pkg/command/server.go @@ -1,16 +1,16 @@ package command import ( + "context" "fmt" - "os" - "os/signal" - "syscall" + "time" + + "github.com/oklog/run" - "github.com/cs3org/reva/v2/pkg/events/server" "github.com/owncloud/ocis/nats/pkg/config" "github.com/owncloud/ocis/nats/pkg/config/parser" "github.com/owncloud/ocis/nats/pkg/logging" - "github.com/owncloud/ocis/ocis-pkg/log" + "github.com/owncloud/ocis/nats/pkg/server/nats" "github.com/urfave/cli/v2" // TODO: .Logger Option on events/server would make this import redundant @@ -28,65 +28,68 @@ func Server(cfg *config.Config) *cli.Command { }, Action: func(c *cli.Context) error { logger := logging.Configure(cfg.Service.Name, cfg.Log) - ch := make(chan os.Signal, 1) - signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM) - err := server.RunNatsServer(server.Host(cfg.Nats.Host), server.Port(cfg.Nats.Port), server.StanOpts(func(o *stanServer.Options) { - o.CustomLogger = &logWrapper{logger} - })) - if err != nil { - return err - } - for { - select { - case <-ch: - // TODO: Should we shut down the NatsServer in a proper way here? - // That would require a reference to the StanServer instance for being able to call - // StanServer.Shutdown() github.com/cs3org/reva/pkg/events/server doesn't provide that - // currently - return nil + + gr := run.Group{} + ctx, cancel := func() (context.Context, context.CancelFunc) { + if cfg.Context == nil { + return context.WithCancel(context.Background()) } - } + return context.WithCancel(cfg.Context) + }() + + defer cancel() + + var natsServer *stanServer.StanServer + + gr.Add(func() error { + var err error + + natsServer, err = nats.RunNatsServer( + nats.Host(cfg.Nats.Host), + nats.Port(cfg.Nats.Port), + nats.StanOpts( + func(o *stanServer.Options) { + o.CustomLogger = logging.NewLogWrapper(logger) + }, + ), + ) + + if err != nil { + return err + } + + errChan := make(chan error) + + go func() { + for { + // check if NATs server has an encountered an error + if err := natsServer.LastError(); err != nil { + errChan <- err + return + } + if ctx.Err() != nil { + return // context closed + } + time.Sleep(1 * time.Second) + } + }() + + select { + case <-ctx.Done(): + return nil + case err = <-errChan: + return err + } + + }, func(_ error) { + logger.Info(). + Msg("Shutting down server") + + natsServer.Shutdown() + cancel() + }) + + return gr.Run() }, } } - -// we need to wrap our logger so we can pass it to the nats server -type logWrapper struct { - logger log.Logger -} - -// Noticef logs a notice statement -func (l *logWrapper) Noticef(format string, v ...interface{}) { - msg := fmt.Sprintf(format, v...) - l.logger.Info().Msg(msg) -} - -// Warnf logs a warning statement -func (l *logWrapper) Warnf(format string, v ...interface{}) { - msg := fmt.Sprintf(format, v...) - l.logger.Warn().Msg(msg) -} - -// Fatalf logs a fatal statement -func (l *logWrapper) Fatalf(format string, v ...interface{}) { - msg := fmt.Sprintf(format, v...) - l.logger.Fatal().Msg(msg) -} - -// Errorf logs an error statement -func (l *logWrapper) Errorf(format string, v ...interface{}) { - msg := fmt.Sprintf(format, v...) - l.logger.Error().Msg(msg) -} - -// Debugf logs a debug statement -func (l *logWrapper) Debugf(format string, v ...interface{}) { - msg := fmt.Sprintf(format, v...) - l.logger.Debug().Msg(msg) -} - -// Tracef logs a trace statement -func (l *logWrapper) Tracef(format string, v ...interface{}) { - msg := fmt.Sprintf(format, v...) - l.logger.Trace().Msg(msg) -} diff --git a/nats/pkg/logging/nats.go b/nats/pkg/logging/nats.go new file mode 100644 index 0000000000..8074de3d60 --- /dev/null +++ b/nats/pkg/logging/nats.go @@ -0,0 +1,52 @@ +package logging + +import ( + "fmt" + + "github.com/owncloud/ocis/ocis-pkg/log" +) + +func NewLogWrapper(logger log.Logger) *LogWrapper { + return &LogWrapper{logger} +} + +// we need to wrap our logger so we can pass it to the nats server +type LogWrapper struct { + logger log.Logger +} + +// Noticef logs a notice statement +func (l *LogWrapper) Noticef(format string, v ...interface{}) { + msg := fmt.Sprintf(format, v...) + l.logger.Info().Msg(msg) +} + +// Warnf logs a warning statement +func (l *LogWrapper) Warnf(format string, v ...interface{}) { + msg := fmt.Sprintf(format, v...) + l.logger.Warn().Msg(msg) +} + +// Fatalf logs a fatal statement +func (l *LogWrapper) Fatalf(format string, v ...interface{}) { + msg := fmt.Sprintf(format, v...) + l.logger.Fatal().Msg(msg) +} + +// Errorf logs an error statement +func (l *LogWrapper) Errorf(format string, v ...interface{}) { + msg := fmt.Sprintf(format, v...) + l.logger.Error().Msg(msg) +} + +// Debugf logs a debug statement +func (l *LogWrapper) Debugf(format string, v ...interface{}) { + msg := fmt.Sprintf(format, v...) + l.logger.Debug().Msg(msg) +} + +// Tracef logs a trace statement +func (l *LogWrapper) Tracef(format string, v ...interface{}) { + msg := fmt.Sprintf(format, v...) + l.logger.Trace().Msg(msg) +} diff --git a/nats/pkg/server/nats/nats.go b/nats/pkg/server/nats/nats.go new file mode 100644 index 0000000000..398a4c9666 --- /dev/null +++ b/nats/pkg/server/nats/nats.go @@ -0,0 +1,17 @@ +package nats + +import ( + stanServer "github.com/nats-io/nats-streaming-server/server" +) + +// RunNatsServer runs the nats streaming server +func RunNatsServer(opts ...Option) (*stanServer.StanServer, error) { + natsOpts := stanServer.DefaultNatsServerOptions + stanOpts := stanServer.GetDefaultOptions() + + for _, o := range opts { + o(&natsOpts, stanOpts) + } + s, err := stanServer.RunServerWithOpts(stanOpts, &natsOpts) + return s, err +} diff --git a/nats/pkg/server/nats/options.go b/nats/pkg/server/nats/options.go new file mode 100644 index 0000000000..74e54e51f1 --- /dev/null +++ b/nats/pkg/server/nats/options.go @@ -0,0 +1,37 @@ +package nats + +import ( + natsServer "github.com/nats-io/nats-server/v2/server" + stanServer "github.com/nats-io/nats-streaming-server/server" +) + +// Option configures the nats server +type Option func(*natsServer.Options, *stanServer.Options) + +// Host sets the host URL for the nats server +func Host(url string) Option { + return func(no *natsServer.Options, _ *stanServer.Options) { + no.Host = url + } +} + +// Port sets the host URL for the nats server +func Port(port int) Option { + return func(no *natsServer.Options, _ *stanServer.Options) { + no.Port = port + } +} + +// NatsOpts allows setting Options from nats package directly +func NatsOpts(opt func(*natsServer.Options)) Option { + return func(no *natsServer.Options, _ *stanServer.Options) { + opt(no) + } +} + +// StanOpts allows setting Options from stan package directly +func StanOpts(opt func(*stanServer.Options)) Option { + return func(_ *natsServer.Options, so *stanServer.Options) { + opt(so) + } +} From 3a60056bb3c45325d283309ee300f307068cb1ec Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 18 Feb 2022 11:44:26 +0100 Subject: [PATCH 3/9] transfer logic into nats server package --- nats/pkg/command/server.go | 50 +++++++------------------------ nats/pkg/server/nats/nats.go | 52 ++++++++++++++++++++++++++++----- nats/pkg/server/nats/options.go | 16 ++++------ 3 files changed, 61 insertions(+), 57 deletions(-) diff --git a/nats/pkg/command/server.go b/nats/pkg/command/server.go index f12538ab64..be2e0ff46d 100644 --- a/nats/pkg/command/server.go +++ b/nats/pkg/command/server.go @@ -3,7 +3,6 @@ package command import ( "context" "fmt" - "time" "github.com/oklog/run" @@ -12,9 +11,6 @@ import ( "github.com/owncloud/ocis/nats/pkg/logging" "github.com/owncloud/ocis/nats/pkg/server/nats" "github.com/urfave/cli/v2" - - // TODO: .Logger Option on events/server would make this import redundant - stanServer "github.com/nats-io/nats-streaming-server/server" ) // Server is the entrypoint for the server command. @@ -39,46 +35,22 @@ func Server(cfg *config.Config) *cli.Command { defer cancel() - var natsServer *stanServer.StanServer + natsServer, err := nats.NewNATSServer( + nats.Host(cfg.Nats.Host), + nats.Port(cfg.Nats.Port), + nats.Logger(logging.NewLogWrapper(logger)), + ) + if err != nil { + return err + } gr.Add(func() error { - var err error - - natsServer, err = nats.RunNatsServer( - nats.Host(cfg.Nats.Host), - nats.Port(cfg.Nats.Port), - nats.StanOpts( - func(o *stanServer.Options) { - o.CustomLogger = logging.NewLogWrapper(logger) - }, - ), - ) - - if err != nil { - return err - } - - errChan := make(chan error) - - go func() { - for { - // check if NATs server has an encountered an error - if err := natsServer.LastError(); err != nil { - errChan <- err - return - } - if ctx.Err() != nil { - return // context closed - } - time.Sleep(1 * time.Second) - } - }() - + err := make(chan error) select { case <-ctx.Done(): return nil - case err = <-errChan: - return err + case err <- natsServer.ListenAndServe(): + return <-err } }, func(_ error) { diff --git a/nats/pkg/server/nats/nats.go b/nats/pkg/server/nats/nats.go index 398a4c9666..4defe9eed2 100644 --- a/nats/pkg/server/nats/nats.go +++ b/nats/pkg/server/nats/nats.go @@ -1,17 +1,55 @@ package nats import ( + "time" + + natsServer "github.com/nats-io/nats-server/v2/server" stanServer "github.com/nats-io/nats-streaming-server/server" ) -// RunNatsServer runs the nats streaming server -func RunNatsServer(opts ...Option) (*stanServer.StanServer, error) { - natsOpts := stanServer.DefaultNatsServerOptions - stanOpts := stanServer.GetDefaultOptions() +type NATSServer struct { + natsOpts *natsServer.Options + stanOpts *stanServer.Options + + server *stanServer.StanServer +} + +func NewNATSServer(opts ...Option) (*NATSServer, error) { + server := &NATSServer{ + natsOpts: &stanServer.DefaultNatsServerOptions, + stanOpts: stanServer.GetDefaultOptions(), + } for _, o := range opts { - o(&natsOpts, stanOpts) + o(server.natsOpts, server.stanOpts) } - s, err := stanServer.RunServerWithOpts(stanOpts, &natsOpts) - return s, err + + return server, nil +} + +func (n *NATSServer) ListenAndServe() (err error) { + + n.server, err = stanServer.RunServerWithOpts( + n.stanOpts, + n.natsOpts, + ) + if err != nil { + return err + } + + for { + // check if NATs server has an encountered an error + if err := n.server.LastError(); err != nil { + return err + } + // check if th NATs server is still running + if n.server.State() == stanServer.Shutdown { + return nil + } + time.Sleep(1 * time.Second) + } +} + +func (n *NATSServer) Shutdown() { + n.server.Shutdown() } diff --git a/nats/pkg/server/nats/options.go b/nats/pkg/server/nats/options.go index 74e54e51f1..0189141ca2 100644 --- a/nats/pkg/server/nats/options.go +++ b/nats/pkg/server/nats/options.go @@ -2,6 +2,7 @@ package nats import ( natsServer "github.com/nats-io/nats-server/v2/server" + "github.com/nats-io/nats-streaming-server/logger" stanServer "github.com/nats-io/nats-streaming-server/server" ) @@ -22,16 +23,9 @@ func Port(port int) Option { } } -// NatsOpts allows setting Options from nats package directly -func NatsOpts(opt func(*natsServer.Options)) Option { - return func(no *natsServer.Options, _ *stanServer.Options) { - opt(no) - } -} - -// StanOpts allows setting Options from stan package directly -func StanOpts(opt func(*stanServer.Options)) Option { - return func(_ *natsServer.Options, so *stanServer.Options) { - opt(so) +// Port sets the host URL for the nats server +func Logger(logger logger.Logger) Option { + return func(no *natsServer.Options, so *stanServer.Options) { + so.CustomLogger = logger } } From 26852f1850c0819b27a503637d900a3c74ac4bc1 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 18 Feb 2022 11:51:56 +0100 Subject: [PATCH 4/9] make nats killable --- nats/pkg/command/server.go | 1 + nats/pkg/server/nats/nats.go | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/nats/pkg/command/server.go b/nats/pkg/command/server.go index be2e0ff46d..c7e613acaf 100644 --- a/nats/pkg/command/server.go +++ b/nats/pkg/command/server.go @@ -36,6 +36,7 @@ func Server(cfg *config.Config) *cli.Command { defer cancel() natsServer, err := nats.NewNATSServer( + ctx, nats.Host(cfg.Nats.Host), nats.Port(cfg.Nats.Port), nats.Logger(logging.NewLogWrapper(logger)), diff --git a/nats/pkg/server/nats/nats.go b/nats/pkg/server/nats/nats.go index 4defe9eed2..28d512fbbc 100644 --- a/nats/pkg/server/nats/nats.go +++ b/nats/pkg/server/nats/nats.go @@ -1,6 +1,7 @@ package nats import ( + "context" "time" natsServer "github.com/nats-io/nats-server/v2/server" @@ -8,14 +9,18 @@ import ( ) type NATSServer struct { + ctx context.Context + natsOpts *natsServer.Options stanOpts *stanServer.Options server *stanServer.StanServer } -func NewNATSServer(opts ...Option) (*NATSServer, error) { +func NewNATSServer(ctx context.Context, opts ...Option) (*NATSServer, error) { + server := &NATSServer{ + ctx: ctx, natsOpts: &stanServer.DefaultNatsServerOptions, stanOpts: stanServer.GetDefaultOptions(), } @@ -28,7 +33,6 @@ func NewNATSServer(opts ...Option) (*NATSServer, error) { } func (n *NATSServer) ListenAndServe() (err error) { - n.server, err = stanServer.RunServerWithOpts( n.stanOpts, n.natsOpts, @@ -37,15 +41,21 @@ func (n *NATSServer) ListenAndServe() (err error) { return err } + defer n.Shutdown() + for { // check if NATs server has an encountered an error if err := n.server.LastError(); err != nil { return err } - // check if th NATs server is still running + // check if the NATs server is still running if n.server.State() == stanServer.Shutdown { return nil } + // check if context was cancelled + if n.ctx.Err() != nil { + return nil + } time.Sleep(1 * time.Second) } } From 98e5a320a8c2de94d92c8b5e54d93884ee49b6dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 06:03:14 +0000 Subject: [PATCH 5/9] Bump ldapjs from 2.3.1 to 2.3.2 in /settings Bumps [ldapjs](https://github.com/ldapjs/node-ldapjs) from 2.3.1 to 2.3.2. - [Release notes](https://github.com/ldapjs/node-ldapjs/releases) - [Changelog](https://github.com/ldapjs/node-ldapjs/blob/master/CHANGES.md) - [Commits](https://github.com/ldapjs/node-ldapjs/compare/v2.3.1...v2.3.2) --- updated-dependencies: - dependency-name: ldapjs dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- settings/package.json | 2 +- settings/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/settings/package.json b/settings/package.json index b229e1ffaf..bd3cfd82c9 100644 --- a/settings/package.json +++ b/settings/package.json @@ -58,7 +58,7 @@ "eslint-plugin-vue": "^7.8.0", "fs-extra": "^10.0.0", "join-path": "^1.1.1", - "ldapjs": "^2.2.4", + "ldapjs": "^2.3.2", "lodash-es": "^4.17.21", "nightwatch": "1.7.11", "nightwatch-api": "3.0.2", diff --git a/settings/yarn.lock b/settings/yarn.lock index fb193841d7..6d7efcb069 100644 --- a/settings/yarn.lock +++ b/settings/yarn.lock @@ -5066,10 +5066,10 @@ ldap-filter@^0.3.3: dependencies: assert-plus "^1.0.0" -ldapjs@^2.2.4: - version "2.3.1" - resolved "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.1.tgz#04136815fb1f21d692ac87fab5961a04d86e8b04" - integrity sha512-kf0tHHLrpwKaBAQOhYHXgdeh2PkFuCCxWgLb1MRn67ZQVo787D2pij3mmHVZx193GIdM8xcfi8HF6AIYYnj0fQ== +ldapjs@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/ldapjs/-/ldapjs-2.3.2.tgz#a599d081519f70462941cc33a50e9354c32f35b7" + integrity sha512-FU+GR/qbQ96WUZ2DUb7FzaEybYvv3240wTVPcbsdELB3o4cK92zGVjntsh68siVkLeCmlCcsd/cIQzyGXSS7LA== dependencies: abstract-logging "^2.0.0" asn1 "^0.2.4" From d7d6a33aaf387b967d3f3a70fc57b65b2647682e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Mar 2022 06:03:22 +0000 Subject: [PATCH 6/9] Bump rollup-plugin-filesize from 9.1.1 to 9.1.2 in /settings Bumps [rollup-plugin-filesize](https://github.com/ritz078/rollup-plugin-filesize) from 9.1.1 to 9.1.2. - [Release notes](https://github.com/ritz078/rollup-plugin-filesize/releases) - [Commits](https://github.com/ritz078/rollup-plugin-filesize/commits) --- updated-dependencies: - dependency-name: rollup-plugin-filesize dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- settings/package.json | 2 +- settings/yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/settings/package.json b/settings/package.json index b229e1ffaf..714d697c61 100644 --- a/settings/package.json +++ b/settings/package.json @@ -69,7 +69,7 @@ "rollup": "^2.55.1", "rollup-plugin-babel": "^4.3.3", "rollup-plugin-eslint": "^7.0.0", - "rollup-plugin-filesize": "^9.1.0", + "rollup-plugin-filesize": "^9.1.2", "rollup-plugin-node-globals": "^1.4.0", "rollup-plugin-node-resolve": "^5.2.0", "rollup-plugin-terser": "^7.0.2", diff --git a/settings/yarn.lock b/settings/yarn.lock index fb193841d7..ca0cfcfff4 100644 --- a/settings/yarn.lock +++ b/settings/yarn.lock @@ -2708,7 +2708,7 @@ colorette@^1.2.2: resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af" integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w== -colors@^1.1.2, colors@^1.4.0: +colors@1.4.0, colors@^1.1.2, colors@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== @@ -7158,15 +7158,15 @@ rollup-plugin-eslint@^7.0.0: eslint "^6.0.0" rollup-pluginutils "^2.7.1" -rollup-plugin-filesize@^9.1.0: - version "9.1.1" - resolved "https://registry.yarnpkg.com/rollup-plugin-filesize/-/rollup-plugin-filesize-9.1.1.tgz#31a6b02b27ce08082ef0970cfe4c451714ff91c4" - integrity sha512-x0r2A85TCEdRwF3rm+bcN4eAmbER8tt+YVf88gBQ6sLyH4oGcnNLPQqAUX+v7mIvHC/y59QwZvo6vxaC2ias6Q== +rollup-plugin-filesize@^9.1.2: + version "9.1.2" + resolved "https://registry.yarnpkg.com/rollup-plugin-filesize/-/rollup-plugin-filesize-9.1.2.tgz#958eea26880698d0bc008fa9d214657ee180b934" + integrity sha512-m2fE9hFaKgWKisJzyWXctOFKlgMRelo/58HgeC0lXUK/qykxiqkr6bsrotlvo2bvrwPsjgT7scNdQSr6qtl37A== dependencies: "@babel/runtime" "^7.13.8" boxen "^5.0.0" brotli-size "4.0.0" - colors "^1.4.0" + colors "1.4.0" filesize "^6.1.0" gzip-size "^6.0.0" pacote "^11.2.7" From 37b56d920e89a0ad3c599f41a07ed9d9f0dc2960 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Mon, 7 Mar 2022 08:15:50 +0100 Subject: [PATCH 7/9] incorporate review feedback --- nats/pkg/server/nats/nats.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nats/pkg/server/nats/nats.go b/nats/pkg/server/nats/nats.go index 28d512fbbc..6cc6cff559 100644 --- a/nats/pkg/server/nats/nats.go +++ b/nats/pkg/server/nats/nats.go @@ -8,6 +8,8 @@ import ( stanServer "github.com/nats-io/nats-streaming-server/server" ) +var NATSListenAndServeLoopTimer = 1 * time.Second + type NATSServer struct { ctx context.Context @@ -17,6 +19,7 @@ type NATSServer struct { server *stanServer.StanServer } +// NewNATSServer returns a new NATSServer func NewNATSServer(ctx context.Context, opts ...Option) (*NATSServer, error) { server := &NATSServer{ @@ -32,6 +35,7 @@ func NewNATSServer(ctx context.Context, opts ...Option) (*NATSServer, error) { return server, nil } +// ListenAndServe runs the NATSServer in a blocking way until the server is shutdown or an error occurs func (n *NATSServer) ListenAndServe() (err error) { n.server, err = stanServer.RunServerWithOpts( n.stanOpts, @@ -56,7 +60,7 @@ func (n *NATSServer) ListenAndServe() (err error) { if n.ctx.Err() != nil { return nil } - time.Sleep(1 * time.Second) + time.Sleep(NATSListenAndServeLoopTimer) } } From c14903cfe773cf7047501d63267921dac9ee3aa6 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Mon, 7 Mar 2022 10:03:40 +0100 Subject: [PATCH 8/9] fix changelog for reva --- changelog/1.18.0_2022-03-03/update-reva.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/changelog/1.18.0_2022-03-03/update-reva.md b/changelog/1.18.0_2022-03-03/update-reva.md index 2efb8ffb48..8b0ec22b6e 100644 --- a/changelog/1.18.0_2022-03-03/update-reva.md +++ b/changelog/1.18.0_2022-03-03/update-reva.md @@ -96,5 +96,4 @@ We updated reva to the version 2.0.0. * Enh [cs3org/reva#2526](https://github.com/cs3org/reva/pull/2526) : Upgrade ginkgo to v2 https://github.com/owncloud/ocis/pull/3231 -https://github.com/owncloud/ocis/pull/3231 - +https://github.com/owncloud/ocis/pull/3258 From 64fdc09fc5798730272ae991f577ea0f32bb6886 Mon Sep 17 00:00:00 2001 From: Michael Barz Date: Mon, 7 Mar 2022 09:54:47 +0000 Subject: [PATCH 9/9] Automated changelog update [skip ci] --- CHANGELOG.md | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21333c5732..e99ab484e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,24 @@ The following sections list the changes for unreleased. -[unreleased]: https://github.com/owncloud/ocis/compare/v1.17.0...master +[unreleased]: https://github.com/owncloud/ocis/compare/v1.18.0...master + +## Summary + +* Enhancement - Include etags in drives listing: [#3267](https://github.com/owncloud/ocis/pull/3267) + +## Details + +* Enhancement - Include etags in drives listing: [#3267](https://github.com/owncloud/ocis/pull/3267) + + Added etags in the response of list drives. + + https://github.com/owncloud/ocis/pull/3267 +# Changelog for [1.18.0] (2022-03-03) + +The following sections list the changes for 1.18.0. + +[1.18.0]: https://github.com/owncloud/ocis/compare/v1.17.0...v1.18.0 ## Summary @@ -15,7 +32,6 @@ The following sections list the changes for unreleased. * Enhancement - Re-Enabling web cache control: [#3109](https://github.com/owncloud/ocis/pull/3109) * Enhancement - Add SPA conform fileserver for web: [#3109](https://github.com/owncloud/ocis/pull/3109) * Enhancement - Implement notifications service: [#3217](https://github.com/owncloud/ocis/pull/3217) -* Enhancement - Include etags in drives listing: [#3267](https://github.com/owncloud/ocis/pull/3267) * Enhancement - Thumbnails in spaces: [#3219](https://github.com/owncloud/ocis/pull/3219) * Enhancement - Update reva to v2.0.0: [#3231](https://github.com/owncloud/ocis/pull/3231) * Enhancement - Update ownCloud Web to v5.2.0: [#6506](https://github.com/owncloud/web/pull/6506) @@ -93,12 +109,6 @@ The following sections list the changes for unreleased. https://github.com/owncloud/ocis/pull/3217 -* Enhancement - Include etags in drives listing: [#3267](https://github.com/owncloud/ocis/pull/3267) - - Added etags in the response of list drives. - - https://github.com/owncloud/ocis/pull/3267 - * Enhancement - Thumbnails in spaces: [#3219](https://github.com/owncloud/ocis/pull/3219) Added support for thumbnails in spaces. @@ -204,7 +214,7 @@ The following sections list the changes for unreleased. * Enh [cs3org/reva#2526](https://github.com/cs3org/reva/pull/2526) : Upgrade ginkgo to v2 https://github.com/owncloud/ocis/pull/3231 - https://github.com/owncloud/ocis/pull/3231 + https://github.com/owncloud/ocis/pull/3258 * Enhancement - Update ownCloud Web to v5.2.0: [#6506](https://github.com/owncloud/web/pull/6506)