Revert "Revert "Update the query for osctrl-admin"" #54

Job	Run time
build_and_test (tls, linux, amd64)	1m 38s
build_and_test (tls, linux, arm64)	1m 33s
build_and_test (tls, darwin, amd64)	1m 12s
build_and_test (tls, darwin, arm64)	1m 33s
build_and_test (tls, windows, amd64)	5s
build_and_test (tls, windows, arm64)	3s
build_and_test (admin, linux, amd64)	1m 31s
build_and_test (admin, linux, arm64)	1m 38s
build_and_test (admin, darwin, amd64)	1m 16s
build_and_test (admin, darwin, arm64)	1m 35s
build_and_test (admin, windows, amd64)	3s
build_and_test (admin, windows, arm64)	5s
build_and_test (api, linux, amd64)	1m 31s
build_and_test (api, linux, arm64)	1m 32s
build_and_test (api, darwin, amd64)	1m 14s
build_and_test (api, darwin, arm64)	1m 43s
build_and_test (api, windows, amd64)	4s
build_and_test (api, windows, arm64)	3s
build_and_test (cli, linux, amd64)	45s
build_and_test (cli, linux, arm64)	43s
build_and_test (cli, darwin, amd64)	22s
build_and_test (cli, darwin, arm64)	46s
build_and_test (cli, windows, amd64)	44s
build_and_test (cli, windows, arm64)	44s
	22m 23s

Provide feedback