From 6867d253639eee50f2e82bf358a751f00d8ebc67 Mon Sep 17 00:00:00 2001 From: Tomasz Pietrek Date: Tue, 2 Jul 2024 11:16:42 +0200 Subject: [PATCH] Fix consumer recreate (#190) * Explicitly denote octal for consistency Signed-off-by: Tomasz Pietrek * Fix consumer recreation if it was manually deleted If the Consumer was deleted outside of NACK, it should be recreated. This fixes the behavior by removing generation check, similar to https://github.com/nats-io/nack/commit/c6ca1ed7cbddfecdfec472008103d9a0525a180a Signed-off-by: Tomasz Pietrek --------- Signed-off-by: Tomasz Pietrek --- controllers/jetstream/consumer.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/jetstream/consumer.go b/controllers/jetstream/consumer.go index 93b059a7..c30c86a4 100644 --- a/controllers/jetstream/consumer.go +++ b/controllers/jetstream/consumer.go @@ -86,7 +86,7 @@ func (c *Controller) processConsumerObject(cns *apis.Consumer, jsm jsmClientFunc remoteRootCA = filepath.Join(accDir, acc.Spec.TLS.RootCAs) for k, v := range secret.Data { - if err := os.WriteFile(filepath.Join(accDir, k), v, 0644); err != nil { + if err := os.WriteFile(filepath.Join(accDir, k), v, 0o644); err != nil { return err } } @@ -107,7 +107,7 @@ func (c *Controller) processConsumerObject(cns *apis.Consumer, jsm jsmClientFunc for k, v := range secret.Data { if k == acc.Spec.Creds.File { accUserCreds = filepath.Join(c.cacheDir, ns, spec.Account, k) - if err := os.WriteFile(filepath.Join(accDir, k), v, 0644); err != nil { + if err := os.WriteFile(filepath.Join(accDir, k), v, 0o644); err != nil { return err } } @@ -193,7 +193,7 @@ func (c *Controller) processConsumerObject(cns *apis.Consumer, jsm jsmClientFunc return err } updateOK := (consumerOK && !deleteOK && newGeneration) - createOK := (!consumerOK && !deleteOK && newGeneration) + createOK := (!consumerOK && !deleteOK) || (!updateOK && !deleteOK && newGeneration) switch { case createOK: