-
Notifications
You must be signed in to change notification settings - Fork 150
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into dev/K8SPSMDB-675
- Loading branch information
Showing
71 changed files
with
1,786 additions
and
306 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18764,7 +18764,6 @@ spec: | |
| type: array | ||
| required: | ||
| - name | ||
| - passwordSecretRef | ||
| - roles | ||
| type: object | ||
| type: array | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19460,7 +19460,6 @@ spec: | |
| type: array | ||
| required: | ||
| - name | ||
| - passwordSecretRef | ||
| - roles | ||
| type: object | ||
| type: array | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19460,7 +19460,6 @@ spec: | |
| type: array | ||
| required: | ||
| - name | ||
| - passwordSecretRef | ||
| - roles | ||
| type: object | ||
| type: array | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19460,7 +19460,6 @@ spec: | |
| type: array | ||
| required: | ||
| - name | ||
| - passwordSecretRef | ||
| - roles | ||
| type: object | ||
| type: array | ||
|
|
||
122 changes: 122 additions & 0 deletions
122
e2e-tests/custom-users-roles-sharded/compare/role-one-50.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| switched to db admin | ||
| { | ||
| "_id" : "admin.role-one", | ||
| "role" : "role-one", | ||
| "db" : "admin", | ||
| "privileges" : [ | ||
| { | ||
| "resource" : { | ||
| "cluster" : true | ||
| }, | ||
| "actions" : [ | ||
| "addShard" | ||
| ] | ||
| }, | ||
| { | ||
| "resource" : { | ||
| "db" : "config", | ||
| "collection" : "" | ||
| }, | ||
| "actions" : [ | ||
| "find", | ||
| "insert", | ||
| "remove", | ||
| "update" | ||
| ] | ||
| } | ||
| ], | ||
| "roles" : [ | ||
| { | ||
| "role" : "read", | ||
| "db" : "admin" | ||
| } | ||
| ], | ||
| "authenticationRestrictions" : [ | ||
| [ | ||
| { | ||
| "clientSource" : [ | ||
| "127.0.0.1" | ||
| ], | ||
| "serverAddress" : [ | ||
| "127.0.0.1" | ||
| ] | ||
| } | ||
| ] | ||
| ], | ||
| "inheritedRoles" : [ | ||
| { | ||
| "role" : "read", | ||
| "db" : "admin" | ||
| } | ||
| ], | ||
| "inheritedPrivileges" : [ | ||
| { | ||
| "resource" : { | ||
| "cluster" : true | ||
| }, | ||
| "actions" : [ | ||
| "addShard" | ||
| ] | ||
| }, | ||
| { | ||
| "resource" : { | ||
| "db" : "config", | ||
| "collection" : "" | ||
| }, | ||
| "actions" : [ | ||
| "find", | ||
| "insert", | ||
| "remove", | ||
| "update" | ||
| ] | ||
| }, | ||
| { | ||
| "resource" : { | ||
| "db" : "admin", | ||
| "collection" : "" | ||
| }, | ||
| "actions" : [ | ||
| "changeStream", | ||
| "collStats", | ||
| "dbHash", | ||
| "dbStats", | ||
| "find", | ||
| "killCursors", | ||
| "listCollections", | ||
| "listIndexes", | ||
| "planCacheRead" | ||
| ] | ||
| }, | ||
| { | ||
| "resource" : { | ||
| "db" : "admin", | ||
| "collection" : "system.js" | ||
| }, | ||
| "actions" : [ | ||
| "changeStream", | ||
| "collStats", | ||
| "dbHash", | ||
| "dbStats", | ||
| "find", | ||
| "killCursors", | ||
| "listCollections", | ||
| "listIndexes", | ||
| "planCacheRead" | ||
| ] | ||
| } | ||
| ], | ||
| "inheritedAuthenticationRestrictions" : [ | ||
| [ | ||
| { | ||
| "clientSource" : [ | ||
| "127.0.0.1" | ||
| ], | ||
| "serverAddress" : [ | ||
| "127.0.0.1" | ||
| ] | ||
| } | ||
| ] | ||
| ], | ||
| "isBuiltin" : false | ||
| } | ||
| bye |
78 changes: 78 additions & 0 deletions
78
e2e-tests/custom-users-roles-sharded/compare/role-two-50.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| switched to db admin | ||
| { | ||
| "_id" : "admin.role-two", | ||
| "role" : "role-two", | ||
| "db" : "admin", | ||
| "privileges" : [ | ||
| { | ||
| "resource" : { | ||
| "db" : "config", | ||
| "collection" : "" | ||
| }, | ||
| "actions" : [ | ||
| "find" | ||
| ] | ||
| } | ||
| ], | ||
| "roles" : [ | ||
| { | ||
| "role" : "read", | ||
| "db" : "admin" | ||
| } | ||
| ], | ||
| "authenticationRestrictions" : [ ], | ||
| "inheritedRoles" : [ | ||
| { | ||
| "role" : "read", | ||
| "db" : "admin" | ||
| } | ||
| ], | ||
| "inheritedPrivileges" : [ | ||
| { | ||
| "resource" : { | ||
| "db" : "config", | ||
| "collection" : "" | ||
| }, | ||
| "actions" : [ | ||
| "find" | ||
| ] | ||
| }, | ||
| { | ||
| "resource" : { | ||
| "db" : "admin", | ||
| "collection" : "" | ||
| }, | ||
| "actions" : [ | ||
| "changeStream", | ||
| "collStats", | ||
| "dbHash", | ||
| "dbStats", | ||
| "find", | ||
| "killCursors", | ||
| "listCollections", | ||
| "listIndexes", | ||
| "planCacheRead" | ||
| ] | ||
| }, | ||
| { | ||
| "resource" : { | ||
| "db" : "admin", | ||
| "collection" : "system.js" | ||
| }, | ||
| "actions" : [ | ||
| "changeStream", | ||
| "collStats", | ||
| "dbHash", | ||
| "dbStats", | ||
| "find", | ||
| "killCursors", | ||
| "listCollections", | ||
| "listIndexes", | ||
| "planCacheRead" | ||
| ] | ||
| } | ||
| ], | ||
| "inheritedAuthenticationRestrictions" : [ ], | ||
| "isBuiltin" : false | ||
| } | ||
| bye |
20 changes: 20 additions & 0 deletions
20
e2e-tests/custom-users-roles-sharded/compare/user-external.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| switched to db $external | ||
| { | ||
| "_id" : "$external.user-external", | ||
| "user" : "user-external", | ||
| "db" : "$external", | ||
| "roles" : [ | ||
| { | ||
| "role" : "clusterAdmin", | ||
| "db" : "admin" | ||
| }, | ||
| { | ||
| "role" : "userAdminAnyDatabase", | ||
| "db" : "admin" | ||
| } | ||
| ], | ||
| "mechanisms" : [ | ||
| "external" | ||
| ] | ||
| } | ||
| bye |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
e2e-tests/custom-users-roles-sharded/compare/user-gen.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| switched to db admin | ||
| { | ||
| "_id" : "admin.user-gen", | ||
| "user" : "user-gen", | ||
| "db" : "admin", | ||
| "roles" : [ | ||
| { | ||
| "role" : "clusterAdmin", | ||
| "db" : "admin" | ||
| }, | ||
| { | ||
| "role" : "userAdminAnyDatabase", | ||
| "db" : "admin" | ||
| } | ||
| ], | ||
| "mechanisms" : [ | ||
| "SCRAM-SHA-1", | ||
| "SCRAM-SHA-256" | ||
| ] | ||
| } | ||
| bye |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.