Initialize volume with data

cmd/api/api/volumes.go

@@ -3,6 +3,9 @@ package api
 import (
 	"context"
 	"errors"
+	"io"
+	"mime/multipart"
+	"strconv"
 
 	"github.com/onkernel/hypeman/lib/logger"
 	"github.com/onkernel/hypeman/lib/oapi"
@@ -31,24 +34,167 @@ func (s *ApiService) ListVolumes(ctx context.Context, request oapi.ListVolumesRe
 }
 
 // CreateVolume creates a new volume
+// Supports two modes:
+// - JSON body: Creates an empty volume of the specified size
+// - Multipart form: Creates a volume pre-populated with content from a tar.gz archive
 func (s *ApiService) CreateVolume(ctx context.Context, request oapi.CreateVolumeRequestObject) (oapi.CreateVolumeResponseObject, error) {
 	log := logger.FromContext(ctx)
 
-	domainReq := volumes.CreateVolumeRequest{
-		Name:   request.Body.Name,
-		SizeGb: request.Body.SizeGb,
-		Id:     request.Body.Id,
+	// Handle JSON request (empty volume)
+	if request.JSONBody != nil {
+		domainReq := volumes.CreateVolumeRequest{
+			Name:   request.JSONBody.Name,
+			SizeGb: request.JSONBody.SizeGb,
+			Id:     request.JSONBody.Id,
+		}
+
+		vol, err := s.VolumeManager.CreateVolume(ctx, domainReq)
+		if err != nil {
+			if errors.Is(err, volumes.ErrAlreadyExists) {
+				return oapi.CreateVolume409JSONResponse{
+					Code:    "already_exists",
+					Message: "volume with this ID already exists",
+				}, nil
+			}
+			log.Error("failed to create volume", "error", err, "name", request.JSONBody.Name)
+			return oapi.CreateVolume500JSONResponse{
+				Code:    "internal_error",
+				Message: "failed to create volume",
+			}, nil
+		}
+		return oapi.CreateVolume201JSONResponse(volumeToOAPI(*vol)), nil
 	}
 
-	vol, err := s.VolumeManager.CreateVolume(ctx, domainReq)
-	if err != nil {
-		log.Error("failed to create volume", "error", err, "name", request.Body.Name)
-		return oapi.CreateVolume500JSONResponse{
-			Code:    "internal_error",
-			Message: "failed to create volume",
+	// Handle multipart request (volume with archive content)
+	if request.MultipartBody != nil {
+		return s.createVolumeFromMultipart(ctx, request.MultipartBody)
+	}
+
+	return oapi.CreateVolume400JSONResponse{
+		Code:    "invalid_request",
+		Message: "request body is required",
+	}, nil
+}
+
+// createVolumeFromMultipart handles creating a volume from multipart form data with archive content
+func (s *ApiService) createVolumeFromMultipart(ctx context.Context, multipartReader *multipart.Reader) (oapi.CreateVolumeResponseObject, error) {
+	log := logger.FromContext(ctx)
+
+	var name string
+	var sizeGb int
+	var id *string
+	var archiveReader io.Reader
+
+	for {
+		part, err := multipartReader.NextPart()
+		if err == io.EOF {
+			break
+		}
+		if err != nil {
+			return oapi.CreateVolume400JSONResponse{
+				Code:    "invalid_form",
+				Message: "failed to parse multipart form: " + err.Error(),
+			}, nil
+		}
+
+		switch part.FormName() {
+		case "name":
+			data, err := io.ReadAll(part)
+			if err != nil {
+				return oapi.CreateVolume400JSONResponse{
+					Code:    "invalid_field",
+					Message: "failed to read name field",
+				}, nil
+			}
+			name = string(data)
+		case "size_gb":
+			data, err := io.ReadAll(part)
+			if err != nil {
+				return oapi.CreateVolume400JSONResponse{
+					Code:    "invalid_field",
+					Message: "failed to read size_gb field",
+				}, nil
+			}
+			sizeGb, err = strconv.Atoi(string(data))
+			if err != nil || sizeGb <= 0 {
+				return oapi.CreateVolume400JSONResponse{
+					Code:    "invalid_field",
+					Message: "size_gb must be a positive integer",
+				}, nil
+			}
+		case "id":
+			data, err := io.ReadAll(part)
+			if err != nil {
+				return oapi.CreateVolume400JSONResponse{
+					Code:    "invalid_field",
+					Message: "failed to read id field",
+				}, nil
+			}
+			idStr := string(data)
+			if idStr != "" {
+				id = &idStr
+			}
+		case "content":
+			archiveReader = part
+			// Process the archive immediately while we have the reader
+			if name == "" {
+				return oapi.CreateVolume400JSONResponse{
+					Code:    "missing_field",
+					Message: "name is required",
+				}, nil
+			}
+			if sizeGb <= 0 {
+				return oapi.CreateVolume400JSONResponse{
+					Code:    "missing_field",
+					Message: "size_gb is required",
+				}, nil
+			}
+
+			// Create the volume from archive
+			domainReq := volumes.CreateVolumeFromArchiveRequest{
+				Name:   name,
+				SizeGb: sizeGb,
+				Id:     id,
+			}
+
+			vol, err := s.VolumeManager.CreateVolumeFromArchive(ctx, domainReq, archiveReader)
+			if err != nil {
+				if errors.Is(err, volumes.ErrArchiveTooLarge) {
+					return oapi.CreateVolume400JSONResponse{
+						Code:    "archive_too_large",
+						Message: err.Error(),
+					}, nil
+				}
+				if errors.Is(err, volumes.ErrAlreadyExists) {
+					return oapi.CreateVolume409JSONResponse{
+						Code:    "already_exists",
+						Message: "volume with this ID already exists",
+					}, nil
+				}
+				log.Error("failed to create volume from archive", "error", err, "name", name)
+				return oapi.CreateVolume500JSONResponse{
+					Code:    "internal_error",
+					Message: "failed to create volume",
+				}, nil
+			}
+
+			return oapi.CreateVolume201JSONResponse(volumeToOAPI(*vol)), nil
+		}
+	}
+
+	// If we get here without processing content, it means content was not provided
+	if archiveReader == nil {
+		return oapi.CreateVolume400JSONResponse{
+			Code:    "missing_file",
+			Message: "content file is required for multipart requests",
 		}, nil
 	}
-	return oapi.CreateVolume201JSONResponse(volumeToOAPI(*vol)), nil
+
+	// Should not reach here
+	return oapi.CreateVolume500JSONResponse{
+		Code:    "internal_error",
+		Message: "unexpected error processing request",
+	}, nil
 }
 
 // GetVolume gets volume details
@@ -157,3 +303,4 @@ func volumeToOAPI(vol volumes.Volume) oapi.Volume {
 	return oapiVol
 }
 
+

go.mod

@@ -5,6 +5,7 @@ go 1.25.4
 require (
 	github.com/c2h5oh/datasize v0.0.0-20231215233829-aa82cc1e6500
 	github.com/creack/pty v1.1.24
+	github.com/cyphar/filepath-securejoin v0.6.1
 	github.com/distribution/reference v0.6.0
 	github.com/getkin/kin-openapi v0.133.0
 	github.com/ghodss/yaml v1.0.0
@@ -39,7 +40,6 @@ require (
 	github.com/apex/log v1.9.0 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect
-	github.com/cyphar/filepath-securejoin v0.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/docker/cli v28.2.2+incompatible // indirect
 	github.com/docker/distribution v2.8.3+incompatible // indirect

go.sum

@@ -19,8 +19,8 @@ github.com/containerd/stargz-snapshotter/estargz v0.16.3 h1:7evrXtoh1mSbGj/pfRcc
 github.com/containerd/stargz-snapshotter/estargz v0.16.3/go.mod h1:uyr4BfYfOj3G9WBVE8cOlQmXAbPN9VEQpBBeJIuOipU=
 github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s=
 github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
-github.com/cyphar/filepath-securejoin v0.5.0 h1:hIAhkRBMQ8nIeuVwcAoymp7MY4oherZdAxD+m0u9zaw=
-github.com/cyphar/filepath-securejoin v0.5.0/go.mod h1:Sdj7gXlvMcPZsbhwhQ33GguGLDGQL7h7bg04C/+u9jI=
+github.com/cyphar/filepath-securejoin v0.6.1 h1:5CeZ1jPXEiYt3+Z6zqprSAgSWiggmpVyciv8syjIpVE=
+github.com/cyphar/filepath-securejoin v0.6.1/go.mod h1:A8hd4EnAeyujCJRrICiOWqjS1AX0a9kM5XL+NwKoYSc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
@@ -66,8 +66,6 @@ github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
 github.com/google/go-containerregistry v0.20.6 h1:cvWX87UxxLgaH76b4hIvya6Dzz9qHB31qAwjAohdSTU=
 github.com/google/go-containerregistry v0.20.6/go.mod h1:T0x8MuoAoKX/873bkeSfLD2FAkwCDf9/HZgsFJ02E2Y=
-github.com/google/subcommands v1.2.0 h1:vWQspBTo2nEqTUFita5/KeEWlUL8kQObDFbub/EN9oE=
-github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -205,8 +203,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
 golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
-golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=
-golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -231,8 +227,6 @@ golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
 golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=
-golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
 gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=