Merge pull request #2144 from josephschorr/expiring-rels-explicit-option

Add explicit option to enable expiration in schema

pkg/schemadsl/compiler/compiler.go

@@ -52,6 +52,7 @@ func (cs CompiledSchema) SourcePositionToRunePosition(source input.Source, posit
 type config struct {
 	skipValidation   bool
 	objectTypePrefix *string
+	allowedFlags     []string
 }
 
 func SkipValidation() Option { return func(cfg *config) { cfg.skipValidation = true } }
@@ -68,6 +69,10 @@ func AllowUnprefixedObjectType() ObjectPrefixOption {
 	return func(cfg *config) { cfg.objectTypePrefix = new(string) }
 }
 
+func AllowExpirationUseFlag() Option {
+	return func(cfg *config) { cfg.allowedFlags = append(cfg.allowedFlags, "expiration") }
+}
+
 type Option func(*config)
 
 type ObjectPrefixOption func(*config)
@@ -94,6 +99,7 @@ func Compile(schema InputSchema, prefix ObjectPrefixOption, opts ...Option) (*Co
 		mapper:           mapper,
 		schemaString:     schema.SchemaString,
 		skipValidate:     cfg.skipValidation,
+		allowedFlags:     cfg.allowedFlags,
 	}, root)
 	if err != nil {
 		var errorWithNode errorWithNode

pkg/schemadsl/compiler/compiler_test.go

@@ -1032,7 +1032,7 @@ func TestCompile(t *testing.T) {
 			require := require.New(t)
 			compiled, err := Compile(InputSchema{
 				input.Source(test.name), test.input,
-			}, test.objectPrefix)
+			}, test.objectPrefix, AllowExpirationUseFlag())
 
 			if test.expectedError != "" {
 				require.Error(err)

pkg/schemadsl/compiler/translator.go

@@ -3,6 +3,7 @@ package compiler
 import (
 	"bufio"
 	"fmt"
+	"slices"
 	"strings"
 
 	"github.com/ccoveille/go-safecast"
@@ -22,6 +23,7 @@ type translationContext struct {
 	mapper           input.PositionMapper
 	schemaString     string
 	skipValidate     bool
+	allowedFlags     []string
 }
 
 func (tctx translationContext) prefixedPath(definitionName string) (string, error) {
@@ -650,6 +652,10 @@ func translateSpecificTypeReference(tctx translationContext, typeRefNode *dslNod
 			return nil, typeRefNode.Errorf("invalid trait: %s", traitName)
 		}
 
+		if !slices.Contains(tctx.allowedFlags, "expiration") {
+			return nil, typeRefNode.Errorf("expiration trait is not allowed")
+		}
+
 		ref.RequiredExpiration = &core.ExpirationTrait{}
 	}
 

pkg/schemadsl/generator/generator_test.go

@@ -405,7 +405,7 @@ definition document {
 			compiled, err := compiler.Compile(compiler.InputSchema{
 				Source:       input.Source(test.name),
 				SchemaString: test.input,
-			}, compiler.AllowUnprefixedObjectType())
+			}, compiler.AllowUnprefixedObjectType(), compiler.AllowExpirationUseFlag())
 			require.NoError(err)
 
 			source, _, err := GenerateSchema(compiled.OrderedDefinitions)