moved operator limits into sub struct for account to remove name conf…

…lict
nats-io · Nov 15, 2018 · f021411 · f021411
1 parent 775fe76
commit f021411
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/account_claims.go b/account_claims.go
@@ -32,27 +32,27 @@ func (o *OperatorLimits) Validate(vr *ValidationResults) {
 
 // Account holds account specific claims data
 type Account struct {
-	Imports    Imports    `json:"imports,omitempty"`
-	Exports    Exports    `json:"exports,omitempty"`
-	Identities []Identity `json:"identity,omitempty"`
-	OperatorLimits
+	Imports    Imports        `json:"imports,omitempty"`
+	Exports    Exports        `json:"exports,omitempty"`
+	Identities []Identity     `json:"identity,omitempty"`
+	Limits     OperatorLimits `json:"limits,omitempty"`
 }
 
 // Validate checks if the account is valid, based on the wrapper
 func (a *Account) Validate(acct *AccountClaims, vr *ValidationResults) {
 	a.Imports.Validate(acct.Subject, vr)
 	a.Exports.Validate(vr)
-	a.OperatorLimits.Validate(vr)
+	a.Limits.Validate(vr)
 
 	for _, i := range a.Identities {
 		i.Validate(vr)
 	}
 
-	if !a.OperatorLimits.IsEmpty() && a.OperatorLimits.Imports >= 0 && int64(len(a.Imports)) > a.OperatorLimits.Imports {
+	if !a.Limits.IsEmpty() && a.Limits.Imports >= 0 && int64(len(a.Imports)) > a.Limits.Imports {
 		vr.AddError("the account contains more imports than allowed by the operator limits")
 	}
 
-	if !a.OperatorLimits.IsEmpty() && a.OperatorLimits.Exports >= 0 && int64(len(a.Exports)) > a.OperatorLimits.Exports {
+	if !a.Limits.IsEmpty() && a.Limits.Exports >= 0 && int64(len(a.Exports)) > a.Limits.Exports {
 		vr.AddError("the account contains more exports than allowed by the operator limits")
 	}
 }
@@ -88,7 +88,7 @@ func (a *AccountClaims) Encode(pair nkeys.KeyPair) (string, error) {
 		if len(a.Identities) > 0 {
 			return "", errors.New("self-signed account JWTs can't contain identity proofs")
 		}
-		if !a.OperatorLimits.IsEmpty() {
+		if !a.Limits.IsEmpty() {
 			return "", errors.New("self-signed account JWTs can't contain operator limits")
 		}
 	}
@@ -124,7 +124,7 @@ func (a *AccountClaims) Validate(vr *ValidationResults) {
 		if len(a.Identities) > 0 {
 			vr.AddError("self-signed account JWTs can't contain identity proofs")
 		}
-		if !a.OperatorLimits.IsEmpty() {
+		if !a.Limits.IsEmpty() {
 			vr.AddError("self-signed account JWTs can't contain operator limits")
 		}
 	}

diff --git a/account_claims_test.go b/account_claims_test.go
@@ -69,7 +69,7 @@ func TestAccountCantSignOperatorLimits(t *testing.T) {
 
 	account := NewAccountClaims(apk)
 	account.Expires = time.Now().Add(time.Duration(time.Hour * 24 * 365)).Unix()
-	account.OperatorLimits.Conn = 1
+	account.Limits.Conn = 1
 
 	_, err := account.Encode(akp)
 	if err == nil {
@@ -103,7 +103,7 @@ func TestOperatorCanSignClaims(t *testing.T) {
 
 	account := NewAccountClaims(apk)
 	account.Expires = time.Now().Add(time.Duration(time.Hour * 24 * 365)).Unix()
-	account.OperatorLimits.Conn = 1
+	account.Limits.Conn = 1
 	account.Identities = []Identity{
 		{
 			ID:    "stephen",
@@ -224,12 +224,12 @@ func TestLimitValidationInAccount(t *testing.T) {
 
 	account := NewAccountClaims(apk)
 	account.Expires = time.Now().Add(time.Duration(time.Hour * 24 * 365)).Unix()
-	account.OperatorLimits.Conn = 10
-	account.OperatorLimits.Imports = 10
-	account.OperatorLimits.Exports = 10
-	account.OperatorLimits.Data = 1024
-	account.OperatorLimits.Payload = 1024
-	account.OperatorLimits.Subs = 10
+	account.Limits.Conn = 10
+	account.Limits.Imports = 10
+	account.Limits.Exports = 10
+	account.Limits.Data = 1024
+	account.Limits.Payload = 1024
+	account.Limits.Subs = 10
 	account.Identities = []Identity{
 		{
 			ID:    "stephen",
@@ -244,12 +244,12 @@ func TestLimitValidationInAccount(t *testing.T) {
 		t.Fatal("valid account should have no validation issues")
 	}
 
-	account.OperatorLimits.Conn = -1
-	account.OperatorLimits.Imports = -1
-	account.OperatorLimits.Exports = -1
-	account.OperatorLimits.Subs = -1
-	account.OperatorLimits.Data = -1
-	account.OperatorLimits.Payload = -1
+	account.Limits.Conn = -1
+	account.Limits.Imports = -1
+	account.Limits.Exports = -1
+	account.Limits.Subs = -1
+	account.Limits.Data = -1
+	account.Limits.Payload = -1
 	vr = CreateValidationResults()
 	account.Validate(vr)
 
@@ -283,7 +283,7 @@ func TestLimitValidationInAccount(t *testing.T) {
 			Proof: "yougotit",
 		},
 	}
-	account.OperatorLimits = OperatorLimits{}
+	account.Limits = OperatorLimits{}
 	account.Issuer = apk
 	vr = CreateValidationResults()
 	account.Validate(vr)