From 1e88c50fd302b04501d43a44147296805eb1bb69 Mon Sep 17 00:00:00 2001 From: Matthias Hanel Date: Wed, 16 Feb 2022 13:20:53 -0500 Subject: [PATCH] rename struct member HaResources to HAResources Signed-off-by: Matthias Hanel --- v2/account_claims.go | 2 +- v2/account_claims_test.go | 12 ++++++------ v2/decoder_account.go | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/v2/account_claims.go b/v2/account_claims.go index fc4b825..48c5d0b 100644 --- a/v2/account_claims.go +++ b/v2/account_claims.go @@ -51,7 +51,7 @@ func (n *NatsLimits) IsUnlimited() bool { } type JetStreamLimits struct { - HaResources int64 `json:"ha_resources"` // Max number of bytes high availability resources (streams & consumer). (0 means disabled). no omitempty on purpose + HAResources int64 `json:"ha_resources"` // Max number of bytes high availability resources (streams & consumer). (0 means disabled). no omitempty on purpose MemoryStorage int64 `json:"mem_storage,omitempty"` // Max number of bytes stored in memory across all streams. (0 means disabled) DiskStorage int64 `json:"disk_storage,omitempty"` // Max number of bytes stored on disk across all streams. (0 means disabled) Streams int64 `json:"streams,omitempty"` // Max number of streams diff --git a/v2/account_claims_test.go b/v2/account_claims_test.go index 4dd1c59..233da0b 100644 --- a/v2/account_claims_test.go +++ b/v2/account_claims_test.go @@ -317,11 +317,11 @@ func TestJetstreamLimits(t *testing.T) { acc1.Limits.JetStreamLimits.MemoryStorage != 0 || acc1.Limits.JetStreamLimits.Consumer != 0 || acc1.Limits.JetStreamLimits.Streams != 0 || - acc1.Limits.JetStreamLimits.HaResources != 0 || + acc1.Limits.JetStreamLimits.HAResources != 0 || acc1.Limits.JetStreamLimits.MaxBytesRequired != false { t.Fatalf("Expected unlimited operator limits") } - acc1.Limits.HaResources = 1 + acc1.Limits.HAResources = 1 acc1.Limits.Consumer = 1 acc1.Limits.Streams = 2 acc1.Limits.MemoryStorage = 3 @@ -348,8 +348,8 @@ func TestJetstreamLimitsDeEnCode(t *testing.T) { t.Fatal(err) } else if c1.Limits.IsJSEnabled() { t.Fatal("JetStream expected to be disabled") - } else if c1.Limits.JetStreamLimits.HaResources != 0 { - t.Fatal("expected value for HaResources is 0") + } else if c1.Limits.JetStreamLimits.HAResources != 0 { + t.Fatal("expected value for HAResources is 0") } // token (generated without this change) with js enabled c2, err := DecodeAccountClaims(`eyJ0eXAiOiJKV1QiLCJhbGciOiJlZDI1NTE5LW5rZXkifQ.eyJqdGkiOiJPVFFXVEQyVkFMWkRQQTZYU1hLS09GRVFZR1VaVFBDNEtKV1BYMlAyWU1XMjVTMzRTVjNRIiwiaWF0IjoxNjQ0Mjc5MzM0LCJpc3MiOiJPQk5UUVJFSEVJUFJFVE1BVlBWUVVDSUdFUktHWkIzRVJBVjVTNUdNM0lPRVFOSFJFQkpPVUFSRiIsIm5hbWUiOiJ0ZXN0Iiwic3ViIjoiQUM2SFFJMlVBTVVQREVQN1dTWVFZV1JDTEVZQkxZVlNQTDZBSExDVVBKVEdVMzJUNEtRQktZU0ciLCJuYXRzIjp7ImxpbWl0cyI6eyJzdWJzIjotMSwiZGF0YSI6LTEsInBheWxvYWQiOi0xLCJpbXBvcnRzIjotMSwiZXhwb3J0cyI6LTEsIndpbGRjYXJkcyI6dHJ1ZSwiY29ubiI6LTEsImxlYWYiOi0xLCJkaXNrX3N0b3JhZ2UiOjEwMDAwMDB9LCJkZWZhdWx0X3Blcm1pc3Npb25zIjp7InB1YiI6e30sInN1YiI6e319LCJ0eXBlIjoiYWNjb3VudCIsInZlcnNpb24iOjJ9fQ.Xt5azhxOkC7nywz9Q8xVtzX8lZIqdOhpfGyQI30aNdd-nbVGX2O13OOfouIaTLyajZiS4bcJFXa29q6QCFRUDA`) @@ -357,8 +357,8 @@ func TestJetstreamLimitsDeEnCode(t *testing.T) { t.Fatal(err) } else if !c2.Limits.IsJSEnabled() { t.Fatal("JetStream expected to be enabled") - } else if c2.Limits.JetStreamLimits.HaResources != NoLimit { - t.Fatal("expected value for HaResources is NoLimit") + } else if c2.Limits.JetStreamLimits.HAResources != NoLimit { + t.Fatal("expected value for HAResources is NoLimit") } } diff --git a/v2/decoder_account.go b/v2/decoder_account.go index f1f4e34..6b42dfd 100644 --- a/v2/decoder_account.go +++ b/v2/decoder_account.go @@ -41,13 +41,13 @@ func loadAccount(data []byte, version int) (*AccountClaims, error) { return v1a.Migrate() case 2: var v2a AccountClaims - v2a.Limits.HaResources = NoLimit + v2a.Limits.HAResources = NoLimit v2a.SigningKeys = make(SigningKeys) if err := json.Unmarshal(data, &v2a); err != nil { return nil, err } if !v2a.Limits.IsJSEnabled() { - v2a.Limits.HaResources = 0 + v2a.Limits.HAResources = 0 } return &v2a, nil default: