something is going on
This commit is contained in:
parent
7b327b38e7
commit
d469a758f5
@ -1,5 +1,7 @@
|
||||
metadata:
|
||||
name: db-operator
|
||||
version: 1.0.0
|
||||
|
||||
image:
|
||||
tag: 1.15.3
|
||||
repository: db-operator
|
||||
|
@ -5,16 +5,3 @@ workload:
|
||||
- name: controller
|
||||
image: {{ .Image }}
|
||||
imagePullPolicy: Always
|
||||
commands:
|
||||
- sh
|
||||
args:
|
||||
- -c
|
||||
- 'sleep 1000'
|
||||
- name: ubuntu
|
||||
image: ubuntu:latest
|
||||
imagePullPolicy: Always
|
||||
commands:
|
||||
- sh
|
||||
args:
|
||||
- -c
|
||||
- 'sleep 1000'
|
||||
|
8
example/vaultwarden/bundle.yaml
Normal file
8
example/vaultwarden/bundle.yaml
Normal file
@ -0,0 +1,8 @@
|
||||
metadata:
|
||||
name: vaultwarden
|
||||
version: 1.0.0
|
||||
|
||||
spec:
|
||||
image:
|
||||
repository: registry.hub.docker.com/vaultwarden/server
|
||||
tag: 1.29.2
|
7
go.mod
7
go.mod
@ -2,10 +2,15 @@ module git.badhouseplants.net/allanger/shoebill
|
||||
|
||||
go 1.21.3
|
||||
|
||||
require github.com/stretchr/testify v1.8.4
|
||||
require (
|
||||
github.com/sirupsen/logrus v1.9.3
|
||||
github.com/stretchr/testify v1.8.4
|
||||
gopkg.in/yaml.v2 v2.4.0
|
||||
)
|
||||
|
||||
require (
|
||||
github.com/davecgh/go-spew v1.1.1 // indirect
|
||||
github.com/pmezard/go-difflib v1.0.0 // indirect
|
||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
|
||||
gopkg.in/yaml.v3 v3.0.1 // indirect
|
||||
)
|
||||
|
10
go.sum
10
go.sum
@ -1,10 +1,20 @@
|
||||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
|
||||
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
|
||||
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
|
||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
|
||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
|
||||
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
|
||||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
||||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||
|
3
internal/bundler/bundler.go
Normal file
3
internal/bundler/bundler.go
Normal file
@ -0,0 +1,3 @@
|
||||
package bundler
|
||||
|
||||
func Build()
|
@ -7,3 +7,7 @@ func (cli *Client) Install () error {
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (cli *Client) Tempalte() error {
|
||||
return nil
|
||||
}
|
50
pkg/types/bundle/bundle.go
Normal file
50
pkg/types/bundle/bundle.go
Normal file
@ -0,0 +1,50 @@
|
||||
// It's called bundle to avoid a conflict with the GO package
|
||||
package bundle
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
"path/filepath"
|
||||
|
||||
"git.badhouseplants.net/allanger/shoebill/pkg/types/metadata"
|
||||
"git.badhouseplants.net/allanger/shoebill/pkg/types/workload"
|
||||
"github.com/sirupsen/logrus"
|
||||
"gopkg.in/yaml.v2"
|
||||
)
|
||||
|
||||
type Bundle struct {
|
||||
// A bundle's metadata
|
||||
Metadata *metadata.Metadata `yaml:"metadata"`
|
||||
BundlePath string `yaml:"-"`
|
||||
Workload *workload.Workload `yaml:"-"`
|
||||
}
|
||||
|
||||
type Image struct {
|
||||
Repository string
|
||||
Tag string
|
||||
}
|
||||
|
||||
// Init a new bundle struct from the file
|
||||
func ReadFromFile(filePath string) (*Bundle, error) {
|
||||
var bundle Bundle
|
||||
logrus.Infof("readig the bundle file: %s", filePath)
|
||||
bundleFile, err := os.ReadFile(filePath)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := yaml.Unmarshal(bundleFile, &bundle); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
bundle.BundlePath = filepath.Dir(filePath)
|
||||
return &bundle, nil
|
||||
}
|
||||
|
||||
func (bundle *Bundle) Bootstrap() (err error) {
|
||||
// TODO: It's ugly as hell
|
||||
workloadFilePath := fmt.Sprintf("%s/bundle/workload.yaml", bundle.BundlePath)
|
||||
bundle.Workload, err = workload.ReadFromFile(workloadFilePath)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return nil
|
||||
}
|
62
pkg/types/bundle/bundle_test.go
Normal file
62
pkg/types/bundle/bundle_test.go
Normal file
@ -0,0 +1,62 @@
|
||||
package bundle_test
|
||||
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"git.badhouseplants.net/allanger/shoebill/pkg/types/bundle"
|
||||
"git.badhouseplants.net/allanger/shoebill/utils/helpers"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
// Test that the file can be read
|
||||
func TestUnitReadValidFile(t *testing.T) {
|
||||
f := helpers.CreateFile(t)
|
||||
defer os.Remove(f.Name())
|
||||
|
||||
const validFile = `---
|
||||
metadata:
|
||||
name: db-operator
|
||||
version: 1.0.0
|
||||
maintainer:
|
||||
name: allanger
|
||||
email: allanger@badhouseplants.net
|
||||
website: https://badhouseplants.net
|
||||
`
|
||||
helpers.FillFile(t, f, validFile)
|
||||
|
||||
bundle, err := bundle.ReadFromFile(f.Name())
|
||||
|
||||
// Check that there is no unexpected error
|
||||
assert.NoError(t, err)
|
||||
|
||||
// Check the bundle metadata
|
||||
assert.Equal(t, "1.0.0", bundle.Metadata.Version)
|
||||
assert.Equal(t, "db-operator", bundle.Metadata.Name)
|
||||
|
||||
assert.Equal(t, "allanger", bundle.Metadata.Maintainer.Name)
|
||||
assert.Equal(t, "allanger@badhouseplants.net", bundle.Metadata.Maintainer.Email)
|
||||
assert.Equal(t, "https://badhouseplants.net", bundle.Metadata.Maintainer.Website)
|
||||
}
|
||||
|
||||
func TestIntegrationBootstrap(t *testing.T) {
|
||||
bundlePath := "../../../test/test-bundle/bundle.yaml"
|
||||
bundle, err := bundle.ReadFromFile(bundlePath)
|
||||
|
||||
// Check that there is no unexpected error
|
||||
assert.NoError(t, err)
|
||||
|
||||
// Check the bundle file in the test folder to get the actual data
|
||||
assert.Equal(t, "0.0.1", bundle.Metadata.Version)
|
||||
assert.Equal(t, "test-bundle", bundle.Metadata.Name)
|
||||
|
||||
assert.Equal(t, "allanger", bundle.Metadata.Maintainer.Name)
|
||||
assert.Equal(t, "allanger@badhouseplants.net", bundle.Metadata.Maintainer.Email)
|
||||
assert.Equal(t, "https://badhouseplants.net", bundle.Metadata.Maintainer.Website)
|
||||
|
||||
err = bundle.Bootstrap()
|
||||
assert.NoError(t, err)
|
||||
|
||||
assert.Equal(t, "Deployment", bundle.Workload.Kind)
|
||||
assert.Equal(t, 1, bundle.Workload.Replicas)
|
||||
}
|
13
pkg/types/metadata/metadata.go
Normal file
13
pkg/types/metadata/metadata.go
Normal file
@ -0,0 +1,13 @@
|
||||
package metadata
|
||||
|
||||
type Metadata struct {
|
||||
Name string `yaml:"name"` // -- A name of the bundle
|
||||
Version string `yaml:"version"` // -- The bundle's version
|
||||
Maintainer Maintainer `yaml:"maintainer"` // -- A main maintainer of the package
|
||||
}
|
||||
|
||||
type Maintainer struct {
|
||||
Name string `yaml:"name"` // -- Maintainer's name
|
||||
Email string `yaml:"email"` // -- Maintainer's email
|
||||
Website string `yaml:"website"` // -- Maintainer's website
|
||||
}
|
@ -1,14 +0,0 @@
|
||||
package pkgdef
|
||||
|
||||
|
||||
type Package struct {
|
||||
Name string
|
||||
Version string
|
||||
AppVersion string
|
||||
Image *Image
|
||||
}
|
||||
|
||||
type Image struct {
|
||||
Repository string
|
||||
Tag string
|
||||
}
|
@ -2,6 +2,10 @@ package workload
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"os"
|
||||
|
||||
"github.com/sirupsen/logrus"
|
||||
"gopkg.in/yaml.v2"
|
||||
)
|
||||
|
||||
type Workload struct {
|
||||
@ -9,6 +13,19 @@ type Workload struct {
|
||||
Replicas int
|
||||
}
|
||||
|
||||
func ReadFromFile(bundlePath string) (*Workload, error) {
|
||||
var workload Workload
|
||||
logrus.Infof("readig the workload file: %s", bundlePath)
|
||||
bundleFile, err := os.ReadFile(bundlePath)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := yaml.Unmarshal(bundleFile, &workload); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &workload, nil
|
||||
}
|
||||
|
||||
func (wd *Workload) ValidateKind() error {
|
||||
if wd.Kind == "Deployment" || wd.Kind == "StatefulSet" || wd.Kind == "DaemonSet" {
|
||||
return nil
|
||||
|
@ -1,12 +1,39 @@
|
||||
package workload_test
|
||||
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"git.badhouseplants.net/allanger/shoebill/pkg/types/workload"
|
||||
"git.badhouseplants.net/allanger/shoebill/utils/helpers"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestUnitReadValidFile(t *testing.T) {
|
||||
f := helpers.CreateFile(t)
|
||||
defer os.Remove(f.Name())
|
||||
|
||||
const validFile = `---
|
||||
kind: Deployment
|
||||
replicas: 1
|
||||
containers:
|
||||
- name: controller
|
||||
image: {{ .Image }}
|
||||
imagePullPolicy: Always
|
||||
`
|
||||
helpers.FillFile(t, f, validFile)
|
||||
|
||||
workload, err := workload.ReadFromFile(f.Name())
|
||||
|
||||
// Check that there is no unexpected error
|
||||
assert.NoError(t, err)
|
||||
|
||||
// Check the bundle metadata
|
||||
assert.Equal(t, "Deployment", workload.Kind)
|
||||
assert.Equal(t, 1, workload.Replicas)
|
||||
|
||||
}
|
||||
|
||||
func TestUnitKindValidatorDeployment(t *testing.T) {
|
||||
wd := &workload.Workload{
|
||||
Kind: "Deployment",
|
||||
|
12
test/test-bundle/bundle.yaml
Normal file
12
test/test-bundle/bundle.yaml
Normal file
@ -0,0 +1,12 @@
|
||||
metadata:
|
||||
name: test-bundle
|
||||
version: 0.0.1
|
||||
maintainer:
|
||||
name: allanger
|
||||
email: allanger@badhouseplants.net
|
||||
website: https://badhouseplants.net
|
||||
|
||||
spec:
|
||||
image:
|
||||
repository: registry.hub.docker.com/vaultwarden/server
|
||||
tag: 1.29.2
|
6
test/test-bundle/bundle/workload.yaml
Normal file
6
test/test-bundle/bundle/workload.yaml
Normal file
@ -0,0 +1,6 @@
|
||||
kind: Deployment
|
||||
replicas: 1
|
||||
containers:
|
||||
- name: controller
|
||||
image: {{ .Image }}
|
||||
imagePullPolicy: Always
|
22
utils/helpers/test.go
Normal file
22
utils/helpers/test.go
Normal file
@ -0,0 +1,22 @@
|
||||
package helpers
|
||||
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func CreateFile(t *testing.T) *os.File {
|
||||
f, err := os.CreateTemp("", "sample")
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
t.Logf("file is created: %s", f.Name())
|
||||
return f
|
||||
}
|
||||
|
||||
func FillFile(t *testing.T, f *os.File, content string) {
|
||||
_, err := f.WriteString(content)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user