Skip to content

Commit aba8426

Browse files
Joshua-AndersonJoshua-Anderson
authored
ref(*): rename client package to deis (#9)
1 parent c94add0 commit aba8426

26 files changed

Lines changed: 204 additions & 204 deletions

‎apps/apps.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"strconv"
88
"strings"
99

10-
client "github.com/deis/controller-sdk-go"
10+
deis "github.com/deis/controller-sdk-go"
1111
"github.com/deis/controller-sdk-go/api"
1212
)
1313

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

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

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

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

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

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

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

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

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

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

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

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

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

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

155155
req := api.AppUpdateRequest{Owner: username}

‎apps/apps_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"reflect"
1010
"testing"
1111

12-
client "github.com/deis/controller-sdk-go"
12+
deis "github.com/deis/controller-sdk-go"
1313
"github.com/deis/controller-sdk-go/api"
1414
)
1515

@@ -50,7 +50,7 @@ type fakeHTTPServer struct {
5050
}
5151

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

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

176-
client, err := client.New(false, server.URL, "abc", "")
176+
deis, err := deis.New(false, server.URL, "abc", "")
177177
if err != nil {
178178
t.Fatal(err)
179179
}
180180

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

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

212-
client, err := client.New(false, server.URL, "abc", "")
212+
deis, err := deis.New(false, server.URL, "abc", "")
213213
if err != nil {
214214
t.Fatal(err)
215215
}
216216

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

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

235-
client, err := client.New(false, server.URL, "abc", "")
235+
deis, err := deis.New(false, server.URL, "abc", "")
236236
if err != nil {
237237
t.Fatal(err)
238238
}
239239

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

257-
client, err := client.New(false, server.URL, "abc", "")
257+
deis, err := deis.New(false, server.URL, "abc", "")
258258
if err != nil {
259259
t.Fatal(err)
260260
}
261261

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

264264
if err != nil {
265265
t.Fatal(err)
@@ -290,12 +290,12 @@ func TestAppsList(t *testing.T) {
290290
},
291291
}
292292

293-
client, err := client.New(false, server.URL, "abc", "")
293+
deis, err := deis.New(false, server.URL, "abc", "")
294294
if err != nil {
295295
t.Fatal(err)
296296
}
297297

298-
actual, _, err := List(client, 100)
298+
actual, _, err := List(deis, 100)
299299

300300
if err != nil {
301301
t.Fatal(err)
@@ -329,13 +329,13 @@ func TestAppsLogs(t *testing.T) {
329329
server := httptest.NewServer(&handler)
330330
defer server.Close()
331331

332-
client, err := client.New(false, server.URL, "abc", "")
332+
deis, err := deis.New(false, server.URL, "abc", "")
333333
if err != nil {
334334
t.Fatal(err)
335335
}
336336

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

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

357-
client, err := client.New(false, server.URL, "abc", "")
357+
deis, err := deis.New(false, server.URL, "abc", "")
358358
if err != nil {
359359
t.Fatal(err)
360360
}
361361

362-
if err = Transfer(client, "example-go", "test"); err != nil {
362+
if err = Transfer(deis, "example-go", "test"); err != nil {
363363
t.Fatal(err)
364364
}
365365
}

‎auth/auth.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package auth
33
import (
44
"encoding/json"
55

6-
client "github.com/deis/controller-sdk-go"
6+
deis "github.com/deis/controller-sdk-go"
77
"github.com/deis/controller-sdk-go/api"
88
)
99

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

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

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

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

4646
// Delete deletes a user.
47-
func Delete(c *client.Client, username string) error {
47+
func Delete(c *deis.Client, username string) error {
4848
var body []byte
4949
var err error
5050

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

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

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

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

101101
if username != "" {

‎auth/auth_test.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"reflect"
99
"testing"
1010

11-
client "github.com/deis/controller-sdk-go"
11+
deis "github.com/deis/controller-sdk-go"
1212
)
1313

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

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

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

169-
client, err := client.New(false, server.URL, "abc", "")
169+
deis, err := deis.New(false, server.URL, "abc", "")
170170
if err != nil {
171171
t.Fatal(err)
172172
}
173173

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

186-
client, err := client.New(false, server.URL, "abc", "")
186+
deis, err := deis.New(false, server.URL, "abc", "")
187187
if err != nil {
188188
t.Fatal(err)
189189
}
190190

191-
actual, err := Login(client, "test", "opensesame")
191+
actual, err := Login(deis, "test", "opensesame")
192192

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

211-
client, err := client.New(false, server.URL, "abc", "")
211+
deis, err := deis.New(false, server.URL, "abc", "")
212212
if err != nil {
213213
t.Fatal(err)
214214
}
215215

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

228-
client, err := client.New(false, server.URL, "abc", "")
228+
deis, err := deis.New(false, server.URL, "abc", "")
229229
if err != nil {
230230
t.Fatal(err)
231231
}
232232

233-
if err := Delete(client, "foo"); err != nil {
233+
if err := Delete(deis, "foo"); err != nil {
234234
t.Error(err)
235235
}
236236

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

249-
client, err := client.New(false, server.URL, "abc", "")
249+
deis, err := deis.New(false, server.URL, "abc", "")
250250
if err != nil {
251251
t.Fatal(err)
252252
}
253253

254-
err = Delete(client, "admin")
254+
err = Delete(deis, "admin")
255255
// should be a 409 Conflict
256256

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

270-
client, err := client.New(false, server.URL, "abc", "")
270+
deis, err := deis.New(false, server.URL, "abc", "")
271271
if err != nil {
272272
t.Fatal(err)
273273
}
274274

275-
token, err := Regenerate(client, "", true)
275+
token, err := Regenerate(deis, "", true)
276276

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

285-
token, err = Regenerate(client, "test", false)
285+
token, err = Regenerate(deis, "test", false)
286286

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

296-
token, err = Regenerate(client, "", false)
296+
token, err = Regenerate(deis, "", false)
297297

298298
if err != nil {
299299
t.Error(err)

0 commit comments

Comments
 (0)