diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch index fff3c823df..11609544e0 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0001-sed-s-coreos-flatcar.patch @@ -1,11 +1,11 @@ -From 854b82967946daf36c553c3ec45d13ca6738f812 Mon Sep 17 00:00:00 2001 +From 437c0f5da61e4195bcfc03da1de9b391cb76472c Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Mon, 19 Feb 2024 18:03:58 +0100 +Date: Mon, 4 Mar 2024 14:53:49 +0100 Subject: [PATCH 01/21] *: sed `s/coreos/flatcar/` Signed-off-by: Mathieu Tortuyaux --- - .github/ISSUE_TEMPLATE/release-checklist.md | 8 ++-- + .github/ISSUE_TEMPLATE/release-checklist.md | 8 +-- .github/ISSUE_TEMPLATE/stabilize-checklist.md | 2 +- .github/workflows/container-rebuild.yml | 2 +- .github/workflows/container.yml | 2 +- @@ -19,7 +19,7 @@ Signed-off-by: Mathieu Tortuyaux config/doc/generate.go | 2 +- config/doc/schema.go | 2 +- config/merge/merge.go | 6 +-- - config/merge/merge_test.go | 8 ++-- + config/merge/merge_test.go | 8 +-- config/shared/validations/unit.go | 2 +- config/translate/translate.go | 2 +- config/translate/translate_test.go | 4 +- @@ -49,7 +49,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_0/types/storage_test.go | 4 +- config/v3_0/types/systemd.go | 6 +-- config/v3_0/types/systemd_test.go | 4 +- - config/v3_0/types/unit.go | 8 ++-- + config/v3_0/types/unit.go | 8 +-- config/v3_0/types/unit_test.go | 4 +- config/v3_0/types/url.go | 4 +- config/v3_0/types/url_test.go | 4 +- @@ -57,7 +57,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_0/types/verification_test.go | 2 +- config/v3_1/config.go | 14 +++--- config/v3_1/config_test.go | 4 +- - config/v3_1/translate/translate.go | 8 ++-- + config/v3_1/translate/translate.go | 8 +-- config/v3_1/translate/translate_test.go | 4 +- config/v3_1/types/config.go | 4 +- config/v3_1/types/config_test.go | 4 +- @@ -86,7 +86,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_1/types/storage_test.go | 4 +- config/v3_1/types/systemd.go | 6 +-- config/v3_1/types/systemd_test.go | 4 +- - config/v3_1/types/unit.go | 8 ++-- + config/v3_1/types/unit.go | 8 +-- config/v3_1/types/unit_test.go | 4 +- config/v3_1/types/url.go | 4 +- config/v3_1/types/url_test.go | 4 +- @@ -126,7 +126,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_2/types/systemd.go | 6 +-- config/v3_2/types/systemd_test.go | 4 +- config/v3_2/types/tang.go | 4 +- - config/v3_2/types/unit.go | 8 ++-- + config/v3_2/types/unit.go | 8 +-- config/v3_2/types/unit_test.go | 4 +- config/v3_2/types/url.go | 4 +- config/v3_2/types/url_test.go | 4 +- @@ -134,7 +134,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_2/types/verification_test.go | 2 +- config/v3_3/config.go | 14 +++--- config/v3_3/config_test.go | 4 +- - config/v3_3/translate/translate.go | 8 ++-- + config/v3_3/translate/translate.go | 8 +-- config/v3_3/translate/translate_test.go | 4 +- config/v3_3/types/clevis.go | 4 +- config/v3_3/types/clevis_test.go | 4 +- @@ -168,7 +168,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_3/types/systemd.go | 6 +-- config/v3_3/types/systemd_test.go | 4 +- config/v3_3/types/tang.go | 4 +- - config/v3_3/types/unit.go | 8 ++-- + config/v3_3/types/unit.go | 8 +-- config/v3_3/types/unit_test.go | 4 +- config/v3_3/types/url.go | 4 +- config/v3_3/types/url_test.go | 4 +- @@ -176,7 +176,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_3/types/verification_test.go | 2 +- config/v3_4/config.go | 14 +++--- config/v3_4/config_test.go | 4 +- - config/v3_4/translate/translate.go | 8 ++-- + config/v3_4/translate/translate.go | 8 +-- config/v3_4/translate/translate_test.go | 4 +- config/v3_4/types/clevis.go | 4 +- config/v3_4/types/clevis_test.go | 4 +- @@ -211,7 +211,7 @@ Signed-off-by: Mathieu Tortuyaux config/v3_4/types/systemd_test.go | 4 +- config/v3_4/types/tang.go | 4 +- config/v3_4/types/tang_test.go | 4 +- - config/v3_4/types/unit.go | 8 ++-- + config/v3_4/types/unit.go | 8 +-- config/v3_4/types/unit_test.go | 4 +- config/v3_4/types/url.go | 4 +- config/v3_4/types/url_test.go | 4 +- @@ -254,7 +254,7 @@ Signed-off-by: Mathieu Tortuyaux .../v3_5_experimental/types/systemd_test.go | 4 +- config/v3_5_experimental/types/tang.go | 4 +- config/v3_5_experimental/types/tang_test.go | 4 +- - config/v3_5_experimental/types/unit.go | 8 ++-- + config/v3_5_experimental/types/unit.go | 8 +-- config/v3_5_experimental/types/unit_test.go | 4 +- config/v3_5_experimental/types/url.go | 4 +- config/v3_5_experimental/types/url_test.go | 4 +- @@ -275,18 +275,18 @@ Signed-off-by: Mathieu Tortuyaux dracut/30ignition/ignition-subsequent.target | 2 +- dracut/30ignition/module-setup.sh | 2 +- go.mod | 2 +- - internal/apply/apply.go | 30 ++++++------ + internal/apply/apply.go | 30 +++++------ internal/distro/distro.go | 2 +- internal/doc/main.go | 14 +++--- internal/exec/config_fetcher.go | 18 +++---- - internal/exec/engine.go | 22 ++++----- - internal/exec/stages/disks/disks.go | 16 +++---- - internal/exec/stages/disks/filesystems.go | 8 ++-- + internal/exec/engine.go | 22 ++++---- + internal/exec/stages/disks/disks.go | 16 +++--- + internal/exec/stages/disks/filesystems.go | 8 +-- internal/exec/stages/disks/luks.go | 12 ++--- - internal/exec/stages/disks/partitions.go | 8 ++-- + internal/exec/stages/disks/partitions.go | 8 +-- internal/exec/stages/disks/raid.go | 6 +-- internal/exec/stages/fetch/fetch.go | 12 ++--- - .../stages/fetch_offline/fetch-offline.go | 16 +++---- + .../stages/fetch_offline/fetch-offline.go | 16 +++--- .../fetch_offline/fetch_offline_test.go | 4 +- internal/exec/stages/files/files.go | 14 +++--- internal/exec/stages/files/files_test.go | 4 +- @@ -295,54 +295,55 @@ Signed-off-by: Mathieu Tortuyaux internal/exec/stages/files/units.go | 12 ++--- internal/exec/stages/files/units_test.go | 4 +- internal/exec/stages/kargs/kargs.go | 14 +++--- - internal/exec/stages/mount/mount.go | 16 +++---- + internal/exec/stages/mount/mount.go | 16 +++--- internal/exec/stages/stages.go | 10 ++-- internal/exec/stages/umount/umount.go | 14 +++--- internal/exec/util/blkid.go | 2 +- internal/exec/util/file.go | 10 ++-- - internal/exec/util/passwd.go | 8 ++-- + internal/exec/util/passwd.go | 8 +-- internal/exec/util/selinux.go | 2 +- internal/exec/util/unit.go | 4 +- internal/exec/util/user_group_lookup_test.go | 2 +- internal/exec/util/util.go | 6 +-- internal/main.go | 18 +++---- internal/platform/platform.go | 10 ++-- - internal/providers/aliyun/aliyun.go | 8 ++-- + internal/providers/aliyun/aliyun.go | 8 +-- internal/providers/applehv/applehv.go | 10 ++-- internal/providers/aws/aws.go | 12 ++--- - internal/providers/azure/azure.go | 14 +++--- - internal/providers/azurestack/azurestack.go | 8 ++-- - internal/providers/cloudstack/cloudstack.go | 16 +++---- + internal/providers/azure/azure.go | 16 +++--- + internal/providers/azurestack/azurestack.go | 8 +-- + internal/providers/cloudstack/cloudstack.go | 16 +++--- internal/providers/cmdline/cmdline.go | 12 ++--- - .../providers/digitalocean/digitalocean.go | 8 ++-- - internal/providers/exoscale/exoscale.go | 8 ++-- - internal/providers/file/file.go | 8 ++-- - internal/providers/gcp/gcp.go | 8 ++-- - internal/providers/hetzner/hetzner.go | 8 ++-- + .../providers/digitalocean/digitalocean.go | 8 +-- + internal/providers/exoscale/exoscale.go | 8 +-- + internal/providers/file/file.go | 8 +-- + internal/providers/gcp/gcp.go | 8 +-- + internal/providers/hetzner/hetzner.go | 8 +-- internal/providers/hyperv/kvp.go | 12 ++--- internal/providers/ibmcloud/ibmcloud.go | 14 +++--- internal/providers/kubevirt/kubevirt.go | 14 +++--- - internal/providers/metal/metal.go | 8 ++-- + internal/providers/metal/metal.go | 8 +-- internal/providers/nutanix/nutanix.go | 14 +++--- - internal/providers/openstack/openstack.go | 16 +++---- - internal/providers/packet/packet.go | 8 ++-- + internal/providers/openstack/openstack.go | 16 +++--- + internal/providers/packet/packet.go | 8 +-- internal/providers/powervs/powervs.go | 14 +++--- internal/providers/qemu/qemu_blockdev.go | 12 ++--- internal/providers/qemu/qemu_fwcfg.go | 10 ++-- + internal/providers/scaleway/scaleway.go | 8 +-- internal/providers/system/system.go | 14 +++--- internal/providers/util/config.go | 6 +-- internal/providers/util/file.go | 4 +- internal/providers/virtualbox/virtualbox.go | 10 ++-- - internal/providers/vmware/vmware_amd64.go | 8 ++-- + internal/providers/vmware/vmware_amd64.go | 8 +-- .../providers/vmware/vmware_unsupported.go | 6 +-- - internal/providers/vultr/vultr.go | 8 ++-- + internal/providers/vultr/vultr.go | 8 +-- internal/providers/zvm/zvm.go | 14 +++--- - internal/register/providers.go | 48 +++++++++---------- + internal/register/providers.go | 50 +++++++++---------- internal/register/stages.go | 14 +++--- internal/resource/http.go | 12 ++--- internal/resource/url.go | 6 +-- internal/resource/url_test.go | 6 +-- - internal/sgdisk/sgdisk.go | 8 ++-- + internal/sgdisk/sgdisk.go | 8 +-- internal/state/state.go | 2 +- internal/util/tools/docs/docs.go | 2 +- internal/util/verification.go | 2 +- @@ -388,19 +389,19 @@ Signed-off-by: Mathieu Tortuyaux tests/positive/passwd/users.go | 4 +- tests/positive/proxy/http.go | 4 +- tests/positive/regression/filesystem.go | 4 +- - tests/positive/security/tls.go | 8 ++-- + tests/positive/security/tls.go | 8 +-- tests/positive/systemd/create_unit.go | 4 +- tests/positive/systemd/modify_service.go | 4 +- tests/positive/timeouts/timeouts.go | 4 +- tests/register/register.go | 14 +++--- - tests/registry/registry.go | 36 +++++++------- + tests/registry/registry.go | 36 ++++++------- tests/servers/servers.go | 2 +- tests/validator.go | 4 +- validate/main.go | 4 +- - 392 files changed, 1051 insertions(+), 1051 deletions(-) + 393 files changed, 1057 insertions(+), 1057 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/release-checklist.md b/.github/ISSUE_TEMPLATE/release-checklist.md -index 9803e88a..75224dbb 100644 +index 2f542cbb..7277a70f 100644 --- a/.github/ISSUE_TEMPLATE/release-checklist.md +++ b/.github/ISSUE_TEMPLATE/release-checklist.md @@ -6,9 +6,9 @@ Release checklist: @@ -4314,7 +4315,7 @@ index 18eea933..4f77f19c 100644 "github.com/coreos/vcontext/path" "github.com/coreos/vcontext/report" diff --git a/docs/_config.yml b/docs/_config.yml -index 9c8859ff..0817bf9e 100644 +index e685a39f..d08e93ff 100644 --- a/docs/_config.yml +++ b/docs/_config.yml @@ -23,7 +23,7 @@ color_scheme: coreos @@ -4336,7 +4337,7 @@ index 9c8859ff..0817bf9e 100644 gh_edit_source: docs gh_edit_view_mode: "tree" diff --git a/docs/development.md b/docs/development.md -index 265ec5b2..4ebc74b9 100644 +index e4d2b82a..43885679 100644 --- a/docs/development.md +++ b/docs/development.md @@ -24,7 +24,7 @@ See also the [Ignition rationale](rationale.md). @@ -4383,10 +4384,10 @@ index 265ec5b2..4ebc74b9 100644 -Create a new [stabilization checklist](https://github.com/coreos/ignition/issues/new?template=stabilize-checklist.md) and follow the steps there. +Create a new [stabilization checklist](https://github.com/flatcar/ignition/issues/new?template=stabilize-checklist.md) and follow the steps there. diff --git a/docs/distributor-notes.md b/docs/distributor-notes.md -index b85b8f66..80917107 100644 +index 23f917f4..44443d7b 100644 --- a/docs/distributor-notes.md +++ b/docs/distributor-notes.md -@@ -10,8 +10,8 @@ nav_order: 10 +@@ -14,8 +14,8 @@ The distribution specific integration is responsible for ensuring that the ignit ## Kernel Arguments @@ -4526,10 +4527,10 @@ index 95ae838f..4c734e43 100644 Before=initrd.target diff --git a/dracut/30ignition/module-setup.sh b/dracut/30ignition/module-setup.sh -index 15bb7276..816e4b66 100755 +index 51bec7e7..340452b9 100755 --- a/dracut/30ignition/module-setup.sh +++ b/dracut/30ignition/module-setup.sh -@@ -52,7 +52,7 @@ install() { +@@ -59,7 +59,7 @@ install() { tpm2_createpolicy # Required by s390x's z/VM installation. @@ -4539,14 +4540,14 @@ index 15bb7276..816e4b66 100755 # Required on system using SELinux diff --git a/go.mod b/go.mod -index 26182e42..5950d85a 100644 +index f749e0d5..c24348db 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/coreos/ignition/v2 +module github.com/flatcar/ignition/v2 - go 1.19 + go 1.20 diff --git a/internal/apply/apply.go b/internal/apply/apply.go index 33113c5c..e8675889 100644 @@ -4860,11 +4861,11 @@ index fb45e966..ea369f0c 100644 "github.com/stretchr/testify/assert" ) diff --git a/internal/exec/stages/files/files.go b/internal/exec/stages/files/files.go -index d5c04f29..22ca2955 100644 +index 5ab5242a..c7785c26 100644 --- a/internal/exec/stages/files/files.go +++ b/internal/exec/stages/files/files.go -@@ -19,13 +19,13 @@ import ( - "fmt" +@@ -20,13 +20,13 @@ import ( + "os" "path/filepath" - "github.com/coreos/ignition/v2/config/v3_5_experimental/types" @@ -5319,7 +5320,7 @@ index 5ac3dcb6..aefc1d0c 100644 // TODO: investigate alternative solutions (adding a Retryer to the // aws.Config, fetching the region from an HTTP URL, handle the diff --git a/internal/providers/azure/azure.go b/internal/providers/azure/azure.go -index d3115f2b..ad26064a 100644 +index caddcff5..398ea8eb 100644 --- a/internal/providers/azure/azure.go +++ b/internal/providers/azure/azure.go @@ -25,13 +25,13 @@ import ( @@ -5343,6 +5344,15 @@ index d3115f2b..ad26064a 100644 "github.com/coreos/vcontext/report" "golang.org/x/sys/unix" +@@ -115,7 +115,7 @@ func fetchFromIMDS(f *resource.Fetcher) ([]byte, error) { + // Azure IMDS expects some codes <500 to still be retried... + // Here, we match the cloud-init set. + // https://github.com/canonical/cloud-init/commit/c1a2047cf291 +- // https://github.com/coreos/ignition/issues/1806 ++ // https://github.com/flatcar/ignition/issues/1806 + retryCodes := []int{ + 404, // not found + 410, // gone diff --git a/internal/providers/azurestack/azurestack.go b/internal/providers/azurestack/azurestack.go index 26334dee..899f2199 100644 --- a/internal/providers/azurestack/azurestack.go @@ -5749,6 +5759,25 @@ index 9451981b..a150869f 100644 + "github.com/flatcar/ignition/v2/internal/distro" + "github.com/flatcar/ignition/v2/internal/platform" + "github.com/flatcar/ignition/v2/internal/providers/util" ++ "github.com/flatcar/ignition/v2/internal/resource" + + "github.com/coreos/vcontext/report" + ) +diff --git a/internal/providers/scaleway/scaleway.go b/internal/providers/scaleway/scaleway.go +index 230519fe..8fe61aa1 100644 +--- a/internal/providers/scaleway/scaleway.go ++++ b/internal/providers/scaleway/scaleway.go +@@ -22,10 +22,10 @@ import ( + "math/rand" + "net/url" + +- "github.com/coreos/ignition/v2/config/v3_5_experimental/types" +- "github.com/coreos/ignition/v2/internal/platform" +- "github.com/coreos/ignition/v2/internal/providers/util" +- "github.com/coreos/ignition/v2/internal/resource" ++ "github.com/flatcar/ignition/v2/config/v3_5_experimental/types" ++ "github.com/flatcar/ignition/v2/internal/platform" ++ "github.com/flatcar/ignition/v2/internal/providers/util" + "github.com/flatcar/ignition/v2/internal/resource" "github.com/coreos/vcontext/report" @@ -5912,10 +5941,10 @@ index 84f66ec3..d07f1ffc 100644 ) diff --git a/internal/register/providers.go b/internal/register/providers.go -index ddebb8bb..a3ffb8b0 100644 +index e7a06b38..372ee32d 100644 --- a/internal/register/providers.go +++ b/internal/register/providers.go -@@ -15,28 +15,28 @@ +@@ -15,29 +15,29 @@ package register import ( @@ -5939,6 +5968,7 @@ index ddebb8bb..a3ffb8b0 100644 - _ "github.com/coreos/ignition/v2/internal/providers/packet" - _ "github.com/coreos/ignition/v2/internal/providers/powervs" - _ "github.com/coreos/ignition/v2/internal/providers/qemu" +- _ "github.com/coreos/ignition/v2/internal/providers/scaleway" - _ "github.com/coreos/ignition/v2/internal/providers/virtualbox" - _ "github.com/coreos/ignition/v2/internal/providers/vmware" - _ "github.com/coreos/ignition/v2/internal/providers/vultr" @@ -5963,6 +5993,7 @@ index ddebb8bb..a3ffb8b0 100644 + _ "github.com/flatcar/ignition/v2/internal/providers/packet" + _ "github.com/flatcar/ignition/v2/internal/providers/powervs" + _ "github.com/flatcar/ignition/v2/internal/providers/qemu" ++ _ "github.com/flatcar/ignition/v2/internal/providers/scaleway" + _ "github.com/flatcar/ignition/v2/internal/providers/virtualbox" + _ "github.com/flatcar/ignition/v2/internal/providers/vmware" + _ "github.com/flatcar/ignition/v2/internal/providers/vultr" @@ -5992,7 +6023,7 @@ index 98c05214..b8043835 100644 + _ "github.com/flatcar/ignition/v2/internal/exec/stages/umount" ) diff --git a/internal/resource/http.go b/internal/resource/http.go -index 0d8edace..b4b7c59f 100644 +index 872ce253..5a751018 100644 --- a/internal/resource/http.go +++ b/internal/resource/http.go @@ -28,12 +28,12 @@ import ( @@ -6015,10 +6046,10 @@ index 0d8edace..b4b7c59f 100644 "github.com/vincent-petithory/dataurl" diff --git a/internal/resource/url.go b/internal/resource/url.go -index 58e0b9fc..44253568 100644 +index ad548a49..8ccf9399 100644 --- a/internal/resource/url.go +++ b/internal/resource/url.go -@@ -31,9 +31,9 @@ import ( +@@ -33,9 +33,9 @@ import ( "cloud.google.com/go/compute/metadata" "cloud.google.com/go/storage" diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch index ff9cf7c9cf..ae9d776b3e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0002-config-add-ignition-translation.patch @@ -1,4 +1,4 @@ -From efb34e37bd7e27ef8547e80718f386af0366b22e Mon Sep 17 00:00:00 2001 +From 716283d11f3ca67e5f1a17970fb7660fb05641ab Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 26 Sep 2022 12:12:04 +0200 Subject: [PATCH 02/21] config: add ignition translation diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch index 5893338374..c22cca8872 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0003-mod-add-flatcar-ignition-0.36.2.patch @@ -1,6 +1,6 @@ -From 9cb0ec3fd1cdaf0eb001e9cf6bdea4b8f21c9544 Mon Sep 17 00:00:00 2001 +From 37cff851d08cd24c8590ef4072436aa5184b9a36 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Mon, 19 Feb 2024 18:06:06 +0100 +Date: Mon, 4 Mar 2024 14:55:33 +0100 Subject: [PATCH 03/21] mod: add flatcar/ignition@0.36.2 it's required for Ignition conversion. @@ -11,7 +11,7 @@ Signed-off-by: Mathieu Tortuyaux 1 file changed, 4 insertions(+) diff --git a/go.mod b/go.mod -index 5950d85a..de759536 100644 +index c24348db..5f74f954 100644 --- a/go.mod +++ b/go.mod @@ -11,6 +11,7 @@ require ( @@ -20,25 +20,25 @@ index 5950d85a..de759536 100644 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/google/uuid v1.6.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 + cloud.google.com/go v0.112.0 // indirect + cloud.google.com/go/compute v1.23.4 // indirect + cloud.google.com/go/iam v1.1.6 // 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/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-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 + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/go-logr/logr v1.4.1 // indirect +@@ -52,6 +55,7 @@ require ( + go.opentelemetry.io/otel v1.23.0 // indirect + go.opentelemetry.io/otel/metric v1.23.0 // indirect + go.opentelemetry.io/otel/trace v1.23.0 // indirect ++ go4.org v0.0.0-20160314031811-03efcb870d84 // indirect + golang.org/x/crypto v0.19.0 // indirect + golang.org/x/sync v0.6.0 // indirect golang.org/x/text v0.14.0 // indirect -- 2.43.0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch index 1545dd7486..a153399288 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0004-sum-go-mod-tidy.patch @@ -1,155 +1,70 @@ -From fd1a7f92a4691d53dd00f7e4ae9e66225368181f Mon Sep 17 00:00:00 2001 +From c7206a8d87a56aac24d4cb7306fc63a239dbca19 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Mon, 19 Feb 2024 18:06:26 +0100 +Date: Mon, 4 Mar 2024 14:55:43 +0100 Subject: [PATCH 04/21] sum: go mod tidy Signed-off-by: Mathieu Tortuyaux --- - go.sum | 213 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 file changed, 211 insertions(+), 2 deletions(-) + go.sum | 28 +++++++++++++++++++++++++++- + 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/go.sum b/go.sum -index 504bf0da..5824228b 100644 +index dac484dc..4afcd5be 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= +@@ -10,6 +10,9 @@ cloud.google.com/go/iam v1.1.6/go.mod h1:O0zxdPeGBoFdWW3HWmBxJsk0pfvNM/p/qa82rWO + cloud.google.com/go/storage v1.38.0 h1:Az68ZRGlnNTpIBbLjSMIV2BDcwwXYlRlQzis0llkpJg= + cloud.google.com/go/storage v1.38.0/go.mod h1:tlUADB0mAb9BgYls9lq+8MGkfzOXuLrnHXlpHmvFJoY= 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/aws/aws-sdk-go v1.50.25 h1:vhiHtLYybv1Nhx3Kv18BBC6L0aPJHaG9aeEsr92W99c= + github.com/aws/aws-sdk-go v1.50.25/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= + github.com/beevik/etree v1.3.0 h1:hQTc+pylzIKDb23yYprodCWWTt+ojFfUZyzU09a/hmU= +@@ -22,8 +25,11 @@ github.com/containers/libhvee v0.6.0 h1:tUzwSz8R0GjR6IctgDnkTMjdtCk5Mxhpai4Vyv6U + github.com/containers/libhvee v0.6.0/go.mod h1:f/q1wCdQqOLiK3IZqqBfOD7exMZYBU5pDYsrMa/pSFg= 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 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= +@@ -38,11 +44,15 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7 + github.com/envoyproxy/protoc-gen-validate v1.0.2 h1:QkIBuU5k+x7/QXPvPPnWXWlCdaBFApVqftFV6k087DA= + github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg= + github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= +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/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= + github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= + github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= + github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= + github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +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= +@@ -83,10 +93,13 @@ github.com/googleapis/enterprise-certificate-proxy v0.3.2 h1:Vie5ybvEvT75RniqhfF 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/googleapis/gax-go/v2 v2.12.1 h1:9F8GV9r9ztXyAi00gsMQHNoF51xPZm8uj1dpYt2ZETM= + github.com/googleapis/gax-go/v2 v2.12.1/go.mod h1:61M8vcyyXR2kqKFxKrfA22jaA8JGF7Dc8App1U3H6jc= +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 +@@ -95,16 +108,22 @@ 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= @@ -159,8 +74,6 @@ index 504bf0da..5824228b 100644 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= @@ -170,12 +83,11 @@ index 504bf0da..5824228b 100644 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 +@@ -112,8 +131,10 @@ 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= @@ -183,225 +95,45 @@ index 504bf0da..5824228b 100644 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= + 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= +@@ -128,6 +149,8 @@ go.opentelemetry.io/otel/metric v1.23.0/go.mod h1:MqUW2X2a6Q8RN96E2/nqNoT+z9BSms + go.opentelemetry.io/otel/sdk v1.21.0 h1:FTt8qirL1EysG6sTQRZ5TokkU8d0ugCj8htOgThZXQ8= + go.opentelemetry.io/otel/trace v1.23.0 h1:37Ik5Ib7xfYVb4V1UtnT97T1jI+AoIYkJyPkuL4iJgI= + go.opentelemetry.io/otel/trace v1.23.0/go.mod h1:GSGTbIClEsuZrGIzoEHqsVfxgn5UkggkflQwDScNUsk= ++go4.org v0.0.0-20160314031811-03efcb870d84 h1:WZkGC1qzoax/QSt84wmvIxk+ZOmGIChsTzdrv9t4nvk= +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/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +@@ -142,6 +165,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-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-20190620200207-3b0461eec859/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= +@@ -182,6 +206,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-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= + 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= +@@ -225,8 +250,9 @@ google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7 + google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= + 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 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch index 4ab400dd37..1430194181 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0005-vendor-go-mod-vendor.patch @@ -1,6 +1,6 @@ -From 0274c54de01a38d93d1cfdf2a12572d7ecd76500 Mon Sep 17 00:00:00 2001 +From 59381307c3483608d300401208ad6f88d68c1cc6 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Mon, 19 Feb 2024 18:06:45 +0100 +Date: Mon, 4 Mar 2024 14:56:54 +0100 Subject: [PATCH 05/21] vendor: go mod vendor Signed-off-by: Mathieu Tortuyaux @@ -17029,7 +17029,7 @@ index 00000000..1b1efb0f + return +} diff --git a/vendor/modules.txt b/vendor/modules.txt -index d1b9b406..879c8c1c 100644 +index 8ce5cb4d..a4d3a6dd 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -20,6 +20,9 @@ cloud.google.com/go/storage @@ -17039,23 +17039,23 @@ index d1b9b406..879c8c1c 100644 +# github.com/ajeddeloh/go-json v0.0.0-20160803184958-73d058cf8437 +## explicit +github.com/ajeddeloh/go-json - # github.com/aws/aws-sdk-go v1.47.9 + # github.com/aws/aws-sdk-go v1.50.25 ## explicit; go 1.19 github.com/aws/aws-sdk-go/aws @@ -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-20191104093116-d3cd4ed1dbcf ++# github.com/coreos/go-systemd v0.0.0-20181031085051-9002847aa142 +## 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 -@@ -102,6 +108,27 @@ github.com/coreos/vcontext/validate - # github.com/davecgh/go-spew v1.1.1 - ## explicit - github.com/davecgh/go-spew/spew +@@ -105,6 +111,27 @@ github.com/davecgh/go-spew/spew + # github.com/felixge/httpsnoop v1.0.4 + ## explicit; go 1.13 + github.com/felixge/httpsnoop +# github.com/flatcar/ignition v0.36.2 +## explicit; go 1.16 +github.com/flatcar/ignition/config/shared/errors @@ -17077,17 +17077,17 @@ index d1b9b406..879c8c1c 100644 +github.com/flatcar/ignition/config/validate/astjson +github.com/flatcar/ignition/config/validate/astnode +github.com/flatcar/ignition/config/validate/report - # github.com/godbus/dbus/v5 v5.0.4 - ## explicit; go 1.12 - github.com/godbus/dbus/v5 -@@ -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-20230225012048-214862532bf5 -+## explicit; go 1.13 + # github.com/go-logr/logr v1.4.1 + ## explicit; go 1.18 + github.com/go-logr/logr +@@ -253,6 +280,9 @@ go.opentelemetry.io/otel/metric/noop + ## explicit; go 1.20 + go.opentelemetry.io/otel/trace + go.opentelemetry.io/otel/trace/embedded ++# go4.org v0.0.0-20160314031811-03efcb870d84 ++## explicit +go4.org/errorutil - # golang.org/x/crypto v0.15.0 + # golang.org/x/crypto v0.19.0 ## explicit; go 1.18 golang.org/x/crypto/chacha20 -- diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch index 75659570c4..9c246b91ca 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0006-config-v3_5-convert-ignition-2.x-to-3.x.patch +++ b/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 d7119d2744c0f3c0071d5590c563f4a2b0de3162 Mon Sep 17 00:00:00 2001 +From 4aebd9b560eb32fb6961846112985efc2ebfa867 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 25 May 2022 10:20:09 +0200 Subject: [PATCH 06/21] config/v3_5: convert ignition 2.x to 3.x diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch index 90828d3a62..4150f24f6a 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0007-internal-prv-cmdline-backport-flatcar-patch.patch @@ -1,4 +1,4 @@ -From cb1476e74d19664ed3a175d240610ebe5daed471 Mon Sep 17 00:00:00 2001 +From 9d97af5dd7cb5f6f301e970cdc24126d8a764c19 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Mon, 19 Feb 2024 18:12:22 +0100 Subject: [PATCH 07/21] internal/prv/cmdline: backport flatcar patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch index 8e65f20daf..5c31cb87e3 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0008-provider-qemu-apply-fw_cfg-patch.patch @@ -1,4 +1,4 @@ -From 6233a0364d3a7aaa67b66d8d776708b61e7a4457 Mon Sep 17 00:00:00 2001 +From 77f3bc5ddd558f75c3239ebf35ee6f430bcda016 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 20 Feb 2024 10:02:28 +0100 Subject: [PATCH 08/21] provider/qemu: apply fw_cfg patch diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_5-test-add-ignition-2.x-test-cases.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_5-test-add-ignition-2.x-test-cases.patch index ed56cafa30..e5d3570e5b 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0009-config-3_5-test-add-ignition-2.x-test-cases.patch +++ b/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 4e6b04bb5ac529732e5814533ab1c0ef0b6c39e7 Mon Sep 17 00:00:00 2001 +From a5c1c025a4eaa12b22eb3093afe0a90350d3e097 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 2 Sep 2021 11:03:17 +0200 Subject: [PATCH 09/21] config/3_5/test: add ignition 2.x test cases diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch index 1454516337..871dcac664 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0010-internal-disk-fs-ignore-fs-format-mismatches-for-the.patch +++ b/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 d83920b6c3b3bb186460a6e6fced1f4ed74cae2e Mon Sep 17 00:00:00 2001 +From c50b4a4645da737d570ed4f4c971004e9529f76e Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 22 Sep 2021 14:53:49 +0200 Subject: [PATCH 10/21] internal/disk/fs: ignore fs format mismatches for the diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch index 9c8b02952e..54814e9e93 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0011-VMware-Fix-guestinfo.-.config.data-and-.config.url-v.patch @@ -1,4 +1,4 @@ -From f354144ff3e000e21a1050a03bba3b58f9ade4cb Mon Sep 17 00:00:00 2001 +From 7a1c08f0e2098687ce5756808872cf212408fdd3 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 20 Feb 2024 10:12:02 +0100 Subject: [PATCH 11/21] VMware: Fix guestinfo.*.config.data and *.config.url diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch index 39e6df1298..d4db79c155 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0012-config-version-handle-configuration-version-1.patch @@ -1,4 +1,4 @@ -From daccef5ca62c3b8b46680b2083cf1e78b626314d Mon Sep 17 00:00:00 2001 +From 2f9915956c2432fcea70be92f046bbdb47b4d16b Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 2 Feb 2022 13:27:18 +0100 Subject: [PATCH 12/21] config/version: handle configuration version 1 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch index ed7585e2b3..22e0c59edc 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0013-config-util-add-cloud-init-detection-to-initial-pars.patch +++ b/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 fca7fd66e1ea504ab884e1c3b88d2956355df4e6 Mon Sep 17 00:00:00 2001 +From 13b9dd461277caf30651ef3cf01e996116e8dc62 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 22 Feb 2022 15:41:13 +0100 Subject: [PATCH 13/21] config/util: add cloud init detection to initial diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch index 141894b122..5cef25a612 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0014-Revert-drop-OEM-URI-support.patch @@ -1,4 +1,4 @@ -From fb939eeea1cbcf1ec47b1eb83f0f0d1d725f3950 Mon Sep 17 00:00:00 2001 +From cda121656f3e45efe9b034718b7f0928c5fcdfe8 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Wed, 25 May 2022 10:38:16 +0200 Subject: [PATCH 14/21] Revert "*: drop OEM URI support" @@ -12,8 +12,8 @@ This reverts commit 0c088d6de77aa1b1f47b9252a07f51cb1e249df3. config/v3_4/types/url.go | 2 +- docs/supported-platforms.md | 1 + internal/distro/distro.go | 11 ++++- - internal/resource/url.go | 92 +++++++++++++++++++++++++++++++++++++ - 8 files changed, 107 insertions(+), 7 deletions(-) + internal/resource/url.go | 91 +++++++++++++++++++++++++++++++++++++ + 8 files changed, 106 insertions(+), 7 deletions(-) diff --git a/config/v3_0/types/url.go b/config/v3_0/types/url.go index 2d8c44b1..f560bc22 100644 @@ -81,7 +81,7 @@ 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 1c9d63bb..39a098dc 100644 +index f0318339..88da2a8e 100644 --- a/docs/supported-platforms.md +++ b/docs/supported-platforms.md @@ -11,6 +11,7 @@ Ignition is currently only supported for the following platforms: @@ -132,22 +132,23 @@ index 703385ea..644c42c4 100644 func GroupaddCmd() string { return groupaddCmd } func GroupdelCmd() string { return groupdelCmd } diff --git a/internal/resource/url.go b/internal/resource/url.go -index 44253568..3f5fb4ab 100644 +index 8ccf9399..7b13c242 100644 --- a/internal/resource/url.go +++ b/internal/resource/url.go -@@ -23,16 +23,21 @@ import ( +@@ -23,10 +23,12 @@ import ( "fmt" "hash" "io" + "io/ioutil" + "net" "net/http" "net/url" "os" + "path/filepath" "strings" -+ "syscall" + "syscall" "time" - +@@ -34,7 +36,9 @@ import ( "cloud.google.com/go/compute/metadata" "cloud.google.com/go/storage" configErrors "github.com/flatcar/ignition/v2/config/shared/errors" @@ -157,7 +158,7 @@ index 44253568..3f5fb4ab 100644 "github.com/flatcar/ignition/v2/internal/util" "golang.org/x/oauth2/google" "google.golang.org/api/option" -@@ -144,6 +149,8 @@ func (f *Fetcher) FetchToBuffer(u url.URL, opts FetchOptions) ([]byte, error) { +@@ -154,6 +158,8 @@ func (f *Fetcher) FetchToBuffer(u url.URL, opts FetchOptions) ([]byte, error) { err = f.fetchFromTFTP(u, dest, opts) case "data": err = f.fetchFromDataURL(u, dest, opts) @@ -166,7 +167,7 @@ index 44253568..3f5fb4ab 100644 case "s3", "arn": buf := &s3buf{ WriteAtBuffer: aws.NewWriteAtBuffer([]byte{}), -@@ -205,6 +212,8 @@ func (f *Fetcher) Fetch(u url.URL, dest *os.File, opts FetchOptions) error { +@@ -215,6 +221,8 @@ func (f *Fetcher) Fetch(u url.URL, dest *os.File, opts FetchOptions) error { return f.fetchFromTFTP(u, dest, opts) case "data": return f.fetchFromDataURL(u, dest, opts) @@ -175,7 +176,7 @@ index 44253568..3f5fb4ab 100644 case "s3", "arn": return f.fetchFromS3(u, dest, opts) case "gs": -@@ -391,6 +400,53 @@ type s3target interface { +@@ -423,6 +431,53 @@ type s3target interface { io.ReadSeeker } @@ -229,7 +230,7 @@ index 44253568..3f5fb4ab 100644 // FetchFromS3 gets data from an S3 bucket as described by u and writes it into // dest, returning an error if one is encountered. It will attempt to acquire // IAM credentials from the EC2 metadata service, and if this fails will attempt -@@ -618,3 +674,39 @@ func (f *Fetcher) parseARN(arnURL string) (string, string, string, string, error +@@ -650,3 +705,39 @@ func (f *Fetcher) parseARN(arnURL string) (string, string, string, string, error key := strings.Join(urlSplit[1:], "/") return bucket, key, "", regionHint, nil } diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch index 30fcee79f6..7d6169446e 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0015-internal-resource-url-support-btrfs-as-OEM-partition.patch +++ b/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 d2c70466cfcfa9c0f4f8ef1bd247e6c36874f1b2 Mon Sep 17 00:00:00 2001 +From 1b90dc1f23b4b1f17fa6caf0722f63e750eab888 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Wed, 7 Jul 2021 18:40:52 +0200 Subject: [PATCH 15/21] internal/resource/url: support btrfs as OEM partition @@ -12,10 +12,10 @@ When mounting ext4 fails, try mounting as btrfs. 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/internal/resource/url.go b/internal/resource/url.go -index 3f5fb4ab..3fbda7a7 100644 +index 7b13c242..6b9f20c6 100644 --- a/internal/resource/url.go +++ b/internal/resource/url.go -@@ -695,8 +695,17 @@ func (f *Fetcher) mountOEM(oemMountPath string) error { +@@ -726,8 +726,17 @@ func (f *Fetcher) mountOEM(oemMountPath string) error { }, "mounting %q at %q", distro.OEMDevicePath(), oemMountPath, ); err != nil { diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch index cba20643c7..c4e6431db1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0016-translation-support-OEM-and-oem.patch @@ -1,4 +1,4 @@ -From ae61d536613332251f033e613ff6775e937378a8 Mon Sep 17 00:00:00 2001 +From 9ef66f2c472d90b1040a07722c135937a42cc092 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 10 Nov 2022 11:58:49 +0100 Subject: [PATCH 16/21] translation: support OEM and oem diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch index 0524134692..a144b59edc 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0017-revert-internal-oem-drop-noop-OEMs.patch @@ -1,4 +1,4 @@ -From ae8a57a3b86eb03152cee167bbbcb245075b8590 Mon Sep 17 00:00:00 2001 +From 8c5952d20e569133ac34e7e6a37367e8276d24b6 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Tue, 20 Feb 2024 10:25:24 +0100 Subject: [PATCH 17/21] revert: internal/oem: drop noop OEMs diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch index 09bf3a3849..d20d6e35d1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0018-docs-Add-re-added-platforms-to-docs-to-pass-tests.patch @@ -1,16 +1,16 @@ -From 56f6c13df51715305100f306f31a65018e3bbea4 Mon Sep 17 00:00:00 2001 +From 01ed9c42af46ec218b4c7c8c4f28083e20bd8cd0 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux -Date: Tue, 20 Feb 2024 10:27:21 +0100 +Date: Mon, 4 Mar 2024 15:05:14 +0100 Subject: [PATCH 18/21] docs: Add re-added platforms to docs to pass tests Signed-off-by: Mathieu Tortuyaux -Co-Authored-By: Krzesimir Nowak +Co-Authored-By: Krzesimir Nowak Date: Tue, 4 Apr 2023 12:12:42 +0200 Subject: [PATCH 19/21] /usr/share/oem -> /oem diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch index f0170e76f5..026bad6336 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0020-internal-exec-stages-mount-Mount-oem.patch @@ -1,4 +1,4 @@ -From 6589dccde4a36ea42e38e410ca710e0034d6454a Mon Sep 17 00:00:00 2001 +From 2fb53dec351d8560cf8ebf6f9ab0edc897f99a22 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 16 May 2023 17:43:43 +0200 Subject: [PATCH 20/21] internal/exec/stages/mount: Mount /oem diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-sgdisk-Run-partprobe-after-partition-changes.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-sgdisk-Run-partprobe-after-partition-changes.patch index fdbb58a25b..b814436142 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-sgdisk-Run-partprobe-after-partition-changes.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/files/0021-sgdisk-Run-partprobe-after-partition-changes.patch @@ -1,4 +1,4 @@ -From 7c3cfae0c00508c845c8408d5a8ec00bc32316a8 Mon Sep 17 00:00:00 2001 +From 850da330f5a01fae0e1dc2d44b0a2fcdcbac037a Mon Sep 17 00:00:00 2001 From: Kai Lueke Date: Fri, 29 Sep 2023 18:06:09 +0200 Subject: [PATCH 21/21] sgdisk: Run partprobe after partition changes @@ -15,10 +15,10 @@ 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 816e4b66..e59f8cdf 100755 +index 340452b9..e1390f6d 100755 --- a/dracut/30ignition/module-setup.sh +++ b/dracut/30ignition/module-setup.sh -@@ -33,6 +33,7 @@ install() { +@@ -40,6 +40,7 @@ install() { mkfs.xfs \ mkswap \ sgdisk \ diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.17.0.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.18.0.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.17.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-2.18.0.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild index 7ae965542e..491e48d419 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/ignition/ignition-9999.ebuild +++ b/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="45e9d394a3e4f240e9d6745af0a83fa36179f510" # v2.17.0 + CROS_WORKON_COMMIT="0abc4078a1bb40077c3e094fc3d70a8dbcb7ec02" # v2.18.0 KEYWORDS="amd64 arm64" fi