Merge pull request #5 from cprivitere/remove-volumes

Remove all volume related functions

Author: displague

go.sum

@@ -1,4 +1,3 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dnaeon/go-vcr v1.0.1 h1:r8L/HqC0Hje5AXMu1ooW8oyQyOFv4GxqpL0nRP7SLLY=
 github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
@@ -10,10 +9,8 @@ github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
 github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
 github.com/packethost/packngo v0.29.0 h1:gRIhciVZQ/zLNrIdIdbOUyB/Tw5IgoaXyhP4bvE+D2s=
 github.com/packethost/packngo v0.29.0/go.mod h1:/UHguFdPs6Lf6FOkkSEPnRY5tgS0fsVM+Zv/bvBrmt0=
-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/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200420201142-3c4aac89819a h1:y6sBfNd1b9Wy08a6K1Z1DZc4aXABUN5TKjkYhz7UKmo=

pkg/server/server.go

@@ -2,17 +2,11 @@ package server
 
 import (
 	"encoding/json"
-	"fmt"
-	"net"
 	"net/http"
-	"net/url"
-	"strconv"
 
 	"github.com/gorilla/mux"
 	"github.com/packethost/packet-api-server/pkg/store"
-	"github.com/packethost/packet-api-server/pkg/util"
 	"github.com/packethost/packngo"
-	"github.com/packethost/packngo/metadata"
 )
 
 // ErrorHandler a handler for errors that can choose to exit or not
@@ -34,26 +28,13 @@ func (p *PacketServer) CreateHandler() http.Handler {
 	r := mux.NewRouter()
 	// list all facilities
 	r.HandleFunc("/facilities", p.allFacilitiesHandler).Methods("GET")
-	// get all volumes for a project
-	r.HandleFunc("/projects/{projectID}/storage", p.listVolumesHandler).Methods("GET")
-	// get information about a specific volume
-	r.HandleFunc("/storage/{volumeID}", p.getVolumeHandler).Methods("GET")
 	// create a BGP config for a project
 	r.HandleFunc("/projects/{projectID}/bgp-configs", p.createBGPHandler).Methods("POST")
-	// create a volume for a project
-	r.HandleFunc("/projects/{projectID}/storage", p.createVolumeHandler).Methods("POST")
-	// delete a volume
-	r.HandleFunc("/storage/{volumeID}", p.deleteVolumeHandler).Methods("DELETE")
-	// attach a volume to a host
-	r.HandleFunc("/storage/{volumeID}/attachments", p.volumeAttachHandler).Methods("POST")
-	// detach a volume from a host
-	r.HandleFunc("/storage/attachments/{attachmentID}", p.volumeDetachHandler).Methods("DELETE")
 	// get all devices for a project
 	r.HandleFunc("/projects/{projectID}/devices", p.listDevicesHandler).Methods("GET")
 	// get a single device
 	r.HandleFunc("/devices/{deviceID}", p.getDeviceHandler).Methods("GET")
 	// handle metadata requests
-	r.HandleFunc("/metadata", p.metadataHandler).Methods("GET")
 	return r
 }
 
@@ -112,191 +93,6 @@ func (p *PacketServer) getDeviceHandler(w http.ResponseWriter, r *http.Request)
 	http.NotFound(w, r)
 }
 
