resolve merge conflicts

Signed-off-by: Kartikay <kartikay_2101ce32@iitp.ac.in>

Author: kartikaysaxena

internal/services/shared/errors.go

@@ -72,6 +72,30 @@ 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,
+	}
+}
+
 // SchemaWriteDataValidationError occurs when a schema cannot be applied due to leaving data unreferenced.
 type SchemaWriteDataValidationError struct {
 	error

pkg/cmd/server/server.go

@@ -124,7 +124,6 @@ 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"`
@@ -455,23 +454,22 @@ func (c *Config) Complete(ctx context.Context) (RunnableServer, error) {
 	}
 
 	permSysConfig := v1svc.PermissionsServerConfig{
-		MaxPreconditionsCount:              maxPreconditionCount,
-		MaxUpdatesPerWrite:                 c.MaximumUpdatesPerWrite,
-		MaximumAPIDepth:                    c.DispatchMaxDepth,
-		MaxCaveatContextSize:               c.MaxCaveatContextSize,
-		MaxRelationshipContextSize:         c.MaxRelationshipContextSize,
-		MaxDatastoreReadPageSize:           c.MaxDatastoreReadPageSize,
-		StreamingAPITimeout:                c.StreamingAPITimeout,
-		MaxReadRelationshipsLimit:          c.MaxReadRelationshipsLimit,
-		MaxDeleteRelationshipsLimit:        c.MaxDeleteRelationshipsLimit,
-		MaxLookupResourcesLimit:            c.MaxLookupResourcesLimit,
-		MaxBulkExportRelationshipsLimit:    c.MaxBulkExportRelationshipsLimit,
-		DispatchChunkSize:                  c.DispatchChunkSize,
-		ExpiringRelationshipsEnabled:       c.EnableExperimentalRelationshipExpiration,
-		CaveatTypeSet:                      c.DatastoreConfig.CaveatTypeSet,
-		PerformanceInsightMetricsEnabled:   c.EnablePerformanceInsightMetrics,
+		MaxPreconditionsCount:                    maxPreconditionCount,
+		MaxUpdatesPerWrite:                       c.MaximumUpdatesPerWrite,
+		MaximumAPIDepth:                          c.DispatchMaxDepth,
+		MaxCaveatContextSize:                     c.MaxCaveatContextSize,
+		MaxRelationshipContextSize:               c.MaxRelationshipContextSize,
+		MaxDatastoreReadPageSize:                 c.MaxDatastoreReadPageSize,
+		StreamingAPITimeout:                      c.StreamingAPITimeout,
+		MaxReadRelationshipsLimit:                c.MaxReadRelationshipsLimit,
+		MaxDeleteRelationshipsLimit:              c.MaxDeleteRelationshipsLimit,
+		MaxLookupResourcesLimit:                  c.MaxLookupResourcesLimit,
+		MaxBulkExportRelationshipsLimit:          c.MaxBulkExportRelationshipsLimit,
+		DispatchChunkSize:                        c.DispatchChunkSize,
+		ExpiringRelationshipsEnabled:             c.EnableExperimentalRelationshipExpiration,
 		DeprecatedRelationshipsAndObjectsEnabled: c.EnableExperimentalRelationshipDeprecation,
-		EnableExperimentalLookupResources3: c.ExperimentalLookupResourcesVersion == "lr3",
+		CaveatTypeSet:                            c.DatastoreConfig.CaveatTypeSet,
+		PerformanceInsightMetricsEnabled:         c.EnablePerformanceInsightMetrics,
 	}
 
 	healthManager := health.NewHealthManager(dispatcher, ds)

pkg/schemadsl/compiler/translator.go

@@ -796,6 +796,15 @@ func translateSpecificTypeReference(tctx *translationContext, typeRefNode *dslNo
 		ref.Deprecation = dep
 	}
 
+	// Add the deprecation, if any.
+	if depChild, err := typeRefNode.Lookup(dslshape.NodeTypeReferenceDeprecatedType); err == nil && depChild.GetType() == dslshape.NodeTypeDeprecation {
+		dep, err := translateDeprecation(tctx, depChild)
+		if err != nil {
+			return nil, err
+		}
+		ref.Deprecation = dep
+	}
+
 	if !tctx.skipValidate {
 		if err := ref.Validate(); err != nil {
 			return nil, typeRefNode.Errorf("invalid type relation: %w", err)