Merge branch 'main' into harshil-goel/upgrade-to-opentelemetry

Author: Harshil Goel

.github/labeler.yml

@@ -32,17 +32,13 @@ area/testing/jepsen:
   - changed-files:
       - any-glob-to-any-file: contrib/jepsen/**
 
-area/enterprise:
+area/backup:
   - changed-files:
-      - any-glob-to-any-file: ee/**
+      - any-glob-to-any-file: backup/**
 
-area/enterprise/backup:
+area/acl:
   - changed-files:
-      - any-glob-to-any-file: ee/backup/**
-
-area/enterprise/acl:
-  - changed-files:
-      - any-glob-to-any-file: ee/acl/**
+      - any-glob-to-any-file: acl/**
 
 area/schema:
   - changed-files:

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

@@ -49,7 +49,7 @@ jobs:
           cp dgraph/dgraph ~/go/bin/dgraph
           # run the core upgrade tests
           go test -v -timeout=120m -failfast -tags=upgrade \
-            github.com/hypermodeinc/dgraph/v24/ee/acl \
+            github.com/hypermodeinc/dgraph/v24/acl \
             github.com/hypermodeinc/dgraph/v24/worker \
             github.com/hypermodeinc/dgraph/v24/query
           # clean up docker containers after test execution

.vscode/launch.json

@@ -41,7 +41,7 @@
         "--security",
         "whitelist=0.0.0.0/0;",
         "--acl",
-        "secret-file=../ee/acl/hmac-secret; access-ttl=300000s;"
+        "secret-file=../acl/hmac-secret; access-ttl=300000s;"
       ],
       "showLog": true
     }

LICENSE.md

@@ -504,7 +504,7 @@ func chMod(conf *viper.Viper) error {
 	if !ok {
 		return errors.New("Malformed output of groupUIDCount")
 	} else if uidCount == 0 {
-		// We already have a check for multiple groups with same name at dgraph/ee/acl/utils.go:142
+		// We already have a check for multiple groups with same name at dgraph/acl/utils.go:142
 		return errors.Errorf("Group <%s> doesn't exist", groupName)
 	}
 	return nil

licenses/APL.txt LICENSE.txtlicenses/APL.txt renamed to LICENSE.txt

@@ -1,5 +1,5 @@
-//go:build !oss && integration
-// +build !oss,integration
+//go:build integration
+// +build integration
 
 /*
  * SPDX-FileCopyrightText: © Hypermode Inc. <[email protected]>

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

@@ -1,5 +1,5 @@
-//go:build (!oss && integration) || upgrade
-// +build !oss,integration upgrade
+//go:build integration || upgrade
+// +build integration upgrade
 
 /*
  * SPDX-FileCopyrightText: © Hypermode Inc. <[email protected]>
@@ -462,34 +462,6 @@ const (
   }`
 )
 
-func checkUserCount(t *testing.T, resp []byte, expected int) {
-	type Response struct {
-		AddUser struct {
-			User []struct {
-				Name string
-			}
-		}
-	}
-
-	var r Response
-	require.NoError(t, json.Unmarshal(resp, &r))
-	require.Equal(t, expected, len(r.AddUser.User))
-}
-
-func checkGroupCount(t *testing.T, resp []byte, expected int) {
-	type Response struct {
-		AddGroup struct {
-			Group []struct {
-				Name string
-			}
-		}
-	}
-
-	var r Response
-	require.NoError(t, json.Unmarshal(resp, &r))
-	require.Equal(t, expected, len(r.AddGroup.Group))
-}
-
 func (asuite *AclTestSuite) TestGetCurrentUser() {
 	t := asuite.T()
 
@@ -837,16 +809,6 @@ func createAccountAndData(t *testing.T, gc *dgraphapi.GrpcClient, hc *dgraphapi.
 	require.NoError(t, err)
 }
 
-type rule struct {
-	Predicate  string `json:"predicate"`
-	Permission int32  `json:"permission"`
-}
-
-type group struct {
-	Name  string `json:"name"`
-	Rules []rule `json:"rules"`
-}
-
 func createGroupAndAcls(t *testing.T, group string, addUserToGroup bool, hc *dgraphapi.HTTPClient) {
 	// create a new group
 	createdGroup, err := hc.CreateGroup(group)