tag v0.149.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.149.0 ---------------- * Update dependencies 2025-05-25 (osbuild/images#1560) * Author: SchutzBot, Reviewers: Simon de Vlieger, Tomáš Hozza * Update osbuild dependency commit ID to latest (osbuild/images#1522) * Author: SchutzBot, Reviewers: Simon de Vlieger, Tomáš Hozza * Update snapshots to 20250515 (osbuild/images#1524) * Author: SchutzBot, Reviewers: Simon de Vlieger, Tomáš Hozza * `vagrant-libvirt` implementation (HMS-6116) (osbuild/images#1548) * Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Tomáš Hozza * fedora: tweaks after all imageTypes are YAML (osbuild/images#1518) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * gha: do not break gobump output (osbuild/images#1561) * Author: Lukáš Zapletal, Reviewers: Simon de Vlieger, Tomáš Hozza * repositories: AlmaLinux 10 (osbuild/images#1567) * Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Lukáš Zapletal, Neal Gompa (ニール・ゴンパ) * vagrant: image config for default vagrant user (HMS-6116) (osbuild/images#1565) * Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Michael Vogt — Somewhere on the Internet, 2025-05-27 --- tag v0.150.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.150.0 ---------------- * Replace hardcoded kickstart %post scripts with new stage options and bootc switch with custom kickstart content (HMS-6051) (osbuild/images#1527) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * test: install yamllint for tests (osbuild/images#1572) * Author: Achilleas Koutsou, Reviewers: Lukáš Zapletal, Simon de Vlieger, Tomáš Hozza — Somewhere on the Internet, 2025-06-02 --- tag v0.151.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.151.0 ---------------- * Introduce new Azure CVM image type (HMS-5636) (osbuild/images#1318) * Author: Achilleas Koutsou, Reviewers: Nobody * Many: support using string with unit for byte-sized partitioning fields in YAML distro definitions (osbuild/images#1579) * Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Brian C. Lane * Update osbuild dependency commit ID to latest (osbuild/images#1587) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Tomáš Hozza * Update snapshots to 20250601 (osbuild/images#1573) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Lukáš Zapletal * bootc: Make installed rootfs configurable (osbuild/images#1555) * Author: Mbarak Bujra, Reviewers: Michael Vogt, Tomáš Hozza * distro: create new ImageConfig.DNFConfig (osbuild/images#1583) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: make "fedora" a "generic" distro (osbuild/images#1563) * Author: Michael Vogt, Reviewers: Nobody * image: If using a separate build container, copy bootc customization to it (osbuild/images#1571) * Author: Alexander Larsson, Reviewers: Achilleas Koutsou, Tomáš Hozza * manifest/ostree: explicitly include shadow-utils (osbuild/images#1585) * Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Michael Vogt * osbuild/tar: explicit compression (HMS-8573, HMS-6116) (osbuild/images#1581) * Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Tomáš Hozza * tests: bump fedora versions to 41 (osbuild/images#1438) * Author: Lukáš Zapletal, Reviewers: Brian C. Lane, Michael Vogt — Somewhere on the Internet, 2025-06-09 ---
92 lines
2.1 KiB
Go
92 lines
2.1 KiB
Go
package distro
|
|
|
|
import (
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/hashicorp/go-version"
|
|
)
|
|
|
|
// ID represents a distro name and version
|
|
type ID struct {
|
|
Name string
|
|
MajorVersion int
|
|
// MinorVersion is -1 if not specified
|
|
MinorVersion int
|
|
}
|
|
|
|
func (id ID) VersionString() string {
|
|
if id.MinorVersion == -1 {
|
|
return fmt.Sprintf("%d", id.MajorVersion)
|
|
} else {
|
|
return fmt.Sprintf("%d.%d", id.MajorVersion, id.MinorVersion)
|
|
}
|
|
}
|
|
|
|
func (id ID) String() string {
|
|
return fmt.Sprintf("%s-%s", id.Name, id.VersionString())
|
|
}
|
|
|
|
func (id ID) Version() (*version.Version, error) {
|
|
return version.NewVersion(id.VersionString())
|
|
}
|
|
|
|
type ParseError struct {
|
|
ToParse string
|
|
Msg string
|
|
Inner error
|
|
}
|
|
|
|
func (e ParseError) Error() string {
|
|
msg := fmt.Sprintf("error when parsing distro name (%s): %v", e.ToParse, e.Msg)
|
|
|
|
if e.Inner != nil {
|
|
msg += fmt.Sprintf(", inner error:\n%v", e.Inner)
|
|
}
|
|
|
|
return msg
|
|
}
|
|
|
|
// ParseID parses a distro name and version from a Distro ID string.
|
|
// This is the generic parser, which is used by all distros as the base parser.
|
|
//
|
|
// Limitations:
|
|
// - the distro name must not contain a dash
|
|
func ParseID(idStr string) (*ID, error) {
|
|
idParts := strings.Split(idStr, "-")
|
|
|
|
if len(idParts) < 2 {
|
|
return nil, ParseError{ToParse: idStr, Msg: "A dash is expected to separate distro name and version"}
|
|
}
|
|
|
|
name := strings.Join(idParts[:len(idParts)-1], "-")
|
|
version := idParts[len(idParts)-1]
|
|
|
|
versionParts := strings.Split(version, ".")
|
|
|
|
if len(versionParts) > 2 {
|
|
return nil, ParseError{ToParse: idStr, Msg: fmt.Sprintf("too many dots in the version (%d)", len(versionParts)-1)}
|
|
}
|
|
|
|
majorVersion, err := strconv.Atoi(versionParts[0])
|
|
if err != nil {
|
|
return nil, ParseError{ToParse: idStr, Msg: "parsing major version failed", Inner: err}
|
|
}
|
|
|
|
minorVersion := -1
|
|
|
|
if len(versionParts) > 1 {
|
|
minorVersion, err = strconv.Atoi(versionParts[1])
|
|
|
|
if err != nil {
|
|
return nil, ParseError{ToParse: idStr, Msg: "parsing minor version failed", Inner: err}
|
|
}
|
|
}
|
|
|
|
return &ID{
|
|
Name: name,
|
|
MajorVersion: majorVersion,
|
|
MinorVersion: minorVersion,
|
|
}, nil
|
|
}
|