-// list all volumes for a project
-func (p *PacketServer) listVolumesHandler(w http.ResponseWriter, r *http.Request) {
-	var err error
-
-	vars := mux.Vars(r)
-	projectID := vars["projectID"]
-
-	// were we asked to limit it?
-	listOpt, err := paramsToListOpts(r.URL.Query())
-	if err != nil {
-		w.WriteHeader(http.StatusOK)
-		resp := struct {
-			Error string `json:"error"`
-		}{
-			Error: fmt.Sprintf("invalid query parameters: %v", err),
-		}
-		err = json.NewEncoder(w).Encode(&resp)
-		if err != nil {
-			p.ErrorHandler.Error(err)
-		}
-		return
-	}
-	vols, err := p.Store.ListVolumes(projectID, listOpt)
-	if err != nil {
-		p.ErrorHandler.Error(err)
-	}
-	var resp = struct {
-		Volumes []*packngo.Volume `json:"volumes"`
-	}{
-		Volumes: vols,
-	}
-	err = json.NewEncoder(w).Encode(&resp)
-	if err != nil {
-		p.ErrorHandler.Error(err)
-	}
-}
-
-// get information about a specific volume
-func (p *PacketServer) getVolumeHandler(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	volID := vars["volumeID"]
-	vol, err := p.Store.GetVolume(volID)
-	if err != nil {
-		p.ErrorHandler.Error(err)
-	}
-	if vol != nil {
-		err := json.NewEncoder(w).Encode(&vol)
-		if err != nil {
-			p.ErrorHandler.Error(err)
-		}
-		return
-	}
-	http.NotFound(w, r)
-}
-
-// delete a volume
-func (p *PacketServer) deleteVolumeHandler(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	volID := vars["volumeID"]
-	deleted, err := p.Store.DeleteVolume(volID)
-	if err != nil {
-		p.ErrorHandler.Error(err)
-	}
-	if deleted {
-		w.WriteHeader(http.StatusOK)
-		return
-	}
-	http.NotFound(w, r)
-}
-
-// create a volume
-func (p *PacketServer) createVolumeHandler(w http.ResponseWriter, r *http.Request) {
-	// get the info from the body
-	decoder := json.NewDecoder(r.Body)
-	var cvr packngo.VolumeCreateRequest
-	err := decoder.Decode(&cvr)
-	if err != nil {
-		p.ErrorHandler.Error(err)
-	}
-
-	vol, err := p.Store.CreateVolume(cvr)
-	if err != nil {
-		p.ErrorHandler.Error(err)
-	}
-	w.WriteHeader(http.StatusCreated)
-	err = json.NewEncoder(w).Encode(&vol)
-	if err != nil {
-		p.ErrorHandler.Error(err)
-	}
-}
-
-// attach volume
-func (p *PacketServer) volumeAttachHandler(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	volID := vars["volumeID"]
-	// get the device from the body
-	decoder := json.NewDecoder(r.Body)
-	var attachRequest struct {
-		Device string `json:"device_id"`
-	}
-	err := decoder.Decode(&attachRequest)
-	if err != nil {
-		p.ErrorHandler.Error(err)
-	}
-
-	attachment, err := p.Store.AttachVolume(volID, attachRequest.Device)
-	if err != nil {
-		p.ErrorHandler.Error(err)
-	}
-
-	if attachment != nil {
-		w.WriteHeader(http.StatusOK)
-		err = json.NewEncoder(w).Encode(&attachment)
-		if err != nil {
-			p.ErrorHandler.Error(err)
-		}
-		return
-	}
-	http.NotFound(w, r)
-}
-
-// detach volume
-func (p *PacketServer) volumeDetachHandler(w http.ResponseWriter, r *http.Request) {
-	vars := mux.Vars(r)
-	attachID := vars["attachmentID"]
-	detached, err := p.Store.DetachVolume(attachID)
-	if err != nil {
-		p.ErrorHandler.Error(err)
-	}
-	if detached {
-		w.WriteHeader(http.StatusOK)
-	}
-	http.NotFound(w, r)
-}
-
-// metadata handler
-// this is a difficult one, since we are building a generic API server
-// but the metadata service is meant to assume it already knows the device ID
-// and it cannot request it from the client sending the http request
-
-// for now, we pre-define it for a device to start
-func (p *PacketServer) metadataHandler(w http.ResponseWriter, r *http.Request) {
-	// do not do anything if we do not have a node defined
-	if p.MetadataDevice == "" {
-		http.NotFound(w, r)
-		return
-	}
-	// now find the given device
-	dev, err := p.Store.GetDevice(p.MetadataDevice)
-	if err != nil {
-		p.ErrorHandler.Error(err)
-	}
-	// find the volumes for the given device, find the attachments, get the metadata
-	allVols := dev.Volumes
-	vols := make([]*metadata.VolumeInfo, 0, len(allVols))
-	for _, v := range allVols {
-		attachment := v.Attachments[0]
-		iqn, ips, err := p.Store.GetAttachmentMetadata(attachment.ID)
-		if err != nil {
-			p.ErrorHandler.Error(err)
-		}
-		vols = append(vols, &metadata.VolumeInfo{
-			Name: util.VolumeIDToName(v.ID),
-			IQN:  iqn,
-			IPs:  []net.IP{net.ParseIP(ips[0]), net.ParseIP(ips[1])},
-			Capacity: struct {
-				Size int    `json:"size,string"`
-				Unit string `json:"unit"`
-			}{
-				Size: v.Size,
-				Unit: "gb",
-			},
-		})
-	}
-	var resp = struct {
-		Volumes []*metadata.VolumeInfo `json:"volumes"`
-	}{
-		Volumes: vols,
-	}
-	err = json.NewEncoder(w).Encode(&resp)
-	if err != nil {
-		p.ErrorHandler.Error(err)
-	}
-}
-
 // createBGPHandler enable BGP for a project
 func (p *PacketServer) createBGPHandler(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
@@ -314,26 +110,3 @@ func (p *PacketServer) createBGPHandler(w http.ResponseWriter, r *http.Request)
 	}
 	w.WriteHeader(http.StatusCreated)
 }
-
-func paramsToListOpts(params url.Values) (*packngo.ListOptions, error) {
-	listOpt := &packngo.ListOptions{}
-	perPage, ok := params["per_page"]
-	if ok && len(perPage) > 0 && perPage[0] != "" {
-		count, err := strconv.Atoi(perPage[0])
-		// any error converting should be returned
-		if err != nil {
-			return nil, fmt.Errorf("error converting per_page %s to int: %v", perPage[0], err)
-		}
-		listOpt.PerPage = count
-	}
-	page, ok := params["page"]
-	if ok && len(page) > 0 && page[0] != "" {
-		pageNo, err := strconv.Atoi(page[0])
-		// any error converting should be returned
-		if err != nil {
-			return nil, fmt.Errorf("error converting page %s to int: %v", page[0], err)
-		}
-		listOpt.Page = pageNo
-	}
-	return listOpt, nil
-}

pkg/store/datastore.go

@@ -18,12 +18,5 @@ type DataStore interface {
 	ListDevices(projectID string) ([]*packngo.Device, error)
 	GetDevice(deviceID string) (*packngo.Device, error)
 	DeleteDevice(deviceID string) (bool, error)
-	ListVolumes(projectID string, listOpt *packngo.ListOptions) ([]*packngo.Volume, error)
-	GetVolume(volID string) (*packngo.Volume, error)
-	DeleteVolume(volID string) (bool, error)
-	CreateVolume(cvr packngo.VolumeCreateRequest) (*packngo.Volume, error)
-	AttachVolume(volID string, deviceID string) (*packngo.VolumeAttachment, error)
-	DetachVolume(attachID string) (bool, error)
-	GetAttachmentMetadata(attachID string) (string, []string, error)
 	EnableBGP(projectID string, cbgpcr packngo.CreateBGPConfigRequest) error
 }