Skip to content

Commit 2103657

Browse files
Joshua-AndersonJoshua-Anderson
authored
feat(*): allow configuration flag (#169)
1 parent 16312db commit 2103657

44 files changed

Lines changed: 676 additions & 493 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/apps.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
)
1818

1919
// AppCreate creates an app.
20-
func AppCreate(id string, buildpack string, remote string, noRemote bool) error {
21-
s, err := settings.Load()
20+
func (d DeisCmd) AppCreate(id, buildpack, remote string, noRemote bool) error {
21+
s, err := settings.Load(d.ConfigFile)
2222
if err != nil {
2323
return err
2424
}
@@ -68,8 +68,8 @@ func AppCreate(id string, buildpack string, remote string, noRemote bool) error
6868
}
6969

7070
// AppsList lists apps on the Deis controller.
71-
func AppsList(results int) error {
72-
s, err := settings.Load()
71+
func (d DeisCmd) AppsList(results int) error {
72+
s, err := settings.Load(d.ConfigFile)
7373

7474
if err != nil {
7575
return err
@@ -93,8 +93,8 @@ func AppsList(results int) error {
9393
}
9494

9595
// AppInfo prints info about app.
96-
func AppInfo(appID string) error {
97-
s, appID, err := load(appID)
96+
func (d DeisCmd) AppInfo(appID string) error {
97+
s, appID, err := load(d.ConfigFile, appID)
9898

9999
if err != nil {
100100
return err
@@ -124,13 +124,13 @@ func AppInfo(appID string) error {
124124

125125
fmt.Println()
126126
// print the app processes
127-
if err = PsList(app.ID, defaultLimit); err != nil {
127+
if err = d.PsList(app.ID, defaultLimit); err != nil {
128128
return err
129129
}
130130

131131
fmt.Println()
132132
// print the app domains
133-
if err = DomainsList(app.ID, defaultLimit); err != nil {
133+
if err = d.DomainsList(app.ID, defaultLimit); err != nil {
134134
return err
135135
}
136136

@@ -140,8 +140,8 @@ func AppInfo(appID string) error {
140140
}
141141

142142
// AppOpen opens an app in the default webbrowser.
143-
func AppOpen(appID string) error {
144-
s, appID, err := load(appID)
143+
func (d DeisCmd) AppOpen(appID string) error {
144+
s, appID, err := load(d.ConfigFile, appID)
145145

146146
if err != nil {
147147
return err
@@ -164,8 +164,8 @@ func AppOpen(appID string) error {
164164
}
165165

166166
// AppLogs returns the logs from an app.
167-
func AppLogs(appID string, lines int) error {
168-
s, appID, err := load(appID)
167+
func (d DeisCmd) AppLogs(appID string, lines int) error {
168+
s, appID, err := load(d.ConfigFile, appID)
169169

170170
if err != nil {
171171
return err
@@ -184,8 +184,8 @@ func AppLogs(appID string, lines int) error {
184184
}
185185

186186
// AppRun runs a one time command in the app.
187-
func AppRun(appID, command string) error {
188-
s, appID, err := load(appID)
187+
func (d DeisCmd) AppRun(appID, command string) error {
188+
s, appID, err := load(d.ConfigFile, appID)
189189

190190
if err != nil {
191191
return err
@@ -209,10 +209,10 @@ func AppRun(appID, command string) error {
209209
}
210210

211211
// AppDestroy destroys an app.
212-
func AppDestroy(appID, confirm string) error {
212+
func (d DeisCmd) AppDestroy(appID, confirm string) error {
213213
gitSession := false
214214

215-
s, err := settings.Load()
215+
s, err := settings.Load(d.ConfigFile)
216216

217217
if err != nil {
218218
return err
@@ -252,15 +252,15 @@ func AppDestroy(appID, confirm string) error {
252252
fmt.Printf("done in %ds\n", int(time.Since(startTime).Seconds()))
253253

254254
if gitSession {
255-
return GitRemove(appID)
255+
return d.GitRemove(appID)
256256
}
257257

258258
return nil
259259
}
260260

261261
// AppTransfer transfers app ownership to another user.
262-
func AppTransfer(appID, username string) error {
263-
s, appID, err := load(appID)
262+
func (d DeisCmd) AppTransfer(appID, username string) error {
263+
s, appID, err := load(d.ConfigFile, appID)
264264

265265
if err != nil {
266266
return err

‎cmd/auth.go‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
)
1515

1616
// Register creates a account on a Deis controller.
17-
func Register(controller string, username string, password string, email string,
17+
func (d DeisCmd) Register(controller string, username string, password string, email string,
1818
sslVerify bool) error {
1919

2020
c, err := deis.New(sslVerify, controller, "")
@@ -23,7 +23,7 @@ func Register(controller string, username string, password string, email string,
2323
return err
2424
}
2525

26-
tempSettings, err := settings.Load()
26+
tempSettings, err := settings.Load(d.ConfigFile)
2727

2828
if err == nil && tempSettings.Client.ControllerURL.Host == c.ControllerURL.Host {
2929
c.Token = tempSettings.Client.Token
@@ -74,10 +74,10 @@ func Register(controller string, username string, password string, email string,
7474
fmt.Printf("Registered %s\n", username)
7575

7676
s := settings.Settings{Client: c}
77-
return doLogin(s, username, password)
77+
return doLogin(d.ConfigFile, s, username, password)
7878
}
7979

80-
func doLogin(s settings.Settings, username, password string) error {
80+
func doLogin(cf string, s settings.Settings, username, password string) error {
8181
token, err := auth.Login(s.Client, username, password)
8282
if checkAPICompatibility(s.Client, err) != nil {
8383
return err
@@ -86,18 +86,19 @@ func doLogin(s settings.Settings, username, password string) error {
8686
s.Client.Token = token
8787
s.Username = username
8888

89-
err = s.Save()
89+
filename, err := s.Save(cf)
9090

9191
if err != nil {
9292
return nil
9393
}
9494

9595
fmt.Printf("Logged in as %s\n", username)
96+
fmt.Printf("Configuration file written to %s\n", filename)
9697
return nil
9798
}
9899

99100
// Login to a Deis controller.
100-
func Login(controller string, username string, password string, sslVerify bool) error {
101+
func (d DeisCmd) Login(controller string, username string, password string, sslVerify bool) error {
101102
c, err := deis.New(sslVerify, controller, "")
102103

103104
if err != nil {
@@ -127,12 +128,12 @@ func Login(controller string, username string, password string, sslVerify bool)
127128
}
128129

129130
s := settings.Settings{Client: c}
130-
return doLogin(s, username, password)
131+
return doLogin(d.ConfigFile, s, username, password)
131132
}
132133

133134
// Logout from a Deis controller.
134-
func Logout() error {
135-
if err := settings.Delete(); err != nil {
135+
func (d DeisCmd) Logout() error {
136+
if err := settings.Delete(d.ConfigFile); err != nil {
136137
return err
137138
}
138139

@@ -141,8 +142,8 @@ func Logout() error {
141142
}
142143

143144
// Passwd changes a user's password.
144-
func Passwd(username string, password string, newPassword string) error {
145-
s, err := settings.Load()
145+
func (d DeisCmd) Passwd(username, password, newPassword string) error {
146+
s, err := settings.Load(d.ConfigFile)
146147

147148
if err != nil {
148149
return err
@@ -186,8 +187,8 @@ func Passwd(username string, password string, newPassword string) error {
186187
}
187188

188189
// Cancel deletes a user's account.
189-
func Cancel(username string, password string, yes bool) error {
190-
s, err := settings.Load()
190+
func (d DeisCmd) Cancel(username, password string, yes bool) error {
191+
s, err := settings.Load(d.ConfigFile)
191192

192193
if err != nil {
193194
return err
@@ -196,15 +197,15 @@ func Cancel(username string, password string, yes bool) error {
196197
if username == "" || password != "" {
197198
fmt.Println("Please log in again in order to cancel this account")
198199

199-
if err = Login(s.Client.ControllerURL.String(), username, password, s.Client.VerifySSL); err != nil {
200+
if err = d.Login(s.Client.ControllerURL.String(), username, password, s.Client.VerifySSL); err != nil {
200201
return err
201202
}
202203
}
203204

204205
if !yes {
205206
confirm := ""
206207

207-
s, err = settings.Load()
208+
s, err = settings.Load(d.ConfigFile)
208209

209210
if err != nil {
210211
return err
@@ -238,7 +239,7 @@ func Cancel(username string, password string, yes bool) error {
238239

239240
// If user targets themselves, logout.
240241
if username == "" || s.Username == username {
241-
if err := settings.Delete(); err != nil {
242+
if err := settings.Delete(d.ConfigFile); err != nil {
242243
return err
243244
}
244245
}
@@ -249,8 +250,8 @@ func Cancel(username string, password string, yes bool) error {
249250

250251
// Whoami prints the logged in user. If all is true, it fetches info from the controller to know
251252
// more about the user.
252-
func Whoami(all bool) error {
253-
s, err := settings.Load()
253+
func (d DeisCmd) Whoami(all bool) error {
254+
s, err := settings.Load(d.ConfigFile)
254255

255256
if err != nil {
256257
return err
@@ -269,8 +270,8 @@ func Whoami(all bool) error {
269270
}
270271

271272
// Regenerate regenenerates a user's token.
272-
func Regenerate(username string, all bool) error {
273-
s, err := settings.Load()
273+
func (d DeisCmd) Regenerate(username string, all bool) error {
274+
s, err := settings.Load(d.ConfigFile)
274275

275276
if err != nil {
276277
return err
@@ -283,8 +284,7 @@ func Regenerate(username string, all bool) error {
283284

284285
if username == "" && !all {
285286
s.Client.Token = token
286-
287-
err = s.Save()
287+
_, err = s.Save(d.ConfigFile)
288288

289289
if err != nil {
290290
return err

‎cmd/builds.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
)
1212

1313
// BuildsList lists an app's builds.
14-
func BuildsList(appID string, results int) error {
15-
s, appID, err := load(appID)
14+
func (d DeisCmd) BuildsList(appID string, results int) error {
15+
s, appID, err := load(d.ConfigFile, appID)
1616

1717
if err != nil {
1818
return err
@@ -36,8 +36,8 @@ func BuildsList(appID string, results int) error {
3636
}
3737

3838
// BuildsCreate creates a build for an app.
39-
func BuildsCreate(appID, image, procfile string) error {
40-
s, appID, err := load(appID)
39+
func (d DeisCmd) BuildsCreate(appID, image, procfile string) error {
40+
s, appID, err := load(d.ConfigFile, appID)
4141

4242
if err != nil {
4343
return err

‎cmd/certs.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ import (
1515
)
1616

1717
// CertsList lists certs registered with the controller.
18-
func CertsList(results int) error {
19-
s, err := settings.Load()
18+
func (d DeisCmd) CertsList(results int) error {
19+
s, err := settings.Load(d.ConfigFile)
2020

2121
if err != nil {
2222
return err
@@ -96,8 +96,8 @@ func CertsList(results int) error {
9696
}
9797

9898
// CertAdd adds a cert to the controller.
99-
func CertAdd(cert string, key string, name string) error {
100-
s, err := settings.Load()
99+
func (d DeisCmd) CertAdd(cert string, key string, name string) error {
100+
s, err := settings.Load(d.ConfigFile)
101101

102102
if err != nil {
103103
return err
@@ -133,8 +133,8 @@ func doCertAdd(c *deis.Client, cert string, key string, name string) error {
133133
}
134134

135135
// CertRemove deletes a cert from the controller.
136-
func CertRemove(name string) error {
137-
s, err := settings.Load()
136+
func (d DeisCmd) CertRemove(name string) error {
137+
s, err := settings.Load(d.ConfigFile)
138138
if checkAPICompatibility(s.Client, err) != nil {
139139
return err
140140
}
@@ -154,8 +154,8 @@ func CertRemove(name string) error {
154154
}
155155

156156
// CertInfo gets info about certficiate
157-
func CertInfo(name string) error {
158-
s, err := settings.Load()
157+
func (d DeisCmd) CertInfo(name string) error {
158+
s, err := settings.Load(d.ConfigFile)
159159
if err != nil {
160160
return err
161161
}
@@ -193,8 +193,8 @@ func CertInfo(name string) error {
193193
}
194194

195195
// CertAttach attaches a certificate to a domain
196-
func CertAttach(name string, domain string) error {
197-
s, err := settings.Load()
196+
func (d DeisCmd) CertAttach(name, domain string) error {
197+
s, err := settings.Load(d.ConfigFile)
198198

199199
if err != nil {
200200
return err
@@ -214,8 +214,8 @@ func CertAttach(name string, domain string) error {
214214
}
215215

216216
// CertDetach detaches a certificate from a domain
217-
func CertDetach(name string, domain string) error {
218-
s, err := settings.Load()
217+
func (d DeisCmd) CertDetach(name, domain string) error {
218+
s, err := settings.Load(d.ConfigFile)
219219

220220
if err != nil {
221221
return err

0 commit comments

Comments
 (0)