Merge pull request #1680 from flatcar/tormath1/ignition

sys-apps/ignition: bump to 2.17.0

changelog/updates/2024-02-20-ignition.md

@@ -0,0 +1 @@
+- Ignition ([2.17.0](https://coreos.github.io/ignition/release-notes/#ignition-2170-2023-11-20) (includes [2.16.2](https://coreos.github.io/ignition/release-notes/#ignition-2162-2023-07-12), [2.16.1](https://coreos.github.io/ignition/release-notes/#ignition-2161-2023-07-10) and [2.16.0](https://coreos.github.io/ignition/release-notes/#ignition-2160-2023-06-29)))

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch

@@ -1,7 +1,7 @@
-From d377780c3294d9a7f86d0e02296fffb1084323d1 Mon Sep 17 00:00:00 2001
+From efb34e37bd7e27ef8547e80718f386af0366b22e Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Mon, 26 Sep 2022 12:12:04 +0200
-Subject: [PATCH 05/21] config: add ignition translation
+Subject: [PATCH 02/21] config: add ignition translation
 
 it's a merge from flatcar/ign-converter
 
@@ -2621,5 +2621,5 @@ index 00000000..e81f6bed
 +	}
 +}
 -- 
-2.25.1
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-mod-add-flatcar-ignition-0.36.2.patch

