update error copy

evergreen-ci · Sep 30, 2024 · 3656959 · 3656959
1 parent 64f90af
commit 3656959
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/graphql/resolver.go b/graphql/resolver.go
@@ -75,9 +75,11 @@ func New(apiURL string) Config {
 				forbiddenHosts = append(forbiddenHosts, h.Id)
 			}
 		}
-		if len(forbiddenHosts) > 0 {
+		if len(forbiddenHosts) == 1 {
+			return nil, Forbidden.Send(ctx, fmt.Sprintf("user '%s' does not have permission to access host '%v'", user.Username(), forbiddenHosts[0]))
+		} else if len(forbiddenHosts) > 1 {
 			hostsString := strings.Join(forbiddenHosts, ", ")
-			return nil, Forbidden.Send(ctx, fmt.Sprintf("user '%s' does not have permission to access the hosts: '%v'", user.Username(), hostsString))
+			return nil, Forbidden.Send(ctx, fmt.Sprintf("user '%s' does not have permission to access hosts: '%v'", user.Username(), hostsString))
 		}
 
 		return next(ctx)

diff --git a/graphql/tests/mutation/reprovisionToNew/results.json b/graphql/tests/mutation/reprovisionToNew/results.json
@@ -58,7 +58,7 @@
         "data": null,
         "errors": [
           {
-            "message": "user 'testuser' does not have permission to access the host 'i-0d0ae8b83366d22be'",
+            "message": "user 'testuser' does not have permission to access host 'i-0d0ae8b83366d22be'",
             "path": [
               "reprovisionToNew",
               "hostIds"

diff --git a/graphql/tests/mutation/restartJasper/results.json b/graphql/tests/mutation/restartJasper/results.json
@@ -58,7 +58,7 @@
         "data": null,
         "errors": [
           {
-            "message": "user 'testuser' does not have permission to access the host 'i-0d0ae8b83366d22be'",
+            "message": "user 'testuser' does not have permission to access host 'i-0d0ae8b83366d22be'",
             "path": [
               "restartJasper",
               "hostIds"

diff --git a/graphql/tests/mutation/updateHostStatus/results.json b/graphql/tests/mutation/updateHostStatus/results.json
@@ -58,7 +58,7 @@
         "data": null,
         "errors": [
           {
-            "message": "user 'testuser' does not have permission to access the host 'i-0d0ae8b83366d22be'",
+            "message": "user 'testuser' does not have permission to access host 'i-0d0ae8b83366d22be'",
             "path": [
               "updateHostStatus",
               "hostIds"

diff --git a/graphql/tests/mutation/updateSpawnHostStatus/results.json b/graphql/tests/mutation/updateSpawnHostStatus/results.json
@@ -6,7 +6,7 @@
                 "data": null,
                 "errors": [
                   {
-                    "message": "user 'testuser' does not have permission to access the host 'i-085085e236d598a60'",
+                    "message": "user 'testuser' does not have permission to access host 'i-085085e236d598a60'",
                     "path": [
                       "updateSpawnHostStatus",
                       "updateSpawnHostStatusInput",
@@ -25,7 +25,7 @@
                 "data": null,
                 "errors": [
                   {
-                    "message": "user 'testuser' does not have permission to access the host 'i-085085e236d598a60'",
+                    "message": "user 'testuser' does not have permission to access host 'i-085085e236d598a60'",
                     "path": [
                       "updateSpawnHostStatus",
                       "updateSpawnHostStatusInput",

diff --git a/graphql/tests/query/hostsForbidden/results.json b/graphql/tests/query/hostsForbidden/results.json
@@ -6,7 +6,7 @@
         "data": null,
         "errors": [
           {
-            "message": "user 'testuser' does not have permission to access one or more hosts.",
+            "message": "user 'testuser' does not have permission to access one or more hosts",
             "path": [
               "hosts"
             ],