chore: BED-5168 - prepare for review

SpecterOps · Dec 18, 2024 · 92421d0 · 92421d0
1 parent 0f28412
commit 92421d0
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/cmd/api/src/api/v2/integration/ingest.go b/cmd/api/src/api/v2/integration/ingest.go
@@ -18,10 +18,11 @@ package integration
 
 import (
 	"encoding/json"
-	"github.com/specterops/bloodhound/graphschema"
 	"strings"
 	"time"
 
+	"github.com/specterops/bloodhound/graphschema"
+
 	"github.com/specterops/bloodhound/dawgs/graph"
 	"github.com/specterops/bloodhound/src/model"
 	"github.com/specterops/bloodhound/src/model/appcfg"

diff --git a/packages/go/cypher/models/pgsql/test/translation_cases/nodes.sql b/packages/go/cypher/models/pgsql/test/translation_cases/nodes.sql
@@ -585,3 +585,11 @@ with s0 as (select (n0.id, n0.kind_ids, n0.properties)::nodecomposite as n0
               and coalesce(n0.properties -> 'a', n0.properties -> 'b')::int8 = 1)
 select s0.n0 as n
 from s0;
+
+-- case: match (n:NodeKind1) where 1 = coalesce(n.a, n.b) return n
+with s0 as (select (n0.id, n0.kind_ids, n0.properties)::nodecomposite as n0
+            from node n0
+            where n0.kind_ids operator (pg_catalog.&&) array [1]::int2[]
+              and 1 = coalesce(n0.properties -> 'a', n0.properties -> 'b')::int8)
+select s0.n0 as n
+from s0;
diff --git a/packages/go/cypher/models/pgsql/translate/translator_test.go b/packages/go/cypher/models/pgsql/translate/translator_test.go
@@ -18,9 +18,10 @@ package translate_test
 
 import (
 	"fmt"
-	"github.com/specterops/bloodhound/dawgs/drivers/pg/pgutil"
 	"testing"
 
+	"github.com/specterops/bloodhound/dawgs/drivers/pg/pgutil"
+
 	"github.com/specterops/bloodhound/cypher/models/pgsql"
 	"github.com/specterops/bloodhound/cypher/models/pgsql/test"
 	"github.com/specterops/bloodhound/dawgs/graph"

diff --git a/packages/go/cypher/models/pgsql/visualization/visualizer_test.go b/packages/go/cypher/models/pgsql/visualization/visualizer_test.go
@@ -19,9 +19,10 @@ package visualization
 import (
 	"bytes"
 	"context"
-	"github.com/specterops/bloodhound/dawgs/drivers/pg/pgutil"
 	"testing"
 
+	"github.com/specterops/bloodhound/dawgs/drivers/pg/pgutil"
+
 	"github.com/specterops/bloodhound/cypher/frontend"
 	"github.com/specterops/bloodhound/cypher/models/pgsql/translate"
 	"github.com/stretchr/testify/require"

diff --git a/packages/go/dawgs/drivers/pg/manager.go b/packages/go/dawgs/drivers/pg/manager.go
@@ -23,8 +23,6 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/specterops/bloodhound/log"
-
 	"github.com/jackc/pgx/v5"
 	"github.com/specterops/bloodhound/dawgs/drivers/pg/model"
 	"github.com/specterops/bloodhound/dawgs/drivers/pg/query"
@@ -61,8 +59,6 @@ func NewSchemaManager(database graph.Database) *SchemaManager {
 }
 
 func (s *SchemaManager) fetch(tx graph.Transaction) error {
-	log.Infof("fetching kinds from database")
-
 	if kinds, err := query.On(tx).SelectKinds(); err != nil {
 		return err
 	} else {

diff --git a/packages/go/dawgs/drivers/pg/node_test.go b/packages/go/dawgs/drivers/pg/node_test.go
@@ -18,9 +18,10 @@ package pg
 
 import (
 	"context"
-	"github.com/specterops/bloodhound/dawgs/drivers/pg/pgutil"
 	"testing"
 
+	"github.com/specterops/bloodhound/dawgs/drivers/pg/pgutil"
+
 	"github.com/specterops/bloodhound/dawgs/graph"
 	graph_mocks "github.com/specterops/bloodhound/dawgs/graph/mocks"
 	"github.com/specterops/bloodhound/dawgs/query"

diff --git a/packages/go/dawgs/drivers/pg/pgutil/kindmapper.go b/packages/go/dawgs/drivers/pg/pgutil/kindmapper.go
@@ -19,6 +19,7 @@ package pgutil
 import (
 	"context"
 	"fmt"
+
 	"github.com/specterops/bloodhound/dawgs/graph"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ package pgutil @@
     import (
     	"context"
     	"fmt"
     	"github.com/specterops/bloodhound/dawgs/graph"
     )
@@ Expand Down @@