Unsupport atomic to granular

Author: kevindelgado

merge/schema_change_test.go

@@ -178,75 +178,3 @@ func TestGranularToAtomicSchemaChanges(t *testing.T) {
 		})
 	}
 }
-
-func TestAtomicToGranularSchemaChanges(t *testing.T) {
-	tests := map[string]TestCase{
-		"to-granular": {
-			Ops: []Operation{
-				Apply{
-					Manager: "one",
-					Object: `
-						struct:
-						  numeric: 1
-						  string: "a"
-					`,
-					APIVersion: "v1",
-				},
-				Apply{
-					Manager: "two",
-					Object: `
-						struct:
-						  string: "b"
-					`,
-					APIVersion: "v1",
-					Conflicts: merge.Conflicts{
-						merge.Conflict{Manager: "one", Path: _P("struct")},
-					},
-				},
-				ChangeParser{Parser: structParser},
-				Apply{
-					Manager: "two",
-					Object: `
-						struct:
-						  string: "b"
-					`,
-					APIVersion: "v1",
-					Conflicts: merge.Conflicts{
-						merge.Conflict{Manager: "one", Path: _P("struct", "string")},
-					},
-				},
-				ForceApply{
-					Manager: "two",
-					Object: `
-						struct:
-						  string: "b"
-					`,
-					APIVersion: "v1",
-				},
-			},
-			Object: `
-				struct:
-				  numeric: 1
-				  string: "b"
-			`,
-			APIVersion: "v1",
-			Managed: fieldpath.ManagedFields{
-				"one": fieldpath.NewVersionedSet(_NS(
-					_P("struct"),
-					_P("struct", "numeric"),
-				), "v1", true),
-				"two": fieldpath.NewVersionedSet(_NS(
-					_P("struct", "string"),
-				), "v1", true),
-			},
-		},
-	}
-
-	for name, test := range tests {
-		t.Run(name, func(t *testing.T) {
-			if err := test.Test(structWithAtomicParser); err != nil {
-				t.Fatal(err)
-			}
-		})
-	}
-}

typed/reconcile_schema.go

@@ -187,19 +187,14 @@ func (v *reconcileWithSchemaWalker) visitListItems(t *schema.List, element *fiel
 }
 
 func (v *reconcileWithSchemaWalker) doList(t *schema.List) (errs ValidationErrors) {
-	// reconcile lists changed from granular to atomic
+	// reconcile lists changed from granular to atomic.
+	// Note that migrations from atomic to granular are unsuported and will
+	// be treated as if they were always granular.
 	if !v.isAtomic && t.ElementRelationship == schema.Atomic {
 		v.toRemove = fieldpath.NewSet(v.path) // remove all root and all children fields
 		v.toAdd = fieldpath.NewSet(v.path)    // add the root of the atomic
 		return errs
 	}
-	// reconcile lists changed from atomic to granular
-	if v.isAtomic && t.ElementRelationship == schema.Associative {
-		v.toAdd, errs = buildGranularFieldSet(v.path, v.value)
-		if errs != nil {
-			return errs
-		}
-	}
 	if v.fieldSet != nil {
 		errs = v.visitListItems(t, v.fieldSet)
 	}
@@ -231,21 +226,16 @@ func (v *reconcileWithSchemaWalker) visitMapItems(t *schema.Map, element *fieldp
 }
 
 func (v *reconcileWithSchemaWalker) doMap(t *schema.Map) (errs ValidationErrors) {
-	// reconcile maps and structs changed from granular to atomic
+	// reconcile maps and structs changed from granular to atomic.
+	// Note that migrations from atomic to granular are unsuported and will
+	// be treated as if they were always granular.
 	if !v.isAtomic && t.ElementRelationship == schema.Atomic {
 		if v.fieldSet != nil && v.fieldSet.Size() > 0 {
 			v.toRemove = fieldpath.NewSet(v.path) // remove all root and all children fields
 			v.toAdd = fieldpath.NewSet(v.path)    // add the root of the atomic
 		}
 		return errs
 	}
-	// reconcile maps changed from atomic to granular
-	if v.isAtomic && (t.ElementRelationship == schema.Separable || t.ElementRelationship == "") {
-		v.toAdd, errs = buildGranularFieldSet(v.path, v.value)
-		if errs != nil {
-			return errs
-		}
-	}
 	if v.fieldSet != nil {
 		errs = v.visitMapItems(t, v.fieldSet)
 	}

typed/reconcile_schema_test.go

@@ -207,39 +207,6 @@ var reconcileCases = []reconcileTestCase{{
 		_P("stringMap"),
 		_P("unchanged", "numeric"),
 	),
-}, {
-	name:         "atomic-to-granular",
-	rootTypeName: "v1",
-	oldSchema:    atomicSchema("v1"),
-	newSchema:    granularSchema("v1"),
-	liveObject:   basicLiveObject,
-	oldFields: _NS(
-		_P("struct"),
-		_P("list"),
-		_P("objectList"),
-		_P("stringMap"),
-		_P("unchanged", "numeric"),
-	),
-	fixedFields: _NS(
-		_P("struct"),
-		_P("struct", "numeric"),
-		_P("struct", "string"),
-		_P("list"),
-		_P("list", _V("one")),
-		_P("list", _V("two")),
-		_P("objectList"),
-		_P("objectList", _KBF("keyA", "a1", "keyB", "b1")),
-		_P("objectList", _KBF("keyA", "a1", "keyB", "b1"), "value"),
-		_P("objectList", _KBF("keyA", "a1", "keyB", "b1"), "keyA"),
-		_P("objectList", _KBF("keyA", "a1", "keyB", "b1"), "keyB"),
-		_P("objectList", _KBF("keyA", "a2", "keyB", "b2")),
-		_P("objectList", _KBF("keyA", "a2", "keyB", "b2"), "value"),
-		_P("objectList", _KBF("keyA", "a2", "keyB", "b2"), "keyA"),
-		_P("objectList", _KBF("keyA", "a2", "keyB", "b2"), "keyB"),
-		_P("stringMap"),
-		_P("stringMap", "key1"),
-		_P("unchanged", "numeric"),
-	),
 }, {
 	name:         "no-change-granular",
 	rootTypeName: "v1",