Skip to content

Commit b65dfb1

Browse files
committed
remove enterprise license completely from dgraph
This PR removes the graphql schema that allows making changes to the license of the dgraph cluster. It also removes the /enterpriseLicense endpoint of Zero.
1 parent 1ce3a24 commit b65dfb1

43 files changed

Lines changed: 1379 additions & 2724 deletions

Some content is hidden

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ jobs:
5151
go test -v -timeout=120m -failfast -tags=upgrade \
5252
github.com/hypermodeinc/dgraph/v24/systest/mutations-and-queries \
5353
github.com/hypermodeinc/dgraph/v24/systest/plugin \
54-
github.com/hypermodeinc/dgraph/v24/systest/license \
5554
github.com/hypermodeinc/dgraph/v24/systest/multi-tenancy
5655
# clean up docker containers after test execution
5756
go clean -testcache

.trunk/trunk.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
33
version: 0.1
44
cli:
5-
version: 1.22.10
5+
version: 1.22.11
66

77
# Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
88
plugins:
@@ -26,24 +26,24 @@ lint:
2626
- contrib/**
2727
- protos/pb/pb.pb.go
2828
enabled:
29-
- trivy@0.59.1
29+
- trivy@0.61.0
3030
31-
31+
3232
3333
- git-diff-check
3434
35-
35+
3636
3737
38-
- osv-scanner@1.9.2
38+
- osv-scanner@2.0.0
3939
40-
41-
- renovate@39.176.4
40+
41+
- renovate@39.222.4
4242
4343
44-
- tflint@0.55.1
45-
46-
- yamllint@1.35.1
44+
- tflint@0.56.0
45+
46+
- yamllint@1.37.0
4747
actions:
4848
enabled:
4949
- trunk-announce

dgraph/cmd/alpha/run.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,7 @@ func setupServer(closer *z.Closer) {
605605
for {
606606
if x.HealthCheck() == nil {
607607
// Audit is enterprise feature.
608-
x.Check(audit.InitAuditorIfNecessary(worker.Config.Audit, worker.EnterpriseEnabled))
608+
x.Check(audit.InitAuditorIfNecessary(worker.Config.Audit))
609609
break
610610
}
611611
time.Sleep(500 * time.Millisecond)

dgraph/cmd/bulk/run.go

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import (
2727
"github.com/hypermodeinc/dgraph/v24/filestore"
2828
"github.com/hypermodeinc/dgraph/v24/protos/pb"
2929
"github.com/hypermodeinc/dgraph/v24/tok"
30-
"github.com/hypermodeinc/dgraph/v24/worker"
3130
"github.com/hypermodeinc/dgraph/v24/x"
3231
)
3332

@@ -195,12 +194,7 @@ func run() {
195194
// Need to set zero addr in WorkerConfig before checking the license.
196195
x.WorkerConfig.ZeroAddr = []string{opt.ZeroAddr}
197196
x.WorkerConfig.TLSClientConfig = tlsConf
198-
if !worker.EnterpriseEnabled() {
199-
// Crash since the enterprise license is not enabled..
200-
log.Fatal("Enterprise License needed for the Encryption feature.")
201-
} else {
202-
log.Printf("Encryption feature enabled.")
203-
}
197+
log.Printf("Encryption feature enabled.")
204198
}
205199
fmt.Printf("Encrypted input: %v; Encrypted output: %v\n", opt.Encrypted, opt.EncryptedOut)
206200

dgraph/cmd/zero/http.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ func (s *Server) zeroHealth(ctx context.Context) (*api.Response, error) {
238238
if ctx.Err() != nil {
239239
return nil, errors.Wrap(ctx.Err(), "http request context error")
240240
}
241-
health := pb.HealthInfo{
241+
health := &pb.HealthInfo{
242242
Instance: "zero",
243243
Address: x.WorkerConfig.MyAddr,
244244
Status: "healthy",

dgraph/cmd/zero/license.go

Lines changed: 0 additions & 38 deletions
This file was deleted.

dgraph/cmd/zero/license_ee.go

Lines changed: 0 additions & 158 deletions
This file was deleted.

0 commit comments

Comments
 (0)