Glance compatibility expansion

internal/api/image/data.go

@@ -0,0 +1,92 @@
+package image
+
+import (
+	"errors"
+	"io"
+	"net/http"
+
+	"github.com/JSYoo5B/SandStack/internal/api/respond"
+	appimage "github.com/JSYoo5B/SandStack/internal/app/image"
+	"github.com/go-chi/chi/v5"
+)
+
+func (h Handler) uploadImageData(w http.ResponseWriter, r *http.Request) {
+	data, err := io.ReadAll(r.Body)
+	if err != nil {
+		respond.Error(w, http.StatusBadRequest, "invalid image data")
+		return
+	}
+
+	err = h.service.UploadData(chi.URLParam(r, "image_id"), data)
+	if errors.Is(err, appimage.ErrImageNotFound) {
+		respond.Error(w, http.StatusNotFound, "image not found")
+		return
+	}
+	if err != nil {
+		respond.Error(w, http.StatusInternalServerError, "image data upload failed")
+		return
+	}
+
+	w.WriteHeader(http.StatusNoContent)
+}
+
+func (h Handler) stageImageData(w http.ResponseWriter, r *http.Request) {
+	data, err := io.ReadAll(r.Body)
+	if err != nil {
+		respond.Error(w, http.StatusBadRequest, "invalid image data")
+		return
+	}
+
+	err = h.service.StageData(chi.URLParam(r, "image_id"), data)
+	if errors.Is(err, appimage.ErrImageNotFound) {
+		respond.Error(w, http.StatusNotFound, "image not found")
+		return
+	}
+	if err != nil {
+		respond.Error(w, http.StatusInternalServerError, "image data stage failed")
+		return
+	}
+
+	w.WriteHeader(http.StatusNoContent)
+}
+
+func (h Handler) importImageData(w http.ResponseWriter, r *http.Request) {
+	err := h.service.ImportData(chi.URLParam(r, "image_id"))
+	if errors.Is(err, appimage.ErrImageNotFound) {
+		respond.Error(w, http.StatusNotFound, "image not found")
+		return
+	}
+	if err != nil {
+		respond.Error(w, http.StatusInternalServerError, "image import failed")
+		return
+	}
+
+	w.WriteHeader(http.StatusAccepted)
+}
+
+func (h Handler) getImportInfo(w http.ResponseWriter, r *http.Request) {
+	respond.JSON(w, http.StatusOK, importInfoResponse{
+		ImportMethods: importMethodsDocument{
+			Description: "Import methods available.",
+			Type:        "array",
+			Value: []string{
+				"glance-direct",
+			},
+		},
+	})
+}
+
+func (h Handler) downloadImageData(w http.ResponseWriter, r *http.Request) {
+	data, err := h.service.DownloadData(chi.URLParam(r, "image_id"))
+	if errors.Is(err, appimage.ErrImageNotFound) {
+		respond.Error(w, http.StatusNotFound, "image data not found")
+		return
+	}
+	if err != nil {
+		respond.Error(w, http.StatusInternalServerError, "image data download failed")
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/octet-stream")
+	_, _ = w.Write(data)
+}

internal/api/image/data_test.go

@@ -0,0 +1,75 @@
+package image_test
+
+import (
+	"io"
+	"net/http/httptest"
+	"strings"
+	"testing"
+
+	"github.com/JSYoo5B/SandStack/internal/api/image"
+	"github.com/JSYoo5B/SandStack/internal/testhelper"
+	"github.com/gophercloud/gophercloud/v2/openstack/image/v2/imagedata"
+	"github.com/gophercloud/gophercloud/v2/openstack/image/v2/images"
+	"github.com/stretchr/testify/suite"
+)
+
+type DataSuite struct {
+	suite.Suite
+	server *httptest.Server
+}
+
+func TestDataSuite(t *testing.T) {
+	suite.Run(t, new(DataSuite))
+}
+
+func (s *DataSuite) SetupTest() {
+	s.server = httptest.NewServer(
+		image.NewRouter(testhelper.DefaultConfig()),
+	)
+}
+
+func (s *DataSuite) TearDownTest() {
+	s.server.Close()
+}
+
+func (s *DataSuite) TestUploadAndDownloadImageData() {
+	created := s.createImage("ubuntu")
+
+	err := imagedata.Upload(
+		s.T().Context(),
+		testhelper.ServiceClient(s.server.URL),
+		created.ID,
+		strings.NewReader("image-data"),
+	).ExtractErr()
+	s.Require().NoError(err)
+
+	reader, err := imagedata.Download(
+		s.T().Context(),
+		testhelper.ServiceClient(s.server.URL),
+		created.ID,
+	).Extract()
+	s.Require().NoError(err)
+	s.Require().NotNil(reader)
+	defer reader.Close()
+
+	data, err := io.ReadAll(reader)
+	s.Require().NoError(err)
+
+	s.Assert().Equal("image-data", string(data))
+}
+
+func (s *DataSuite) createImage(name string) *images.Image {
+	created, err := images.Create(
+		s.T().Context(),
+		testhelper.ServiceClient(s.server.URL),
+		images.CreateOpts{
+			Name:            name,
+			ContainerFormat: "bare",
+			DiskFormat:      "qcow2",
+		},
+	).Extract()
+	s.Require().NoError(err)
+	s.Require().NotNil(created)
+
+	return created
+}

internal/api/image/image_dto.go

@@ -37,6 +37,7 @@ type imageDocument struct {
 	Protected       bool     `json:"protected"`
 	Visibility      string   `json:"visibility"`
 	Tags            []string `json:"tags"`
+	SizeBytes       int64    `json:"size"`
 	CreatedAt       string   `json:"created_at"`
 	UpdatedAt       string   `json:"updated_at"`
 	File            string   `json:"file"`
@@ -64,6 +65,7 @@ func toImageDocument(image appimage.Image) imageDocument {
 		Protected:       image.Protected,
 		Visibility:      image.Visibility,
 		Tags:            image.Tags,
+		SizeBytes:       image.SizeBytes,
 		CreatedAt:       image.CreatedAt,
 		UpdatedAt:       image.UpdatedAt,
 		File:            "/v2/images/" + image.ID + "/file",

internal/api/image/import_dto.go

@@ -0,0 +1,11 @@
+package image
+
+type importInfoResponse struct {
+	ImportMethods importMethodsDocument `json:"import-methods"`
+}
+
+type importMethodsDocument struct {
+	Description string   `json:"description"`
+	Type        string   `json:"type"`
+	Value       []string `json:"value"`
+}

internal/api/image/import_test.go

@@ -0,0 +1,78 @@
+package image_test
+
+import (
+	"bytes"
+	"context"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/JSYoo5B/SandStack/internal/api/image"
+	"github.com/JSYoo5B/SandStack/internal/testhelper"
+	"github.com/gophercloud/gophercloud/v2/openstack/image/v2/imagedata"
+	"github.com/gophercloud/gophercloud/v2/openstack/image/v2/imageimport"
+	"github.com/gophercloud/gophercloud/v2/openstack/image/v2/images"
+	"github.com/stretchr/testify/suite"
+)
+
+type ImportSuite struct {
+	suite.Suite
+	server *httptest.Server
+}
+
+func TestImportSuite(t *testing.T) {
+	suite.Run(t, new(ImportSuite))
+}
+
+func (s *ImportSuite) SetupTest() {
+	s.server = httptest.NewServer(
+		image.NewRouter(testhelper.DefaultConfig()),
+	)
+}
+
+func (s *ImportSuite) TearDownTest() {
+	s.server.Close()
+}
+
+func (s *ImportSuite) TestGetImportInfo() {
+	client := testhelper.ServiceClient(s.server.URL)
+
+	info, err := imageimport.Get(context.Background(), client).Extract()
+	s.Require().NoError(err)
+
+	s.Assert().Contains(info.ImportMethods.Value, "glance-direct")
+}
+
+func (s *ImportSuite) TestStageAndImportImageData() {
+	client := testhelper.ServiceClient(s.server.URL)
+
+	created, err := images.Create(
+		context.Background(),
+		client,
+		images.CreateOpts{Name: "ubuntu"},
+	).Extract()
+	s.Require().NoError(err)
+
+	err = imagedata.Stage(
+		context.Background(),
+		client,
+		created.ID,
+		bytes.NewBufferString("image-bytes"),
+	).ExtractErr()
+	s.Require().NoError(err)
+
+	staged, err := images.Get(context.Background(), client, created.ID).Extract()
+	s.Require().NoError(err)
+	s.Assert().Equal(images.ImageStatus("uploading"), staged.Status)
+
+	err = imageimport.Create(
+		context.Background(),
+		client,
+		created.ID,
+		imageimport.CreateOpts{Name: imageimport.GlanceDirectMethod},
+	).ExtractErr()
+	s.Require().NoError(err)
+
+	imported, err := images.Get(context.Background(), client, created.ID).Extract()
+	s.Require().NoError(err)
+	s.Assert().Equal(images.ImageStatusActive, imported.Status)
+}

internal/api/image/member.go

@@ -0,0 +1,108 @@
+package image
+
+import (
+	"encoding/json"
+	"errors"
+	"net/http"
+
+	"github.com/JSYoo5B/SandStack/internal/api/respond"
+	appimage "github.com/JSYoo5B/SandStack/internal/app/image"
+	"github.com/go-chi/chi/v5"
+)
+
+func (h Handler) listMembers(w http.ResponseWriter, r *http.Request) {
+	members, err := h.service.ListMembers(chi.URLParam(r, "image_id"))
+	if errors.Is(err, appimage.ErrImageNotFound) {
+		respond.Error(w, http.StatusNotFound, "image not found")
+		return
+	}
+	if err != nil {
+		respond.Error(w, http.StatusInternalServerError, "image member lookup failed")
+		return
+	}
+
+	respond.JSON(w, http.StatusOK, memberListResponse{
+		Members: toMemberDocuments(members),
+	})
+}
+
+func (h Handler) createMember(w http.ResponseWriter, r *http.Request) {
+	var request createMemberRequest
+	if err := json.NewDecoder(r.Body).Decode(&request); err != nil {
+		respond.Error(w, http.StatusBadRequest, "invalid JSON request body")
+		return
+	}
+
+	member, err := h.service.CreateMember(
+		chi.URLParam(r, "image_id"),
+		request.Member,
+	)
+	if errors.Is(err, appimage.ErrImageNotFound) {
+		respond.Error(w, http.StatusNotFound, "image not found")
+		return
+	}
+	if err != nil {
+		respond.Error(w, http.StatusInternalServerError, "image member create failed")
+		return
+	}
+
+	respond.JSON(w, http.StatusOK, toMemberDocument(member))
+}
+
+func (h Handler) getMember(w http.ResponseWriter, r *http.Request) {
+	member, err := h.service.GetMember(
+		chi.URLParam(r, "image_id"),
+		chi.URLParam(r, "member_id"),
+	)
+	if errors.Is(err, appimage.ErrImageNotFound) {
+		respond.Error(w, http.StatusNotFound, "image member not found")
+		return
+	}
+	if err != nil {
+		respond.Error(w, http.StatusInternalServerError, "image member lookup failed")
+		return
+	}
+
+	respond.JSON(w, http.StatusOK, toMemberDocument(member))
+}
+
+func (h Handler) updateMember(w http.ResponseWriter, r *http.Request) {
+	var request updateMemberRequest
+	if err := json.NewDecoder(r.Body).Decode(&request); err != nil {
+		respond.Error(w, http.StatusBadRequest, "invalid JSON request body")
+		return
+	}
+
+	member, err := h.service.UpdateMember(
+		chi.URLParam(r, "image_id"),
+		chi.URLParam(r, "member_id"),
+		request.Status,
+	)
+	if errors.Is(err, appimage.ErrImageNotFound) {
+		respond.Error(w, http.StatusNotFound, "image member not found")
+		return
+	}
+	if err != nil {
+		respond.Error(w, http.StatusInternalServerError, "image member update failed")
+		return
+	}
+
+	respond.JSON(w, http.StatusOK, toMemberDocument(member))
+}
+
+func (h Handler) deleteMember(w http.ResponseWriter, r *http.Request) {
+	err := h.service.DeleteMember(
+		chi.URLParam(r, "image_id"),
+		chi.URLParam(r, "member_id"),
+	)
+	if errors.Is(err, appimage.ErrImageNotFound) {
+		respond.Error(w, http.StatusNotFound, "image member not found")
+		return
+	}
+	if err != nil {
+		respond.Error(w, http.StatusInternalServerError, "image member delete failed")
+		return
+	}
+
+	w.WriteHeader(http.StatusNoContent)
+}