Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/ci-dgraph-core-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
dgraph-core-tests:
if: github.event.pull_request.draft == false
runs-on: warp-ubuntu-latest-x64-4x
timeout-minutes: 30
timeout-minutes: 60
steps:
- uses: actions/checkout@v4
- name: Set up Go
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ci-dgraph-system-upgrade-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ jobs:
go test -v -timeout=120m -failfast -tags=upgrade \
github.com/hypermodeinc/dgraph/v24/systest/mutations-and-queries \
github.com/hypermodeinc/dgraph/v24/systest/plugin \
github.com/hypermodeinc/dgraph/v24/systest/license \
github.com/hypermodeinc/dgraph/v24/systest/multi-tenancy
# clean up docker containers after test execution
go clean -testcache
Expand Down
20 changes: 10 additions & 10 deletions .trunk/trunk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
version: 0.1
cli:
version: 1.22.10
version: 1.22.11

# Trunk provides extensibility via plugins. (https://docs.trunk.io/plugins)
plugins:
Expand All @@ -26,24 +26,24 @@ lint:
- contrib/**
- protos/pb/pb.pb.go
enabled:
- trivy@0.59.1
- trivy@0.61.0
- actionlint@1.7.7
- checkov@3.2.372
- checkov@3.2.395
- dotenv-linter@3.3.0
- git-diff-check
- gofmt@1.20.4
- golangci-lint@1.64.5
- golangci-lint@1.64.8
- hadolint@2.12.1-beta
- markdownlint@0.44.0
- osv-scanner@1.9.2
- osv-scanner@2.0.0
- oxipng@9.1.4
- prettier@3.5.1
- renovate@39.176.4
- prettier@3.5.3
- renovate@39.222.4
- shellcheck@0.10.0
- shfmt@3.6.0
- tflint@0.55.1
- trufflehog@3.88.11
- yamllint@1.35.1
- tflint@0.56.0
- trufflehog@3.88.20
- yamllint@1.37.0
actions:
enabled:
- trunk-announce
Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/alpha/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ func setupServer(closer *z.Closer) {
for {
if x.HealthCheck() == nil {
// Audit is enterprise feature.
x.Check(audit.InitAuditorIfNecessary(worker.Config.Audit, worker.EnterpriseEnabled))
x.Check(audit.InitAuditorIfNecessary(worker.Config.Audit))
break
}
time.Sleep(500 * time.Millisecond)
Expand Down
8 changes: 1 addition & 7 deletions dgraph/cmd/bulk/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import (
"github.com/hypermodeinc/dgraph/v24/filestore"
"github.com/hypermodeinc/dgraph/v24/protos/pb"
"github.com/hypermodeinc/dgraph/v24/tok"
"github.com/hypermodeinc/dgraph/v24/worker"
"github.com/hypermodeinc/dgraph/v24/x"
)

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

Expand Down
2 changes: 1 addition & 1 deletion dgraph/cmd/zero/http.go
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ func (s *Server) zeroHealth(ctx context.Context) (*api.Response, error) {
if ctx.Err() != nil {
return nil, errors.Wrap(ctx.Err(), "http request context error")
}
health := pb.HealthInfo{
Comment thread
mangalaman93 marked this conversation as resolved.
health := &pb.HealthInfo{
Instance: "zero",
Address: x.WorkerConfig.MyAddr,
Status: "healthy",
Expand Down
38 changes: 0 additions & 38 deletions dgraph/cmd/zero/license.go

This file was deleted.

158 changes: 0 additions & 158 deletions dgraph/cmd/zero/license_ee.go

This file was deleted.

Loading