From 3e321e3cea3ecc16629a201e806d57a9a6f1464c Mon Sep 17 00:00:00 2001 From: Achilleas Koutsou Date: Fri, 31 Jan 2025 14:52:04 +0100 Subject: [PATCH] go.mod: update to latest images@v0.112.0 --- go.mod | 2 +- go.sum | 4 +-- .../osbuild/images/pkg/dnfjson/dnfjson.go | 25 +++++++++++++++++++ .../images/pkg/manifest/ostree_deployment.go | 12 ++++----- .../images/pkg/osbuild/containers_input.go | 2 +- .../pkg/osbuild/containers_storage_source.go | 2 ++ .../images/pkg/osbuild/skopeo_index_source.go | 2 ++ .../images/pkg/osbuild/skopeo_source.go | 2 ++ .../images/pkg/osbuild/skopeo_stage.go | 4 +-- .../osbuild/images/pkg/osbuild/source.go | 6 ++--- vendor/modules.txt | 2 +- 11 files changed, 47 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index c24cb7393..4d5d00cca 100644 --- a/go.mod +++ b/go.mod @@ -44,7 +44,7 @@ require ( github.com/labstack/gommon v0.4.2 github.com/openshift-online/ocm-sdk-go v0.1.438 github.com/oracle/oci-go-sdk/v54 v54.0.0 - github.com/osbuild/images v0.111.0 + github.com/osbuild/images v0.112.0 github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d github.com/osbuild/pulp-client v0.1.0 github.com/prometheus/client_golang v1.20.2 diff --git a/go.sum b/go.sum index 174202bbf..9f259f2eb 100644 --- a/go.sum +++ b/go.sum @@ -541,8 +541,8 @@ github.com/openshift-online/ocm-sdk-go v0.1.438 h1:tsLCCUzbLCTL4RZG02y9RuopmGCXp github.com/openshift-online/ocm-sdk-go v0.1.438/go.mod h1:CiAu2jwl3ITKOxkeV0Qnhzv4gs35AmpIzVABQLtcI2Y= 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.111.0 h1:mnPLdSin/q1ZTaGZVJHepsikguFjUMAWblQdPgvZ02M= -github.com/osbuild/images v0.111.0/go.mod h1:58tzp7jV50rjaH9gMpvmQdVati0c4TaC5Op7wmSD/tY= +github.com/osbuild/images v0.112.0 h1:+pKwPniwYTRRgist6V+7DQfZEg7osddl1z4pASecq4M= +github.com/osbuild/images v0.112.0/go.mod h1:58tzp7jV50rjaH9gMpvmQdVati0c4TaC5Op7wmSD/tY= github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d h1:r9BFPDv0uuA9k1947Jybcxs36c/pTywWS1gjeizvtcQ= github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d/go.mod h1:zR1iu/hOuf+OQNJlk70tju9IqzzM4ycq0ectkFBm94U= github.com/osbuild/pulp-client v0.1.0 h1:L0C4ezBJGTamN3BKdv+rKLuq/WxXJbsFwz/Hj7aEmJ8= diff --git a/vendor/github.com/osbuild/images/pkg/dnfjson/dnfjson.go b/vendor/github.com/osbuild/images/pkg/dnfjson/dnfjson.go index f45eb6806..5b1e8a6ef 100644 --- a/vendor/github.com/osbuild/images/pkg/dnfjson/dnfjson.go +++ b/vendor/github.com/osbuild/images/pkg/dnfjson/dnfjson.go @@ -722,10 +722,12 @@ type transactionArgs struct { } type packageSpecs []PackageSpec +type moduleSpecs map[string]ModuleSpec type depsolveResult struct { Packages packageSpecs `json:"packages"` Repos map[string]repoConfig `json:"repos"` + Modules moduleSpecs `json:"modules"` // (optional) contains the solver used, e.g. "dnf5" Solver string `json:"solver,omitempty"` @@ -748,6 +750,29 @@ type PackageSpec struct { Secrets string `json:"secrets,omitempty"` } +// Module specification +type ModuleSpec struct { + ModuleConfigFile ModuleConfigFile `json:"module-file"` + FailsafeFile ModuleFailsafeFile `json:"failsafe-file"` +} + +type ModuleConfigFile struct { + Path string `json:"path"` + Data ModuleConfigData `json:"data"` +} + +type ModuleConfigData struct { + Name string `json:"name"` + Stream string `json:"stream"` + Profiles []string `json:"profiles"` + State string `json:"state"` +} + +type ModuleFailsafeFile struct { + Path string `json:"path"` + Data string `json:"string"` +} + // dnf-json error structure type Error struct { Kind string `json:"kind"` diff --git a/vendor/github.com/osbuild/images/pkg/manifest/ostree_deployment.go b/vendor/github.com/osbuild/images/pkg/manifest/ostree_deployment.go index 5ab151ce4..4166f6a22 100644 --- a/vendor/github.com/osbuild/images/pkg/manifest/ostree_deployment.go +++ b/vendor/github.com/osbuild/images/pkg/manifest/ostree_deployment.go @@ -337,6 +337,12 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline { fstabStage.MountOSTree(p.osName, ref, 0) pipeline.AddStage(fstabStage) + if len(p.Groups) > 0 { + grpStage := osbuild.GenGroupsStage(p.Groups) + grpStage.MountOSTree(p.osName, ref, 0) + pipeline.AddStage(grpStage) + } + if len(p.Users) > 0 { usersStage, err := osbuild.GenUsersStage(p.Users, false) if err != nil { @@ -346,12 +352,6 @@ func (p *OSTreeDeployment) serialize() osbuild.Pipeline { pipeline.AddStage(usersStage) } - if len(p.Groups) > 0 { - grpStage := osbuild.GenGroupsStage(p.Groups) - grpStage.MountOSTree(p.osName, ref, 0) - pipeline.AddStage(grpStage) - } - if p.IgnitionPlatform != "" { pipeline.AddStage(osbuild.NewIgnitionStage(&osbuild.IgnitionStageOptions{ // This is a workaround to make the systemd believe it's firstboot when ignition runs on real firstboot. diff --git a/vendor/github.com/osbuild/images/pkg/osbuild/containers_input.go b/vendor/github.com/osbuild/images/pkg/osbuild/containers_input.go index 917f1ac4a..0caad6fea 100644 --- a/vendor/github.com/osbuild/images/pkg/osbuild/containers_input.go +++ b/vendor/github.com/osbuild/images/pkg/osbuild/containers_input.go @@ -29,7 +29,7 @@ func newContainersInputForSources(containers []container.Spec, forLocal bool) Co var sourceType string if forLocal { - sourceType = "org.osbuild.containers-storage" + sourceType = SourceNameContainersStorage } else { sourceType = "org.osbuild.containers" } diff --git a/vendor/github.com/osbuild/images/pkg/osbuild/containers_storage_source.go b/vendor/github.com/osbuild/images/pkg/osbuild/containers_storage_source.go index 97799268e..626c28938 100644 --- a/vendor/github.com/osbuild/images/pkg/osbuild/containers_storage_source.go +++ b/vendor/github.com/osbuild/images/pkg/osbuild/containers_storage_source.go @@ -2,6 +2,8 @@ package osbuild import "fmt" +const SourceNameContainersStorage = "org.osbuild.containers-storage" + type ContainersStorageSource struct { Items map[string]struct{} `json:"items"` } diff --git a/vendor/github.com/osbuild/images/pkg/osbuild/skopeo_index_source.go b/vendor/github.com/osbuild/images/pkg/osbuild/skopeo_index_source.go index d273fb138..d503c2e5b 100644 --- a/vendor/github.com/osbuild/images/pkg/osbuild/skopeo_index_source.go +++ b/vendor/github.com/osbuild/images/pkg/osbuild/skopeo_index_source.go @@ -4,6 +4,8 @@ import ( "fmt" ) +const SourceNameSkopeoIndex = "org.osbuild.skopeo-index" + type SkopeoIndexSource struct { Items map[string]SkopeoIndexSourceItem `json:"items"` } diff --git a/vendor/github.com/osbuild/images/pkg/osbuild/skopeo_source.go b/vendor/github.com/osbuild/images/pkg/osbuild/skopeo_source.go index 1145e59c5..e522b3d7e 100644 --- a/vendor/github.com/osbuild/images/pkg/osbuild/skopeo_source.go +++ b/vendor/github.com/osbuild/images/pkg/osbuild/skopeo_source.go @@ -5,6 +5,8 @@ import ( "regexp" ) +const SourceNameSkopeo = "org.osbuild.skopeo" + var skopeoDigestPattern = regexp.MustCompile(`sha256:[0-9a-f]{64}`) const DockerTransport = "docker" diff --git a/vendor/github.com/osbuild/images/pkg/osbuild/skopeo_stage.go b/vendor/github.com/osbuild/images/pkg/osbuild/skopeo_stage.go index 8a2b48da8..606cc545e 100644 --- a/vendor/github.com/osbuild/images/pkg/osbuild/skopeo_stage.go +++ b/vendor/github.com/osbuild/images/pkg/osbuild/skopeo_stage.go @@ -41,7 +41,7 @@ func NewSkopeoStageWithContainersStorage(path string, images ContainersInput, ma } return &Stage{ - Type: "org.osbuild.skopeo", + Type: SourceNameSkopeo, Options: &SkopeoStageOptions{ Destination: SkopeoDestinationContainersStorage{ Type: "containers-storage", @@ -59,7 +59,7 @@ func NewSkopeoStageWithOCI(path string, images ContainersInput, manifests *Files } return &Stage{ - Type: "org.osbuild.skopeo", + Type: SourceNameSkopeo, Options: &SkopeoStageOptions{ Destination: &SkopeoDestinationOCI{ Type: "oci", diff --git a/vendor/github.com/osbuild/images/pkg/osbuild/source.go b/vendor/github.com/osbuild/images/pkg/osbuild/source.go index 0505f214c..ad88f6c99 100644 --- a/vendor/github.com/osbuild/images/pkg/osbuild/source.go +++ b/vendor/github.com/osbuild/images/pkg/osbuild/source.go @@ -160,13 +160,13 @@ func GenSources(inputs SourceInputs, rpmDownloader RpmDownloader) (Sources, erro } } if len(skopeo.Items) > 0 { - sources["org.osbuild.skopeo"] = skopeo + sources[SourceNameSkopeo] = skopeo } if len(skopeoIndex.Items) > 0 { - sources["org.osbuild.skopeo-index"] = skopeoIndex + sources[SourceNameSkopeoIndex] = skopeoIndex } if len(localContainers.Items) > 0 { - sources["org.osbuild.containers-storage"] = localContainers + sources[SourceNameContainersStorage] = localContainers } } diff --git a/vendor/modules.txt b/vendor/modules.txt index 9e27b239c..dc3737b1f 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1021,7 +1021,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.111.0 +# github.com/osbuild/images v0.112.0 ## explicit; go 1.21.0 github.com/osbuild/images/internal/common github.com/osbuild/images/internal/environment