cleanup: remove remaining references to assets/

Dockerfile

@@ -7,12 +7,11 @@ RUN apk update \
 WORKDIR /go/src/virter
 COPY . .
 
-RUN make && mv ./virter / && mv ./assets /
+RUN make && mv ./virter /
 
 FROM alpine:latest
 
 COPY --from=builder /virter /opt/virter/
-COPY --from=builder /assets /opt/virter/assets
 
 RUN apk update \
 	&& apk add rsync \

README.md

@@ -51,9 +51,6 @@ By default, virter uses the libvirt network named `default`.
 
 ## Usage
 
-Virter uses some templates and an image registry file. It is simplest just to
-run it from a checkout of this repository.
-
 For usage just run `virter help`.
 
 ## Architecture

cmd/config.go

@@ -31,13 +31,6 @@ pool = "{{ get "libvirt.pool" }}"
 # Default value: "{{ get "libvirt.network" }}"
 network = "{{ get "libvirt.network" }}"
 
-# template_dir is the directory where virters libvirt template files are stored.
-# These are static and normally do not have to be touched by the user.
-# Relative paths will be interpreted as relative to the current working directory
-# when executing virter.
-# Default value: "{{ get "libvirt.template_dir" }}"
-template_dir = "{{ get "libvirt.template_dir" }}"
-
 [time]
 # ssh_ping_count is the number of times virter will try to connect to a VM's
 # ssh port after starting it.
