Skip to content

Commit

Permalink
ref(*): rename client package to deis (#9)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Joshua-Anderson
Joshua-Anderson authored Jun 17, 2016
1 parent c94add0 commit aba8426
Show file tree
Hide file tree
Showing 26 changed files with 204 additions and 204 deletions.
16 changes: 8 additions & 8 deletions apps/apps.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strconv"
"strings"

client "github.com/deis/controller-sdk-go"
deis "github.com/deis/controller-sdk-go"
"github.com/deis/controller-sdk-go/api"
)

Expand All @@ -21,7 +21,7 @@ var ErrNoLogs = errors.New(
3) Making sure that the container logs were mounted properly into the fluentd pod: kubectl exec <fluentd pod> --namespace=deis ls /var/log/containers`)

// List lists apps on a Deis controller.
func List(c *client.Client, results int) ([]api.App, int, error) {
func List(c *deis.Client, results int) ([]api.App, int, error) {
body, count, err := c.LimitedRequest("/v2/apps/", results)

if err != nil {
Expand All @@ -43,7 +43,7 @@ func List(c *client.Client, results int) ([]api.App, int, error) {
}

// New creates a new app.
func New(c *client.Client, id string) (api.App, error) {
func New(c *deis.Client, id string) (api.App, error) {
body := []byte{}

var err error
Expand Down Expand Up @@ -74,7 +74,7 @@ func New(c *client.Client, id string) (api.App, error) {
}

// Get app details from a Deis controller.
func Get(c *client.Client, appID string) (api.App, error) {
func Get(c *deis.Client, appID string) (api.App, error) {
u := fmt.Sprintf("/v2/apps/%s/", appID)

body, err := c.BasicRequest("GET", u, nil)
Expand All @@ -96,7 +96,7 @@ func Get(c *client.Client, appID string) (api.App, error) {
}

// Logs retrieves logs from an app.
func Logs(c *client.Client, appID string, lines int) (string, error) {
func Logs(c *deis.Client, appID string, lines int) (string, error) {
u := fmt.Sprintf("/v2/apps/%s/logs", appID)

if lines > 0 {
Expand All @@ -115,7 +115,7 @@ func Logs(c *client.Client, appID string, lines int) (string, error) {
}

// Run one time command in an app.
func Run(c *client.Client, appID string, command string) (api.AppRunResponse, error) {
func Run(c *deis.Client, appID string, command string) (api.AppRunResponse, error) {
req := api.AppRunRequest{Command: command}
body, err := json.Marshal(req)

Expand All @@ -141,15 +141,15 @@ func Run(c *client.Client, appID string, command string) (api.AppRunResponse, er
}

// Delete an app.
func Delete(c *client.Client, appID string) error {
func Delete(c *deis.Client, appID string) error {
u := fmt.Sprintf("/v2/apps/%s/", appID)

_, err := c.BasicRequest("DELETE", u, nil)
return err
}

// Transfer an app to another user.
func Transfer(c *client.Client, appID string, username string) error {
func Transfer(c *deis.Client, appID string, username string) error {
u := fmt.Sprintf("/v2/apps/%s/", appID)

req := api.AppUpdateRequest{Owner: username}
Expand Down
32 changes: 16 additions & 16 deletions apps/apps_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"reflect"
"testing"

client "github.com/deis/controller-sdk-go"
deis "github.com/deis/controller-sdk-go"
"github.com/deis/controller-sdk-go/api"
)

Expand Down Expand Up @@ -50,7 +50,7 @@ type fakeHTTPServer struct {
}

func (f *fakeHTTPServer) ServeHTTP(res http.ResponseWriter, req *http.Request) {
res.Header().Add("DEIS_API_VERSION", client.APIVersion)
res.Header().Add("DEIS_API_VERSION", deis.APIVersion)

if req.URL.Path == "/v2/apps/" && req.Method == "POST" {
body, err := ioutil.ReadAll(req.Body)
Expand Down Expand Up @@ -173,13 +173,13 @@ func TestAppsCreate(t *testing.T) {
UUID: "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
}

client, err := client.New(false, server.URL, "abc", "")
deis, err := deis.New(false, server.URL, "abc", "")
if err != nil {
t.Fatal(err)
}

for _, id := range []string{"example-go", ""} {
actual, err := New(client, id)
actual, err := New(deis, id)

if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -209,12 +209,12 @@ func TestAppsGet(t *testing.T) {
UUID: "de1bf5b5-4a72-4f94-a10c-d2a3741cdf75",
}

client, err := client.New(false, server.URL, "abc", "")
deis, err := deis.New(false, server.URL, "abc", "")
if err != nil {
t.Fatal(err)
}

actual, err := Get(client, "example-go")
actual, err := Get(deis, "example-go")

if err != nil {
t.Fatal(err)
Expand All @@ -232,12 +232,12 @@ func TestAppsDestroy(t *testing.T) {
server := httptest.NewServer(&handler)
defer server.Close()

client, err := client.New(false, server.URL, "abc", "")
deis, err := deis.New(false, server.URL, "abc", "")
if err != nil {
t.Fatal(err)
}

if err = Delete(client, "example-go"); err != nil {
if err = Delete(deis, "example-go"); err != nil {
t.Fatal(err)
}
}
Expand All @@ -254,12 +254,12 @@ func TestAppsRun(t *testing.T) {
server := httptest.NewServer(&handler)
defer server.Close()

client, err := client.New(false, server.URL, "abc", "")
deis, err := deis.New(false, server.URL, "abc", "")
if err != nil {
t.Fatal(err)
}

actual, err := Run(client, "example-go", "echo hi")
actual, err := Run(deis, "example-go", "echo hi")

if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -290,12 +290,12 @@ func TestAppsList(t *testing.T) {
},
}

client, err := client.New(false, server.URL, "abc", "")
deis, err := deis.New(false, server.URL, "abc", "")
if err != nil {
t.Fatal(err)
}

actual, _, err := List(client, 100)
actual, _, err := List(deis, 100)

if err != nil {
t.Fatal(err)
Expand Down Expand Up @@ -329,13 +329,13 @@ func TestAppsLogs(t *testing.T) {
server := httptest.NewServer(&handler)
defer server.Close()

client, err := client.New(false, server.URL, "abc", "")
deis, err := deis.New(false, server.URL, "abc", "")
if err != nil {
t.Fatal(err)
}

for _, test := range tests {
actual, err := Logs(client, "example-go", test.Input)
actual, err := Logs(deis, "example-go", test.Input)

if err != nil {
t.Error(err)
Expand All @@ -354,12 +354,12 @@ func TestAppsTransfer(t *testing.T) {
server := httptest.NewServer(&handler)
defer server.Close()

client, err := client.New(false, server.URL, "abc", "")
deis, err := deis.New(false, server.URL, "abc", "")
if err != nil {
t.Fatal(err)
}

if err = Transfer(client, "example-go", "test"); err != nil {
if err = Transfer(deis, "example-go", "test"); err != nil {
t.Fatal(err)
}
}
12 changes: 6 additions & 6 deletions auth/auth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package auth
import (
"encoding/json"

client "github.com/deis/controller-sdk-go"
deis "github.com/deis/controller-sdk-go"
"github.com/deis/controller-sdk-go/api"
)

// Register a new user with the controller.
func Register(c *client.Client, username, password, email string) error {
func Register(c *deis.Client, username, password, email string) error {
user := api.AuthRegisterRequest{Username: username, Password: password, Email: email}
body, err := json.Marshal(user)

Expand All @@ -21,7 +21,7 @@ func Register(c *client.Client, username, password, email string) error {
}

// Login to the controller and get a token
func Login(c *client.Client, username, password string) (string, error) {
func Login(c *deis.Client, username, password string) (string, error) {
user := api.AuthLoginRequest{Username: username, Password: password}
reqBody, err := json.Marshal(user)

Expand All @@ -44,7 +44,7 @@ func Login(c *client.Client, username, password string) (string, error) {
}

// Delete deletes a user.
func Delete(c *client.Client, username string) error {
func Delete(c *deis.Client, username string) error {
var body []byte
var err error

Expand All @@ -62,7 +62,7 @@ func Delete(c *client.Client, username string) error {
}

// Regenerate user's auth tokens.
func Regenerate(c *client.Client, username string, all bool) (string, error) {
func Regenerate(c *deis.Client, username string, all bool) (string, error) {
var reqBody []byte
var err error

Expand Down Expand Up @@ -95,7 +95,7 @@ func Regenerate(c *client.Client, username string, all bool) (string, error) {
}

// Passwd changes a user's password.
func Passwd(c *client.Client, username, password, newPassword string) error {
func Passwd(c *deis.Client, username, password, newPassword string) error {
req := api.AuthPasswdRequest{Password: password, NewPassword: newPassword}

if username != "" {
Expand Down
34 changes: 17 additions & 17 deletions auth/auth_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"reflect"
"testing"

client "github.com/deis/controller-sdk-go"
deis "github.com/deis/controller-sdk-go"
)

const registerExpected string = `{"username":"test","password":"opensesame","email":"test@example.com"}`
Expand All @@ -28,7 +28,7 @@ type fakeHTTPServer struct {
}

func (f *fakeHTTPServer) ServeHTTP(res http.ResponseWriter, req *http.Request) {
res.Header().Add("DEIS_API_VERSION", client.APIVersion)
res.Header().Add("DEIS_API_VERSION", deis.APIVersion)

if req.URL.Path == "/v2/auth/register/" && req.Method == "POST" {
body, err := ioutil.ReadAll(req.Body)
Expand Down Expand Up @@ -166,12 +166,12 @@ func TestRegister(t *testing.T) {
server := httptest.NewServer(&handler)
defer server.Close()

client, err := client.New(false, server.URL, "abc", "")
deis, err := deis.New(false, server.URL, "abc", "")
if err != nil {
t.Fatal(err)
}

if err = Register(client, "test", "opensesame", "test@example.com"); err != nil {
if err = Register(deis, "test", "opensesame", "test@example.com"); err != nil {
t.Error(err)
}
}
Expand All @@ -183,12 +183,12 @@ func TestLogin(t *testing.T) {
server := httptest.NewServer(&handler)
defer server.Close()

client, err := client.New(false, server.URL, "abc", "")
deis, err := deis.New(false, server.URL, "abc", "")
if err != nil {
t.Fatal(err)
}

actual, err := Login(client, "test", "opensesame")
actual, err := Login(deis, "test", "opensesame")

if err != nil {
t.Error(err)
Expand All @@ -208,12 +208,12 @@ func TestPasswd(t *testing.T) {
server := httptest.NewServer(&handler)
defer server.Close()

client, err := client.New(false, server.URL, "abc", "")
deis, err := deis.New(false, server.URL, "abc", "")
if err != nil {
t.Fatal(err)
}

if err := Passwd(client, "test", "old", "new"); err != nil {
if err := Passwd(deis, "test", "old", "new"); err != nil {
t.Error(err)
}
}
Expand All @@ -225,16 +225,16 @@ func TestDelete(t *testing.T) {
server := httptest.NewServer(&handler)
defer server.Close()

client, err := client.New(false, server.URL, "abc", "")
deis, err := deis.New(false, server.URL, "abc", "")
if err != nil {
t.Fatal(err)
}

if err := Delete(client, "foo"); err != nil {
if err := Delete(deis, "foo"); err != nil {
t.Error(err)
}

if err := Delete(client, ""); err != nil {
if err := Delete(deis, ""); err != nil {
t.Error(err)
}
}
Expand All @@ -246,12 +246,12 @@ func TestDeleteUserApp(t *testing.T) {
server := httptest.NewServer(&handler)
defer server.Close()

client, err := client.New(false, server.URL, "abc", "")
deis, err := deis.New(false, server.URL, "abc", "")
if err != nil {
t.Fatal(err)
}

err = Delete(client, "admin")
err = Delete(deis, "admin")
// should be a 409 Conflict

expected := fmt.Errorf("\n%s %s\n\n", "409", "Conflict")
Expand All @@ -267,12 +267,12 @@ func TestRegenerate(t *testing.T) {
server := httptest.NewServer(&handler)
defer server.Close()

client, err := client.New(false, server.URL, "abc", "")
deis, err := deis.New(false, server.URL, "abc", "")
if err != nil {
t.Fatal(err)
}

token, err := Regenerate(client, "", true)
token, err := Regenerate(deis, "", true)

if err != nil {
t.Error(err)
Expand All @@ -282,7 +282,7 @@ func TestRegenerate(t *testing.T) {
t.Errorf("Expected token be empty, Got %s", token)
}

token, err = Regenerate(client, "test", false)
token, err = Regenerate(deis, "test", false)

if err != nil {
t.Error(err)
Expand All @@ -293,7 +293,7 @@ func TestRegenerate(t *testing.T) {
t.Errorf("Expected %s, Got %s", expected, token)
}

token, err = Regenerate(client, "", false)
token, err = Regenerate(deis, "", false)

if err != nil {
t.Error(err)
Expand Down
Loading

0 comments on commit aba8426

Please sign in to comment.