*: remove api and clt

It's not clear that the best way to manage clients is through a
gRPC based command line tool. For example we may explore an admin
dashboard and enable bootstrapping through static clients.

For now use static clients while we hold off on a more concrete
proposal.

Makefile

@@ -46,13 +46,6 @@ lint:
       golint $$package; \
 	done
 
-# TODO(ericchiang): Grab protoc as well.
-grpc: bin/protoc-gen-go
-	@protoc --go_out=plugins=grpc:. ./api/apipb/*.proto
-
-bin/protoc-gen-go:
-	@go install ${REPO_PATH}/vendor/github.com/golang/protobuf/protoc-gen-go
-
 clean:
 	@rm bin/*
 
@@ -60,4 +53,4 @@ testall: testrace vet fmt lint
 
 FORCE:
 
-.PHONY: test testrace vet fmt lint testall grpc
+.PHONY: test testrace vet fmt lint testall

api/api.go

-package api
-
-import (
-	"errors"
-
-	"golang.org/x/net/context"
-
-	"github.com/coreos/poke/api/apipb"
-	"github.com/coreos/poke/storage"
-)
-
-// NewServer returns a gRPC server for talking to a storage.
-func NewServer(s storage.Storage) apipb.StorageServer {
-	return &server{s}
-}
-
-type server struct {
-	storage storage.Storage
-}
-
-func fromPBClient(client *apipb.Client) storage.Client {
-	return storage.Client{
-		ID:           client.Id,
-		Secret:       client.Secret,
-		RedirectURIs: client.RedirectUris,
-		TrustedPeers: client.TrustedPeers,
-		Public:       client.Public,
-		Name:         client.Name,
-		LogoURL:      client.LogoUrl,
-	}
-}
-
-func toPBClient(client storage.Client) *apipb.Client {
-	return &apipb.Client{
-		Id:           client.ID,
-		Secret:       client.Secret,
-		RedirectUris: client.RedirectURIs,
-		TrustedPeers: client.TrustedPeers,
-		Public:       client.Public,
-		Name:         client.Name,
-		LogoUrl:      client.LogoURL,
-	}
-}
-
-func (s *server) CreateClient(ctx context.Context, req *apipb.CreateClientReq) (*apipb.CreateClientResp, error) {
-	// TODO(ericchiang): Create a more centralized strategy for creating client IDs
-	// and secrets which are restricted based on the storage.
-	client := fromPBClient(req.Client)
-	if client.ID == "" {
-		client.ID = storage.NewID()
-	}
-	if client.Secret == "" {
-		client.Secret = storage.NewID() + storage.NewID()
-	}
-
-	if err := s.storage.CreateClient(client); err != nil {
-		return nil, err
-	}
-	return &apipb.CreateClientResp{Client: toPBClient(client)}, nil
-}
-
-func (s *server) UpdateClient(ctx context.Context, req *apipb.UpdateClientReq) (*apipb.UpdateClientResp, error) {
-	switch {
-	case req.Id == "":
-		return nil, errors.New("no ID supplied")
-	case req.MakePublic && req.MakePrivate:
-		return nil, errors.New("cannot both make public and private")
-	case req.MakePublic && len(req.RedirectUris) != 0:
-		return nil, errors.New("redirect uris supplied for a public client")
-	}
-
-	var client *storage.Client
-	updater := func(old storage.Client) (storage.Client, error) {
-		if req.MakePublic {
-			old.Public = true
-		}
-		if req.MakePrivate {
-			old.Public = false
-		}
-		if req.Secret != "" {
-			old.Secret = req.Secret
-		}
-		if req.Name != "" {
-			old.Name = req.Name
-		}
-		if req.LogoUrl != "" {
-			old.LogoURL = req.LogoUrl
-		}
-		if len(req.RedirectUris) != 0 {
-			if old.Public {
-				return old, errors.New("public clients cannot have redirect URIs")
-			}
-			old.RedirectURIs = req.RedirectUris
-		}
-		client = &old
-		return old, nil
-	}
-
-	if err := s.storage.UpdateClient(req.Id, updater); err != nil {
-		return nil, err
-	}
-	return &apipb.UpdateClientResp{Client: toPBClient(*client)}, nil
-}
-
-func (s *server) DeleteClient(ctx context.Context, req *apipb.DeleteClientReq) (*apipb.DeleteClientReq, error) {
-	if req.Id == "" {
-		return nil, errors.New("no client ID supplied")
-	}
-	if err := s.storage.DeleteClient(req.Id); err != nil {
-		return nil, err
-	}
-	return &apipb.DeleteClientReq{}, nil
-}
-
-func (s *server) ListClients(ctx context.Context, req *apipb.ListClientsReq) (*apipb.ListClientsResp, error) {
-	clients, err := s.storage.ListClients()
-	if err != nil {
-		return nil, err
-	}
-	resp := make([]*apipb.Client, len(clients))
-	for i, client := range clients {
-		resp[i] = toPBClient(client)
-	}
-	return &apipb.ListClientsResp{Clients: resp}, nil
-}
-
-func (s *server) GetClient(ctx context.Context, req *apipb.GetClientReq) (*apipb.GetClientResp, error) {
-	if req.Id == "" {
-		return nil, errors.New("no client ID supplied")
-	}
-	client, err := s.storage.GetClient(req.Id)
-	if err != nil {
-		return nil, err
-	}
-	return &apipb.GetClientResp{Client: toPBClient(client)}, nil
-}

api/apipb/api.proto

-syntax = "proto3";
-
-// Run `make grpc` at the top level directory to regenerate Go source code.
-
-package apipb;
-
-message Client {
-  string id = 1;
-  string secret = 2;
-
-  repeated string redirect_uris = 3;
-  repeated string trusted_peers = 4;
-
-  bool public = 5; 
-
-  string name = 6;
-  string logo_url = 7;
-}
-
-message CreateClientReq {
-  Client client = 1;
-}
-
-message CreateClientResp {
-  Client client = 1;
-}
-
-message UpdateClientReq {
-  string id = 1;
-
-  // Empty strings indicate that string fields should not be updated.
-  string secret = 2;
-  string name = 3;
-  string logo_url = 4;
-
-  bool make_public = 5;
-  bool make_private = 6;
-
-  // If no redirect URIs are specified, the current redirect URIs are preserved.
-  repeated string redirect_uris = 7;
-}
-
-message UpdateClientResp {
-  Client client = 1;
-}
-
-message ListClientsReq {
-}
-
-message ListClientsResp {
-  repeated Client clients = 1;
-}
-
-message DeleteClientReq {
-  string id = 1;
-}
-
-message DeleteClientResp {}
-
-message GetClientReq {
-  string id = 1;
-}
-
-message GetClientResp {
-  Client client = 1;
-}
-
-service Storage {
-  rpc CreateClient(CreateClientReq) returns (CreateClientResp) {}
-  rpc DeleteClient(DeleteClientReq) returns (DeleteClientReq) {}
-  rpc GetClient(GetClientReq) returns (GetClientResp) {}
-  rpc ListClients(ListClientsReq) returns (ListClientsResp) {}
-  rpc UpdateClient(UpdateClientReq) returns (UpdateClientResp) {}
-}

api/doc.go

-// Package api implements a gRPC interface for interacting with a storage.
-package api

cmd/pokectl/pokectl.go

-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/spf13/cobra"
-)
-
-var rootCmd = &cobra.Command{
-	Use: "pokectl",
-	RunE: func(cmd *cobra.Command, args []string) error {
-		return nil
-	},
-}
-
-func init() {}
-
-func main() {
-	if err := rootCmd.Execute(); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(2)
-	}
-}

glide.yaml

@@ -22,6 +22,11 @@ import:
   - cipher
   - json
 
+- package: golang.org/x/net
+  version: 6a513affb38dc9788b449d59ffed099b8de18fa0
+  subpackages:
+  - context
+
 - package: gopkg.in/yaml.v2
   version: a83829b6f1293c91addabc89d0571c246397bbf4
 
@@ -67,27 +72,6 @@ import:
 - package: github.com/mitchellh/go-homedir
   verison: 756f7b183b7ab78acdbbee5c7f392838ed459dda
 
-- package: google.golang.org/grpc
-  version: v1.0.0
-  subpackages:
-  - codes
-  - credentials
-  - grpclog
-  - internal
-  - metadata
-  - naming
-  - transport
-  - peer
-- package: golang.org/x/net
-  version: 6a513affb38dc9788b449d59ffed099b8de18fa0
-  subpackages:
-  - context # context is also imported directly by this repo.
-  - http2
-  - http2/hpack
-  - trace
-  - lex/httplex
-  - internal/timeseries
-
 - package: github.com/kylelemons/godebug
   subpackages:
   - diff