feat!: new kernel config structure

BREAKING CHANGE: kernel definition in the configuration files has switched

from

  [[targets]]
  distro = { id = "Ubuntu", release = "18.04" }
  release_mask = ".*"

to

  [[targets]]
  distro = { id = "Ubuntu", release = "18.04" }
  kernel = { regex = ".*" }

config/config.go

@@ -5,12 +5,10 @@
 package config
 
 import (
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"regexp"
-	"strconv"
 	"strings"
 	"time"
 
@@ -19,21 +17,21 @@ import (
 	"github.com/naoina/toml"
 )
 
-type kernel struct {
-	Version []int
-	Major   []int
-	Minor   []int
-	Patch   []int
+type Kernel struct {
+	// TODO
+	// Version string
+	// From    string
+	// To      string
+
+	// prev. ReleaseMask
+	Regex string
 }
 
 // Target defines the kernel
 type Target struct {
 	Distro distro.Distro
 
-	ReleaseMask string
-
-	// Overrides ReleaseMask
-	Kernel kernel
+	Kernel Kernel
 }
 
 // DockerName is returns stable name for docker container
@@ -131,11 +129,11 @@ type Patch struct {
 
 // Artifact is for .out-of-tree.toml
 type Artifact struct {
-	Name             string
-	Type             ArtifactType
-	TestFiles        []FileTransfer
-	SourcePath       string
-	Targets []Target
+	Name       string
+	Type       ArtifactType
+	TestFiles  []FileTransfer
+	SourcePath string
+	Targets    []Target
 
 	Script string
 
@@ -181,7 +179,7 @@ func (ka Artifact) checkSupport(ki KernelInfo, km Target) (
 		return
 	}
 
-	supported, err = regexp.MatchString(km.ReleaseMask, ki.KernelRelease)
+	supported, err = regexp.MatchString(km.Kernel.Regex, ki.KernelRelease)
 	return
 }
 
@@ -259,66 +257,6 @@ func ReadKernelConfig(path string) (kernelCfg KernelConfig, err error) {
 	return
 }
 
-func rangeRegexp(start, end int) (s string) {
-	s += "("
-	for i := start; i <= end; i++ {
-		s += strconv.Itoa(i)
-		if i != end {
-			s += "|"
-		}
-	}
-	s += ")"
-	return
-}
-
-func versionRegexp(l []int) (s string, err error) {
-	switch len(l) {
-	case 1:
-		s += strconv.Itoa(l[0])
-	case 2:
-		s += rangeRegexp(l[0], l[1])
-	default:
-		err = errors.New("version must contain one value or range")
-		return
-	}
-	return
-}
-
-func genReleaseMask(km kernel) (mask string, err error) {
-	s, err := versionRegexp(km.Version)
-	if err != nil {
-		return
-	}
-	mask += s + "[.]"
-
-	s, err = versionRegexp(km.Major)
-	if err != nil {
-		return
-	}
-	mask += s + "[.]"
-
-	s, err = versionRegexp(km.Minor)
-	if err != nil {
-		return
-	}
-	mask += s
-
-	switch len(km.Patch) {
-	case 0:
-		// ok
-	case 1:
-		mask += "-" + strconv.Itoa(km.Patch[0]) + "-"
-	case 2:
-		mask += "-" + rangeRegexp(km.Patch[0], km.Patch[1]) + "-"
-	default:
-		err = errors.New("version must contain one value or range")
-		return
-	}
-
-	mask += ".*"
-	return
-}
-
 // ReadArtifactConfig is for read .out-of-tree.toml
 func ReadArtifactConfig(path string) (ka Artifact, err error) {
 	buf, err := readFileAll(path)
@@ -327,25 +265,5 @@ func ReadArtifactConfig(path string) (ka Artifact, err error) {
 	}
 
 	err = toml.Unmarshal(buf, &ka)
-	if err != nil {
-		return
-	}
-
-	for i, _ := range ka.Targets {
-		km := &ka.Targets[i]
-		if len(km.Kernel.Version) != 0 && km.ReleaseMask != "" {
-			s := "Only one way to define kernel version is allowed"
-			err = errors.New(s)
-			return
-		}
-
-		if km.ReleaseMask == "" {
-			km.ReleaseMask, err = genReleaseMask(km.Kernel)
-			if err != nil {
-				return
-			}
-		}
-	}
-
 	return
 }

config/config_test.go

@@ -18,10 +18,15 @@ func TestMarshalUnmarshal(t *testing.T) {
 		Type: KernelModule,
 	}
 	artifactCfg.Targets = append(artifactCfg.Targets,
-		Target{distro.Distro{
-			ID:      distro.Ubuntu,
-			Release: "18.04",
-		}, ".*", kernel{}})
+		Target{
+			Distro: distro.Distro{
+				ID:      distro.Ubuntu,
+				Release: "18.04",
+			},
+			Kernel: Kernel{
+				Regex: ".*",
+			},
+		})
 	buf, err := toml.Marshal(&artifactCfg)
 	if err != nil {
 		t.Fatal(err)
@@ -33,38 +38,3 @@ func TestMarshalUnmarshal(t *testing.T) {
 		t.Fatal(err)
 	}
 }
-
-func TestKernelRegex(t *testing.T) {
-	mask := "4[.]4[.]0-(1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60|61|62|63|64|65|66|67|68|69|70|71|72|73|74|75|76|77|78|79|80|81|82|83|84|85|86|87|88|89|90|91|92|93|94|95|96|97|98|99|100|101|102|103|104|105|106|107|108|109|110|111|112|113|114|115|116)-.*"
-	k := kernel{
-		Version: []int{4},
-		Major:   []int{4},
-		Minor:   []int{0},
-		Patch:   []int{1, 116},
-	}
-
-	gmask, err := genReleaseMask(k)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if mask != gmask {
-		t.Fatal("Got", gmask, "instead of", mask)
-	}
-
-	mask = "4[.]4[.]0.*"
-	k = kernel{
-		Version: []int{4},
-		Major:   []int{4},
-		Minor:   []int{0},
-	}
-
-	gmask, err = genReleaseMask(k)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if mask != gmask {
-		t.Fatal("Got", gmask, "instead of", mask)
-	}
-}