Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions cmd/cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Usage: raptor COMMAND

Commands:
endpoint Create a new endpoint
list List all endpoints
publish Publish a deployment to an endpoint
deploy Create a new deployment
help Show usage
Expand Down Expand Up @@ -72,6 +73,8 @@ func main() {
command.handlePublish(args[1:])
case "endpoint":
command.handleEndpoint(args[1:])
case "list":
command.handleListEndpoints(args[1:])
case "deploy":
command.handleDeploy(args[1:])
case "serve":
Expand Down Expand Up @@ -153,6 +156,21 @@ func (c command) handleEndpoint(args []string) {
fmt.Println(string(b))
}

func (c command) handleListEndpoints(args []string) {
flagSet := flag.NewFlagSet("lists", flag.ExitOnError)
_ = flagSet.Parse(args)

endpoint, err := c.client.ListEndpoints()
if err != nil {
printErrorAndExit(err)
}
b, err := json.MarshalIndent(endpoint, "", " ")
if err != nil {
printErrorAndExit(err)
}
fmt.Println(string(b))
}

func (c command) handleDeploy(args []string) {
flagset := flag.NewFlagSet("deploy", flag.ExitOnError)

Expand Down
13 changes: 6 additions & 7 deletions internal/api/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -178,13 +178,12 @@ func (s *Server) handleGetEndpoint(w http.ResponseWriter, r *http.Request) error
return writeJSON(w, http.StatusOK, endpoint)
}

func (s *Server) handleGetEndpoints(w http.ResponseWriter, r *http.Request) error {
return nil
// endpoints, err := s.store.GetEndpoints()
// if err != nil {
// return writeJSON(w, http.StatusNotFound, ErrorResponse(err))
// }
// return writeJSON(w, http.StatusOK, endpoints)
func (s *Server) handleGetEndpoints(w http.ResponseWriter, _ *http.Request) error {
endpoints, err := s.store.GetEndpoints()
if err != nil {
return writeJSON(w, http.StatusNotFound, ErrorResponse(err))
}
return writeJSON(w, http.StatusOK, endpoints)
}

// PublishParams holds all the necessary fields to publish a specific
Expand Down
54 changes: 54 additions & 0 deletions internal/api/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,24 @@ func TestGetEndpoint(t *testing.T) {
require.Equal(t, *endpoint, other)
}

func TestGetEndpoints(t *testing.T) {
s := createServer()
endpoints := seedEndpoints(t, s)

req := httptest.NewRequest("GET", "/endpoint", nil)
resp := httptest.NewRecorder()

s.router.ServeHTTP(resp, req)

require.Equal(t, http.StatusOK, resp.Result().StatusCode)

var others []*types.Endpoint
err := json.NewDecoder(resp.Body).Decode(&others)
require.Nil(t, err)

require.True(t, endpointsExistsInEndpoints(endpoints, others))
}

func TestCreateDeploy(t *testing.T) {
s := createServer()
endpoint := seedEndpoint(t, s)
Expand Down Expand Up @@ -131,6 +149,42 @@ func seedEndpoint(t *testing.T, s *Server) *types.Endpoint {
require.Nil(t, s.store.CreateEndpoint(e))
return e
}
func seedEndpoints(t *testing.T, s *Server) []*types.Endpoint {
items := []map[string]string{
{"FOO": "BAR"},
{"Bar": "foo"},
{"Yada": "Yada"},
}

endpoints := make([]*types.Endpoint, 0, len(items))
for _, item := range items {
e := types.NewEndpoint("My endpoint", "go", item)
require.Nil(t, s.store.CreateEndpoint(e))
endpoints = append(endpoints, e)
}
return endpoints
}

func endpointsExistsInEndpoints(s1, s2 []*types.Endpoint) bool {
if len(s1) != len(s2) {
return false
}

for _, item1 := range s1 {
found := false
for _, item2 := range s2 {
if item1.ID == item2.ID {
found = true
break
}
}
if !found {
return false
}
}

return true
}

func createServer() *Server {
cache := storage.NewDefaultModCache()
Expand Down
12 changes: 12 additions & 0 deletions internal/storage/memory_store.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,18 @@ func (s *MemoryStore) GetEndpoint(id uuid.UUID) (*types.Endpoint, error) {
return e, nil
}

func (s *MemoryStore) GetEndpoints() ([]*types.Endpoint, error) {
s.mu.RLock()
defer s.mu.RUnlock()

endpoints := make([]*types.Endpoint, 0, len(s.endpoints))
for _, endpoint := range s.endpoints {
endpoints = append(endpoints, endpoint)
}

return endpoints, nil
}

func (s *MemoryStore) UpdateEndpoint(id uuid.UUID, params UpdateEndpointParams) error {
endpoint, err := s.GetEndpoint(id)
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions internal/storage/sql.go
Original file line number Diff line number Diff line change
Expand Up @@ -64,20 +64,20 @@ func (s *SQLStore) GetEndpoint(id uuid.UUID) (*types.Endpoint, error) {
return &endpoint, err
}

func (s *SQLStore) GetEndpoints() ([]types.Endpoint, error) {
func (s *SQLStore) GetEndpoints() ([]*types.Endpoint, error) {
rows, err := s.db.Query("SELECT * FROM endpoint")
if err != nil {
return nil, err
}
defer rows.Close()

var endpoints []types.Endpoint
var endpoints []*types.Endpoint
for rows.Next() {
var endpoint types.Endpoint
if err := scanEndpoint(rows, &endpoint); err != nil {
return nil, err
}
endpoints = append(endpoints, endpoint)
endpoints = append(endpoints, &endpoint)
}
return endpoints, nil
}
Expand Down
1 change: 1 addition & 0 deletions internal/storage/storage.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ type Store interface {
CreateEndpoint(*types.Endpoint) error
UpdateEndpoint(uuid.UUID, UpdateEndpointParams) error
GetEndpoint(uuid.UUID) (*types.Endpoint, error)
GetEndpoints() ([]*types.Endpoint, error)
CreateDeployment(*types.Deployment) error
GetDeployment(uuid.UUID) (*types.Deployment, error)
}
Expand Down