From 176a19de75e5b0dea61f248d14efd6062fbf16e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Pi=C3=B1a?= <jaime@variadi.co>
Date: Wed, 4 Sep 2019 13:49:59 -0500
Subject: [PATCH] Update SYS account name

Currently, the $SYSTEM subject is used in this repo, but it seems like this
subject name is out of date.

This change updates the code to use $SYS to match the documentation.
---
 server/configs/new_style_authorization.conf |  6 +++---
 server/opts_test.go                         | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/server/configs/new_style_authorization.conf b/server/configs/new_style_authorization.conf
index a22e39c0..02e76506 100644
--- a/server/configs/new_style_authorization.conf
+++ b/server/configs/new_style_authorization.conf
@@ -12,14 +12,14 @@ authorization {
     publish = {
       allow = ["foo", "bar", "baz"]
     }
-    # Can subscribe to everything but $SYSTEM prefixed subjects.
+    # Can subscribe to everything but $SYS prefixed subjects.
     subscribe = {
-      deny = "$SYSTEM.>"
+      deny = "$SYS.>"
     }
   }
 
  admin_user = {
-   publish = "$SYSTEM.>"
+   publish = "$SYS.>"
    subscribe = {
      deny = ["foo", "bar", "baz"]
    }
diff --git a/server/opts_test.go b/server/opts_test.go
index 5be34dce..ef87b2b9 100644
--- a/server/opts_test.go
+++ b/server/opts_test.go
@@ -797,8 +797,8 @@ func TestNewStyleAuthorizationConfig(t *testing.T) {
 			len(alice.Permissions.Subscribe.Deny))
 	}
 	subPerm := alice.Permissions.Subscribe.Deny[0]
-	if subPerm != "$SYSTEM.>" {
-		t.Fatalf("Expected Alice's only denied subscribe permission to be '$SYSTEM.>', got %q", subPerm)
+	if subPerm != "$SYS.>" {
+		t.Fatalf("Expected Alice's only denied subscribe permission to be '$SYS.>', got %q", subPerm)
 	}
 
 	// Bob
@@ -818,8 +818,8 @@ func TestNewStyleAuthorizationConfig(t *testing.T) {
 			len(bob.Permissions.Publish.Allow))
 	}
 	pubPerm = bob.Permissions.Publish.Allow[0]
-	if pubPerm != "$SYSTEM.>" {
-		t.Fatalf("Expected Bob's first allowed publish permission to be '$SYSTEM.>', got %q", pubPerm)
+	if pubPerm != "$SYS.>" {
+		t.Fatalf("Expected Bob's first allowed publish permission to be '$SYS.>', got %q", pubPerm)
 	}
 	if len(bob.Permissions.Publish.Deny) != 0 {
 		t.Fatalf("Expected Bob's denied publish permissions to have 0 elements, got %d",
@@ -877,7 +877,7 @@ func TestNkeyUsersWithPermsConfig(t *testing.T) {
       users = [
         {nkey: "UDKTV7HZVYJFJN64LLMYQBUR6MTNNYCDC3LAZH4VHURW3GZLL3FULBXV",
          permissions = {
-           publish = "$SYSTEM.>"
+           publish = "$SYS.>"
            subscribe = { deny = ["foo", "bar", "baz"] }
          }
         }
@@ -899,8 +899,8 @@ func TestNkeyUsersWithPermsConfig(t *testing.T) {
 	if nk.Permissions.Publish == nil {
 		t.Fatal("Expected to have publish permissions")
 	}
-	if nk.Permissions.Publish.Allow[0] != "$SYSTEM.>" {
-		t.Fatalf("Expected publish to allow \"$SYSTEM.>\", but got %v", nk.Permissions.Publish.Allow[0])
+	if nk.Permissions.Publish.Allow[0] != "$SYS.>" {
+		t.Fatalf("Expected publish to allow \"$SYS.>\", but got %v", nk.Permissions.Publish.Allow[0])
 	}
 	if nk.Permissions.Subscribe == nil {
 		t.Fatal("Expected to have subscribe permissions")