multiple updates to address spicedb validation errors (#235)

project-kessel · Nov 15, 2024 · 08ee79c · 08ee79c
1 parent ff15e42
commit 08ee79c
Show file tree

Hide file tree

Showing 14 changed files with 970 additions and 90 deletions.
diff --git a/data/host-service-account.json b/data/host-service-account.json
@@ -1,7 +1,7 @@
 {
   "rhel_host": {
     "metadata": {
-      "workspace_id": "hbi/rhel_host"
+      "workspace_id": "workspace1"
     },
     "reporter_data": {
       "reporter_type": "OCM",

diff --git a/data/host.json b/data/host.json
@@ -1,8 +1,8 @@
 {
   "rhel_host": {
     "metadata": {
-      "resource_type": "rhel-host",
-      "workspace_id": "hbi/rhel_host"
+      "resource_type": "rhel_host",
+      "workspace_id": "01932c7e-e93e-719c-a488-3159877367b0"
     },
     "reporter_data": {
       "reporter_type": "OCM",

diff --git a/data/k8s-cluster-reporter.json b/data/k8s-cluster-reporter.json
@@ -0,0 +1,9 @@
+{
+  "reporter_data": {
+    "reporter_type": "OCM",
+    "reporter_version": "0.1",
+    "local_resource_id": "2",
+    "api_href": "www.example.com",
+    "console_href": "www.example.com"
+  }
+}
diff --git a/data/k8s-cluster.json b/data/k8s-cluster.json
@@ -1,8 +1,8 @@
 {
   "k8s_cluster": {
     "metadata": {
-      "resource_type": "k8s-cluster",
-      "workspace_id": "hbi/k8s_cluster"
+      "resource_type": "k8s_cluster",
+      "workspace_id": "01932c7e-e93e-719c-a488-3159877367b0"
     },
     "reporter_data": {
       "reporter_type": "ACM",

diff --git a/data/k8s-policy.json b/data/k8s-policy.json
@@ -1,8 +1,8 @@
 {
   "k8s_policy": {
     "metadata": {
-      "resource_type": "k8s-policy",
-      "workspace_id": "hbi/k8s_policy"
+      "resource_type": "k8s_policy",
+      "workspace_id": "01932c7e-e93e-719c-a488-3159877367b0"
     },
     "reporter_data": {
       "reporter_type": "ACM",

diff --git a/data/k8spolicy_ispropagatedto_k8scluster.json b/data/k8spolicy_ispropagatedto_k8scluster.json
@@ -3,7 +3,7 @@
     "metadata": {
     },
     "reporter_data": {
-      "reporter_type": "OCM",
+      "reporter_type": "ACM",
       "reporter_version": "0.1",
       "subject_local_resource_id": "1",
       "object_local_resource_id": "2"

diff --git a/deploy/schema.yaml b/deploy/schema.yaml
diff --git a/deploy/schema.zed b/deploy/schema.zed
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -52,6 +52,8 @@ services:
   relations-api:
     image: "quay.io/cloudservices/kessel-relations:latest"
     hostname: relations-api
+    volumes:
+      - ./deploy/schema.zed:/deploy/schema.zed:ro,z
     environment:
       - "SPICEDB_PRESHARED=${SPICEDB_GRPC_PRESHARED_KEY}"
       # - "SPICEDB_PRESHARED_FILE=/run/secrets/spicedb_pre_shared"

diff --git a/internal/service/common/common.go b/internal/service/common/common.go
@@ -77,8 +77,8 @@ func ReporterRelationshipIdFromPb(relationshipType, reporterId string, reporter
 		return model.ReporterRelationshipId{}, errors.New("invalid relationship type, not in the expected format subject_relation_object ")
 	}
 
-	subjectType := res[0]
-	objectType := res[2]
+	subjectType := conform(res[0])
+	objectType := conform(res[2])
 
 	return model.ReporterRelationshipId{
 		ReporterId:       reporterId,
@@ -106,8 +106,8 @@ func RelationshipFromPb(relationshipType, reporterId string, relationshipData mo
 		return nil, errors.New("invalid relationship type, not in the expected format subject_relation_object ")
 	}
 
-	subjectType := res[0]
-	objectType := res[2]
+	subjectType := conform(res[0])
+	objectType := conform(res[2])
 
 	return &model.Relationship{
 		ID:               uuid.UUID{},
@@ -129,3 +129,8 @@ func RelationshipFromPb(relationshipType, reporterId string, relationshipData mo
 		},
 	}, nil
 }
+
+// Conform converts any hyphens in resource types to underscores to conform with SpiceDB validation requirements
+func conform(resource string) string {
+	return strings.ReplaceAll(resource, "-", "_")
+}
diff --git a/internal/service/resources/hosts/hosts.go b/internal/service/resources/hosts/hosts.go
@@ -2,6 +2,7 @@ package hosts
 
 import (
 	"context"
+
 	pb "github.com/project-kessel/inventory-api/api/kessel/inventory/v1beta1/resources"
 	authnapi "github.com/project-kessel/inventory-api/internal/authn/api"
 	"github.com/project-kessel/inventory-api/internal/biz/model"
@@ -11,7 +12,7 @@ import (
 )
 
 const (
-	ResourceType = "rhel-host"
+	ResourceType = "rhel_host"
 )
 
 // HostsService handles requests for Rhel hosts

diff --git a/internal/service/resources/k8sclusters/k8scluster.go b/internal/service/resources/k8sclusters/k8scluster.go
@@ -2,6 +2,7 @@ package k8sclusters
 
 import (
 	"context"
+
 	"github.com/project-kessel/inventory-api/internal/biz/resources"
 
 	pb "github.com/project-kessel/inventory-api/api/kessel/inventory/v1beta1/resources"
@@ -12,7 +13,7 @@ import (
 )
 
 const (
-	ResourceType = "k8s-cluster"
+	ResourceType = "k8s_cluster"
 )
 
 // K8sClustersService handles requests for k8s clusters

diff --git a/internal/service/resources/k8spolicies/k8spolicies.go b/internal/service/resources/k8spolicies/k8spolicies.go
@@ -2,6 +2,7 @@ package k8spolicies
 
 import (
 	"context"
+
 	"github.com/project-kessel/inventory-api/internal/biz/model"
 	"github.com/project-kessel/inventory-api/internal/biz/resources"
 
@@ -12,7 +13,7 @@ import (
 )
 
 const (
-	ResourceType = "k8s-policy"
+	ResourceType = "k8s_policy"
 )
 
 // K8sPoliciesService handles requests for K8s Policies

diff --git a/test/e2e/inventory_http_test.go b/test/e2e/inventory_http_test.go
@@ -5,16 +5,17 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
+	nethttp "net/http"
+	"os"
+	"strconv"
+	"testing"
+
 	"github.com/go-kratos/kratos/v2/log"
 	"github.com/go-kratos/kratos/v2/transport/http"
 	v1 "github.com/project-kessel/inventory-api/api/kessel/inventory/v1"
 	"github.com/project-kessel/inventory-api/api/kessel/inventory/v1beta1/resources"
 	"github.com/project-kessel/inventory-client-go/v1beta1"
 	"github.com/stretchr/testify/assert"
-	nethttp "net/http"
-	"os"
-	"strconv"
-	"testing"
 )
 
 var inventoryapi_http_url string
@@ -150,7 +151,7 @@ func TestInventoryAPIHTTP_CreateRHELHost(t *testing.T) {
 	}
 	request := resources.CreateRhelHostRequest{RhelHost: &resources.RhelHost{
 		Metadata: &resources.Metadata{
-			ResourceType: "rhel-host",
+			ResourceType: "rhel_host",
 			WorkspaceId:  "workspace1",
 			OrgId:        "",
 		},
@@ -183,7 +184,7 @@ func TestInventoryAPIHTTP_K8SCluster_CreateK8SCluster(t *testing.T) {
 	request := resources.CreateK8SClusterRequest{
 		K8SCluster: &resources.K8SCluster{
 			Metadata: &resources.Metadata{
-				ResourceType: "k8s-cluster",
+				ResourceType: "k8s_cluster",
 				WorkspaceId:  "",
 				OrgId:        "",
 			},
@@ -238,7 +239,7 @@ func TestInventoryAPIHTTP_K8SPolicy_CreateK8SPolicy(t *testing.T) {
 	request := resources.CreateK8SPolicyRequest{
 		K8SPolicy: &resources.K8SPolicy{
 			Metadata: &resources.Metadata{
-				ResourceType: "k8s-policy",
+				ResourceType: "k8s_policy",
 				WorkspaceId:  "default",
 				OrgId:        "",
 			},