From 8e02b1a2f71076ddcacd3845f4fdffac2f4bc0b9 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Thu, 8 Aug 2024 14:06:59 +0200
Subject: [PATCH] vendor: update compose-go to v2.1.6

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
---
 go.mod                                                   | 2 +-
 go.sum                                                   | 4 ++--
 .../compose-spec/compose-go/v2/schema/compose-spec.json  | 4 +++-
 .../compose-spec/compose-go/v2/types/derived.gen.go      | 6 ++++++
 .../compose-spec/compose-go/v2/types/develop.go          | 9 +++++----
 vendor/modules.txt                                       | 2 +-
 6 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/go.mod b/go.mod
index 512c41b2..59960df0 100644
--- a/go.mod
+++ b/go.mod
@@ -6,7 +6,7 @@ require (
 	github.com/Masterminds/semver/v3 v3.2.1
 	github.com/Microsoft/go-winio v0.6.2
 	github.com/aws/aws-sdk-go-v2/config v1.26.6
-	github.com/compose-spec/compose-go/v2 v2.1.5
+	github.com/compose-spec/compose-go/v2 v2.1.6
 	github.com/containerd/console v1.0.4
 	github.com/containerd/containerd v1.7.19
 	github.com/containerd/continuity v0.4.3
diff --git a/go.sum b/go.sum
index f1765a6e..774d6251 100644
--- a/go.sum
+++ b/go.sum
@@ -84,8 +84,8 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4 h1:/inchEIKaYC1Akx+H+g
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE=
 github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4=
-github.com/compose-spec/compose-go/v2 v2.1.5 h1:6YoC9ik3NXdSYtgRn51EMZ2DxzGPyGjZ8M0B7mXTXeQ=
-github.com/compose-spec/compose-go/v2 v2.1.5/go.mod h1:lFN0DrMxIncJGYAXTfWuajfwj5haBJqrBkarHcnjJKc=
+github.com/compose-spec/compose-go/v2 v2.1.6 h1:d0Cs0DffmOwmSzs0YPHwKCskknGq2jfGg4uGowlEpps=
+github.com/compose-spec/compose-go/v2 v2.1.6/go.mod h1:lFN0DrMxIncJGYAXTfWuajfwj5haBJqrBkarHcnjJKc=
 github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
 github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
 github.com/containerd/console v1.0.4 h1:F2g4+oChYvBTsASRTz8NP6iIAi97J3TtSAsLbIFn4ro=
diff --git a/vendor/github.com/compose-spec/compose-go/v2/schema/compose-spec.json b/vendor/github.com/compose-spec/compose-go/v2/schema/compose-spec.json
index 5ec6218b..335cbe09 100644
--- a/vendor/github.com/compose-spec/compose-go/v2/schema/compose-spec.json
+++ b/vendor/github.com/compose-spec/compose-go/v2/schema/compose-spec.json
@@ -480,7 +480,9 @@
               "path": {"type": "string"},
               "action": {"type": "string", "enum": ["rebuild", "sync", "sync+restart"]},
               "target": {"type": "string"}
-            }
+            },
+            "additionalProperties": false,
+            "patternProperties": {"^x-": {}}
           },
           "additionalProperties": false,
           "patternProperties": {"^x-": {}}
diff --git a/vendor/github.com/compose-spec/compose-go/v2/types/derived.gen.go b/vendor/github.com/compose-spec/compose-go/v2/types/derived.gen.go
index dd1ea8a6..c78b17c8 100644
--- a/vendor/github.com/compose-spec/compose-go/v2/types/derived.gen.go
+++ b/vendor/github.com/compose-spec/compose-go/v2/types/derived.gen.go
@@ -1814,6 +1814,12 @@ func deriveDeepCopy_40(dst, src *Trigger) {
 		}
 		copy(dst.Ignore, src.Ignore)
 	}
+	if src.Extensions != nil {
+		dst.Extensions = make(map[string]any, len(src.Extensions))
+		src.Extensions.DeepCopy(dst.Extensions)
+	} else {
+		dst.Extensions = nil
+	}
 }
 
 // deriveDeepCopy_41 recursively copies the contents of src into dst.
diff --git a/vendor/github.com/compose-spec/compose-go/v2/types/develop.go b/vendor/github.com/compose-spec/compose-go/v2/types/develop.go
index 6eeef7a7..24e142c3 100644
--- a/vendor/github.com/compose-spec/compose-go/v2/types/develop.go
+++ b/vendor/github.com/compose-spec/compose-go/v2/types/develop.go
@@ -31,8 +31,9 @@ const (
 )
 
 type Trigger struct {
-	Path   string      `yaml:"path" json:"path"`
-	Action WatchAction `yaml:"action" json:"action"`
-	Target string      `yaml:"target,omitempty" json:"target,omitempty"`
-	Ignore []string    `yaml:"ignore,omitempty" json:"ignore,omitempty"`
+	Path       string      `yaml:"path" json:"path"`
+	Action     WatchAction `yaml:"action" json:"action"`
+	Target     string      `yaml:"target,omitempty" json:"target,omitempty"`
+	Ignore     []string    `yaml:"ignore,omitempty" json:"ignore,omitempty"`
+	Extensions Extensions  `yaml:"#extensions,inline,omitempty" json:"-"`
 }
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 011c6947..77af3392 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -128,7 +128,7 @@ github.com/cenkalti/backoff/v4
 # github.com/cespare/xxhash/v2 v2.2.0
 ## explicit; go 1.11
 github.com/cespare/xxhash/v2
-# github.com/compose-spec/compose-go/v2 v2.1.5
+# github.com/compose-spec/compose-go/v2 v2.1.6
 ## explicit; go 1.21
 github.com/compose-spec/compose-go/v2/cli
 github.com/compose-spec/compose-go/v2/consts