@@ -1,45 +0,0 @@
-From b71a858e20878b09149f3b490e204aec738e2ed9 Mon Sep 17 00:00:00 2001
-From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
-Date: Fri, 24 Feb 2023 09:13:33 +0100
-Subject: [PATCH 02/21] mod: add flatcar/ignition@0.36.2
-
-it's required for Ignition conversion.
-
-Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
----
- go.mod | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/go.mod b/go.mod
-index 85b3e34e..b109532e 100644
---- a/go.mod
-+++ b/go.mod
-@@ -10,6 +10,7 @@ require (
- 	github.com/coreos/go-semver v0.3.1
- 	github.com/coreos/go-systemd/v22 v22.5.0
- 	github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687
-+	github.com/flatcar/ignition v0.36.2
- 	github.com/google/renameio/v2 v2.0.0
- 	github.com/google/uuid v1.3.0
- 	github.com/pin/tftp v2.1.0+incompatible
-@@ -27,7 +28,9 @@ require (
- 	cloud.google.com/go v0.107.0 // indirect
- 	cloud.google.com/go/compute v1.18.0 // indirect
- 	cloud.google.com/go/iam v0.8.0 // indirect
-+	github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 // indirect
- 	github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb // indirect
-+	github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 // indirect
- 	github.com/davecgh/go-spew v1.1.1 // indirect
- 	github.com/godbus/dbus/v5 v5.0.4 // indirect
- 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
-@@ -38,6 +41,7 @@ require (
- 	github.com/jmespath/go-jmespath v0.4.0 // indirect
- 	github.com/pmezard/go-difflib v1.0.0 // indirect
- 	go.opencensus.io v0.24.0 // indirect
-+	go4.org v0.0.0-20160314031811-03efcb870d84 // indirect
- 	golang.org/x/text v0.7.0 // indirect
- 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
- 	google.golang.org/appengine v1.6.7 // indirect
--- 
-2.25.1
-

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch

@@ -0,0 +1,45 @@
+From 9cb0ec3fd1cdaf0eb001e9cf6bdea4b8f21c9544 Mon Sep 17 00:00:00 2001
+From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
+Date: Mon, 19 Feb 2024 18:06:06 +0100
+Subject: [PATCH 03/21] mod: add flatcar/ignition@0.36.2
+
+it's required for Ignition conversion.
+
+Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
+---
+ go.mod | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/go.mod b/go.mod
+index 5950d85a..de759536 100644
+--- a/go.mod
++++ b/go.mod
+@@ -11,6 +11,7 @@ require (
+ 	github.com/coreos/go-semver v0.3.1
+ 	github.com/coreos/go-systemd/v22 v22.5.0
+ 	github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687
++	github.com/flatcar/ignition v0.36.2
+ 	github.com/google/renameio/v2 v2.0.0
+ 	github.com/google/uuid v1.4.0
+ 	github.com/mdlayher/vsock v1.2.1
+@@ -31,7 +32,9 @@ require (
+ 	cloud.google.com/go v0.110.8 // indirect
+ 	cloud.google.com/go/compute v1.23.1 // indirect
+ 	cloud.google.com/go/iam v1.1.3 // indirect
++	github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 // indirect
+ 	github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb // indirect
++	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
+ 	github.com/davecgh/go-spew v1.1.1 // indirect
+ 	github.com/godbus/dbus/v5 v5.0.4 // indirect
+ 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
+@@ -44,6 +47,7 @@ require (
+ 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
+ 	github.com/pmezard/go-difflib v1.0.0 // indirect
+ 	go.opencensus.io v0.24.0 // indirect
++	go4.org v0.0.0-20230225012048-214862532bf5 // indirect
+ 	golang.org/x/crypto v0.15.0 // indirect
+ 	golang.org/x/sync v0.5.0 // indirect
+ 	golang.org/x/text v0.14.0 // indirect
+-- 
+2.43.0
+

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-sum-go-mod-tidy.patch

@@ -1,123 +0,0 @@
-From e028524c08935766822c3a1760124a14f6eb090c Mon Sep 17 00:00:00 2001
-From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
-Date: Fri, 24 Feb 2023 09:14:03 +0100
-Subject: [PATCH 03/21] sum: go mod tidy
-
-Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
----
- go.sum | 28 +++++++++++++++++++++++++++-
- 1 file changed, 27 insertions(+), 1 deletion(-)
-
-diff --git a/go.sum b/go.sum
-index 087ef0ad..bb95e1fe 100644
---- a/go.sum
-+++ b/go.sum
-@@ -11,6 +11,9 @@ cloud.google.com/go/longrunning v0.3.0 h1:NjljC+FYPV3uh5/OwWT6pVU+doBqMg2x/rZlE+
- cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI=
- cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4=
- github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-+github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 h1:gZCtZ+Hh/e3CGEX8q/yAcp8wWu5ZS6NMk6VGzpQhI3s=
-+github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437/go.mod h1:otnto4/Icqn88WCcM4bhIJNSgsh9VLBuspyyCfvof9c=
-+github.com/aws/aws-sdk-go v1.8.39/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k=
- github.com/aws/aws-sdk-go v1.44.204 h1:7/tPUXfNOHB390A63t6fJIwmlwVQAkAwcbzKsU2/6OQ=
- github.com/aws/aws-sdk-go v1.44.204/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI=
- github.com/beevik/etree v1.1.1-0.20200718192613-4a2f8b9d084c h1:uYq6BD31fkfeNKQmfLj7ODcEfkb5JLsKrXVSqgnfGg8=
-@@ -20,8 +23,11 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
- github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
- github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4=
- github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb/go.mod h1:rcFZM3uxVvdyNmsAV2jopgPD1cs5SPWJWU5dOz2LUnw=
-+github.com/coreos/go-semver v0.1.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
- github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
- github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
-+github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 h1:3jFq2xL4ZajGK4aZY8jz+DAF0FHjI51BXjjSwCzS1Dk=
-+github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
- github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
- github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
- github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 h1:uSmlDgJGbUB0bwQBcZomBTottKwEDF5fF8UjSwKSzWM=
-@@ -33,6 +39,10 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
- github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
- github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
- github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-+github.com/flatcar/ignition v0.36.2 h1:xGHgScUe0P4Fkprjqv7L2CE58emiQgP833OCCn9z2v4=
-+github.com/flatcar/ignition v0.36.2/go.mod h1:uk1tpzLFRXus4RrvzgMI+IqmmB8a/RGFSBlI+tMTbbA=
-+github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
-+github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
- github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA=
- github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
- github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-@@ -71,32 +81,45 @@ github.com/googleapis/enterprise-certificate-proxy v0.2.3 h1:yk9/cqRKtT9wXZSsRH9
- github.com/googleapis/enterprise-certificate-proxy v0.2.3/go.mod h1:AwSRAtLfXpU5Nm3pW+v7rGDHp09LsPtGY9MduiEsR9k=
- github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ=
- github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=
-+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
-+github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
- github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
- github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
- github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
- github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
-+github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
-+github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=
- github.com/pin/tftp v2.1.0+incompatible h1:Yng4J7jv6lOc6IF4XoB5mnd3P7ZrF60XQq+my3FAMus=
- github.com/pin/tftp v2.1.0+incompatible/go.mod h1:xVpZOMCXTy+A5QMjEVN0Glwa1sUvaJhFXbr/aAxuxGY=
- github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
- github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
- github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
- github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-+github.com/sigma/bdoor v0.0.0-20160202064022-babf2a4017b0/go.mod h1:WBu7REWbxC/s/J06jsk//d+9DOz9BbsmcIrimuGRFbs=
-+github.com/sigma/vmw-guestinfo v0.0.0-20160204083807-95dd4126d6e8/go.mod h1:JrRFFC0veyh0cibh0DAhriSY7/gV3kDdNaVUOmfx01U=
-+github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
-+github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM=
- github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA=
- github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
- github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
- github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
- github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
- github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
- github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
- github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
- github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
- github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI=
- github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U=
-+github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk=
- github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3 h1:v6jG/tdl4O07LNVp74Nt7/OyL+1JsIW1M2f/nSvQheY=
- github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3/go.mod h1:CSBTxrhePCm0cmXNKDGeu+6bOQzpaEklfCqEpn89JWk=
-+github.com/vmware/vmw-ovflib v0.0.0-20170608004843-1f217b9dc714/go.mod h1:jiPk45kn7klhByRvUq5i2vo1RtHKBHj+iWGFpxbXuuI=
- github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
- go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
- go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
-+go4.org v0.0.0-20160314031811-03efcb870d84 h1:WZkGC1qzoax/QSt84wmvIxk+ZOmGIChsTzdrv9t4nvk=
-+go4.org v0.0.0-20160314031811-03efcb870d84/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
- golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
- golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
- golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-@@ -109,6 +132,7 @@ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73r
- golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
- golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
- golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-+golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
- golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
- golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
- golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-@@ -150,6 +174,7 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
- golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
- golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
- golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-+golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
- golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
- golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
- golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-@@ -190,8 +215,9 @@ google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175
- google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
- gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
- gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
--gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
- gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
- gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
- gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
- gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
--- 
-2.25.1
-

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch

@@ -0,0 +1,407 @@
+From fd1a7f92a4691d53dd00f7e4ae9e66225368181f Mon Sep 17 00:00:00 2001
+From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
+Date: Mon, 19 Feb 2024 18:06:26 +0100
+Subject: [PATCH 04/21] sum: go mod tidy
+
+Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
+---
+ go.sum | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 211 insertions(+), 2 deletions(-)
+
+diff --git a/go.sum b/go.sum
+index 504bf0da..5824228b 100644
+--- a/go.sum
++++ b/go.sum
+@@ -1,28 +1,55 @@
+ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
++cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
++cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
++cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
++cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
++cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
++cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
++cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
++cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+ cloud.google.com/go v0.110.8 h1:tyNdfIxjzaWctIiLYOTalaLKZ17SI44SKFW26QbOhME=
+ cloud.google.com/go v0.110.8/go.mod h1:Iz8AkXJf1qmxC3Oxoep8R1T36w8B92yU29PcBhHO5fk=
++cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
++cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+ cloud.google.com/go/compute v1.23.1 h1:V97tBoDaZHb6leicZ1G6DLK2BAaZLJ/7+9BB/En3hR0=
+ cloud.google.com/go/compute v1.23.1/go.mod h1:CqB3xpmPKKt3OJpW2ndFIXnA9A4xAy/F3Xp1ixncW78=
+ cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY=
+ cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
++cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+ cloud.google.com/go/iam v1.1.3 h1:18tKG7DzydKWUnLjonWcJO6wjSCAtzh4GcRKlH/Hrzc=
+ cloud.google.com/go/iam v1.1.3/go.mod h1:3khUlaBXfPKKe7huYgEpDn6FtgRyMEqbkvBxrQyY5SE=
++cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
++cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
++cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
++cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+ cloud.google.com/go/storage v1.35.1 h1:B59ahL//eDfx2IIKFBeT5Atm9wnNmj3+8xG/W4WB//w=
+ cloud.google.com/go/storage v1.35.1/go.mod h1:M6M/3V/D3KpzMTJyPOR/HU6n2Si5QdaXYEsng2xgOs8=
++dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
+ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
++github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
++github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 h1:gZCtZ+Hh/e3CGEX8q/yAcp8wWu5ZS6NMk6VGzpQhI3s=
++github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437/go.mod h1:otnto4/Icqn88WCcM4bhIJNSgsh9VLBuspyyCfvof9c=
++github.com/aws/aws-sdk-go v1.8.39/go.mod h1:ZRmQr0FajVIyZ4ZzBYKG5P3ZqPz9IHG41ZoMu1ADI3k=
+ github.com/aws/aws-sdk-go v1.47.9 h1:rarTsos0mA16q+huicGx0e560aYRtOucV5z2Mw23JRY=
+ github.com/aws/aws-sdk-go v1.47.9/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
+ github.com/beevik/etree v1.2.0 h1:l7WETslUG/T+xOPs47dtd6jov2Ii/8/OjCldk5fYfQw=
+ github.com/beevik/etree v1.2.0/go.mod h1:aiPf89g/1k3AShMVAzriilpcE4R/Vuor90y83zVZWFc=
+ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
++github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
++github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
++github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+ github.com/containers/libhvee v0.4.0 h1:HGHIIExgP2PjwjHKKoQM3B+3qakNIZcmmkiAO4luAZE=
+ github.com/containers/libhvee v0.4.0/go.mod h1:fyWDxNQccveTdE3Oe+QRuLbwF/iyV0hDxXqRX5Svlic=
+ github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb h1:rmqyI19j3Z/74bIRhuC59RB442rXUazKNueVpfJPxg4=
+ github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb/go.mod h1:rcFZM3uxVvdyNmsAV2jopgPD1cs5SPWJWU5dOz2LUnw=
++github.com/coreos/go-semver v0.1.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+ github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
+ github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
++github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
++github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
++github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+ github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
+ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+ github.com/coreos/vcontext v0.0.0-20230201181013-d72178a18687 h1:uSmlDgJGbUB0bwQBcZomBTottKwEDF5fF8UjSwKSzWM=
+@@ -34,16 +61,28 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF
+ github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
+ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
++github.com/flatcar/ignition v0.36.2 h1:xGHgScUe0P4Fkprjqv7L2CE58emiQgP833OCCn9z2v4=
++github.com/flatcar/ignition v0.36.2/go.mod h1:uk1tpzLFRXus4RrvzgMI+IqmmB8a/RGFSBlI+tMTbbA=
++github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
++github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
++github.com/go-ini/ini v1.25.4/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
++github.com/godbus/dbus v0.0.0-20181025153459-66d97aec3384/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
+ github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA=
+ github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+ github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
++github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
++github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+ github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
+ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+ github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
++github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
++github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
++github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+ github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+ github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+ github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
++github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+ github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+@@ -54,6 +93,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
+ github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
++github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
++github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+ github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+@@ -62,7 +103,13 @@ github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
+ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
++github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
++github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+ github.com/google/martian/v3 v3.3.2 h1:IqNFLAmvJOgVlpdEBiQbDc2EwKW77amAycfTuWKdfvw=
++github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
++github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
++github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
++github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+ github.com/google/renameio/v2 v2.0.0 h1:UifI23ZTGY8Tt29JbYFiuyIU3eX+RNFtUwefq9qAhxg=
+ github.com/google/renameio/v2 v2.0.0/go.mod h1:BtmJXm5YlszgC+TD4HOEEUFgkJP3nLxehU6hfe7jRt4=
+ github.com/google/s2a-go v0.1.7 h1:60BLSyTrOV4/haCDW4zb1guZItoSq8foHCXrAnjBo/o=
+@@ -72,12 +119,28 @@ github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
+ github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfFxPRy3Bf7vr3h0cechB90XaQs=
+ github.com/googleapis/enterprise-certificate-proxy v0.3.2/go.mod h1:VLSiSSBs/ksPL8kq3OBOQ6WRI2QnaFynd1DCjZ62+V0=
++github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
++github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+ github.com/googleapis/gax-go/v2 v2.12.0 h1:A+gCJKdRfqXkr+BIRGtZLibNXf0m1f9E4HG56etFpas=
+ github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qKpsEkdD5+I6QGU=
++github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
++github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
++github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
++github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
++github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
+ github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg=
+ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo=
+ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8=
+ github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
++github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
++github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
++github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
++github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
++github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
++github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
++github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
++github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
++github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+ github.com/mdlayher/socket v0.4.1 h1:eM9y2/jlbs1M615oshPQOHZzj6R6wMT7bX5NPiQvn2U=
+ github.com/mdlayher/socket v0.4.1/go.mod h1:cAqeGjoufqdxWkD7DkpyS+wcefOtmu5OQ8KuoJGIReA=
+ github.com/mdlayher/vsock v1.2.1 h1:pC1mTJTvjo1r9n9fbm7S1j04rCgCzhCOS5DY0zqHlnQ=
+@@ -86,16 +149,25 @@ github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa1
+ github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
+ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
+ github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
++github.com/pborman/uuid v0.0.0-20170612153648-e790cca94e6c/go.mod h1:VyrYX9gd7irzKovcSS6BIIEwPRkP2Wm2m9ufcdFSJ34=
+ github.com/pin/tftp v2.1.0+incompatible h1:Yng4J7jv6lOc6IF4XoB5mnd3P7ZrF60XQq+my3FAMus=
+ github.com/pin/tftp v2.1.0+incompatible/go.mod h1:xVpZOMCXTy+A5QMjEVN0Glwa1sUvaJhFXbr/aAxuxGY=
+ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
++github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
++github.com/rwcarlsen/goexif v0.0.0-20190401172101-9e8deecbddbd/go.mod h1:hPqNNc0+uJM6H+SuU8sEs5K5IQeKccPqeSjfgcKGgPk=
++github.com/sigma/bdoor v0.0.0-20160202064022-babf2a4017b0/go.mod h1:WBu7REWbxC/s/J06jsk//d+9DOz9BbsmcIrimuGRFbs=
++github.com/sigma/vmw-guestinfo v0.0.0-20160204083807-95dd4126d6e8/go.mod h1:JrRFFC0veyh0cibh0DAhriSY7/gV3kDdNaVUOmfx01U=
++github.com/smartystreets/assertions v1.2.0/go.mod h1:tcbTF8ujkAEcZ8TElKY+i30BzYlVhC/LOxJk7iOWnoo=
++github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM=
+ github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA=
+ github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+ github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
++github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
++github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+@@ -103,64 +175,187 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
+ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+ github.com/vincent-petithory/dataurl v1.0.0 h1:cXw+kPto8NLuJtlMsI152irrVw9fRDX8AbShPRpg2CI=
+ github.com/vincent-petithory/dataurl v1.0.0/go.mod h1:FHafX5vmDzyP+1CQATJn7WFKc9CvnvxyvZy6I1MrG/U=
++github.com/vmware/vmw-guestinfo v0.0.0-20170707015358-25eff159a728/go.mod h1:x9oS4Wk2s2u4tS29nEaDLdzvuHdB19CvSGJjPgkZJNk=
+ github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3 h1:v6jG/tdl4O07LNVp74Nt7/OyL+1JsIW1M2f/nSvQheY=
+ github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3/go.mod h1:CSBTxrhePCm0cmXNKDGeu+6bOQzpaEklfCqEpn89JWk=
++github.com/vmware/vmw-ovflib v0.0.0-20170608004843-1f217b9dc714/go.mod h1:jiPk45kn7klhByRvUq5i2vo1RtHKBHj+iWGFpxbXuuI=
++github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
++go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
++go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
++go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
++go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+ go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
+ go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
++go4.org v0.0.0-20160314031811-03efcb870d84/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
++go4.org v0.0.0-20230225012048-214862532bf5 h1:nifaUDeh+rPaBCMPMQHZmvJf+QdpLFnuQPwx+LxVmtc=
++go4.org v0.0.0-20230225012048-214862532bf5/go.mod h1:F57wTi5Lrj6WLyswp5EYV1ncrEbFGHD4hhz6S1ZYeaU=
+ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
++golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
++golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
++golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
++golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+ golang.org/x/crypto v0.15.0 h1:frVn1TEaCEaZcn3Tmd7Y2b5KKPaZ+I32Q2OA3kYp5TA=
+ golang.org/x/crypto v0.15.0/go.mod h1:4ChreQoLWfG3xLDer1WdlH5NdlQ3+mwnQq1YTKY+72g=
+ golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
++golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
++golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
++golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
++golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
++golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
++golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
++golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
++golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
++golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
+ golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+ golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
++golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
++golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
++golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
++golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
++golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
++golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
++golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
++golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
++golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
++golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
++golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
++golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
++golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+ golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+ golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
++golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+ golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
++golang.org/x/net v0.0.0-20190320064053-1272bf9dcd53/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
++golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
++golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
++golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
++golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
++golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
++golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+ golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
++golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
++golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
++golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+ golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
+ golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
+ golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
++golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
++golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
++golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
++golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+ golang.org/x/oauth2 v0.14.0 h1:P0Vrf/2538nmC0H+pEQ3MNFRRnVR7RlqyVw+bvm26z0=
+ golang.org/x/oauth2 v0.14.0/go.mod h1:lAtNWgaWfL4cm7j2OV8TxGi9Qb7ECORx8DktCY74OwM=
+ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+ golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
+ golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
++golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
++golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
++golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
++golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
++golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
+ golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
++golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
++golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
++golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
++golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
++golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
++golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
++golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+ golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
+ golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
++golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
++golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+ golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+ golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+ golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
++golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
++golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
++golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
++golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
++golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
++golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
++golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
++golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
++golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
++golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
++golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
++golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
++golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
++golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
++golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
++golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
++golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
++golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
++golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
++golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
++golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
++golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
++golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 h1:H2TDz8ibqkAF6YGhCdN3jS9O0/s90v0rJh3X/OLHEUk=
+ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
++google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
++google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
++google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
++google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
++google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
++google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
++google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
++google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+ google.golang.org/api v0.151.0 h1:FhfXLO/NFdJIzQtCqjpysWwqKk8AzGWBUhMIx67cVDU=
+ google.golang.org/api v0.151.0/go.mod h1:ccy+MJ6nrYFgE3WgRx/AMXOxOmU8Q4hSa+jjibzhxcg=
+ google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
++google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
++google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
++google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+ google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
+ google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
++google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
++google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
++google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
++google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
++google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
++google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
++google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
++google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
++google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
++google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
++google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+ google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+ google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b h1:+YaDE2r2OG8t/z5qmsh7Y+XXwCbvadxxZ0YY6mTdrVA=
+ google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b/go.mod h1:CgAqfJo+Xmu0GwA0411Ht3OU3OntXwsGmrmjI8ioGXI=
+@@ -169,9 +364,13 @@ google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b/go.
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405 h1:AB/lmRny7e2pLhFEYIbl5qkDAUt2h0ZRO4wGPhZf+ik=
+ google.golang.org/genproto/googleapis/rpc v0.0.0-20231030173426-d783a09b4405/go.mod h1:67X1fPuzjcrkymZzZV1vvkFeTn2Rvc6lYF9MYFGCcwE=
+ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
++google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
++google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+ google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
+ google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
++google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+ google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
++google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+ google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
+ google.golang.org/grpc v1.59.0 h1:Z5Iec2pjwb+LEOqzpB2MR12/eKFhDPhuqW91O+4bwUk=
+ google.golang.org/grpc v1.59.0/go.mod h1:aUPDwccQo6OTjy7Hct4AfBPD1GptF4fyUjIkQ9YtF98=
+@@ -188,12 +387,22 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
+ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+ google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+ google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
++gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
++gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
++gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
++gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
++gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
++gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+ gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
++honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
++honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
++honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
++rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
++rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
++rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+-- 
+2.43.0
+

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch

@@ -1,7 +1,7 @@
-From 338d08aaa3a001b0c6c9ba07c8c987cde055a8a2 Mon Sep 17 00:00:00 2001
+From 0274c54de01a38d93d1cfdf2a12572d7ecd76500 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
-Date: Fri, 24 Feb 2023 09:14:24 +0100
+Date: Mon, 19 Feb 2024 18:06:45 +0100
-Subject: [PATCH 04/21] vendor: go mod vendor
+Subject: [PATCH 05/21] vendor: go mod vendor
 
 Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 ---
@@ -17029,30 +17029,30 @@ index 00000000..1b1efb0f
 +	return
 +}
 diff --git a/vendor/modules.txt b/vendor/modules.txt
-index 9b01b083..1e050725 100644
+index d1b9b406..879c8c1c 100644
 --- a/vendor/modules.txt
 +++ b/vendor/modules.txt
 @@ -20,6 +20,9 @@ cloud.google.com/go/storage
  cloud.google.com/go/storage/internal
  cloud.google.com/go/storage/internal/apiv2
- cloud.google.com/go/storage/internal/apiv2/stubs
+ cloud.google.com/go/storage/internal/apiv2/storagepb
 +# github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437
 +## explicit
 +github.com/ajeddeloh/go-json
- # github.com/aws/aws-sdk-go v1.44.204
+ # github.com/aws/aws-sdk-go v1.47.9
- ## explicit; go 1.11
+ ## explicit; go 1.19
  github.com/aws/aws-sdk-go/aws
-@@ -82,6 +85,9 @@ github.com/coreos/go-json
+@@ -87,6 +90,9 @@ github.com/coreos/go-json
  # github.com/coreos/go-semver v0.3.1
  ## explicit; go 1.8
  github.com/coreos/go-semver/semver
-+# github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142
++# github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
 +## explicit
 +github.com/coreos/go-systemd/unit
  # github.com/coreos/go-systemd/v22 v22.5.0
  ## explicit; go 1.12
  github.com/coreos/go-systemd/v22/dbus
-@@ -97,6 +103,27 @@ github.com/coreos/vcontext/validate
+@@ -102,6 +108,27 @@ github.com/coreos/vcontext/validate
  # github.com/davecgh/go-spew v1.1.1
  ## explicit
  github.com/davecgh/go-spew/spew
@@ -17080,16 +17080,16 @@ index 9b01b083..1e050725 100644
  # github.com/godbus/dbus/v5 v5.0.4
  ## explicit; go 1.12
  github.com/godbus/dbus/v5
-@@ -179,6 +206,9 @@ go.opencensus.io/trace
+@@ -213,6 +240,9 @@ go.opencensus.io/trace
  go.opencensus.io/trace/internal
  go.opencensus.io/trace/propagation
  go.opencensus.io/trace/tracestate
-+# go4.org v0.0.0-20160314031811-03efcb870d84
++# go4.org v0.0.0-20230225012048-214862532bf5
-+## explicit
++## explicit; go 1.13
 +go4.org/errorutil
- # golang.org/x/net v0.7.0
+ # golang.org/x/crypto v0.15.0
- ## explicit; go 1.17
+ ## explicit; go 1.18
- golang.org/x/net/context
+ golang.org/x/crypto/chacha20
 -- 
-2.25.1
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch

@@ -1,4 +1,4 @@
-From ddbbaf9d0c3c997b0040d42e79055fc29bd63d19 Mon Sep 17 00:00:00 2001
+From d7119d2744c0f3c0071d5590c563f4a2b0de3162 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Wed, 25 May 2022 10:20:09 +0200
 Subject: [PATCH 06/21] config/v3_5: convert ignition 2.x to 3.x
@@ -72,5 +72,5 @@ index f0d4bb84..dccc5c4c 100644
  		return Parse(raw)
  	}
 -- 
-2.25.1
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch

@@ -1,18 +1,18 @@
-From 049ed96101d50d0a5303d1b54b3e7fb8e543b513 Mon Sep 17 00:00:00 2001
+From cb1476e74d19664ed3a175d240610ebe5daed471 Mon Sep 17 00:00:00 2001
-From: Mathieu Tortuyaux <mathieu@kinvolk.io>
+From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
-Date: Fri, 30 Jul 2021 14:21:31 +0200
+Date: Mon, 19 Feb 2024 18:12:22 +0100
 Subject: [PATCH 07/21] internal/prv/cmdline: backport flatcar patch
 
 this patch provides backward compatibility for various config
 key
 
-Signed-off-by: Mathieu Tortuyaux <mathieu@kinvolk.io>
+Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 ---
  internal/providers/cmdline/cmdline.go | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/internal/providers/cmdline/cmdline.go b/internal/providers/cmdline/cmdline.go
-index f09e6fcb..b6de99d5 100644
+index eb8e2b45..0561438a 100644
 --- a/internal/providers/cmdline/cmdline.go
 +++ b/internal/providers/cmdline/cmdline.go
 @@ -33,7 +33,9 @@ import (
@@ -25,8 +25,8 @@ index f09e6fcb..b6de99d5 100644
 +	cmdlineUrlFlag             = "ignition.config.url"
  )
  
- func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
+ var (
-@@ -82,7 +84,7 @@ func parseCmdline(cmdline []byte) (url string) {
+@@ -91,7 +93,7 @@ func parseCmdline(cmdline []byte) (url string) {
  		parts := strings.SplitN(strings.TrimSpace(arg), "=", 2)
  		key := parts[0]
  
@@ -36,5 +36,5 @@ index f09e6fcb..b6de99d5 100644
  		}
  
 -- 
-2.25.1
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch

@@ -1,6 +1,6 @@
-From acd94e7ce33771252491f25a0dcb0e45ad5b908a Mon Sep 17 00:00:00 2001
+From 6233a0364d3a7aaa67b66d8d776708b61e7a4457 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
-Date: Fri, 24 Feb 2023 09:40:01 +0100
+Date: Tue, 20 Feb 2024 10:02:28 +0100
 Subject: [PATCH 08/21] provider/qemu: apply fw_cfg patch
 
 we support both CoreOS and Flatcar fw_cfg path to ensure compatiblity
@@ -11,7 +11,7 @@ Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
  1 file changed, 63 insertions(+), 55 deletions(-)
 
 diff --git a/internal/providers/qemu/qemu_fwcfg.go b/internal/providers/qemu/qemu_fwcfg.go
-index f8bf820e..89515187 100644
+index a150869f..e233865a 100644
 --- a/internal/providers/qemu/qemu_fwcfg.go
 +++ b/internal/providers/qemu/qemu_fwcfg.go
 @@ -29,6 +29,7 @@ import (
@@ -20,9 +20,9 @@ index f8bf820e..89515187 100644
  
 +	iErrors "github.com/flatcar/ignition/v2/config/shared/errors"
  	"github.com/flatcar/ignition/v2/config/v3_5_experimental/types"
- 	"github.com/flatcar/ignition/v2/internal/providers/util"
+ 	"github.com/flatcar/ignition/v2/internal/distro"
- 	"github.com/flatcar/ignition/v2/internal/resource"
+ 	"github.com/flatcar/ignition/v2/internal/platform"
-@@ -36,9 +37,11 @@ import (
+@@ -38,9 +39,11 @@ import (
  	"github.com/coreos/vcontext/report"
  )
  
@@ -36,8 +36,8 @@ index f8bf820e..89515187 100644
 +	}
  )
  
- func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
+ func init() {
-@@ -48,63 +51,68 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
+@@ -57,63 +60,68 @@ func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
  		return types.Config{}, report.Report{}, err
  	}
  
@@ -56,6 +56,20 @@ index f8bf820e..89515187 100644
 -		return types.Config{}, report.Report{}, err
 -	}
 +	for cfg, size := range firmwareConfigPaths {
++		// get size of firmware blob, if it exists
++		sizeBytes, err := os.ReadFile(size)
++		if os.IsNotExist(err) {
++			f.Logger.Info("QEMU firmware config was not found. Ignoring...")
++			continue
++		} else if err != nil {
++			f.Logger.Err("couldn't read QEMU firmware config size: %v", err)
++			return types.Config{}, report.Report{}, err
++		}
++		size, err := strconv.Atoi(strings.TrimSpace(string(sizeBytes)))
++		if err != nil {
++			f.Logger.Err("couldn't parse QEMU firmware config size: %v", err)
++			return types.Config{}, report.Report{}, err
++		}
  
 -	// Read firmware blob.  We need to make as few, large read() calls as
 -	// possible, since the qemu_fw_cfg kernel module takes O(offset)
@@ -76,21 +90,6 @@ index f8bf820e..89515187 100644
 -		// if size is correct, we will never call this at an offset
 -		// where it would return io.EOF
 -		n, err := fh.Read(data[len(data):cap(data)])
-+		// get size of firmware blob, if it exists
-+		sizeBytes, err := os.ReadFile(size)
-+		if os.IsNotExist(err) {
-+			f.Logger.Info("QEMU firmware config was not found. Ignoring...")
-+			continue
-+		} else if err != nil {
-+			f.Logger.Err("couldn't read QEMU firmware config size: %v", err)
-+			return types.Config{}, report.Report{}, err
-+		}
-+		size, err := strconv.Atoi(strings.TrimSpace(string(sizeBytes)))
-+		if err != nil {
-+			f.Logger.Err("couldn't parse QEMU firmware config size: %v", err)
-+			return types.Config{}, report.Report{}, err
-+		}
-+
 +		// Read firmware blob.  We need to make as few, large read() calls as
 +		// possible, since the qemu_fw_cfg kernel module takes O(offset)
 +		// time for each read syscall.  os.ReadFile() would eventually
@@ -157,7 +156,8 @@ index f8bf820e..89515187 100644
 -	// of the file so the extra read would be maximally expensive.
 -	return util.ParseConfig(f.Logger, data)
 +	return types.Config{}, report.Report{}, iErrors.ErrEmpty
++
  }
 -- 
-2.25.1
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_5-test-add-ignition-2.x-test-cases.patch

@@ -1,4 +1,4 @@
-From 63e54cff2a72f07ca5c3b15d507c552d681622aa Mon Sep 17 00:00:00 2001
+From 4e6b04bb5ac529732e5814533ab1c0ef0b6c39e7 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mathieu@kinvolk.io>
 Date: Thu, 2 Sep 2021 11:03:17 +0200
 Subject: [PATCH 09/21] config/3_5/test: add ignition 2.x test cases
@@ -40,5 +40,5 @@ index 7e10866e..58423719 100644
  			in:  in{config: []byte(`{"ignition": {"version": "3.0.0"}}`)},
  			out: out{config: types.Config{Ignition: types.Ignition{Version: types.MaxVersion.String()}}},
 -- 
-2.25.1
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch

@@ -1,4 +1,4 @@
-From 35d2df7eb82eb83c015aaa714fd66ecddf65282b Mon Sep 17 00:00:00 2001
+From d83920b6c3b3bb186460a6e6fced1f4ed74cae2e Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Wed, 22 Sep 2021 14:53:49 +0200
 Subject: [PATCH 10/21] internal/disk/fs: ignore fs format mismatches for the
@@ -22,7 +22,7 @@ Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/internal/exec/stages/disks/filesystems.go b/internal/exec/stages/disks/filesystems.go
-index 18103f38..72baf50d 100644
+index 62dab634..2bd2debd 100644
 --- a/internal/exec/stages/disks/filesystems.go
 +++ b/internal/exec/stages/disks/filesystems.go
 @@ -126,7 +126,7 @@ func (s stage) createFilesystem(fs types.Filesystem) error {
@@ -35,5 +35,5 @@ index 18103f38..72baf50d 100644
  			(fs.UUID == nil || canonicalizeFilesystemUUID(info.Type, info.UUID) == canonicalizeFilesystemUUID(fileSystemFormat, *fs.UUID)) {
  			s.Logger.Info("filesystem at %q is already correctly formatted. Skipping mkfs...", fs.Device)
 -- 
-2.25.1
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch

@@ -1,6 +1,6 @@
-From fb84b45f0499fc2cdc4cb7ea72cc7639bbcf7c98 Mon Sep 17 00:00:00 2001
+From f354144ff3e000e21a1050a03bba3b58f9ade4cb Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
-Date: Wed, 25 May 2022 10:34:32 +0200
+Date: Tue, 20 Feb 2024 10:12:02 +0100
 Subject: [PATCH 11/21] VMware: Fix guestinfo.*.config.data and *.config.url
  variables
 MIME-Version: 1.0
@@ -20,12 +20,13 @@ never used to fetch the Ignition config.
 Thus, use guestinfo.*.config.url as fallback if no guestinfo.*.config.data variables are set.
 
 Co-authored-by: Kai Lüke <kailuke@microsoft.com>
+Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 ---
- internal/providers/vmware/vmware_amd64.go | 96 +++++++++++++++++------
+ internal/providers/vmware/vmware_amd64.go | 93 +++++++++++++++++------
- 1 file changed, 74 insertions(+), 22 deletions(-)
+ 1 file changed, 71 insertions(+), 22 deletions(-)
 
 diff --git a/internal/providers/vmware/vmware_amd64.go b/internal/providers/vmware/vmware_amd64.go
-index b41b54bc..5a660b6c 100644
+index 1d40249c..a0833794 100644
 --- a/internal/providers/vmware/vmware_amd64.go
 +++ b/internal/providers/vmware/vmware_amd64.go
 @@ -19,6 +19,7 @@ package vmware
@@ -35,18 +36,16 @@ index b41b54bc..5a660b6c 100644
 +	"net/url"
  
  	"github.com/flatcar/ignition/v2/config/v3_5_experimental/types"
- 	"github.com/flatcar/ignition/v2/internal/providers"
+ 	"github.com/flatcar/ignition/v2/internal/platform"
-@@ -50,26 +51,85 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
+@@ -58,26 +59,83 @@ func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
- 		return types.Config{}, report.Report{}, providers.ErrNoProvider
+ 		return types.Config{}, report.Report{}, platform.ErrNoProvider
  	}
  
 -	config, err := fetchRawConfig(f)
 +	config, err := fetchDataConfig(f)
-+
 +	if err == nil && len(config) == 0 {
 +		config, err = fetchUrlConfig(f)
 +	}
-+
  	if err != nil {
  		return types.Config{}, report.Report{}, err
  	}
@@ -129,7 +128,7 @@ index b41b54bc..5a660b6c 100644
  
  	ovfEnv, err := info.String(GUESTINFO_OVF, "")
  	if err != nil {
-@@ -79,28 +139,20 @@ func fetchRawConfig(f *resource.Fetcher) (config, error) {
+@@ -87,28 +145,19 @@ func fetchRawConfig(f *resource.Fetcher) (config, error) {
  		env, err := ReadOvfEnvironment([]byte(ovfEnv))
  		if err != nil {
  			f.Logger.Warning("failed to parse OVF environment: %v. Continuing...", err)
@@ -161,10 +160,9 @@ index b41b54bc..5a660b6c 100644
 -		encoding: encoding,
 -	}, nil
 +	return data, nil
-+
  }
  
- func DelConfig(f *resource.Fetcher) error {
+ func delConfig(f *resource.Fetcher) error {
 -- 
-2.25.1
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch

@@ -1,4 +1,4 @@
-From 1c6a110cc09e7cc99f760628f70ad2c08acb64bd Mon Sep 17 00:00:00 2001
+From daccef5ca62c3b8b46680b2083cf1e78b626314d Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Wed, 2 Feb 2022 13:27:18 +0100
 Subject: [PATCH 12/21] config/version: handle configuration version 1
@@ -49,5 +49,5 @@ index 3b9bb22f..f81056fa 100644
  		return semver.Version{}, report.Report{}, errors.ErrInvalidVersion
  	}
 -- 
-2.25.1
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch

@@ -1,4 +1,4 @@
-From a2ca1caba7445bf93c7bfd5d50c7c4f39054e2c6 Mon Sep 17 00:00:00 2001
+From fca7fd66e1ea504ab884e1c3b88d2956355df4e6 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Tue, 22 Feb 2022 15:41:13 +0100
 Subject: [PATCH 13/21] config/util: add cloud init detection to initial
@@ -90,5 +90,5 @@ index 865d75d2..313d42ea 100644
  	if err == nil {
  		return report.Report{}, nil
 -- 
-2.25.1
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch

@@ -1,4 +1,4 @@
-From 469c4eddc01603ae65f7bbbc3e8233e99f4ac902 Mon Sep 17 00:00:00 2001
+From fb939eeea1cbcf1ec47b1eb83f0f0d1d725f3950 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Wed, 25 May 2022 10:38:16 +0200
 Subject: [PATCH 14/21] Revert "*: drop OEM URI support"
@@ -11,14 +11,9 @@ This reverts commit 0c088d6de77aa1b1f47b9252a07f51cb1e249df3.
  config/v3_3/types/url.go    |  2 +-
  config/v3_4/types/url.go    |  2 +-
  docs/supported-platforms.md |  1 +
- internal/distro/distro.go            | 11 +++-
+ internal/distro/distro.go   | 11 ++++-
- internal/resource/url.go             | 92 ++++++++++++++++++++++++++++
+ internal/resource/url.go    | 92 +++++++++++++++++++++++++++++++++++++
- tests/blackbox_test.go               | 14 ++++-
+ 8 files changed, 107 insertions(+), 7 deletions(-)
- tests/negative/files/missing_file.go | 27 ++++++++
- tests/negative/general/config.go     | 52 ++++++++++++++++
- tests/positive/files/remote.go       | 44 +++++++++++++
- tests/types/types.go                 |  1 +
- 13 files changed, 243 insertions(+), 9 deletions(-)
 
 diff --git a/config/v3_0/types/url.go b/config/v3_0/types/url.go
 index 2d8c44b1..f560bc22 100644
@@ -86,10 +81,10 @@ index 9b2b4405..5258c3c6 100644
  	case "s3":
  		if v, ok := u.Query()["versionId"]; ok {
 diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md
-index 9ecb590a..f7bb4b40 100644
+index 1c9d63bb..39a098dc 100644
 --- a/docs/supported-platforms.md
 +++ b/docs/supported-platforms.md
-@@ -10,6 +10,7 @@ Ignition is currently only supported for the following platforms:
+@@ -11,6 +11,7 @@ Ignition is currently only supported for the following platforms:
  * [Amazon Web Services] (`aws`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
  * [Microsoft Azure] (`azure`)- Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately.
  * [Microsoft Azure Stack] (`azurestack`) - Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately.
@@ -274,240 +269,6 @@ index 44253568..3f5fb4ab 100644
 +		"unmounting %q", oemMountPath,
 +	)
 +}
-diff --git a/tests/blackbox_test.go b/tests/blackbox_test.go
-index 7914738b..2fb15345 100644
---- a/tests/blackbox_test.go
-+++ b/tests/blackbox_test.go
-@@ -139,13 +139,19 @@ func outer(t *testing.T, test types.Test, negativeTests bool) error {
- 		return fmt.Errorf("failed to change mode of temp dir: %v", err)
- 	}
- 
-+	oemLookasideDir := filepath.Join(tmpDirectory, "oem-lookaside")
- 	systemConfigDir := filepath.Join(tmpDirectory, "system")
- 	var rootPartition *types.Partition
- 
- 	// Setup
--	err = createFilesFromSlice(systemConfigDir, test.SystemDirFiles)
-+	err = createFilesFromSlice(oemLookasideDir, test.OEMLookasideFiles)
- 	// Defer before the error handling because the createFilesFromSlice function
- 	// can fail after partially-creating things
-+	defer os.RemoveAll(oemLookasideDir)
-+	if err != nil {
-+		return err
-+	}
-+	err = createFilesFromSlice(systemConfigDir, test.SystemDirFiles)
- 	defer os.RemoveAll(systemConfigDir)
- 	if err != nil {
- 		return err
-@@ -275,7 +281,11 @@ func outer(t *testing.T, test types.Test, negativeTests bool) error {
- 
- 	// Ignition
- 	appendEnv := test.Env
--	appendEnv = append(appendEnv, "IGNITION_SYSTEM_CONFIG_DIR="+systemConfigDir)
-+	appendEnv = append(appendEnv, []string{
-+		"IGNITION_OEM_DEVICE=" + test.In[0].Partitions.GetPartition("OEM").Device,
-+		"IGNITION_OEM_LOOKASIDE_DIR=" + oemLookasideDir,
-+		"IGNITION_SYSTEM_CONFIG_DIR=" + systemConfigDir,
-+	}...)
- 
- 	if !negativeTests {
- 		if err := runIgnition(t, ctx, "fetch", "", tmpDirectory, appendEnv); err != nil {
-diff --git a/tests/negative/files/missing_file.go b/tests/negative/files/missing_file.go
-index 251f5593..4f6a9801 100644
---- a/tests/negative/files/missing_file.go
-+++ b/tests/negative/files/missing_file.go
-@@ -23,6 +23,7 @@ func init() {
- 	register.Register(register.NegativeTest, MissingRemoteContentsHTTP())
- 	register.Register(register.NegativeTest, InvalidHeaderRemoteContentsHTTP())
- 	register.Register(register.NegativeTest, MissingRemoteContentsTFTP())
-+	register.Register(register.NegativeTest, MissingRemoteContentsOEM())
- }
- 
- func MissingRemoteContentsHTTP() types.Test {
-@@ -103,3 +104,29 @@ func MissingRemoteContentsTFTP() types.Test {
- 		ConfigMinVersion: configMinVersion,
- 	}
- }
-+
-+func MissingRemoteContentsOEM() types.Test {
-+	name := "Create Files from Remote Contents - OEM"
-+	in := types.GetBaseDisk()
-+	out := in
-+	config := `{
-+	  "ignition": { "version": "$version" },
-+	  "storage": {
-+	    "files": [{
-+	      "path": "/foo/bar",
-+	      "contents": {
-+	        "source": "oem:///source"
-+	      }
-+	    }]
-+	  }
-+	}`
-+	configMinVersion := "3.0.0-experimental"
-+
-+	return types.Test{
-+		Name:             name,
-+		In:               in,
-+		Out:              out,
-+		Config:           config,
-+		ConfigMinVersion: configMinVersion,
-+	}
-+}
-diff --git a/tests/negative/general/config.go b/tests/negative/general/config.go
-index 6fcabe80..6d3cf848 100644
---- a/tests/negative/general/config.go
-+++ b/tests/negative/general/config.go
-@@ -29,12 +29,14 @@ func init() {
- 	register.Register(register.NegativeTest, ReplaceConfigWithMissingFileHTTP())
- 	register.Register(register.NegativeTest, ReplaceConfigWithInvalidHeaderHTTP())
- 	register.Register(register.NegativeTest, ReplaceConfigWithMissingFileTFTP())
-+	register.Register(register.NegativeTest, ReplaceConfigWithMissingFileOEM())
- 	register.Register(register.NegativeTest, AppendConfigWithMissingFileHTTP())
- 	register.Register(register.NegativeTest, AppendConfigWithInvalidHeaderHTTP())
- 	register.Register(register.NegativeTest, AppendConfigWithMissingFileTFTP())
- 	register.Register(register.NegativeTest, VersionOnlyConfig25())
- 	register.Register(register.NegativeTest, VersionOnlyConfig35())
- 	register.Register(register.NegativeTest, MergingCanFail())
-+	register.Register(register.NegativeTest, AppendConfigWithMissingFileOEM())
- }
- 
- func ReplaceConfigWithInvalidHash() types.Test {
-@@ -185,6 +187,31 @@ func ReplaceConfigWithMissingFileTFTP() types.Test {
- 	}
- }
- 
-+func ReplaceConfigWithMissingFileOEM() types.Test {
-+	name := "Replace Config with Missing File - OEM"
-+	in := types.GetBaseDisk()
-+	out := in
-+	config := `{
-+	  "ignition": {
-+	    "version": "$version",
-+	    "config": {
-+	      "replace": {
-+	        "source": "oem:///asdf"
-+	      }
-+	    }
-+	  }
-+	}`
-+	configMinVersion := "3.0.0-experimental"
-+
-+	return types.Test{
-+		Name:             name,
-+		In:               in,
-+		Out:              out,
-+		Config:           config,
-+		ConfigMinVersion: configMinVersion,
-+	}
-+}
-+
- func AppendConfigWithMissingFileHTTP() types.Test {
- 	name := "config.merge.http.notfound"
- 	in := types.GetBaseDisk()
-@@ -261,6 +288,31 @@ func AppendConfigWithMissingFileTFTP() types.Test {
- 	}
- }
- 
-+func AppendConfigWithMissingFileOEM() types.Test {
-+	name := "Append Config with Missing File - OEM"
-+	in := types.GetBaseDisk()
-+	out := in
-+	config := `{
-+	  "ignition": {
-+	    "version": "$version",
-+	    "config": {
-+	      "append": [{
-+	        "source": "oem:///asdf"
-+	      }]
-+	    }
-+	  }
-+	}`
-+	configMinVersion := "3.0.0-experimental"
-+
-+	return types.Test{
-+		Name:             name,
-+		In:               in,
-+		Out:              out,
-+		Config:           config,
-+		ConfigMinVersion: configMinVersion,
-+	}
-+}
-+
- func VersionOnlyConfig25() types.Test {
- 	name := "config.version.2.5.0-exp"
- 	in := types.GetBaseDisk()
-diff --git a/tests/positive/files/remote.go b/tests/positive/files/remote.go
-index 792bdae7..9117e651 100644
---- a/tests/positive/files/remote.go
-+++ b/tests/positive/files/remote.go
-@@ -29,6 +29,7 @@ func init() {
- 	register.Register(register.PositiveTest, CreateFileFromRemoteContentsHTTPUsingHeadersWithRedirect())
- 	register.Register(register.PositiveTest, CreateFileFromRemoteContentsHTTPUsingOverwrittenHeaders())
- 	register.Register(register.PositiveTest, CreateFileFromRemoteContentsTFTP())
-+	register.Register(register.PositiveTest, CreateFileFromRemoteContentsOEM())
- }
- 
- func CreateFileFromRemoteContentsHTTP() types.Test {
-@@ -252,3 +253,46 @@ func CreateFileFromRemoteContentsTFTP() types.Test {
- 		ConfigMinVersion: configMinVersion,
- 	}
- }
-+
-+func CreateFileFromRemoteContentsOEM() types.Test {
-+	name := "Create Files from Remote Contents - OEM"
-+	in := types.GetBaseDisk()
-+	out := types.GetBaseDisk()
-+	config := `{
-+	  "ignition": { "version": "$version" },
-+	  "storage": {
-+	    "files": [{
-+	      "path": "/foo/bar",
-+	      "contents": {
-+	        "source": "oem:///source"
-+	      }
-+	    }]
-+	  }
-+	}`
-+	in[0].Partitions.AddFiles("OEM", []types.File{
-+		{
-+			Node: types.Node{
-+				Name: "source",
-+			},
-+			Contents: "asdf\nfdsa",
-+		},
-+	})
-+	out[0].Partitions.AddFiles("ROOT", []types.File{
-+		{
-+			Node: types.Node{
-+				Name:      "bar",
-+				Directory: "foo",
-+			},
-+			Contents: "asdf\nfdsa",
-+		},
-+	})
-+	configMinVersion := "3.0.0-experimental"
-+
-+	return types.Test{
-+		Name:             name,
-+		In:               in,
-+		Out:              out,
-+		Config:           config,
-+		ConfigMinVersion: configMinVersion,
-+	}
-+}
-diff --git a/tests/types/types.go b/tests/types/types.go
-index d5bd3fe7..ea4ff6ab 100644
---- a/tests/types/types.go
-+++ b/tests/types/types.go
-@@ -97,6 +97,7 @@ type Test struct {
- 	In                []Disk // Disk state before running Ignition
- 	Out               []Disk // Expected disk state after running Ignition
- 	MntDevices        []MntDevice
-+	OEMLookasideFiles []File
- 	SystemDirFiles    []File
- 	Env               []string // Environment variables for Ignition
- 	Config            string
 -- 
-2.25.1
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch

@@ -1,4 +1,4 @@
-From c38cba8cd7303ec1d2d2559ba4e34fc52f1ca84a Mon Sep 17 00:00:00 2001
+From d2c70466cfcfa9c0f4f8ef1bd247e6c36874f1b2 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Kai=20L=C3=BCke?= <kailuke@microsoft.com>
 Date: Wed, 7 Jul 2021 18:40:52 +0200
 Subject: [PATCH 15/21] internal/resource/url: support btrfs as OEM partition
@@ -35,5 +35,5 @@ index 3f5fb4ab..3fbda7a7 100644
  
  	return nil
 -- 
-2.25.1
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-internal-exec-stages-disks-prevent-races-with-udev.patch

@@ -1,197 +0,0 @@
-From f39a78c6a9dd787c31fe02fbf098150b87c8cbc7 Mon Sep 17 00:00:00 2001
-From: Kai Lueke <kailuke@microsoft.com>
-Date: Fri, 11 Feb 2022 15:41:12 +0100
-Subject: [PATCH 16/21] internal/exec/stages/disks: prevent races with udev
-
-The "udevadm settle" command used to wait for udev to process the disk
-changes and recreate the entries under /dev was still prone to races
-where udev didn't get notified yet of the final event to wait for.
-This caused the boot with a btrfs root filesystem created by Ignition
-to fail almost every time on certain hardware.
-
-Issue tagged events and wait for them to be processed by udev. This is
-actually meanigful in all stages not only for the other parts of the
-initramfs which may be surprised by sudden device nodes disappearing
-shortly like the case was with systemd's fsck service but also for the
-inter-stage dependencies which currently are using the waiter for
-systemd device units but that doesn't really prevent from races with
-udev device node recreation. Thus, these changes are complementary to
-the existing waiter which mainly has the purpose to wait for unmodified
-devices. For newly created RAIDs we can wait for the new node to be
-available as udev will not recreate it.
-Note: This is a port for Ignition 0.35 while for 2.2 this also should
-be done for LUKS.
----
- internal/exec/stages/disks/disks.go       | 63 ++++++++++++-----------
- internal/exec/stages/disks/filesystems.go | 23 +++++++++
- internal/exec/stages/disks/partitions.go  |  9 ++++
- internal/exec/stages/disks/raid.go        | 12 +++++
- 4 files changed, 78 insertions(+), 29 deletions(-)
-
-diff --git a/internal/exec/stages/disks/disks.go b/internal/exec/stages/disks/disks.go
-index fcc60b88..7baca8fc 100644
---- a/internal/exec/stages/disks/disks.go
-+++ b/internal/exec/stages/disks/disks.go
-@@ -23,6 +23,7 @@ import (
- 	"errors"
- 	"fmt"
- 	"os/exec"
-+	"path/filepath"
- 
- 	"github.com/flatcar/ignition/v2/config/v3_5_experimental/types"
- 	"github.com/flatcar/ignition/v2/internal/distro"
-@@ -106,35 +107,39 @@ func (s stage) Run(config types.Config) error {
- 		return fmt.Errorf("failed to create filesystems: %v", err)
- 	}
- 
--	// udevd registers an IN_CLOSE_WRITE inotify watch on block device
--	// nodes, and synthesizes udev "change" events when the watch fires.
--	// mkfs.btrfs triggers multiple such events, the first of which
--	// occurs while there is no recognizable filesystem on the
--	// partition. Thus, if an existing partition is reformatted as
--	// btrfs while keeping the same filesystem label, there will be a
--	// synthesized uevent that deletes the /dev/disk/by-label symlink
--	// and a second one that restores it. If we didn't account for this,
--	// a systemd unit that depended on the by-label symlink (e.g.
--	// systemd-fsck-root.service) could have the symlink deleted out
--	// from under it.
--	//
--	// There's no way to fix this completely. We can't wait for the
--	// restoring uevent to propagate, since we can't determine which
--	// specific uevents were triggered by the mkfs. We can wait for
--	// udev to settle, though it's conceivable that the deleting uevent
--	// has already been processed and the restoring uevent is still
--	// sitting in the inotify queue. In practice the uevent queue will
--	// be the slow one, so this should be good enough.
--	//
--	// Test case: boot failure in coreos.ignition.*.btrfsroot kola test.
--	//
--	// Additionally, partitioning (and possibly creating raid) suffers
--	// the same problem. To be safe, always settle.
--	if _, err := s.Logger.LogCmd(
--		exec.Command(distro.UdevadmCmd(), "settle"),
--		"waiting for udev to settle",
--	); err != nil {
--		return fmt.Errorf("udevadm settle failed: %v", err)
-+	return nil
-+}
-+
-+// waitForUdev triggers a tagged event and waits for it to bubble up
-+// again. This ensures that udev processed the device changes.
-+// The requirement is that the used device path exists and itself is
-+// not recreated by udev seeing the changes done. Thus, resolve a
-+// /dev/disk/by-something/X symlink before performing the device
-+// changes (i.e., pass /run/ignition/dev_aliases/X) and, e.g., don't
-+// call it for a partition but the full disk if you modified the
-+// partition table.
-+func (s stage) waitForUdev(dev, ctxt string) error {
-+	// Resolve the original /dev/ABC entry because udevadm wants
-+	// this as argument instead of a symlink like
-+	// /run/ignition/dev_aliases/X.
-+	devPath, err := filepath.EvalSymlinks(dev)
-+	if err != nil {
-+		return fmt.Errorf("failed to resolve device alias %q on %s: %v", dev, ctxt, err)
-+	}
-+	// By triggering our own event and waiting for it we know that udev
-+	// will have processed the device changes, a bare "udevadm settle"
-+	// is prone to races with the inotify queue. We expect the /dev/DISK
-+	// entry to exist because this function is either called for the full
-+	// disk and only the /dev/DISKpX partition entries will change, or the
-+	// function is called for a partition where the contents changed and
-+	// nothing causes the kernel/udev to reread the partition table and
-+	// recreate the /dev/DISKpX entries. If that was the case best we could
-+	// do here is to add a retry loop (and relax the function comment).
-+	_, err = s.Logger.LogCmd(
-+		exec.Command(distro.UdevadmCmd(), "trigger", "--settle",
-+			devPath), "waiting for triggered uevent")
-+	if err != nil {
-+		return fmt.Errorf("udevadm trigger failed on %s: %v", ctxt, err)
- 	}
- 
- 	return nil
-diff --git a/internal/exec/stages/disks/filesystems.go b/internal/exec/stages/disks/filesystems.go
-index 72baf50d..67fec316 100644
---- a/internal/exec/stages/disks/filesystems.go
-+++ b/internal/exec/stages/disks/filesystems.go
-@@ -210,6 +210,29 @@ func (s stage) createFilesystem(fs types.Filesystem) error {
- 		return fmt.Errorf("mkfs failed: %v", err)
- 	}
- 
-+	// udevd registers an IN_CLOSE_WRITE inotify watch on block device
-+	// nodes, and synthesizes udev "change" events when the watch fires.
-+	// mkfs.btrfs triggers multiple such events, the first of which
-+	// occurs while there is no recognizable filesystem on the
-+	// partition. Thus, if an existing partition is reformatted as
-+	// btrfs while keeping the same filesystem label, there will be a
-+	// synthesized uevent that deletes the /dev/disk/by-label symlink
-+	// and a second one that restores it. If we didn't account for this,
-+	// a systemd unit that depended on the by-label symlink (e.g.
-+	// systemd-fsck-root.service) could have the symlink deleted out
-+	// from under it.
-+	// Trigger a tagged uevent and wait for it because a bare "udevadm
-+	// settle" does not guarantee that all changes were processed
-+	// because it's conceivable that only the deleting uevent has
-+	// already been processed (or none!) while the restoring uevent
-+	// is still sitting in the inotify queue. By triggering our own
-+	// event and waiting for it we know that udev will have processed
-+	// the device changes.
-+	// Test case: boot failure in coreos.ignition.*.btrfsroot kola test.
-+	if err := s.waitForUdev(devAlias, "createFilesystems"); err != nil {
-+		return err
-+	}
-+
- 	return nil
- }
- 
-diff --git a/internal/exec/stages/disks/partitions.go b/internal/exec/stages/disks/partitions.go
-index 5578ffd7..747f08dc 100644
---- a/internal/exec/stages/disks/partitions.go
-+++ b/internal/exec/stages/disks/partitions.go
-@@ -394,5 +394,14 @@ func (s stage) partitionDisk(dev types.Disk, devAlias string) error {
- 	if err := op.Commit(); err != nil {
- 		return fmt.Errorf("commit failure: %v", err)
- 	}
-+
-+	// It's best to wait here for the /dev/ABC entries to be
-+	// (re)created, not only for other parts of the initramfs but
-+	// also because s.waitOnDevices() can still race with udev's
-+	// partition entry recreation.
-+	if err := s.waitForUdev(devAlias, "createPartitions"); err != nil {
-+		return err
-+	}
-+
- 	return nil
- }
-diff --git a/internal/exec/stages/disks/raid.go b/internal/exec/stages/disks/raid.go
-index 41f98a41..d22f604c 100644
---- a/internal/exec/stages/disks/raid.go
-+++ b/internal/exec/stages/disks/raid.go
-@@ -22,6 +22,7 @@ package disks
- import (
- 	"fmt"
- 	"os/exec"
-+	"strings"
- 
- 	"github.com/flatcar/ignition/v2/config/v3_5_experimental/types"
- 	"github.com/flatcar/ignition/v2/internal/distro"
-@@ -78,6 +79,17 @@ func (s stage) createRaids(config types.Config) error {
- 		); err != nil {
- 			return fmt.Errorf("mdadm failed: %v", err)
- 		}
-+
-+		devName := md.Name
-+		if !strings.HasPrefix(devName, "/dev") {
-+			devName = "/dev/md/" + md.Name
-+		}
-+		// Wait for the created device node to show up, no udev
-+		// race prevention required because this node did not
-+		// exist before.
-+		if err := s.waitOnDevices([]string{devName}, "raids"); err != nil {
-+			return err
-+		}
- 	}
- 
- 	return nil
--- 
-2.25.1
-

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch

@@ -1,7 +1,7 @@
-From cf5ed759582236d6935eb9ab167f46671a7c038d Mon Sep 17 00:00:00 2001
+From ae61d536613332251f033e613ff6775e937378a8 Mon Sep 17 00:00:00 2001
 From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 Date: Thu, 10 Nov 2022 11:58:49 +0100
-Subject: [PATCH 17/21] translation: support OEM and oem
+Subject: [PATCH 16/21] translation: support OEM and oem
 
 Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
 ---
@@ -157,5 +157,5 @@ index e81f6bed..68c07109 100644
 +	}
 +}
 -- 
-2.25.1
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch

@@ -0,0 +1,46 @@
+From ae8a57a3b86eb03152cee167bbbcb245075b8590 Mon Sep 17 00:00:00 2001
+From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
+Date: Tue, 20 Feb 2024 10:25:24 +0100
+Subject: [PATCH 17/21] revert: internal/oem: drop noop OEMs
+
+This reverts: https://github.com/flatcar/ignition/commit/26828f92e00060aa8ebf2197545ad602af237132
+
+Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
+---
+ internal/providers/metal/metal.go | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/internal/providers/metal/metal.go b/internal/providers/metal/metal.go
+index 8a5c2362..9b764e09 100644
+--- a/internal/providers/metal/metal.go
++++ b/internal/providers/metal/metal.go
+@@ -26,10 +26,26 @@ import (
+ )
+ 
+ func init() {
++	platform.Register(platform.Provider{
++		Name:  "cloudsigma",
++		Fetch: fetchConfig,
++	})
+ 	platform.Register(platform.Provider{
+ 		Name:  "metal",
+ 		Fetch: fetchConfig,
+ 	})
++	platform.Register(platform.Provider{
++		Name:  "rackspace",
++		Fetch: fetchConfig,
++	})
++	platform.Register(platform.Provider{
++		Name:  "rackspace-onmetal",
++		Fetch: fetchConfig,
++	})
++	platform.Register(platform.Provider{
++		Name:  "vagrant",
++		Fetch: fetchConfig,
++	})
+ }
+ 
+ func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) {
+-- 
+2.43.0
+

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch

@@ -1,30 +1,27 @@
-From 8848eb28f78750b16cd503f64279847a5e2681ae Mon Sep 17 00:00:00 2001
+From 56f6c13df51715305100f306f31a65018e3bbea4 Mon Sep 17 00:00:00 2001
-From: Krzesimir Nowak <knowak@microsoft.com>
+From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
-Date: Fri, 14 Apr 2023 11:37:20 +0200
+Date: Tue, 20 Feb 2024 10:27:21 +0100
-Subject: [PATCH 19/21] docs: Add re-added platforms to docs to pass tests
+Subject: [PATCH 18/21] docs: Add re-added platforms to docs to pass tests
 
+Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
+Co-Authored-By: Krzesimir Nowak <knowak@microsoft.com>
 ---
- docs/supported-platforms.md | 5 +++++
+ docs/supported-platforms.md | 4 ++++
- 1 file changed, 5 insertions(+)
+ 1 file changed, 4 insertions(+)
 
 diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md
-index f7bb4b40..eb5db00f 100644
+index 39a098dc..deff10af 100644
 --- a/docs/supported-platforms.md
 +++ b/docs/supported-platforms.md
-@@ -12,10 +12,12 @@ Ignition is currently only supported for the following platforms:
+@@ -14,6 +14,7 @@ Ignition is currently only supported for the following platforms:
- * [Microsoft Azure Stack] (`azurestack`) - Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately.
  * Bare Metal - Use the `ignition.config.url` kernel parameter to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, `s3://`, or `gs://` schemes to specify a remote config or the `oem://` scheme to specify a local config, rooted in `/usr/share/oem`.
  * [Brightbox] (`brightbox`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
-+* `cloudsigma` - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
  * [CloudStack] (`cloudstack`) - Ignition will read its configuration from the instance userdata via either metadata service or config drive. Cloud SSH keys are handled separately.
++* `cloudsigma` - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
  * [DigitalOcean] (`digitalocean`) - Ignition will read its configuration from the droplet userdata. Cloud SSH keys and network configuration are handled separately.
  * [Exoscale] (`exoscale`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
  * [Google Cloud] (`gcp`) - Ignition will read its configuration from the instance metadata entry named "user-data". Cloud SSH keys are handled separately.
-+* `hyperv` - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
+@@ -27,6 +28,9 @@ Ignition is currently only supported for the following platforms:
- * [IBM Cloud] (`ibmcloud`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
- * [KubeVirt] (`kubevirt`) - Ignition will read its configuration from the instance userdata via config drive. Cloud SSH keys are handled separately.
- * Bare Metal (`metal`) - Use the `ignition.config.url` kernel parameter to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, `s3://`, `arn:`, or `gs://` schemes to specify a remote config.
-@@ -24,6 +26,9 @@ Ignition is currently only supported for the following platforms:
  * [Equinix Metal] (`packet`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
  * [IBM Power Systems Virtual Server] (`powervs`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
  * [QEMU] (`qemu`) - Ignition will read its configuration from the 'opt/com.coreos/config' key on the QEMU Firmware Configuration Device (available in QEMU 2.4.0 and higher).
@@ -35,5 +32,5 @@ index f7bb4b40..eb5db00f 100644
  * [VMware] (`vmware`) - Use the VMware Guestinfo variables `ignition.config.data` and `ignition.config.data.encoding` to provide the config and its encoding to the virtual machine. Valid encodings are "", "base64", and "gzip+base64". Guestinfo variables can be provided directly or via an OVF environment, with priority given to variables specified directly.
  * [Vultr] (`vultr`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
 -- 
-2.25.1
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-revert-internal-oem-drop-noop-OEMs.patch

@@ -1,60 +0,0 @@
-From 8e7ad5ef7ea79d541d8f960f2647a5cd17e72751 Mon Sep 17 00:00:00 2001
-From: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
-Date: Wed, 21 Dec 2022 17:25:02 +0100
-Subject: [PATCH 18/21] revert: internal/oem: drop noop OEMs
-
-This reverts: https://github.com/coreos/ignition/commit/26828f92e00060aa8ebf2197545ad602af237132
-
-Signed-off-by: Mathieu Tortuyaux <mtortuyaux@microsoft.com>
----
- internal/platform/platform.go | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/internal/platform/platform.go b/internal/platform/platform.go
-index 51bf5174..5ed36663 100644
---- a/internal/platform/platform.go
-+++ b/internal/platform/platform.go
-@@ -132,6 +132,10 @@ func init() {
- 		name:  "brightbox",
- 		fetch: openstack.FetchConfig,
- 	})
-+	configs.Register(Config{
-+		name:  "cloudsigma",
-+		fetch: noop.FetchConfig,
-+	})
- 	configs.Register(Config{
- 		name:  "cloudstack",
- 		fetch: cloudstack.FetchConfig,
-@@ -152,6 +156,10 @@ func init() {
- 		name:  "gcp",
- 		fetch: gcp.FetchConfig,
- 	})
-+	configs.Register(Config{
-+		name:  "hyperv",
-+		fetch: noop.FetchConfig,
-+	})
- 	configs.Register(Config{
- 		name:  "ibmcloud",
- 		fetch: ibmcloud.FetchConfig,
-@@ -185,6 +193,18 @@ func init() {
- 		name:  "qemu",
- 		fetch: qemu.FetchConfig,
- 	})
-+	configs.Register(Config{
-+		name:  "rackspace",
-+		fetch: noop.FetchConfig,
-+	})
-+	configs.Register(Config{
-+		name:  "rackspace-onmetal",
-+		fetch: noop.FetchConfig,
-+	})
-+	configs.Register(Config{
-+		name:  "vagrant",
-+		fetch: noop.FetchConfig,
-+	})
- 	configs.Register(Config{
- 		name:      "virtualbox",
- 		fetch:     virtualbox.FetchConfig,
--- 
-2.25.1
-

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0019-usr-share-oem-oem.patch

@@ -0,0 +1,42 @@
+From 9be71387c9b0ff2681f3f4902f508f9071cae988 Mon Sep 17 00:00:00 2001
+From: Krzesimir Nowak <knowak@microsoft.com>
+Date: Tue, 4 Apr 2023 12:12:42 +0200
+Subject: [PATCH 19/21] /usr/share/oem -> /oem
+
+---
+ config/util/translate.go  | 2 +-
+ internal/distro/distro.go | 5 ++++-
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/config/util/translate.go b/config/util/translate.go
+index 347d148c..d4c057b2 100644
+--- a/config/util/translate.go
++++ b/config/util/translate.go
+@@ -154,7 +154,7 @@ func FSGeneration(name string, fsMap map[string]string) (string, error) {
+ 	if _, ok := fsMap[name]; !ok {
+ 		addedSuffixCounter += 1
+ 		if name == "oem" {
+-			fsMap[name] = "/usr/share/oem"
++			fsMap[name] = "/oem"
+ 		} else {
+ 			// generate a new path
+ 			fsMap[name] = "/tmp/" + name + "-ign" + strconv.FormatUint(addedSuffixCounter, 10)
+diff --git a/internal/distro/distro.go b/internal/distro/distro.go
+index 644c42c4..9e96166e 100644
+--- a/internal/distro/distro.go
++++ b/internal/distro/distro.go
+@@ -32,7 +32,10 @@ var (
+ 	bootIDPath        = "/proc/sys/kernel/random/boot_id"
+ 	// initramfs directory containing distro-provided base config
+ 	systemConfigDir = "/usr/lib/ignition"
+-	// initramfs directory to check before retrieving file from OEM partition
++	// initramfs directory to check before retrieving file from
++	// OEM partition; note that OEM partition is mounted on /oem
++	// on the host, but initrds still use /usr/share/oem for
++	// backwards compatilibity
+ 	oemLookasideDir = "/usr/share/oem"
+ 
+ 	// Helper programs
+-- 
+2.43.0
+

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch

@@ -1,7 +1,7 @@
-From 3adef6a01c987ed2156636fab1791e534f770621 Mon Sep 17 00:00:00 2001
+From 6589dccde4a36ea42e38e410ca710e0034d6454a Mon Sep 17 00:00:00 2001
 From: Krzesimir Nowak <knowak@microsoft.com>
 Date: Tue, 16 May 2023 17:43:43 +0200
-Subject: [PATCH 21/21] internal/exec/stages/mount: Mount /oem
+Subject: [PATCH 20/21] internal/exec/stages/mount: Mount /oem
 
 When asking to mount the OEM partition to /usr/share/oem, actually
 mount it in /oem. The /usr/share/oem is a symlink pointing to /oem, so
@@ -12,7 +12,7 @@ into /usr/share/oem, should end up having things in /oem.
  1 file changed, 5 insertions(+)
 
 diff --git a/internal/exec/stages/mount/mount.go b/internal/exec/stages/mount/mount.go
-index 8074dbe6..b8cdc5cb 100644
+index ecf7ce7f..395e772a 100644
 --- a/internal/exec/stages/mount/mount.go
 +++ b/internal/exec/stages/mount/mount.go
 @@ -118,6 +118,11 @@ func (s stage) mountFs(fs types.Filesystem) error {
@@ -28,5 +28,5 @@ index 8074dbe6..b8cdc5cb 100644
  	if err := checkForNonDirectories(path); err != nil {
  		return err
 -- 
-2.25.1
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-usr-share-oem-oem.patch

@@ -1,56 +0,0 @@
-From 6f80f077330d91ee9bab5ece26dceb5b4a12939a Mon Sep 17 00:00:00 2001
-From: Krzesimir Nowak <knowak@microsoft.com>
-Date: Tue, 4 Apr 2023 12:12:42 +0200
-Subject: [PATCH 20/21] /usr/share/oem -> /oem
-
----
- config/util/translate.go    | 2 +-
- docs/supported-platforms.md | 2 +-
- internal/distro/distro.go   | 5 ++++-
- 3 files changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/config/util/translate.go b/config/util/translate.go
-index 347d148c..d4c057b2 100644
---- a/config/util/translate.go
-+++ b/config/util/translate.go
-@@ -154,7 +154,7 @@ func FSGeneration(name string, fsMap map[string]string) (string, error) {
- 	if _, ok := fsMap[name]; !ok {
- 		addedSuffixCounter += 1
- 		if name == "oem" {
--			fsMap[name] = "/usr/share/oem"
-+			fsMap[name] = "/oem"
- 		} else {
- 			// generate a new path
- 			fsMap[name] = "/tmp/" + name + "-ign" + strconv.FormatUint(addedSuffixCounter, 10)
-diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md
-index eb5db00f..d79c3bf2 100644
---- a/docs/supported-platforms.md
-+++ b/docs/supported-platforms.md
-@@ -10,7 +10,7 @@ Ignition is currently only supported for the following platforms:
- * [Amazon Web Services] (`aws`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
- * [Microsoft Azure] (`azure`)- Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately.
- * [Microsoft Azure Stack] (`azurestack`) - Ignition will read its configuration from the custom data provided to the instance. Cloud SSH keys are handled separately.
--* Bare Metal - Use the `ignition.config.url` kernel parameter to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, `s3://`, or `gs://` schemes to specify a remote config or the `oem://` scheme to specify a local config, rooted in `/usr/share/oem`.
-+* Bare Metal - Use the `ignition.config.url` kernel parameter to provide a URL to the configuration. The URL can use the `http://`, `https://`, `tftp://`, `s3://`, or `gs://` schemes to specify a remote config or the `oem://` scheme to specify a local config, rooted in `/oem`.
- * [Brightbox] (`brightbox`) - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
- * `cloudsigma` - Ignition will read its configuration from the instance userdata. Cloud SSH keys are handled separately.
- * [CloudStack] (`cloudstack`) - Ignition will read its configuration from the instance userdata via either metadata service or config drive. Cloud SSH keys are handled separately.
-diff --git a/internal/distro/distro.go b/internal/distro/distro.go
-index 644c42c4..9e96166e 100644
---- a/internal/distro/distro.go
-+++ b/internal/distro/distro.go
-@@ -32,7 +32,10 @@ var (
- 	bootIDPath        = "/proc/sys/kernel/random/boot_id"
- 	// initramfs directory containing distro-provided base config
- 	systemConfigDir = "/usr/lib/ignition"
--	// initramfs directory to check before retrieving file from OEM partition
-+	// initramfs directory to check before retrieving file from
-+	// OEM partition; note that OEM partition is mounted on /oem
-+	// on the host, but initrds still use /usr/share/oem for
-+	// backwards compatilibity
- 	oemLookasideDir = "/usr/share/oem"
- 
- 	// Helper programs
--- 
-2.25.1
-

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-sgdisk-Run-partprobe-after-partition-changes.patch

@@ -1,7 +1,7 @@
-From e5c4e6bd9f3bad3b27e338e4da2f3b0b53ab1599 Mon Sep 17 00:00:00 2001
+From 7c3cfae0c00508c845c8408d5a8ec00bc32316a8 Mon Sep 17 00:00:00 2001
 From: Kai Lueke <kailuke@microsoft.com>
 Date: Fri, 29 Sep 2023 18:06:09 +0200
-Subject: [PATCH] sgdisk: Run partprobe after partition changes
+Subject: [PATCH 21/21] sgdisk: Run partprobe after partition changes
 
 The sgdisk tool does not update the kernel partition table in contrast
 to other similar tools. Often udev can detect the changes but not always
@@ -15,7 +15,7 @@ kernel partition table, trigger the re-read with partprobe.
  3 files changed, 8 insertions(+)
 
 diff --git a/dracut/30ignition/module-setup.sh b/dracut/30ignition/module-setup.sh
-index ad7e80fd..3cdcb631 100755
+index 816e4b66..e59f8cdf 100755
 --- a/dracut/30ignition/module-setup.sh
 +++ b/dracut/30ignition/module-setup.sh
 @@ -33,6 +33,7 @@ install() {
@@ -27,10 +27,10 @@ index ad7e80fd..3cdcb631 100755
          userdel \
          usermod \
 diff --git a/internal/distro/distro.go b/internal/distro/distro.go
-index 61ca87ae..c1c13b62 100644
+index 9e96166e..04544dbf 100644
 --- a/internal/distro/distro.go
 +++ b/internal/distro/distro.go
-@@ -37,6 +37,7 @@ var (
+@@ -44,6 +44,7 @@ var (
  	mdadmCmd     = "mdadm"
  	mountCmd     = "mount"
  	sgdiskCmd    = "sgdisk"
@@ -38,7 +38,7 @@ index 61ca87ae..c1c13b62 100644
  	modprobeCmd  = "modprobe"
  	udevadmCmd   = "udevadm"
  	usermodCmd   = "usermod"
-@@ -90,6 +91,7 @@ func GroupdelCmd() string  { return groupdelCmd }
+@@ -100,6 +101,7 @@ func GroupdelCmd() string  { return groupdelCmd }
  func MdadmCmd() string     { return mdadmCmd }
  func MountCmd() string     { return mountCmd }
  func SgdiskCmd() string    { return sgdiskCmd }
@@ -47,7 +47,7 @@ index 61ca87ae..c1c13b62 100644
  func UdevadmCmd() string   { return udevadmCmd }
  func UsermodCmd() string   { return usermodCmd }
 diff --git a/internal/sgdisk/sgdisk.go b/internal/sgdisk/sgdisk.go
-index 29915809..e70a3881 100644
+index 136aca67..5f9d399a 100644
 --- a/internal/sgdisk/sgdisk.go
 +++ b/internal/sgdisk/sgdisk.go
 @@ -121,6 +121,11 @@ func (op *Operation) Commit() error {
@@ -63,5 +63,5 @@ index 29915809..e70a3881 100644
  	return nil
  }
 -- 
-2.41.0
+2.43.0
 

sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild

@@ -12,7 +12,7 @@ inherit coreos-go cros-workon systemd udev
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
 else
-	CROS_WORKON_COMMIT="13f05b3c9f6221fb68234387ff2e4c2d63a39b63" # v2.15.0
+	CROS_WORKON_COMMIT="45e9d394a3e4f240e9d6745af0a83fa36179f510" # v2.17.0
 	KEYWORDS="amd64 arm64"
 fi
 
@@ -43,10 +43,10 @@ RDEPEND+="${DEPEND}"
 
 PATCHES=(
 	"${FILESDIR}/0001-sed-s-coreos-flatcar.patch"
-	"${FILESDIR}/0002-mod-add-flatcar-ignition-0.36.2.patch"
+	"${FILESDIR}/0002-config-add-ignition-translation.patch"
-	"${FILESDIR}/0003-sum-go-mod-tidy.patch"
+	"${FILESDIR}/0003-mod-add-flatcar-ignition-0.36.2.patch"
-	"${FILESDIR}/0004-vendor-go-mod-vendor.patch"
+	"${FILESDIR}/0004-sum-go-mod-tidy.patch"
-	"${FILESDIR}/0005-config-add-ignition-translation.patch"
+	"${FILESDIR}/0005-vendor-go-mod-vendor.patch"
 	"${FILESDIR}/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch"
 	"${FILESDIR}/0007-internal-prv-cmdline-backport-flatcar-patch.patch"
 	"${FILESDIR}/0008-provider-qemu-apply-fw_cfg-patch.patch"
@@ -57,13 +57,12 @@ PATCHES=(
 	"${FILESDIR}/0013-config-util-add-cloud-init-detection-to-initial-pars.patch"
 	"${FILESDIR}/0014-Revert-drop-OEM-URI-support.patch"
 	"${FILESDIR}/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch"
-	"${FILESDIR}/0016-internal-exec-stages-disks-prevent-races-with-udev.patch"
+	"${FILESDIR}/0016-translation-support-OEM-and-oem.patch"
-	"${FILESDIR}/0017-translation-support-OEM-and-oem.patch"
+	"${FILESDIR}/0017-revert-internal-oem-drop-noop-OEMs.patch"
-	"${FILESDIR}/0018-revert-internal-oem-drop-noop-OEMs.patch"
+	"${FILESDIR}/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch"
-	"${FILESDIR}/0019-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch"
+	"${FILESDIR}/0019-usr-share-oem-oem.patch"
-	"${FILESDIR}/0020-usr-share-oem-oem.patch"
+	"${FILESDIR}/0020-internal-exec-stages-mount-Mount-oem.patch"
-	"${FILESDIR}/0021-internal-exec-stages-mount-Mount-oem.patch"
+	"${FILESDIR}/0021-sgdisk-Run-partprobe-after-partition-changes.patch"
-	"${FILESDIR}/0022-sgdisk-Run-partprobe-after-partition-changes.patch"
 )
 
 src_compile() {