@@ -85,7 +78,6 @@ virter_private_key_path = "{{ get "auth.virter_private_key_path" }}"
 func initConfig() {
 	viper.SetDefault("libvirt.pool", "default")
 	viper.SetDefault("libvirt.network", "default")
-	viper.SetDefault("libvirt.template_dir", "assets/libvirt-templates")
 	viper.SetDefault("time.ssh_ping_count", 60)
 	viper.SetDefault("time.ssh_ping_period", time.Second)
 	viper.SetDefault("time.shutdown_timeout", 20*time.Second)

cmd/libvirt.go

@@ -9,13 +9,10 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/LINBIT/virter/internal/virter"
-	"github.com/LINBIT/virter/pkg/directory"
 )
 
 // VirterConnect connects to a local libvirt instance
 func VirterConnect() (*virter.Virter, error) {
-	var templates directory.Directory = directory.Directory(viper.GetString("libvirt.template_dir"))
-
 	c, err := net.DialTimeout("unix", "/var/run/libvirt/libvirt-sock", 2*time.Second)
 	if err != nil {
 		return nil, fmt.Errorf("failed to dial libvirt: %w", err)
@@ -29,5 +26,5 @@ func VirterConnect() (*virter.Virter, error) {
 	pool := viper.GetString("libvirt.pool")
 	network := viper.GetString("libvirt.network")
 
-	return virter.New(l, pool, network, templates), nil
+	return virter.New(l, pool, network), nil
 }

internal/virter/cloudconfig.go

@@ -27,7 +27,7 @@ func (v *Virter) metaData(vmName string) (string, error) {
 		"VMName": vmName,
 	}
 
-	return v.renderTemplate("meta-data", templateMetaData, templateData)
+	return renderTemplate("meta-data", templateMetaData, templateData)
 }
 
 func (v *Virter) userData(vmName string, sshPublicKeys []string) (string, error) {
@@ -36,7 +36,7 @@ func (v *Virter) userData(vmName string, sshPublicKeys []string) (string, error)
 		"SSHPublicKeys": sshPublicKeys,
 	}
 
-	return v.renderTemplate("user-data", templateUserData, templateData)
+	return renderTemplate("user-data", templateUserData, templateData)
 }
 
 func (v *Virter) createCIData(sp libvirt.StoragePool, g ISOGenerator, vmConfig VMConfig) error {

internal/virter/image.go

@@ -111,5 +111,3 @@ func (v *Virter) ImageBuild(ctx context.Context, tools ImageBuildTools, vmConfig
 
 	return nil
 }
-
-const templateVolumeImage = "volume-image.xml"

internal/virter/image_test.go

@@ -25,7 +25,7 @@ func TestImagePull(t *testing.T) {
 
 	l := newFakeLibvirtConnection()
 
-	v := virter.New(l, poolName, networkName, testDirectory())
+	v := virter.New(l, poolName, networkName)
 
 	err := v.ImagePull(client, nopReaderProxy{}, imageURL, imageName)
 	assert.NoError(t, err)
@@ -42,7 +42,7 @@ func TestImagePullBadStatus(t *testing.T) {
 
 	l := newFakeLibvirtConnection()
 
-	v := virter.New(l, poolName, networkName, testDirectory())
+	v := virter.New(l, poolName, networkName)
 
 	err := v.ImagePull(client, nopReaderProxy{}, imageURL, imageName)
 	assert.Error(t, err)
@@ -89,7 +89,7 @@ func TestImageBuild(t *testing.T) {
 	l.vols[imageName] = &FakeLibvirtStorageVol{}
 	l.lifecycleEvents = makeShutdownEvents()
 
-	v := virter.New(l, poolName, networkName, testDirectory())
+	v := virter.New(l, poolName, networkName)
 
 	tools := virter.ImageBuildTools{
 		ISOGenerator:  g,

internal/virter/virter.go

@@ -11,11 +11,6 @@ import (
 	libvirt "github.com/digitalocean/go-libvirt"
 )
 
-// FileReader is the interface for reading whole files.
-type FileReader interface {
-	ReadFile(subpath string) ([]byte, error)
-}
-
 // LibvirtConnection contains required libvirt connection methods.
 type LibvirtConnection interface {
 	StoragePoolLookupByName(Name string) (rPool libvirt.StoragePool, err error)
@@ -47,19 +42,16 @@ type Virter struct {
 	libvirt         LibvirtConnection
 	storagePoolName string
 	networkName     string
-	templates       FileReader
 }
 
 // New configures a new Virter.
 func New(libvirtConnection LibvirtConnection,
 	storagePoolName string,
-	networkName string,
-	fileReader FileReader) *Virter {
+	networkName string) *Virter {
 	return &Virter{
 		libvirt:         libvirtConnection,
 		storagePoolName: storagePoolName,
 		networkName:     networkName,
-		templates:       fileReader,
 	}
 }
 
@@ -122,7 +114,7 @@ type NetworkCopier interface {
 	Copy(host string, source []string, destination string) error
 }
 
-func (v *Virter) renderTemplate(name, content string, data interface{}) (string, error) {
+func renderTemplate(name, content string, data interface{}) (string, error) {
 	t, err := template.New(name).Parse(content)
 	if err != nil {
 		return "", fmt.Errorf("invalid template %v: %w", name, err)

internal/virter/virter_test.go

@@ -1,16 +1,10 @@
 package virter_test
 
-import "github.com/LINBIT/virter/pkg/directory"
-
 //go:generate mockery -name=ISOGenerator
 //go:generate mockery -name=PortWaiter
 //go:generate mockery -name=AfterNotifier
 //go:generate mockery -name=NetworkCopier
 
-func testDirectory() directory.Directory {
-	return directory.Directory("../../assets/libvirt-templates")
-}
-
 const poolName = "some-pool"
 const networkName = "some-network"
 const imageName = "some-image"

internal/virter/vm_test.go

@@ -52,7 +52,7 @@ func TestVMRun(t *testing.T) {
 
 	l.vols[imageName] = &FakeLibvirtStorageVol{}
 
-	v := virter.New(l, poolName, networkName, testDirectory())
+	v := virter.New(l, poolName, networkName)
 
 	c := virter.VMConfig{
 		ImageName:     imageName,
@@ -153,7 +153,7 @@ func TestVMRm(t *testing.T) {
 			fakeNetworkAddHost(l.network, vmMAC, vmIP)
 		}
 
-		v := virter.New(l, poolName, networkName, testDirectory())
+		v := virter.New(l, poolName, networkName)
 
 		err := v.VMRm(vmName)
 		assert.NoError(t, err)
@@ -226,7 +226,7 @@ func TestVMCommit(t *testing.T) {
 
 		}
 
-		v := virter.New(l, poolName, networkName, testDirectory())
+		v := virter.New(l, poolName, networkName)
 
 		err := v.VMCommit(an, vmName, r[commitShutdown], shutdownTimeout)
 		if expectOk {
@@ -266,7 +266,7 @@ func TestVMExecDocker(t *testing.T) {
 	docker := new(mocks.DockerClient)
 	mockDockerRun(docker)
 
-	v := virter.New(l, poolName, networkName, testDirectory())
+	v := virter.New(l, poolName, networkName)
 
 	dockercfg := virter.DockerContainerConfig{ImageName: dockerImageName}
 	err := v.VMExecDocker(context.Background(), docker, []string{vmName}, dockercfg, []byte(sshPrivateKey))
@@ -285,7 +285,7 @@ func TestVMExecRsync(t *testing.T) {
 
 	fakeNetworkAddHost(l.network, vmMAC, vmIP)
 
-	v := virter.New(l, poolName, networkName, testDirectory())
+	v := virter.New(l, poolName, networkName)
 
 	dir, err := createFakeDirectory()
 	assert.NoError(t, err)