Skip to content

Commit 075ac50

Browse files
committed
remove enterprise related terminology
1 parent b307fad commit 075ac50

87 files changed

Lines changed: 253 additions & 807 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/labeler.yml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,13 @@ area/testing/jepsen:
3232
- changed-files:
3333
- any-glob-to-any-file: contrib/jepsen/**
3434

35-
area/enterprise:
35+
area/backup:
3636
- changed-files:
37-
- any-glob-to-any-file: ee/**
37+
- any-glob-to-any-file: backup/**
3838

39-
area/enterprise/backup:
39+
area/acl:
4040
- changed-files:
41-
- any-glob-to-any-file: ee/backup/**
42-
43-
area/enterprise/acl:
44-
- changed-files:
45-
- any-glob-to-any-file: ee/acl/**
41+
- any-glob-to-any-file: acl/**
4642

4743
area/schema:
4844
- changed-files:

.github/workflows/ci-dgraph-core-upgrade-tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
cp dgraph/dgraph ~/go/bin/dgraph
5050
# run the core upgrade tests
5151
go test -v -timeout=120m -failfast -tags=upgrade \
52-
github.com/hypermodeinc/dgraph/v24/ee/acl \
52+
github.com/hypermodeinc/dgraph/v24/acl \
5353
github.com/hypermodeinc/dgraph/v24/worker \
5454
github.com/hypermodeinc/dgraph/v24/query
5555
# clean up docker containers after test execution

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"--security",
4242
"whitelist=0.0.0.0/0;",
4343
"--acl",
44-
"secret-file=../ee/acl/hmac-secret; access-ttl=300000s;"
44+
"secret-file=../acl/hmac-secret; access-ttl=300000s;"
4545
],
4646
"showLog": true
4747
}

LICENSE.md

Lines changed: 0 additions & 16 deletions
This file was deleted.
File renamed without changes.

ee/acl/acl.go renamed to acl/acl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ func chMod(conf *viper.Viper) error {
504504
if !ok {
505505
return errors.New("Malformed output of groupUIDCount")
506506
} else if uidCount == 0 {
507-
// We already have a check for multiple groups with same name at dgraph/ee/acl/utils.go:142
507+
// We already have a check for multiple groups with same name at dgraph/acl/utils.go:142
508508
return errors.Errorf("Group <%s> doesn't exist", groupName)
509509
}
510510
return nil
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build !oss && integration
2-
// +build !oss,integration
1+
//go:build integration
2+
// +build integration
33

44
/*
55
* SPDX-FileCopyrightText: © Hypermode Inc. <[email protected]>
Lines changed: 2 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
//go:build (!oss && integration) || upgrade
2-
// +build !oss,integration upgrade
1+
//go:build integration || upgrade
2+
// +build integration upgrade
33

44
/*
55
* SPDX-FileCopyrightText: © Hypermode Inc. <[email protected]>
@@ -462,34 +462,6 @@ const (
462462
}`
463463
)
464464

465-
func checkUserCount(t *testing.T, resp []byte, expected int) {
466-
type Response struct {
467-
AddUser struct {
468-
User []struct {
469-
Name string
470-
}
471-
}
472-
}
473-
474-
var r Response
475-
require.NoError(t, json.Unmarshal(resp, &r))
476-
require.Equal(t, expected, len(r.AddUser.User))
477-
}
478-
479-
func checkGroupCount(t *testing.T, resp []byte, expected int) {
480-
type Response struct {
481-
AddGroup struct {
482-
Group []struct {
483-
Name string
484-
}
485-
}
486-
}
487-
488-
var r Response
489-
require.NoError(t, json.Unmarshal(resp, &r))
490-
require.Equal(t, expected, len(r.AddGroup.Group))
491-
}
492-
493465
func (asuite *AclTestSuite) TestGetCurrentUser() {
494466
t := asuite.T()
495467

@@ -837,16 +809,6 @@ func createAccountAndData(t *testing.T, gc *dgraphapi.GrpcClient, hc *dgraphapi.
837809
require.NoError(t, err)
838810
}
839811

840-
type rule struct {
841-
Predicate string `json:"predicate"`
842-
Permission int32 `json:"permission"`
843-
}
844-
845-
type group struct {
846-
Name string `json:"name"`
847-
Rules []rule `json:"rules"`
848-
}
849-
850812
func createGroupAndAcls(t *testing.T, group string, addUserToGroup bool, hc *dgraphapi.HTTPClient) {
851813
// create a new group
852814
createdGroup, err := hc.CreateGroup(group)
File renamed without changes.

0 commit comments

Comments
 (0)