Skip to content

rename galaxy to root and guardian to superadmin #9396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mangalaman93 merged 2 commits into from
Apr 28, 2025
Merged

rename galaxy to root and guardian to superadmin #9396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4809732
rename galaxy to root and guardian to superadmin
mangalaman93 Apr 24, 2025
ce29063
update telemetry URL
mangalaman93 Apr 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions acl/acl_curl_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@ func (asuite *AclTestSuite) TestCurlAuthorization() {
require.NoError(t, err)
defer cleanup()
require.NoError(t, gc.LoginIntoNamespace(ctx, dgraphapi.DefaultUser,
dgraphapi.DefaultPassword, x.GalaxyNamespace))
dgraphapi.DefaultPassword, x.RootNamespace))

hc, err := asuite.dc.HTTPClient()
require.NoError(t, err)
require.NoError(t, hc.LoginIntoNamespace(dgraphapi.DefaultUser,
dgraphapi.DefaultPassword, x.GalaxyNamespace))
dgraphapi.DefaultPassword, x.RootNamespace))
createAccountAndData(t, gc, hc)

// test query through curl
require.NoError(t, hc.LoginIntoNamespace(userid, userpassword, x.GalaxyNamespace))
require.NoError(t, hc.LoginIntoNamespace(userid, userpassword, x.RootNamespace))
// No ACL rules are specified, so query should return empty response,
// alter and mutate should fail.
queryArgs := func(jwt string) []string {
Expand Down Expand Up @@ -96,20 +96,20 @@ func (asuite *AclTestSuite) TestCurlAuthorization() {
DgraphErrMsg: "Token is expired",
})
// login again using the refreshJwt
require.NoError(t, hc.LoginUsingToken(x.GalaxyNamespace))
require.NoError(t, hc.LoginUsingToken(x.RootNamespace))
require.NoError(t, err, fmt.Sprintf("login through refresh httpToken failed: %v", err))
hcWithGroot, err := asuite.dc.HTTPClient()
require.NoError(t, err)
require.NoError(t, hcWithGroot.LoginIntoNamespace(dgraphapi.DefaultUser,
dgraphapi.DefaultPassword, x.GalaxyNamespace))
dgraphapi.DefaultPassword, x.RootNamespace))
createGroupAndAcls(t, unusedGroup, false, hcWithGroot)
time.Sleep(expireJwtSleep)
testutil.VerifyCurlCmd(t, queryArgs(hc.AccessJwt), &testutil.CurlFailureConfig{
ShouldFail: true,
DgraphErrMsg: "Token is expired",
})
// refresh the jwts again
require.NoError(t, hc.LoginUsingToken(x.GalaxyNamespace))
require.NoError(t, hc.LoginUsingToken(x.RootNamespace))

require.NoError(t, err, fmt.Sprintf("login through refresh httpToken failed: %v", err))
// verify that with an ACL rule defined, all the operations except query should
Expand All @@ -126,11 +126,11 @@ func (asuite *AclTestSuite) TestCurlAuthorization() {
DgraphErrMsg: "PermissionDenied",
})
require.NoError(t, hcWithGroot.LoginIntoNamespace(dgraphapi.DefaultUser,
dgraphapi.DefaultPassword, x.GalaxyNamespace))
dgraphapi.DefaultPassword, x.RootNamespace))
createGroupAndAcls(t, devGroup, true, hcWithGroot)
time.Sleep(defaultTimeToSleep)
// refresh the jwts again
require.NoError(t, hc.LoginUsingToken(x.GalaxyNamespace))
require.NoError(t, hc.LoginUsingToken(x.RootNamespace))

