Merge pull request #93 from port-labs/PORT-12601-bug-kubernetes-expor…

…ter-entities-ownership Fix bug with entities ownership
port-labs · Jan 21, 2025 · 8732c1b · 8732c1b
2 parents 9f85629 + 934e271
commit 8732c1b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/pkg/port/cli/entity.go b/pkg/port/cli/entity.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/port-labs/port-k8s-exporter/pkg/port"
-	"k8s.io/klog/v2"
 	"net/url"
 	"strconv"
+
+	"github.com/port-labs/port-k8s-exporter/pkg/port"
+	"k8s.io/klog/v2"
 )
 
 func (c *PortClient) SearchEntities(ctx context.Context, body port.SearchBody) ([]port.Entity, error) {
@@ -100,7 +101,7 @@ func (c *PortClient) DeleteStaleEntities(ctx context.Context, stateKey string, e
 			{
 				Property: "$datasource",
 				Operator: "contains",
-				Value:    fmt.Sprintf("statekey/%s", stateKey),
+				Value:    fmt.Sprintf("(statekey/%s)", stateKey),
 			},
 		},
 		Combinator: "and",

diff --git a/pkg/port/entity/entity.go b/pkg/port/entity/entity.go
@@ -4,13 +4,14 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"hash/fnv"
+	"reflect"
+	"strconv"
+
 	"github.com/port-labs/port-k8s-exporter/pkg/config"
 	"github.com/port-labs/port-k8s-exporter/pkg/jq"
 	"github.com/port-labs/port-k8s-exporter/pkg/port"
 	"github.com/port-labs/port-k8s-exporter/pkg/port/cli"
-	"hash/fnv"
-	"reflect"
-	"strconv"
 )
 
 func CheckIfOwnEntity(entity port.EntityRequest, portClient *cli.PortClient) (*bool, error) {
@@ -29,7 +30,7 @@ func CheckIfOwnEntity(entity port.EntityRequest, portClient *cli.PortClient) (*b
 			{
 				Property: "$datasource",
 				Operator: "contains",
-				Value:    fmt.Sprintf("statekey/%s", config.ApplicationConfig.StateKey),
+				Value:    fmt.Sprintf("(statekey/%s)", config.ApplicationConfig.StateKey),
 			},
 			{
 				Property: "$blueprint",