remove enterprise related terminology

Author: mangalaman93

.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:

LICENSE.md

@@ -37,9 +37,6 @@ BUILD_FLAGS   ?= -ldflags '-X ${lastCommitSHA}=${BUILD} -X "${lastCommitTime}=${
 # Insert build tags if specified
 ifneq ($(strip $(BUILD_TAGS)),)
 	BUILD_FLAGS += -tags '$(BUILD_TAGS)'
-	ifneq (,$(findstring oss,$(BUILD_TAGS)))
-		BUILD_VERSION := $(BUILD_VERSION)-oss
-	endif
 endif
 
 # Build with compiler optimizations disabled, which will help debugging with dlv.

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

@@ -159,6 +159,7 @@ func loginHandler(w http.ResponseWriter, r *http.Request) {
 	jwt := &api.Jwt{}
 	if err := proto.Unmarshal(resp.Json, jwt); err != nil {
 		x.SetStatusWithData(w, x.Error, err.Error())
+		return
 	}
 
 	response := map[string]interface{}{}

dgraph/Makefile

@@ -605,7 +605,6 @@ func setupServer(closer *z.Closer) {
 	// Therefore we wait for the cluster initialization to be done.
 	for {
 		if x.HealthCheck() == nil {
-			// Audit is enterprise feature.
 			x.Check(audit.InitAuditorIfNecessary(worker.Config.Audit))
 			break
 		}

dgraph/cmd/alpha/http.go

@@ -71,7 +71,7 @@ type options struct {
 	shardOutputDirs []string
 
 	// ........... Badger options ..........
-	// EncryptionKey is the key used for encryption. Enterprise only feature.
+	// EncryptionKey is the key used for encryption.
 	EncryptionKey x.Sensitive
 	// Badger options.
 	Badger badger.Options

dgraph/cmd/alpha/run.go

@@ -30,7 +30,6 @@ import (
 	"github.com/dgraph-io/ristretto/v2/z"
 	"github.com/hypermodeinc/dgraph/v24/conn"
 	"github.com/hypermodeinc/dgraph/v24/ee/audit"
-	"github.com/hypermodeinc/dgraph/v24/ee/enc"
 	"github.com/hypermodeinc/dgraph/v24/protos/pb"
 	"github.com/hypermodeinc/dgraph/v24/raftwal"
 	"github.com/hypermodeinc/dgraph/v24/worker"
@@ -87,7 +86,7 @@ instances to achieve high-availability.
 	flag.String("peer", "", "Address of another dgraphzero server.")
 	flag.StringP("wal", "w", "zw", "Directory storing WAL.")
 	flag.Duration("rebalance_interval", 8*time.Minute, "Interval for trying a predicate move.")
-	flag.String("enterprise_license", "", "Path to the enterprise license file.")
+	flag.String("enterprise_license", "", "(deprecated) Path to the enterprise license file.")
 	flag.String("cid", "", "Cluster ID")
 
 	flag.String("limit", worker.ZeroLimitsDefaults, z.NewSuperFlagHelp(worker.ZeroLimitsDefaults).
@@ -236,10 +235,6 @@ func run() {
 	glog.Infof("Setting Config to: %+v", opts)
 	x.WorkerConfig.Parse(Zero.Conf)
 
-	if !enc.EeBuild && Zero.Conf.GetString("enterprise_license") != "" {
-		log.Fatalf("ERROR: enterprise_license option cannot be applied to OSS builds. ")
-	}
-
 	if opts.numReplicas < 0 || opts.numReplicas%2 == 0 {
 		log.Fatalf("ERROR: Number of replicas must be odd for consensus. Found: %d",
 			opts.numReplicas)

dgraph/cmd/bulk/loader.go

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: Hypermode Inc. <[email protected]>
+ * SPDX-FileCopyrightText: © Hypermode Inc. <[email protected]>
  * SPDX-License-Identifier: Apache-2.0
  */