require.NoError(t, err, fmt.Sprintf("login through refresh httpToken failed: %v", err))
// verify that the operations should be allowed again through the dev group
Expand Down
28 changes: 14 additions & 14 deletions acl/acl_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func (asuite *AclTestSuite) TestPasswordReturn() {
hc, err := asuite.dc.HTTPClient()
require.NoError(t, err)
require.NoError(t, hc.LoginIntoNamespace(dgraphapi.DefaultUser,
dgraphapi.DefaultPassword, x.GalaxyNamespace))
dgraphapi.DefaultPassword, x.RootNamespace))
query := dgraphapi.GraphQLParams{
Query: `
query {
Expand All @@ -56,18 +56,18 @@ func (asuite *AclTestSuite) TestHealthForAcl() {
hc, err := asuite.dc.HTTPClient()
require.NoError(t, err)
require.NoError(t, hc.LoginIntoNamespace(dgraphapi.DefaultUser,
dgraphapi.DefaultPassword, x.GalaxyNamespace))
dgraphapi.DefaultPassword, x.RootNamespace))

resetUser(t, hc)
require.NoError(t, hc.LoginIntoNamespace(userid, userpassword, x.GalaxyNamespace))
require.NoError(t, hc.LoginIntoNamespace(userid, userpassword, x.RootNamespace))
gqlResp, err := hc.HealthForInstance()
require.Error(t, err)
// assert errors for non-guardians
assertNonGuardianFailure(t, "health", false, gqlResp, err)

// assert data for guardians
require.NoError(t, hc.LoginIntoNamespace(dgraphapi.DefaultUser,
dgraphapi.DefaultPassword, x.GalaxyNamespace))
dgraphapi.DefaultPassword, x.RootNamespace))

resp, err := hc.HealthForInstance()
require.NoError(t, err, "health request failed")
Expand Down Expand Up @@ -313,10 +313,10 @@ func (asuite *AclTestSuite) TestGuardianOnlyAccessForAdminEndpoints() {
hc, err := asuite.dc.HTTPClient()
require.NoError(t, err)
require.NoError(t, hc.LoginIntoNamespace(dgraphapi.DefaultUser,
dgraphapi.DefaultPassword, x.GalaxyNamespace))
dgraphapi.DefaultPassword, x.RootNamespace))

resetUser(t, hc)
require.NoError(t, hc.LoginIntoNamespace(userid, userpassword, x.GalaxyNamespace))
require.NoError(t, hc.LoginIntoNamespace(userid, userpassword, x.RootNamespace))
gqlResp, err := hc.RunGraphqlQuery(params, true)
require.Error(t, err)
// assert ACL error for non-guardians
Expand All @@ -325,7 +325,7 @@ func (asuite *AclTestSuite) TestGuardianOnlyAccessForAdminEndpoints() {
// for guardians, assert non-ACL error or success
if tcase.testGuardianAccess {
require.NoError(t, hc.LoginIntoNamespace(dgraphapi.DefaultUser,
dgraphapi.DefaultPassword, x.GalaxyNamespace))
dgraphapi.DefaultPassword, x.RootNamespace))

resp, err := hc.RunGraphqlQuery(params, true)
if tcase.guardianErr == "" {
Expand All @@ -352,26 +352,26 @@ func (asuite *AclTestSuite) TestFailedLogin() {
require.NoError(t, err)
defer cleanup()
require.NoError(t, gc.LoginIntoNamespace(ctx, dgraphapi.DefaultUser,
dgraphapi.DefaultPassword, x.GalaxyNamespace))
dgraphapi.DefaultPassword, x.RootNamespace))

hc, err := asuite.dc.HTTPClient()
require.NoError(t, err)
require.NoError(t, hc.LoginIntoNamespace(dgraphapi.DefaultUser,
dgraphapi.DefaultPassword, x.GalaxyNamespace))
dgraphapi.DefaultPassword, x.RootNamespace))

require.NoError(t, gc.DropAll())

client, _, err := asuite.dc.Client()
require.NoError(t, err)

// User is not present
err = client.LoginIntoNamespace(ctx, userid, "simplepassword", x.GalaxyNamespace)
err = client.LoginIntoNamespace(ctx, userid, "simplepassword", x.RootNamespace)
require.Error(t, err)
require.Contains(t, err.Error(), x.ErrorInvalidLogin.Error())

resetUser(t, hc)
// User is present
require.Error(t, client.LoginIntoNamespace(ctx, userid, "randomstring", x.GalaxyNamespace))
require.Error(t, client.LoginIntoNamespace(ctx, userid, "randomstring", x.RootNamespace))
require.Contains(t, err.Error(), x.ErrorInvalidLogin.Error())
}

Expand All @@ -384,7 +384,7 @@ func (asuite *AclTestSuite) TestWrongPermission() {
require.NoError(t, err)
defer cleanup()
require.NoError(t, gc.LoginIntoNamespace(ctx, dgraphapi.DefaultUser,
dgraphapi.DefaultPassword, x.GalaxyNamespace))
dgraphapi.DefaultPassword, x.RootNamespace))
require.NoError(t, gc.DropAll())

mu := &api.Mutation{SetNquads: []byte(`
Expand Down Expand Up @@ -418,7 +418,7 @@ func (asuite *AclTestSuite) TestACLNamespaceEdge() {
require.NoError(t, err)
defer cleanup()
require.NoError(t, gc.LoginIntoNamespace(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword, x.GalaxyNamespace))
dgraphapi.DefaultUser, dgraphapi.DefaultPassword, x.RootNamespace))

json := `
{
Expand Down Expand Up @@ -449,7 +449,7 @@ func (asuite *AclTestSuite) TestACLDuplicateGrootUser() {
require.NoError(t, err)
defer cleanup()
require.NoError(t, gc.LoginIntoNamespace(context.Background(),
dgraphapi.DefaultUser, dgraphapi.DefaultPassword, x.GalaxyNamespace))
dgraphapi.DefaultUser, dgraphapi.DefaultPassword, x.RootNamespace))

rdfs := `_:a <dgraph.xid> "groot" .
_:a <dgraph.type> "dgraph.type.User" .`
Expand Down
Loading