With apiv2 os installer in chroot

cmd/install_test.go

@@ -2,18 +2,20 @@ package cmd
 
 import (
 	"log/slog"
-	"reflect"
 	"testing"
 
+	"github.com/google/go-cmp/cmp"
+	apiv2 "github.com/metal-stack/api/go/metalstack/api/v2"
 	"github.com/metal-stack/metal-go/api/models"
+	"google.golang.org/protobuf/testing/protocmp"
 )
 
 func TestHammer_onlyNicsWithNeighbors(t *testing.T) {
 
 	tests := []struct {
 		name string
 		nics []*models.V1MachineNic
-		want []*models.V1MachineNic
+		want []*apiv2.MachineNic
 	}{
 		{
 			name: "4 interfaces, two with neighbors",
@@ -23,9 +25,9 @@ func TestHammer_onlyNicsWithNeighbors(t *testing.T) {
 				{Name: new("eth2"), Mac: new("aa:bb"), Neighbors: []*models.V1MachineNic{{Name: new("swp1"), Mac: new("cc:dd")}}},
 				{Name: new("eth3"), Mac: new("aa:bc"), Neighbors: []*models.V1MachineNic{{Name: new("swp2"), Mac: new("cc:de")}}},
 			},
-			want: []*models.V1MachineNic{
-				{Name: new("eth2"), Mac: new("aa:bb"), Neighbors: []*models.V1MachineNic{{Name: new("swp1"), Mac: new("cc:dd")}}},
-				{Name: new("eth3"), Mac: new("aa:bc"), Neighbors: []*models.V1MachineNic{{Name: new("swp2"), Mac: new("cc:de")}}},
+			want: []*apiv2.MachineNic{
+				{Name: "eth2", Mac: "aa:bb", Neighbors: []*apiv2.MachineNic{{Name: "swp1", Mac: "cc:dd"}}},
+				{Name: "eth3", Mac: "aa:bc", Neighbors: []*apiv2.MachineNic{{Name: "swp2", Mac: "cc:de"}}},
 			},
 		},
 		{
@@ -36,9 +38,9 @@ func TestHammer_onlyNicsWithNeighbors(t *testing.T) {
 				{Name: new("eth2"), Mac: new("aa:bb"), Neighbors: []*models.V1MachineNic{{Name: new("swp1"), Mac: new("cc:dd")}}},
 				{Name: new("eth3"), Mac: new("aa:bc"), Neighbors: []*models.V1MachineNic{{Name: new("swp2"), Mac: new("cc:de")}}},
 			},
-			want: []*models.V1MachineNic{
-				{Name: new("eth2"), Mac: new("aa:bb"), Neighbors: []*models.V1MachineNic{{Name: new("swp1"), Mac: new("cc:dd")}}},
-				{Name: new("eth3"), Mac: new("aa:bc"), Neighbors: []*models.V1MachineNic{{Name: new("swp2"), Mac: new("cc:de")}}},
+			want: []*apiv2.MachineNic{
+				{Name: "eth2", Mac: "aa:bb", Neighbors: []*apiv2.MachineNic{{Name: "swp1", Mac: "cc:dd"}}},
+				{Name: "eth3", Mac: "aa:bc", Neighbors: []*apiv2.MachineNic{{Name: "swp2", Mac: "cc:de"}}},
 			},
 		},
 	}
@@ -47,8 +49,9 @@ func TestHammer_onlyNicsWithNeighbors(t *testing.T) {
 			h := &hammer{
 				log: slog.Default(),
 			}
-			if got := h.onlyNicsWithNeighbors(tt.nics); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("Hammer.onlyNicsWithNeighbors() = %v, want %v", got, tt.want)
+			got := h.onlyNicsWithNeighbors(tt.nics)
+			if diff := cmp.Diff(got, tt.want, protocmp.Transform()); diff != "" {
+				t.Errorf("Hammer.onlyNicsWithNeighbors() diff = %s", diff)
 			}
 		})
 	}

cmd/reinstall.go

@@ -5,14 +5,14 @@ import (
 	"time"
 
 	v1 "github.com/metal-stack/metal-api/pkg/api/v1"
-	kernelapi "github.com/metal-stack/metal-hammer/pkg/api"
 	"github.com/metal-stack/metal-hammer/pkg/kernel"
+	installerv1 "github.com/metal-stack/os-installer/api/v1"
 )
 
 func (h *hammer) abortReinstall(reason error, machineID string, primaryDiskWiped bool) error {
 	h.log.Error("reinstall cancelled => boot into existing OS...", "reason", reason)
 
-	var bootInfo *kernelapi.Bootinfo
+	var bootInfo *installerv1.Bootinfo
 
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 	defer cancel()
@@ -23,7 +23,7 @@ func (h *hammer) abortReinstall(reason error, machineID string, primaryDiskWiped
 	}
 
 	if resp != nil && resp.BootInfo != nil {
-		bootInfo = &kernelapi.Bootinfo{
+		bootInfo = &installerv1.Bootinfo{
 			Initrd:       resp.BootInfo.Initrd,
 			Cmdline:      resp.BootInfo.Cmdline,
 			Kernel:       resp.BootInfo.Kernel,

cmd/storage/filesystem.go

@@ -1,7 +1,6 @@
 package storage
 
 import (
-	"encoding/json"
 	"fmt"
 	"log/slog"
 	gos "os"
@@ -16,24 +15,21 @@ import (
 	"github.com/u-root/u-root/pkg/mount/block"
 
 	"github.com/metal-stack/metal-go/api/models"
-	"github.com/metal-stack/metal-hammer/pkg/api"
 	"github.com/metal-stack/metal-hammer/pkg/os"
 	"github.com/metal-stack/metal-hammer/pkg/os/command"
 	"github.com/metal-stack/v"
 )
 
 type Filesystem struct {
+	log *slog.Logger
+
 	config models.V1FilesystemLayoutResponse
 	// chroot defines the root of the mounts
 	chroot string
 	// mounts are collected to be able to umount all in reverse order
 	mounts       []string
 	fstabEntries fstabEntries
-	// disk is the legacy disk.json representatio
-	// TODO remove once old images are gone
-	disk     api.Disk
-	log      *slog.Logger
-	RootUUID string
+	RootUUID     string
 }
 
 type fstabEntries []fstabEntry
@@ -50,11 +46,10 @@ type fstabEntry struct {
 
 func New(log *slog.Logger, chroot string, config models.V1FilesystemLayoutResponse) *Filesystem {
 	return &Filesystem{
+		log:          log,
 		config:       config,
 		chroot:       chroot,
 		fstabEntries: fstabEntries{},
-		disk:         api.Disk{Device: "legacy", Partitions: []api.Partition{}},
-		log:          log,
 	}
 }
 
@@ -89,11 +84,6 @@ func (f *Filesystem) Run() error {
 		return fmt.Errorf("mount special filesystems failed:%w", err)
 	}
 
-	// TODO legacy image support, can be removed once all images in use do no depend on disk.json anymore
-	err = f.createDiskJSON()
-	if err != nil {
-		return fmt.Errorf("disk.json creation failed:%w", err)
-	}
 	return nil
 }
 func (f *Filesystem) Umount() {
@@ -389,19 +379,8 @@ func (f *Filesystem) mountFilesystems() error {
 			passno:    passno,
 		}
 		f.fstabEntries = append(f.fstabEntries, fstabEntry)
-		// create legacy disk.json
-		switch fs.Label {
-		case "root", "efi", "varlib":
-			partUUID := properties["UUID"]
-			if fs.Label == "root" {
-				f.RootUUID = partUUID
-			}
-			part := api.Partition{
-				Label:      fs.Label,
-				Filesystem: *fs.Format,
-				Properties: map[string]string{"UUID": properties["UUID"]},
-			}
-			f.disk.Partitions = append(f.disk.Partitions, part)
+		if fs.Label == "root" {
+			f.RootUUID = properties["UUID"]
 		}
 	}
 	return nil
@@ -474,26 +453,6 @@ func (f *Filesystem) CreateFSTab() error {
 	return f.fstabEntries.write(f.log, f.chroot)
 }
 
-func (f *Filesystem) createDiskJSON() error {
-	configdir := path.Join(f.chroot, "etc", "metal")
-	destination := path.Join(configdir, "disk.json")
-
-	if _, err := gos.Stat(configdir); err != nil && gos.IsNotExist(err) {
-		if err := gos.MkdirAll(configdir, 0755); err != nil {
-			return err
-		}
-	} else if err != nil {
-		return err
-	}
-
-	j, err := json.MarshalIndent(f.disk, "", "  ")
-	if err != nil {
-		return fmt.Errorf("unable to marshal to json %w", err)
-	}
-	f.log.Info("create legacy disk.json", "content", string(j))
-	return gos.WriteFile(destination, j, 0600)
-}
-
 func mountFs(log *slog.Logger, chroot string, fs models.V1Filesystem) (string, error) {
 	if fs.Format == nil || *fs.Format == "swap" || *fs.Format == "" || *fs.Format == "tmpfs" {
 		return "", nil