From a0d569263e926fa6cef5f151f9519e2eb1c38b32 Mon Sep 17 00:00:00 2001 From: Ivan Kozlovic Date: Tue, 15 Feb 2022 14:01:35 -0700 Subject: [PATCH 1/2] [FIXED] KV use of JS prefix If the user creates a JS context with a custom prefix, this needs to be used for the subject of the Put() and Delete() operations. This is addressing the architecture design ADR-19. Signed-off-by: Ivan Kozlovic --- kv.go | 14 +++++ test/kv_test.go | 145 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+) diff --git a/kv.go b/kv.go index ce8542db1..9773b6943 100644 --- a/kv.go +++ b/kv.go @@ -291,6 +291,8 @@ func (js *js) KeyValue(bucket string) (KeyValue, error) { stream: stream, pre: fmt.Sprintf(kvSubjectsPreTmpl, bucket), js: js, + // Determine if we need to use the JS prefix in front of Put and Delete operations + useJSPfx: js.opts.pre != defaultAPIPrefix, } return kv, nil } @@ -352,6 +354,8 @@ func (js *js) CreateKeyValue(cfg *KeyValueConfig) (KeyValue, error) { stream: scfg.Name, pre: fmt.Sprintf(kvSubjectsPreTmpl, cfg.Bucket), js: js, + // Determine if we need to use the JS prefix in front of Put and Delete operations + useJSPfx: js.opts.pre != defaultAPIPrefix, } return kv, nil } @@ -370,6 +374,10 @@ type kvs struct { stream string pre string js *js + // If true, it means that APIPrefix/Domain was set in the context + // and we need to add something to some of our high level protocols + // (such as Put, etc..) + useJSPfx bool } // Underlying entry. @@ -481,6 +489,9 @@ func (kv *kvs) Put(key string, value []byte) (revision uint64, err error) { } var b strings.Builder + if kv.useJSPfx { + b.WriteString(kv.js.opts.pre) + } b.WriteString(kv.pre) b.WriteString(key) @@ -548,6 +559,9 @@ func (kv *kvs) delete(key string, purge bool) error { } var b strings.Builder + if kv.useJSPfx { + b.WriteString(kv.js.opts.pre) + } b.WriteString(kv.pre) b.WriteString(key) diff --git a/test/kv_test.go b/test/kv_test.go index 5682cc04b..fa8ffe826 100644 --- a/test/kv_test.go +++ b/test/kv_test.go @@ -16,6 +16,7 @@ package test import ( "context" "fmt" + "os" "reflect" "regexp" "strconv" @@ -599,6 +600,150 @@ func TestKeyValueDiscardNew(t *testing.T) { } } +func TestKeyValueCrossAccounts(t *testing.T) { + conf := createConfFile(t, []byte(` + jetstream: enabled + accounts: { + A: { + users: [ {user: a, password: a} ] + jetstream: enabled + exports: [ + {service: '$JS.API.>' } + {service: '$KV.>'} + {stream: 'accI.>'} + ] + }, + I: { + users: [ {user: i, password: i} ] + imports: [ + {service: {account: A, subject: '$JS.API.>'}, to: 'fromA.>' } + {service: {account: A, subject: '$KV.>'}, to: 'fromA.$KV.>' } + {stream: {subject: 'accI.>', account: A}} + ] + } + }`)) + defer os.Remove(conf) + s, _ := RunServerWithConfig(conf) + defer shutdownJSServerAndRemoveStorage(t, s) + + watchNext := func(w nats.KeyWatcher) nats.KeyValueEntry { + t.Helper() + select { + case e := <-w.Updates(): + return e + case <-time.After(time.Second): + t.Fatal("Fail to get the next update") + } + return nil + } + + nc1, js1 := jsClient(t, s, nats.UserInfo("a", "a")) + defer nc1.Close() + + kv1, err := js1.CreateKeyValue(&nats.KeyValueConfig{Bucket: "Map"}) + if err != nil { + t.Fatalf("Error creating kv store: %v", err) + } + + w1, err := kv1.Watch("map") + if err != nil { + t.Fatalf("Error creating watcher: %v", err) + } + if e := watchNext(w1); e != nil { + t.Fatalf("Expected nil entry, got %+v", e) + } + + nc2, err := nats.Connect(s.ClientURL(), nats.UserInfo("i", "i"), nats.CustomInboxPrefix("accI")) + if err != nil { + t.Fatalf("Error on connect: %v", err) + } + defer nc2.Close() + js2, err := nc2.JetStream(nats.APIPrefix("fromA")) + if err != nil { + t.Fatalf("Error getting jetstream context: %v", err) + } + + kv2, err := js2.CreateKeyValue(&nats.KeyValueConfig{Bucket: "Map"}) + if err != nil { + t.Fatalf("Error creating kv store: %v", err) + } + + w2, err := kv2.Watch("map") + if err != nil { + t.Fatalf("Error creating watcher: %v", err) + } + if e := watchNext(w2); e != nil { + t.Fatalf("Expected nil entry, got %+v", e) + } + + if _, err := kv2.Put("map", []byte("value")); err != nil { + t.Fatalf("Error on put: %v", err) + } + + // Get from kv1 + e, err := kv1.Get("map") + if err != nil { + t.Fatalf("Error on get: %v", err) + } + if e.Key() != "map" || string(e.Value()) != "value" { + t.Fatalf("Unexpected entry: +%v", e) + } + + // Get from kv2 + e, err = kv2.Get("map") + if err != nil { + t.Fatalf("Error on get: %v", err) + } + if e.Key() != "map" || string(e.Value()) != "value" { + t.Fatalf("Unexpected entry: +%v", e) + } + + // Watcher 1 + if e := watchNext(w1); e == nil || e.Key() != "map" || string(e.Value()) != "value" { + t.Fatalf("Unexpected entry: %+v", e) + } + + // Watcher 2 + if e := watchNext(w2); e == nil || e.Key() != "map" || string(e.Value()) != "value" { + t.Fatalf("Unexpected entry: %+v", e) + } + + // Purge from kv2 + if err := kv2.Purge("map"); err != nil { + t.Fatalf("Error on purge: %v", err) + } + + // Check purge ok from w1 + if e := watchNext(w1); e == nil || e.Operation() != nats.KeyValuePurge { + t.Fatalf("Unexpected entry: %+v", e) + } + + // Check purge ok from w2 + if e := watchNext(w2); e == nil || e.Operation() != nats.KeyValuePurge { + t.Fatalf("Unexpected entry: %+v", e) + } + + // Delete purge records from kv2 + if err := kv2.PurgeDeletes(nats.DeleteMarkersOlderThan(-1)); err != nil { + t.Fatalf("Error on purge deletes: %v", err) + } + + // Check all gone from js1 + if si, err := js1.StreamInfo("KV_Map"); err != nil || si == nil || si.State.Msgs != 0 { + t.Fatalf("Error getting stream info: err=%v si=%+v", err, si) + } + + // Delete key from kv2 + if err := kv2.Delete("map"); err != nil { + t.Fatalf("Error on delete: %v", err) + } + + // Check key gone from kv1 + if e, err := kv1.Get("map"); err != nats.ErrKeyNotFound || e != nil { + t.Fatalf("Expected key not found, got err=%v e=%+v", err, e) + } +} + // Helpers func client(t *testing.T, s *server.Server, opts ...nats.Option) *nats.Conn { From 9bbca0d8a8211481a59b593afb875f6061a06175 Mon Sep 17 00:00:00 2001 From: Ivan Kozlovic Date: Tue, 15 Feb 2022 16:31:38 -0700 Subject: [PATCH 2/2] Fix Update that needs to use the prefix too... Signed-off-by: Ivan Kozlovic --- kv.go | 3 +++ test/kv_test.go | 41 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/kv.go b/kv.go index 9773b6943..0b75054d9 100644 --- a/kv.go +++ b/kv.go @@ -530,6 +530,9 @@ func (kv *kvs) Update(key string, value []byte, revision uint64) (uint64, error) } var b strings.Builder + if kv.useJSPfx { + b.WriteString(kv.js.opts.pre) + } b.WriteString(kv.pre) b.WriteString(key) diff --git a/test/kv_test.go b/test/kv_test.go index fa8ffe826..831ad1315 100644 --- a/test/kv_test.go +++ b/test/kv_test.go @@ -640,7 +640,7 @@ func TestKeyValueCrossAccounts(t *testing.T) { nc1, js1 := jsClient(t, s, nats.UserInfo("a", "a")) defer nc1.Close() - kv1, err := js1.CreateKeyValue(&nats.KeyValueConfig{Bucket: "Map"}) + kv1, err := js1.CreateKeyValue(&nats.KeyValueConfig{Bucket: "Map", History: 10}) if err != nil { t.Fatalf("Error creating kv store: %v", err) } @@ -663,7 +663,7 @@ func TestKeyValueCrossAccounts(t *testing.T) { t.Fatalf("Error getting jetstream context: %v", err) } - kv2, err := js2.CreateKeyValue(&nats.KeyValueConfig{Bucket: "Map"}) + kv2, err := js2.CreateKeyValue(&nats.KeyValueConfig{Bucket: "Map", History: 10}) if err != nil { t.Fatalf("Error creating kv store: %v", err) } @@ -676,7 +676,9 @@ func TestKeyValueCrossAccounts(t *testing.T) { t.Fatalf("Expected nil entry, got %+v", e) } - if _, err := kv2.Put("map", []byte("value")); err != nil { + // Do a Put from kv2 + rev, err := kv2.Put("map", []byte("value")) + if err != nil { t.Fatalf("Error on put: %v", err) } @@ -708,6 +710,39 @@ func TestKeyValueCrossAccounts(t *testing.T) { t.Fatalf("Unexpected entry: %+v", e) } + // Try an update form kv2 + if _, err := kv2.Update("map", []byte("updated"), rev); err != nil { + t.Fatalf("Failed to update: %v", err) + } + + // Get from kv1 + e, err = kv1.Get("map") + if err != nil { + t.Fatalf("Error on get: %v", err) + } + if e.Key() != "map" || string(e.Value()) != "updated" { + t.Fatalf("Unexpected entry: +%v", e) + } + + // Get from kv2 + e, err = kv2.Get("map") + if err != nil { + t.Fatalf("Error on get: %v", err) + } + if e.Key() != "map" || string(e.Value()) != "updated" { + t.Fatalf("Unexpected entry: +%v", e) + } + + // Watcher 1 + if e := watchNext(w1); e == nil || e.Key() != "map" || string(e.Value()) != "updated" { + t.Fatalf("Unexpected entry: %+v", e) + } + + // Watcher 2 + if e := watchNext(w2); e == nil || e.Key() != "map" || string(e.Value()) != "updated" { + t.Fatalf("Unexpected entry: %+v", e) + } + // Purge from kv2 if err := kv2.Purge("map"); err != nil { t.Fatalf("Error on purge: %v", err)