From 5bc57bb6989838d0ac3fdbbe768d2723fe07ea42 Mon Sep 17 00:00:00 2001
From: Nicolas De Loof <nicolas.deloof@gmail.com>
Date: Fri, 26 Jan 2024 14:00:32 +0100
Subject: [PATCH] !reset can be used to replace value

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
---
 loader/{null.go => reset.go} |  4 ++
 loader/reset_test.go         | 83 ++++++++++++++++++++++++++++++++++++
 override/merge.go            |  3 ++
 3 files changed, 90 insertions(+)
 rename loader/{null.go => reset.go} (97%)
 create mode 100644 loader/reset_test.go

diff --git a/loader/null.go b/loader/reset.go
similarity index 97%
rename from loader/null.go
rename to loader/reset.go
index d3e99f4b..3c615eff 100644
--- a/loader/null.go
+++ b/loader/reset.go
@@ -44,6 +44,10 @@ func (p *ResetProcessor) resolveReset(node *yaml.Node, path tree.Path) (*yaml.No
 		p.paths = append(p.paths, path)
 		return nil, nil
 	}
+	if node.Tag == "!override" {
+		p.paths = append(p.paths, path)
+		return node, nil
+	}
 	switch node.Kind {
 	case yaml.SequenceNode:
 		var nodes []*yaml.Node
diff --git a/loader/reset_test.go b/loader/reset_test.go
new file mode 100644
index 00000000..71e7dc3e
--- /dev/null
+++ b/loader/reset_test.go
@@ -0,0 +1,83 @@
+/*
+   Copyright 2020 The Compose Specification Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package loader
+
+import (
+	"testing"
+
+	"github.com/compose-spec/compose-go/v2/types"
+	"gotest.tools/v3/assert"
+)
+
+func TestResetRemove(t *testing.T) {
+	p, err := Load(types.ConfigDetails{
+		ConfigFiles: []types.ConfigFile{
+			{
+				Filename: "(inline)",
+				Content: []byte(`
+name: test-reset
+networks:
+  test:
+    name: test
+    external: true
+`),
+			},
+			{
+				Filename: "(override)",
+				Content: []byte(`
+networks:
+  test: !reset {}
+`),
+			},
+		},
+	}, func(options *Options) {
+		options.SkipNormalization = true
+		options.SkipConsistencyCheck = true
+	})
+	assert.NilError(t, err)
+	_, ok := p.Networks["test"]
+	assert.Check(t, !ok)
+}
+
+func TestOverrideReplace(t *testing.T) {
+	p, err := Load(types.ConfigDetails{
+		ConfigFiles: []types.ConfigFile{
+			{
+				Filename: "(inline)",
+				Content: []byte(`
+name: test-override
+networks:
+  test:
+    name: test
+    external: true
+`),
+			},
+			{
+				Filename: "(override)",
+				Content: []byte(`
+networks:
+  test: !override {}
+`),
+			},
+		},
+	}, func(options *Options) {
+		options.SkipNormalization = true
+		options.SkipConsistencyCheck = true
+	})
+	assert.NilError(t, err)
+	assert.Check(t, p.Networks["test"].External == false)
+}
diff --git a/override/merge.go b/override/merge.go
index 9120b3fc..2196d799 100644
--- a/override/merge.go
+++ b/override/merge.go
@@ -62,6 +62,9 @@ func mergeYaml(e any, o any, p tree.Path) (any, error) {
 			return merged, nil
 		}
 	}
+	if o == nil {
+		return e, nil
+	}
 	switch value := e.(type) {
 	case map[string]any:
 		other, ok := o.(map[string]any)