mirror of
https://github.com/mudler/luet.git
synced 2025-07-05 19:46:48 +00:00
Add compiler interfaces and build definition skeleton
Create compiler interface with switchable backends. For now it can resolve and parse a `build.yaml` which is in the same folder as in `definition.yaml` Add also tests to cover this and new fixtures
This commit is contained in:
parent
61c318d549
commit
add0021cfd
18
pkg/compiler/artifact.go
Normal file
18
pkg/compiler/artifact.go
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
// Copyright © 2019 Ettore Di Giacinto <mudler@gentoo.org>
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation; either version 2 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License along
|
||||||
|
// with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package compiler
|
||||||
|
|
||||||
|
type Artifact struct{}
|
58
pkg/compiler/compiler.go
Normal file
58
pkg/compiler/compiler.go
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
// Copyright © 2019 Ettore Di Giacinto <mudler@gentoo.org>
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation; either version 2 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License along
|
||||||
|
// with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package compiler
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"io/ioutil"
|
||||||
|
|
||||||
|
"github.com/mudler/luet/pkg/helpers"
|
||||||
|
pkg "github.com/mudler/luet/pkg/package"
|
||||||
|
"github.com/mudler/luet/pkg/tree"
|
||||||
|
)
|
||||||
|
|
||||||
|
const BuildFile = "build.yaml"
|
||||||
|
|
||||||
|
type LuetCompiler struct {
|
||||||
|
*tree.Recipe
|
||||||
|
Backend CompilerBackend
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewLuetCompiler(backend CompilerBackend, t pkg.Tree) Compiler {
|
||||||
|
return &LuetCompiler{Backend: backend, Recipe: &tree.Recipe{PackageTree: t}}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (cs *LuetCompiler) Compile(p CompilationSpec) (*Artifact, error) {
|
||||||
|
return nil, errors.New("Not implemented yet")
|
||||||
|
}
|
||||||
|
|
||||||
|
func (cs *LuetCompiler) FromPackage(p pkg.Package) (CompilationSpec, error) {
|
||||||
|
|
||||||
|
pack, err := cs.Tree().GetPackageSet().FindPackage(p)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
buildFile := pack.Rel(BuildFile)
|
||||||
|
if !helpers.Exists(buildFile) {
|
||||||
|
return nil, errors.New("No build file present for " + p.GetFingerPrint())
|
||||||
|
}
|
||||||
|
|
||||||
|
dat, err := ioutil.ReadFile(buildFile)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return NewLuetCompilationSpec(dat)
|
||||||
|
}
|
28
pkg/compiler/compiler_suite_test.go
Normal file
28
pkg/compiler/compiler_suite_test.go
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
// Copyright © 2019 Ettore Di Giacinto <mudler@gentoo.org>
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation; either version 2 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License along
|
||||||
|
// with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package compiler_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
. "github.com/onsi/ginkgo"
|
||||||
|
. "github.com/onsi/gomega"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestSolver(t *testing.T) {
|
||||||
|
RegisterFailHandler(Fail)
|
||||||
|
RunSpecs(t, "Compiler Suite")
|
||||||
|
}
|
33
pkg/compiler/interface.go
Normal file
33
pkg/compiler/interface.go
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
// Copyright © 2019 Ettore Di Giacinto <mudler@gentoo.org>
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation; either version 2 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License along
|
||||||
|
// with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package compiler
|
||||||
|
|
||||||
|
import pkg "github.com/mudler/luet/pkg/package"
|
||||||
|
|
||||||
|
type Compiler interface {
|
||||||
|
Compile(CompilationSpec) (*Artifact, error)
|
||||||
|
FromPackage(pkg.Package) (CompilationSpec, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
type CompilerBackend interface {
|
||||||
|
Tree() pkg.Tree
|
||||||
|
WithTree(pkg.Tree)
|
||||||
|
}
|
||||||
|
|
||||||
|
// CompilationSpec represent a compilation specification derived from a package
|
||||||
|
type CompilationSpec interface {
|
||||||
|
ToDocker() (string, error)
|
||||||
|
}
|
38
pkg/compiler/spec.go
Normal file
38
pkg/compiler/spec.go
Normal file
@ -0,0 +1,38 @@
|
|||||||
|
// Copyright © 2019 Ettore Di Giacinto <mudler@gentoo.org>
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation; either version 2 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License along
|
||||||
|
// with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package compiler
|
||||||
|
|
||||||
|
import (
|
||||||
|
yaml "gopkg.in/yaml.v2"
|
||||||
|
)
|
||||||
|
|
||||||
|
type LuetCompilationSpec struct {
|
||||||
|
Steps []string `json:"steps"`
|
||||||
|
Image string `json:"image"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewLuetCompilationSpec(b []byte) (CompilationSpec, error) {
|
||||||
|
var spec LuetCompilationSpec
|
||||||
|
err := yaml.Unmarshal(b, &spec)
|
||||||
|
if err != nil {
|
||||||
|
return &spec, err
|
||||||
|
}
|
||||||
|
return &spec, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (cs *LuetCompilationSpec) ToDocker() (string, error) {
|
||||||
|
return "", nil
|
||||||
|
}
|
49
pkg/compiler/spec_test.go
Normal file
49
pkg/compiler/spec_test.go
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
// Copyright © 2019 Ettore Di Giacinto <mudler@gentoo.org>
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation; either version 2 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License along
|
||||||
|
// with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package compiler_test
|
||||||
|
|
||||||
|
import (
|
||||||
|
. "github.com/mudler/luet/pkg/compiler"
|
||||||
|
pkg "github.com/mudler/luet/pkg/package"
|
||||||
|
"github.com/mudler/luet/pkg/tree"
|
||||||
|
. "github.com/onsi/ginkgo"
|
||||||
|
. "github.com/onsi/gomega"
|
||||||
|
)
|
||||||
|
|
||||||
|
var _ = Describe("Spec", func() {
|
||||||
|
Context("Simple package build definition", func() {
|
||||||
|
It("Loads it correctly", func() {
|
||||||
|
generalRecipe := tree.NewGeneralRecipe()
|
||||||
|
|
||||||
|
err := generalRecipe.Load("../../tests/fixtures/buildtree")
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
Expect(generalRecipe.Tree()).ToNot(BeNil()) // It should be populated back at this point
|
||||||
|
|
||||||
|
Expect(len(generalRecipe.Tree().GetPackageSet().GetPackages())).To(Equal(1))
|
||||||
|
|
||||||
|
compiler := NewLuetCompiler(nil, generalRecipe.Tree())
|
||||||
|
spec, err := compiler.FromPackage(&pkg.DefaultPackage{Name: "enman", Category: "app-admin", Version: "1.4.0"})
|
||||||
|
Expect(err).ToNot(HaveOccurred())
|
||||||
|
|
||||||
|
lspec, ok := spec.(*LuetCompilationSpec)
|
||||||
|
Expect(ok).To(BeTrue())
|
||||||
|
|
||||||
|
Expect(lspec.Steps).To(Equal([]string{"echo foo", "bar"}))
|
||||||
|
Expect(lspec.Image).To(Equal("luet/base"))
|
||||||
|
})
|
||||||
|
|
||||||
|
})
|
||||||
|
})
|
28
pkg/helpers/file.go
Normal file
28
pkg/helpers/file.go
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
// Copyright © 2019 Ettore Di Giacinto <mudler@gentoo.org>
|
||||||
|
//
|
||||||
|
// This program is free software; you can redistribute it and/or modify
|
||||||
|
// it under the terms of the GNU General Public License as published by
|
||||||
|
// the Free Software Foundation; either version 2 of the License, or
|
||||||
|
// (at your option) any later version.
|
||||||
|
//
|
||||||
|
// This program is distributed in the hope that it will be useful,
|
||||||
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
// GNU General Public License for more details.
|
||||||
|
//
|
||||||
|
// You should have received a copy of the GNU General Public License along
|
||||||
|
// with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
package helpers
|
||||||
|
|
||||||
|
import "os"
|
||||||
|
|
||||||
|
// Exists reports whether the named file or directory exists.
|
||||||
|
func Exists(name string) bool {
|
||||||
|
if _, err := os.Stat(name); err != nil {
|
||||||
|
if os.IsNotExist(err) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
4
tests/fixtures/buildtree/app-admin/enman/1.4.0/build.yaml
vendored
Normal file
4
tests/fixtures/buildtree/app-admin/enman/1.4.0/build.yaml
vendored
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
image: "luet/base"
|
||||||
|
steps:
|
||||||
|
- echo foo
|
||||||
|
- bar
|
8
tests/fixtures/buildtree/app-admin/enman/1.4.0/definition.yaml
vendored
Normal file
8
tests/fixtures/buildtree/app-admin/enman/1.4.0/definition.yaml
vendored
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
State: ""
|
||||||
|
category: app-admin
|
||||||
|
conflicts: null
|
||||||
|
name: enman
|
||||||
|
requires: null
|
||||||
|
set: false
|
||||||
|
use_flags: null
|
||||||
|
version: 1.4.0
|
Loading…
Reference in New Issue
Block a user