diff --git a/lineage.cue b/lineage.cue index 44bd4782..3fc48b68 100644 --- a/lineage.cue +++ b/lineage.cue @@ -27,7 +27,8 @@ import ( // // A lineage's joinSchema must never change as the lineage evolves. - joinSchema?: struct.MinFields(1) + // joinSchema?: struct.MinFields(1) + joinSchema: _ // schemas is the ordered list of all schemas in the lineage. // @@ -256,7 +257,7 @@ import ( _#schema: _join & schema - _schemaIsNonEmpty: struct.MinFields(1) & _#schema + // _schemaIsNonEmpty: struct.MinFields(1) & _#schema // examples is an optional set of named examples of the schema, intended // for use in documentation or other non-functional contexts. diff --git a/lineage_test.go b/lineage_test.go index 997b7c82..dd15c786 100644 --- a/lineage_test.go +++ b/lineage_test.go @@ -57,6 +57,7 @@ func TestInvalidLineages(t *testing.T) { ToDo: map[string]string{ "invalidlineage/defaultchange": "Thema compat analyzer fails to classify changes to default values as breaking", "invalidlineage/joindef": "no invariant checker written to disallow definitions from joinSchema", + "invalidlineage/onlydef": "Lineage schema non-emptiness constraints are temporarily suspended while migrating grafana to flattened lineage structure", }, } diff --git a/testdata/invalidlineage/empty-schemas.txtar b/testdata/invalidlineage/empty-schemas.txtar index 0009801d..e8dec32b 100644 --- a/testdata/invalidlineage/empty-schemas.txtar +++ b/testdata/invalidlineage/empty-schemas.txtar @@ -6,8 +6,8 @@ thema.#Lineage name: "empty-schemas" schemas: [] -- out/bindfail -- -schemas: incompatible list lengths (0 and 1) +incompatible list lengths (0 and 1) _sortedSchemas: invalid value [] (does not satisfy list.MinItems(1)): len(list) < MinItems(1) (0 < 1): - ../../lineage.cue:97:7 - ../../lineage.cue:93:21 - ../../lineage.cue:97:21 + ../../lineage.cue:98:7 + ../../lineage.cue:94:21 + ../../lineage.cue:98:21 diff --git a/testdata/invalidlineage/second-schema-versionless.txtar b/testdata/invalidlineage/second-schema-versionless.txtar index 71775792..7d88c1d9 100644 --- a/testdata/invalidlineage/second-schema-versionless.txtar +++ b/testdata/invalidlineage/second-schema-versionless.txtar @@ -32,8 +32,8 @@ lenses: [ ] -- out/bindfail -- _schemasAreOrdered.1: conflicting values true and false: - ../../lineage.cue:124:3 - ../../lineage.cue:125:4 - ../../lineage.cue:130:5 - ../../lineage.cue:131:11 + ../../lineage.cue:125:3 + ../../lineage.cue:126:4 + ../../lineage.cue:131:5 + ../../lineage.cue:132:11 ./in.cue:4:1