fix: merge conflict and lint

Signed-off-by: Kartikay <[email protected]>

Author: kartikaysaxena

internal/services/shared/errors.go

@@ -72,54 +72,6 @@ func NewDeprecationError(err error) DeprecationError {
 	}
 }
 
-// DeprecationError is an error returned when a schema object or relation is deprecated.
-type DeprecationError struct {
-	error
-}
-
-func (err DeprecationError) GRPCStatus() *status.Status {
-	return spiceerrors.WithCodeAndDetails(
-		err,
-		codes.Aborted,
-		spiceerrors.ForReason(
-			// TODO: replace with a deprecation type error reason
-			v1.ErrorReason_ERROR_REASON_SCHEMA_TYPE_ERROR,
-			map[string]string{},
-		),
-	)
-}
-
-// NewDeprecationError wraps an error to indicate an attempted write to a deprecated object type, subject or allowed relation type.
-func NewDeprecationError(err error) DeprecationError {
-	return DeprecationError{
-		error: err,
-	}
-}
-
-// DeprecationError is an error returned when a schema object or relation is deprecated.
-type DeprecationError struct {
-	error
-}
-
-func (err DeprecationError) GRPCStatus() *status.Status {
-	return spiceerrors.WithCodeAndDetails(
-		err,
-		codes.Aborted,
-		spiceerrors.ForReason(
-			// TODO: replace with a deprecation type error reason
-			v1.ErrorReason_ERROR_REASON_SCHEMA_TYPE_ERROR,
-			map[string]string{},
-		),
-	)
-}
-
-// NewDeprecationError wraps an error to indicate an attempted write to a deprecated object type, subject or allowed relation type.
-func NewDeprecationError(err error) DeprecationError {
-	return DeprecationError{
-		error: err,
-	}
-}
-
 // SchemaWriteDataValidationError occurs when a schema cannot be applied due to leaving data unreferenced.
 type SchemaWriteDataValidationError struct {
 	error

internal/services/v1/relationships.go

@@ -107,9 +107,6 @@ type PermissionsServerConfig struct {
 	// DeprecatedRelationshipsEnabled defines whether or not deprecated relationships are enabled.
 	DeprecatedRelationshipsAndObjectsEnabled bool
 
-	// DeprecatedRelationshipsEnabled defines whether or not deprecated relationships are enabled.
-	DeprecatedRelationshipsAndObjectsEnabled bool
-
 	// CaveatTypeSet is the set of caveat types to use for caveats. If not specified,
 	// the default type set is used.
 	CaveatTypeSet *caveattypes.TypeSet
@@ -144,7 +141,7 @@ func NewPermissionsServer(
 		ExpiringRelationshipsEnabled:             config.ExpiringRelationshipsEnabled,
 		DeprecatedRelationshipsAndObjectsEnabled: config.DeprecatedRelationshipsAndObjectsEnabled,
 		PerformanceInsightMetricsEnabled:         config.PerformanceInsightMetricsEnabled,
-		EnableExperimentalLookupResources3: 	  config.EnableExperimentalLookupResources3,
+		EnableExperimentalLookupResources3:       config.EnableExperimentalLookupResources3,
 	}
 
 	return &permissionServer{

pkg/cmd/server/server.go

@@ -124,6 +124,7 @@ type Config struct {
 	MaxLookupResourcesLimit                   uint32        `debugmap:"visible"`
 	MaxBulkExportRelationshipsLimit           uint32        `debugmap:"visible"`
 	EnableExperimentalLookupResources         bool          `debugmap:"visible"`
+	ExperimentalLookupResourcesVersion        string        `debugmap:"visible"`
 	EnableExperimentalRelationshipExpiration  bool          `debugmap:"visible"`
 	EnableExperimentalRelationshipDeprecation bool          `debugmap:"visible"`
 	EnableRevisionHeartbeat                   bool          `debugmap:"visible"`

pkg/schema/definition_test.go

@@ -1467,7 +1467,7 @@ func TestTypeSystemAccessors(t *testing.T) {
 						traits, err = vts.PossibleTraitsForAnySubject("viewer")
 						require.NoError(t, err)
 						require.False(t, traits.AllowsCaveats)
-						require.True(t, traits.AllowsExpiration)
+						require.False(t, traits.AllowsExpiration)
 
 						traits, err = vts.PossibleTraitsForAnySubject("caveated_viewer")
 						require.NoError(t, err)