diff --git a/docs/release-notes.md b/docs/release-notes.md index bc90352f48..1723099fcc 100644 --- a/docs/release-notes.md +++ b/docs/release-notes.md @@ -10,7 +10,7 @@ nav_order: 9 ### Features - +- Support HyperV platform ### Changes diff --git a/docs/supported-platforms.md b/docs/supported-platforms.md index 9ecb590a73..b8ca92048b 100644 --- a/docs/supported-platforms.md +++ b/docs/supported-platforms.md @@ -15,6 +15,9 @@ Ignition is currently only supported for the following platforms: * [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. +* [Microsoft HyperV] (`hyperv`) - Ignition will read its configuration from a key named `ignition.config.0` in pool 0 of the Hyper-V Data Exchange Service (KVP). KVP +values are limited to 1 KiB in size, but larger configs can be split into multiple values where the key name is incremented (eg. `ignition.config.0`, `ignition.config.1`, `ignition.config.2`) +on the Windows host. Ignition will reassemble the config from the split values. * [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. @@ -41,6 +44,7 @@ For most cloud providers, cloud SSH keys and custom network configuration are ha [DigitalOcean]: https://www.digitalocean.com/products/droplets/ [Exoscale]: https://www.exoscale.com/compute/ [Google Cloud]: https://cloud.google.com/compute +[Microsoft HyperV]: https://learn.microsoft.com/en-us/virtualization/hyper-v-on-windows/ [IBM Cloud]: https://www.ibm.com/cloud/vpc [KubeVirt]: https://kubevirt.io [Nutanix]: https://www.nutanix.com/products/ahv diff --git a/dracut/30ignition/module-setup.sh b/dracut/30ignition/module-setup.sh index d7a5cfcded..df14a08e2c 100755 --- a/dracut/30ignition/module-setup.sh +++ b/dracut/30ignition/module-setup.sh @@ -96,3 +96,8 @@ install() { # needed for openstack config drive support inst_rules 60-cdrom_id.rules } + +installkernel() { + # required by hyperv platform to read kvp from the kernel + instmods -c hv_utils +} diff --git a/go.mod b/go.mod index 35aa4208fe..9a5ac21283 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( cloud.google.com/go/storage v1.30.1 github.com/aws/aws-sdk-go v1.44.239 github.com/beevik/etree v1.1.1-0.20200718192613-4a2f8b9d084c + github.com/containers/libhvee v0.0.3 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 diff --git a/go.sum b/go.sum index 5a10601f57..c97f4880ad 100644 --- a/go.sum +++ b/go.sum @@ -18,6 +18,8 @@ github.com/beevik/etree v1.1.1-0.20200718192613-4a2f8b9d084c/go.mod h1:0yGO2rna3 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= 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.0.3 h1:gD68S5jjBGJ4+KNkgHkp7phYofnOWUELrcjtpshAxs0= +github.com/containers/libhvee v0.0.3/go.mod h1:AYsyMe44w9ylWWEZNW+IOzA7oZ2i/P9TChNljavhYMI= 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.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4= diff --git a/internal/providers/hyperv/kvp.go b/internal/providers/hyperv/kvp.go new file mode 100644 index 0000000000..58afdf3590 --- /dev/null +++ b/internal/providers/hyperv/kvp.go @@ -0,0 +1,61 @@ +// Copyright 2023 Red Hat +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package hyperv + +import ( + "os/exec" + + "github.com/containers/libhvee/pkg/kvp" + "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/coreos/vcontext/report" +) + +// key represents the prefix key name for finding kvp file parts +// in the key value pairs. it normally will have an integer added to the +// end when looking up keys sequentially +const key = "ignition.config." + +func init() { + platform.Register(platform.Provider{ + Name: "hyperv", + Fetch: fetchConfig, + }) +} + +func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { + f.Logger.Info("attempting to read from kvp") + + // To read key-value pairs from the Windows host, the hv_util kernel module + // must be loaded to create the kernel device itself. + _, err := f.Logger.LogCmd(exec.Command("modprobe", "hv_utils"), "loading hyperv kernel device module") + if err != nil { + return types.Config{}, report.Report{}, err + } + + keyValuePairs, err := kvp.GetKeyValuePairs() + if err != nil { + return types.Config{}, report.Report{}, err + } + + ign, _, err := keyValuePairs.GetSplitKeyValues(key, kvp.DefaultKVPPoolID) + if err != nil { + return types.Config{}, report.Report{}, err + } + + return util.ParseConfig(f.Logger, []byte(ign)) +} diff --git a/internal/register/providers.go b/internal/register/providers.go index 38085fdeaf..bfbd07c392 100644 --- a/internal/register/providers.go +++ b/internal/register/providers.go @@ -24,6 +24,7 @@ import ( _ "github.com/coreos/ignition/v2/internal/providers/exoscale" _ "github.com/coreos/ignition/v2/internal/providers/file" _ "github.com/coreos/ignition/v2/internal/providers/gcp" + _ "github.com/coreos/ignition/v2/internal/providers/hyperv" _ "github.com/coreos/ignition/v2/internal/providers/ibmcloud" _ "github.com/coreos/ignition/v2/internal/providers/kubevirt" _ "github.com/coreos/ignition/v2/internal/providers/metal" diff --git a/vendor/github.com/containers/libhvee/LICENSE b/vendor/github.com/containers/libhvee/LICENSE new file mode 100644 index 0000000000..261eeb9e9f --- /dev/null +++ b/vendor/github.com/containers/libhvee/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/vendor/github.com/containers/libhvee/pkg/kvp/config.go b/vendor/github.com/containers/libhvee/pkg/kvp/config.go new file mode 100644 index 0000000000..2383473549 --- /dev/null +++ b/vendor/github.com/containers/libhvee/pkg/kvp/config.go @@ -0,0 +1,148 @@ +package kvp + +import ( + "errors" + "fmt" + "os" + "path/filepath" +) + +var ( + // ErrUnableToWriteToKVP is used when we are unable to write to the kernel + // device for hyperv + ErrUnableToWriteToKVP = errors.New("failed to write to hv_kvp") + // ErrUnableToReadFromKVP is used when we are unable to read from the kernel + // device for hyperv + ErrUnableToReadFromKVP = errors.New("failed to read from hv_kvp") + // ErrNoKeyValuePairsFound means we were unable to find key-value pairs as passed + // from the hyperv host to this guest. + ErrNoKeyValuePairsFound = errors.New("unable to find kvp keys") + // ErrKeyNotFound means we could not find the key in information read + ErrKeyNotFound = errors.New("unable to find key") +) + +const ( + // Timeout amount of time in ms to poll the hyperv kernel device + Timeout = 1000 + OpRegister1 = 100 + HvSOk = 0 + HvKvpExchangeMaxValueSize = 2048 + HvKvpExchangeMaxKeySize = 512 + OpSet = 1 + // KernelDevice s the hyperv kernel device used for communicating key-values pairs + // on hyperv between the host and guest + KernelDevice = "/dev/vmbus/hv_kvp" + // DefaultKVPPoolID is where Windows host write to for Linux VMs + DefaultKVPPoolID = 0 + DefaultKVPBaseName = ".kvp_pool_" + DefaultKVPFilePath = "/var/lib/hyperv" + defaultKVPFileWritePermissions = 644 +) + +type hvKvpExchgMsgValue struct { + valueType uint32 + keySize uint32 + valueSize uint32 + key [HvKvpExchangeMaxKeySize]uint8 + value [HvKvpExchangeMaxValueSize]uint8 +} + +type hvKvpMsgSet struct { + data hvKvpExchgMsgValue +} + +type hvKvpHdr struct { + operation uint8 + pool uint8 + pad uint16 +} + +type hvKvpMsg struct { + kvpHdr hvKvpHdr + kvpSet hvKvpMsgSet + // unused is needed to get to the same struct size as the C version. + unused [4856]byte +} + +type hvKvpMsgRet struct { + error int + kvpSet hvKvpMsgSet + // unused is needed to get to the same struct size as the C version. + unused [4856]byte +} + +type PoolID uint8 + +type ValuePair struct { + Key string + Value string +} + +type ValuePairs []ValuePair + +func (vp ValuePairs) getValueByKey(key string) (ValuePair, error) { + for _, vp := range vp { + if key == vp.Key { + return vp, nil + } + } + return ValuePair{}, ErrKeyNotFound +} + +type KeyValuePair map[PoolID]ValuePairs + +func (kv KeyValuePair) encodePoolFile(poolID PoolID) (poolFile []byte) { + poolEntries, exists := kv[poolID] + if !exists { + return + } + for _, entry := range poolEntries { + // These have to be padded with nulls + emptyKey := make([]byte, HvKvpExchangeMaxKeySize) + emptyVal := make([]byte, HvKvpExchangeMaxValueSize) + _ = copy(emptyKey, entry.Key) + _ = copy(emptyVal, entry.Value) + poolFile = append(poolFile, emptyKey...) + poolFile = append(poolFile, emptyVal...) + } + return +} + +func (kv KeyValuePair) append(poolID PoolID, key, value string) { + vps, exists := kv[poolID] + vp := ValuePair{ + Key: key, + Value: value, + } + if !exists { + kv[poolID] = ValuePairs{vp} + return + } + kv[poolID] = append(vps, vp) +} + +func (kv KeyValuePair) WriteToFS(path string) error { + if err := os.MkdirAll(path, 777); err != nil { + return err + } + for poolID := range kv { + fqWritePath := filepath.Join(path, fmt.Sprintf("%s%d", DefaultKVPBaseName, poolID)) + if _, err := os.Stat(fqWritePath); err != nil { + if os.IsExist(err) { + return errors.New("%s already exists and will not be overwritten") + } + return err + } + if len(kv[poolID]) < 1 { + // need to set permissions so ... + if err := os.WriteFile(fqWritePath, []byte{}, defaultKVPFileWritePermissions); err != nil { + return err + } + continue + } + if err := os.WriteFile(fqWritePath, kv.encodePoolFile(poolID), defaultKVPFileWritePermissions); err != nil { + return err + } + } + return nil +} diff --git a/vendor/github.com/containers/libhvee/pkg/kvp/kvp.go b/vendor/github.com/containers/libhvee/pkg/kvp/kvp.go new file mode 100644 index 0000000000..a096bd3ee3 --- /dev/null +++ b/vendor/github.com/containers/libhvee/pkg/kvp/kvp.go @@ -0,0 +1,146 @@ +//go:build linux + +package kvp + +import ( + "errors" + "fmt" + "strings" + "unsafe" + + "golang.org/x/sys/unix" +) + +// readKvpData reads all key-value pairs from the hyperv kernel device and creates +// a map representation of them +func readKvpData() (KeyValuePair, error) { + ret := make(KeyValuePair) + for i := 0; i < 5; i++ { + // We need to seed the poolids + ret[PoolID(i)] = ValuePairs{} + } + kvp, err := unix.Open(KernelDevice, unix.O_RDWR|unix.O_CLOEXEC|unix.O_NONBLOCK, 0) + if err != nil { + return nil, err + } + defer unix.Close(kvp) + + var ( + hvMsg hvKvpMsg + hvMsgRet hvKvpMsgRet + ) + + const sizeOf = int(unsafe.Sizeof(hvMsg)) + + var ( + asByteSlice = (*(*[sizeOf]byte)(unsafe.Pointer(&hvMsg)))[:] + retAsByteSlice = (*(*[sizeOf]byte)(unsafe.Pointer(&hvMsgRet)))[:] + ) + + hvMsg.kvpHdr.operation = OpRegister1 + + l, err := unix.Write(kvp, asByteSlice) + if err != nil { + return nil, err + } + if l != sizeOf { + return nil, ErrUnableToWriteToKVP + } + +next: + for { + var pfd unix.PollFd + pfd.Fd = int32(kvp) + pfd.Events = unix.POLLIN + pfd.Revents = 0 + + howMany, err := unix.Poll([]unix.PollFd{pfd}, Timeout) + if err != nil { + if err == unix.EINVAL { + return nil, err + } else { + continue + } + } + + if howMany == 0 { + return ret, nil + } + + l, err := unix.Read(kvp, asByteSlice) + if err != nil { + if err == unix.EAGAIN || err == unix.EWOULDBLOCK { + continue + } + return nil, err + } + if l != sizeOf { + return nil, ErrUnableToReadFromKVP + } + + switch hvMsg.kvpHdr.operation { + case OpRegister1: + continue next + case OpSet: + // on the next two variables, we are cutting the last byte because otherwise + // it is padded and key lookups fail + key := hvMsg.kvpSet.data.key[:hvMsg.kvpSet.data.keySize-1] + value := hvMsg.kvpSet.data.value[:hvMsg.kvpSet.data.valueSize-1] + + poolID := PoolID(hvMsg.kvpHdr.pool) + ret.append(poolID, string(key), string(value)) + } + + hvMsgRet.error = HvSOk + + l, err = unix.Write(kvp, retAsByteSlice) + if err != nil { + return nil, err + } + if l != sizeOf { + return nil, ErrUnableToWriteToKVP + } + } +} + +// GetKeyValuePairs reads the key value pairs from the wmi hyperv kernel device +// and returns them in map form. the map value is a ValuePair which contains +// the value string and the poolid +func GetKeyValuePairs() (KeyValuePair, error) { + return readKvpData() +} + +// GetSplitKeyValues "filters" KVPs looking for split values using a key and pool_id. Returns the assembled +// split values as a key as well as a new KVP that no longer has the split keys in question +func (kv KeyValuePair) GetSplitKeyValues(key string, pool PoolID) (string, KeyValuePair, error) { + var ( + parts []string + counter = 0 + ) + + leftOvers := make(KeyValuePair) + + for { + wantKey := fmt.Sprintf("%s%d", key, counter) + entries, exists := kv[pool] + if !exists { + // No entries for the pool + break + } + entry, err := entries.getValueByKey(wantKey) + leftOvers[pool] = append(leftOvers[pool], entry) + if err != nil { + if errors.Is(err, ErrKeyNotFound) { + break + } + + return "", nil, err + } + parts = append(parts, entry.Value) + counter++ + } + if len(parts) < 1 { + return "", nil, ErrNoKeyValuePairsFound + } + return strings.Join(parts, ""), leftOvers, nil +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 0ff299a594..efbc820b47 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -76,6 +76,9 @@ github.com/aws/aws-sdk-go/service/sts/stsiface # github.com/beevik/etree v1.1.1-0.20200718192613-4a2f8b9d084c ## explicit; go 1.12 github.com/beevik/etree +# github.com/containers/libhvee v0.0.3 +## explicit; go 1.18 +github.com/containers/libhvee/pkg/kvp # github.com/coreos/go-json v0.0.0-20230131223807-18775e0fb4fb ## explicit; go 1.18 github.com/coreos/go-json