changing type to name in the ObjectType

project-kessel · Jun 5, 2024 · 862644e · 862644e
1 parent 887b966
commit 862644e
Show file tree

Hide file tree

Showing 18 changed files with 78 additions and 55 deletions.
diff --git a/api/health/v1/health.pb.go b/api/health/v1/health.pb.go
diff --git a/api/health/v1/health_grpc.pb.go b/api/health/v1/health_grpc.pb.go
diff --git a/api/health/v1/health_http.pb.go b/api/health/v1/health_http.pb.go
diff --git a/api/relations/v0/check.pb.go b/api/relations/v0/check.pb.go
diff --git a/api/relations/v0/check_grpc.pb.go b/api/relations/v0/check_grpc.pb.go
diff --git a/api/relations/v0/check_http.pb.go b/api/relations/v0/check_http.pb.go
diff --git a/api/relations/v0/common.pb.go b/api/relations/v0/common.pb.go
diff --git a/api/relations/v0/common.proto b/api/relations/v0/common.proto
@@ -45,5 +45,5 @@ message ObjectReference {
 
 message ObjectType {
 	string namespace = 1;
-	string type = 2;
+	string name = 2;
 }
diff --git a/api/relations/v0/lookup.pb.go b/api/relations/v0/lookup.pb.go
diff --git a/api/relations/v0/lookup_grpc.pb.go b/api/relations/v0/lookup_grpc.pb.go
diff --git a/api/relations/v0/relation_tuples.pb.go b/api/relations/v0/relation_tuples.pb.go
diff --git a/api/relations/v0/relation_tuples_grpc.pb.go b/api/relations/v0/relation_tuples_grpc.pb.go
diff --git a/api/relations/v0/relation_tuples_http.pb.go b/api/relations/v0/relation_tuples_http.pb.go
diff --git a/internal/conf/conf.pb.go b/internal/conf/conf.pb.go
diff --git a/internal/data/spicedb.go b/internal/data/spicedb.go
@@ -297,10 +297,10 @@ func spicedbTypeToKesselType(spicedbType string) *apiV0.ObjectType {
 	parts := strings.Split(spicedbType, "/")
 	switch len(parts) {
 	case 1:
-		kesselType.Type = parts[0]
+		kesselType.Name = parts[0]
 	case 2:
 		kesselType.Namespace = parts[0]
-		kesselType.Type = parts[1]
+		kesselType.Name = parts[1]
 	default:
 		return nil //?? Error?
 	}
@@ -310,10 +310,10 @@ func spicedbTypeToKesselType(spicedbType string) *apiV0.ObjectType {
 
 func kesselTypeToSpiceDBType(kesselType *apiV0.ObjectType) string {
 	if kesselType.Namespace != "" {
-		return fmt.Sprintf("%s/%s", kesselType.Namespace, kesselType.Type)
+		return fmt.Sprintf("%s/%s", kesselType.Namespace, kesselType.Name)
 	}
 
-	return kesselType.Type
+	return kesselType.Name
 }
 
 func optionalStringToStringPointer(optional string) *string {

diff --git a/internal/data/spicedb_test.go b/internal/data/spicedb_test.go
@@ -351,7 +351,7 @@ func TestSpiceDbRepository_CheckPermission(t *testing.T) {
 }
 
 func simple_type(typename string) *apiV0.ObjectType {
-	return &apiV0.ObjectType{Type: typename}
+	return &apiV0.ObjectType{Name: typename}
 }
 
 func pointerize(value string) *string { //Used to turn string literals into pointers