Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: support versions used in extensions #3

Merged
merged 1 commit into from
May 23, 2024
Merged

chore: support versions used in extensions #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions cmd/extensions-validator/cmd/validate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,8 @@ package cmd
import (
"errors"
"fmt"
"strings"
"regexp"

"github.com/blang/semver/v4"
"github.com/siderolabs/talos/pkg/machinery/extensions"
"github.com/spf13/cobra"
)
Expand All @@ -28,6 +27,29 @@ var validateCmd = &cobra.Command{
var (
rootfsPath string
pkgName string

// semverRegex is a regex to match a semver version.
semverRegex = regexp.MustCompile(`^v?(\d+\.\d+\.\d+(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?)$`)
// yyyymmddRegex is a regex to match a yyyymmdd date.
// Eg:
// 20210914
// 20210914.1
yyyymmddRegex = regexp.MustCompile(`^\d{8}(\.\d)?$`)
// buildArgRegex is a regex to match a build arg version.
// Eg:
// 535.129.03-v1.8.0-alpha.0-10-g336fa0f-dirty
// 535.129.03-v1.8.0-alpha.0-10-g336fa0f
buildArgRegex = regexp.MustCompile(`^(\d+\.\d+\.\d+)-v(\d+\.\d+\.\d+(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?)-(\d+)-g([0-9a-f]+)(-dirty)?$`)
// commitBuildArgRegex is a regex to match a commit build arg version.
// Eg:
// 5815ee3-v1.8.0-alpha.0-10-g336fa0f-dirty
// 5815ee3-v1.8.0-alpha.0-10-g336fa0f
commitBuildArgRegex = regexp.MustCompile(`^([0-9a-f]+)-v(\d+\.\d+\.\d+(-[0-9A-Za-z-]+(\.[0-9A-Za-z-]+)*)?)-(\d+)-g([0-9a-f]+)(-dirty)?$`)
// partialSemverRegex is a regex to match a partial semver version.
// Eg:
// v4.3
// 4.3
partialSemverRegex = regexp.MustCompile(`^v?(\d+\.\d+)$`)
)

func init() {
Expand All @@ -54,8 +76,14 @@ func validateRootfs() error {
}

// validate extension version
if _, err := semver.Parse(strings.TrimPrefix(extension.Manifest.Metadata.Version, "v")); err != nil {
return fmt.Errorf("error parsing extension with version %s, : %w", extension.Manifest.Metadata.Version, err)
switch _ = extension.Manifest.Metadata.Version; {
case semverRegex.MatchString(extension.Manifest.Metadata.Version):
case yyyymmddRegex.MatchString(extension.Manifest.Metadata.Version):
case buildArgRegex.MatchString(extension.Manifest.Metadata.Version):
case commitBuildArgRegex.MatchString(extension.Manifest.Metadata.Version):
case partialSemverRegex.MatchString(extension.Manifest.Metadata.Version):
default:
return fmt.Errorf("invalid version format %s for extension: %s", extension.Manifest.Metadata.Version, extension.Manifest.Metadata.Name)
}

return extension.Validate()
Expand Down