Merge branch 'main' into K8SPSMDB-1174

percona · Nov 27, 2024 · e5cf2cd · e5cf2cd
2 parents 596155c + 437ac69
commit e5cf2cd
Show file tree

Hide file tree

Showing 34 changed files with 721 additions and 132 deletions.
diff --git a/e2e-tests/custom-users-roles-sharded/compare/role-one-50.json b/e2e-tests/custom-users-roles-sharded/compare/role-one-50.json
@@ -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
diff --git a/e2e-tests/custom-users-roles-sharded/compare/role-two-50.json b/e2e-tests/custom-users-roles-sharded/compare/role-two-50.json
@@ -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
diff --git a/e2e-tests/custom-users-roles-sharded/run b/e2e-tests/custom-users-roles-sharded/run
@@ -8,6 +8,10 @@ compare() {
 	local uri="$3"
 	local target="$4"
 
+	if [[ $IMAGE_MONGOD =~ 5\.0 ]] && [ -f ${test_dir}/compare/$target-50.json ]; then
+		target=$target-50
+	fi
+
 	run_mongos "use ${database}\n ${command}" "$uri" "mongodb" \
 		| egrep -v 'I NETWORK|W NETWORK|F NETWORK|Error saving history file|Percona Server for MongoDB|connecting to:|Unable to reach primary for set|Implicit session:|versions do not match|Error saving history file:' \
 		| $sed -re 's/ObjectId\("[0-9a-f]+"\)//; s/-[0-9]+.svc/-xxxesvc/' \

diff --git a/e2e-tests/custom-users-roles/compare/role-one-50.json b/e2e-tests/custom-users-roles/compare/role-one-50.json
@@ -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