From 38ce3c412602f182b928bfa4433a86bd3738d988 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 15 Nov 2023 09:38:27 -0800 Subject: [PATCH] deps: update osbuild/images to v0.3.0-r9.3.4 Update images dependency to pull in fix for loop variable aliases. --- go.mod | 2 +- go.sum | 4 ++-- .../osbuild/images/pkg/blueprint/customizations.go | 7 ++++--- vendor/github.com/osbuild/images/pkg/rpmmd/repository.go | 3 ++- vendor/modules.txt | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 050fdbd3c1..56eadb64bc 100644 --- a/go.mod +++ b/go.mod @@ -31,7 +31,7 @@ require ( github.com/labstack/gommon v0.4.0 github.com/openshift-online/ocm-sdk-go v0.1.362 github.com/oracle/oci-go-sdk/v54 v54.0.0 - github.com/osbuild/images v0.3.0-r9.3.3 + github.com/osbuild/images v0.3.0-r9.3.4 github.com/prometheus/client_golang v1.16.0 github.com/segmentio/ksuid v1.0.4 github.com/sirupsen/logrus v1.9.3 diff --git a/go.sum b/go.sum index 6de120ffae..58c956b8d2 100644 --- a/go.sum +++ b/go.sum @@ -581,8 +581,8 @@ github.com/openshift-online/ocm-sdk-go v0.1.362 h1:MoaSMCSzcr8nSK9DBqKmZ9c5e4Cp8 github.com/openshift-online/ocm-sdk-go v0.1.362/go.mod h1:KYOw8kAKAHyPrJcQoVR82CneQ4ofC02Na4cXXaTq4Nw= github.com/oracle/oci-go-sdk/v54 v54.0.0 h1:CDLjeSejv2aDpElAJrhKpi6zvT/zhZCZuXchUUZ+LS4= github.com/oracle/oci-go-sdk/v54 v54.0.0/go.mod h1:+t+yvcFGVp+3ZnztnyxqXfQDsMlq8U25faBLa+mqCMc= -github.com/osbuild/images v0.3.0-r9.3.3 h1:SODY0LH3cnPAulOV4GwKB6/rhV5mTtm7XT3nS6ZQPmw= -github.com/osbuild/images v0.3.0-r9.3.3/go.mod h1:lZsi8oJNfk57VRv5zhdrSLmn0z8YPcQzZBxzdHNfZls= +github.com/osbuild/images v0.3.0-r9.3.4 h1:6ODBirIEzDNnfV81omqOEYTzMXpwdBI7KcpFWOWR1Ps= +github.com/osbuild/images v0.3.0-r9.3.4/go.mod h1:lZsi8oJNfk57VRv5zhdrSLmn0z8YPcQzZBxzdHNfZls= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= diff --git a/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go b/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go index b142fa9bf5..0fea935451 100644 --- a/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go +++ b/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go @@ -211,10 +211,11 @@ func (c *Customizations) GetUsers() []UserCustomization { // prepend sshkey for backwards compat (overridden by users) if len(c.SSHKey) > 0 { - for _, c := range c.SSHKey { + for idx := range c.SSHKey { + keyc := c.SSHKey[idx] users = append(users, UserCustomization{ - Name: c.User, - Key: &c.Key, + Name: keyc.User, + Key: &keyc.Key, }) } } diff --git a/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go b/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go index 03992cc95b..6c879ac9bd 100644 --- a/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go +++ b/vendor/github.com/osbuild/images/pkg/rpmmd/repository.go @@ -245,7 +245,8 @@ func loadRepositoriesFromFile(filename string) (map[string][]RepoConfig, error) } for arch, repos := range reposMap { - for _, repo := range repos { + for idx := range repos { + repo := repos[idx] var urls []string if repo.BaseURL != "" { urls = []string{repo.BaseURL} diff --git a/vendor/modules.txt b/vendor/modules.txt index ff9c77a1d0..fe70574f5c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -645,7 +645,7 @@ github.com/oracle/oci-go-sdk/v54/identity github.com/oracle/oci-go-sdk/v54/objectstorage github.com/oracle/oci-go-sdk/v54/objectstorage/transfer github.com/oracle/oci-go-sdk/v54/workrequests -# github.com/osbuild/images v0.3.0-r9.3.3 +# github.com/osbuild/images v0.3.0-r9.3.4 ## explicit; go 1.19 github.com/osbuild/images/internal/common github.com/osbuild/images/internal/dnfjson