Skip to content
Open
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
4 changes: 0 additions & 4 deletions .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,5 @@ linters:
- path: _test\.go
linters:
- forcetypeassert # test files use mocks
- path: pkg/assembler/backends/neo4j
linters:
- unused # getting many unused false positives in neo4j backend
- forcetypeassert # this backend does this a lot
issues:
max-same-issues: 50
3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,6 @@ container: check-docker-tool-check check-docker-buildx-tool-check check-goreleas
# making the container is a longer process and thus not a dependency of service.
.PHONY: start-service
start-service: check-docker-compose-tool-check
# requires force recreate since docker compose reuses containers and neo4j does
# not handle that well.
#
# if container images are missing, run `make container` first
$(CONTAINER) compose -f docker-compose.yml -f container_files/mem.yaml up --force-recreate
@echo "Waiting for the service to start"
Expand Down
6 changes: 0 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,6 @@ The other backends are:
optimized)](https://github.com/guacsec/guac/tree/main/pkg/assembler/backends/arangodb):
a persistent backend based on [ArangoDB](https://arangodb.com/)

- [neo4j/openCypher (unsupported,
incomplete)](https://github.com/guacsec/guac/tree/main/pkg/assembler/backends/neo4j):
a persistent backend based on [neo4j](https://neo4j.com/) and
[openCypher](https://opencypher.org/). This backend should work with any
database that supported openCypher queries.

- [keyvalue: Redis (experimental, complete)](/pkg/assembler/kv/redis): The
default keyvalue backend, but using Redis as storage.

Expand Down
6 changes: 3 additions & 3 deletions cmd/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ services:

- what it does: runs a GraphQL server
- options:
- backend: keyvalue, neo4j, arango, ent, or future DB
- backend-specific options: neo4j connection options
- backend: keyvalue, arango, ent, or future DB
- backend-specific options: backend connection options
- playground / debug: also start playground

**guaccsub**
Expand Down Expand Up @@ -103,7 +103,7 @@ not required.
be short: ex: interval.

- Namespaced - If appropriate, group a group of flags that go together with a
prefix, ex: neo4j.
prefix, ex: arango.

- Short versions - Service oriented flags don't need short versions, user
oriented flags should.
Expand Down
2 changes: 0 additions & 2 deletions cmd/guacgql/cmd/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ import (
_ "github.com/guacsec/guac/pkg/assembler/backends/arangodb"
_ "github.com/guacsec/guac/pkg/assembler/backends/ent/backend"
_ "github.com/guacsec/guac/pkg/assembler/backends/keyvalue"
_ "github.com/guacsec/guac/pkg/assembler/backends/neo4j"
_ "github.com/guacsec/guac/pkg/assembler/backends/neptune"
"github.com/guacsec/guac/pkg/assembler/server"
"github.com/guacsec/guac/pkg/logging"
"github.com/guacsec/guac/pkg/metrics"
Expand Down
38 changes: 0 additions & 38 deletions container_files/neo4j.yaml

This file was deleted.

33 changes: 0 additions & 33 deletions container_files/neo4j/guac.yaml

This file was deleted.

1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@ require (
github.com/mitchellh/go-homedir v1.1.0
github.com/nats-io/nats-server/v2 v2.14.0
github.com/nats-io/nats.go v1.52.0
github.com/neo4j/neo4j-go-driver/v5 v5.28.4
github.com/oapi-codegen/oapi-codegen/v2 v2.4.1
github.com/oapi-codegen/runtime v1.1.1
github.com/opencontainers/go-digest v1.0.0
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -1122,8 +1122,6 @@ github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
github.com/ncruces/go-strftime v1.0.0 h1:HMFp8mLCTPp341M/ZnA4qaf7ZlsbTc+miZjCLOFAw7w=
github.com/ncruces/go-strftime v1.0.0/go.mod h1:Fwc5htZGVVkseilnfgOVb9mKy6w1naJmn9CehxcKcls=
github.com/neo4j/neo4j-go-driver/v5 v5.28.4 h1:7toxehVcYkZbyxV4W3Ib9VcnyRBQPucF+VwNNmtSXi4=
github.com/neo4j/neo4j-go-driver/v5 v5.28.4/go.mod h1:Vff8OwT7QpLm7L2yYr85XNWe9Rbqlbeb9asNXJTHO4k=
github.com/nwaples/rardecode/v2 v2.2.0 h1:4ufPGHiNe1rYJxYfehALLjup4Ls3ck42CWwjKiOqu0A=
github.com/nwaples/rardecode/v2 v2.2.0/go.mod h1:7uz379lSxPe6j9nvzxUZ+n7mnJNgjsRNb6IbvGVHRmw=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
Expand Down
16 changes: 1 addition & 15 deletions guac.yaml
Original file line number Diff line number Diff line change
@@ -1,22 +1,8 @@
# arangodb
# arangodb
arango-user: root
arango-pass: test123
arango-addr: http://localhost:8529

# Neo4j details
neo4j-user: neo4j
neo4j-pass: s3cr3t
neo4j-addr: neo4j://localhost:7687
neo4j-realm: neo4j

# Neptune details
# Populate neptune-endpoint, neptune-port and neptune-region with accurate values.
neptune-user: username
neptune-endpoint: localhost
neptune-port: 8182
neptune-region: us-east-1
neptune-realm: neptune

# pubsub setup
pubsub-addr: nats://localhost:4222
publish-to-queue: true
Expand Down
11 changes: 1 addition & 10 deletions internal/testing/cmd/pubsub_test/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,6 @@ import (
var cfgFile string

var flags = struct {
dbAddr string
gdbuser string
gdbpass string
realm string

// nats
pubsubAddr string

Expand All @@ -46,16 +41,12 @@ var flags = struct {
func init() {
cobra.OnInitialize(initConfig)
persistentFlags := rootCmd.PersistentFlags()
persistentFlags.StringVar(&flags.dbAddr, "gdbaddr", "neo4j://localhost:7687", "address to neo4j db")
persistentFlags.StringVar(&flags.gdbuser, "gdbuser", "", "neo4j user credential to connect to graph db")
persistentFlags.StringVar(&flags.gdbpass, "gdbpass", "", "neo4j password credential to connect to graph db")
persistentFlags.StringVar(&flags.realm, "realm", "neo4j", "realm to connect to graph db")
persistentFlags.StringVar(&flags.pubsubAddr, "pubsubAddr", "nats://127.0.0.1:4222", "address to connect to NATs Server")
// certifier flags
persistentFlags.BoolVarP(&flags.poll, "poll", "p", true, "sets the certifier to polling mode")
persistentFlags.IntVarP(&flags.interval, "interval", "i", 5, "if polling set interval in minutes")

flagNames := []string{"gdbaddr", "gdbuser", "gdbpass", "realm", "pubsubAddr", "poll", "interval"}
flagNames := []string{"pubsubAddr", "poll", "interval"}
for _, name := range flagNames {
if flag := persistentFlags.Lookup(name); flag != nil {
if err := viper.BindPFlag(name, flag); err != nil {
Expand Down
1 change: 0 additions & 1 deletion pkg/assembler/backends/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@ project.
## Backends

- `arangodb/`: Backend based on the Arango database
- `neo4j/`: Backend based on the Neo4j database
- `testing/`: simple backend with no resolvers implemented. Useful for
prototyping. Also known as the in-memory backend.
2 changes: 0 additions & 2 deletions pkg/assembler/backends/arangodb/pkg.go
Original file line number Diff line number Diff line change
Expand Up @@ -781,8 +781,6 @@ func getFilterQualifiers(qualifiersSpec []*model.PackageQualifierSpec) []string
}

func removeInvalidCharFromProperty(key string) string {
// neo4j does not accept "." in its properties. If the qualifier contains a "." that must
// be replaced by an "-"
return strings.ReplaceAll(key, ".", "_")
}

Expand Down
145 changes: 0 additions & 145 deletions pkg/assembler/backends/neo4j/artifact.go

This file was deleted.

Loading
Loading