Skip to content

Commit 251b5d8

Browse files
duanhongyiduanhongyi
committed
chore(workflow-cli): volume support nfs
1 parent 1a44c98 commit 251b5d8

69 files changed

Lines changed: 552 additions & 395 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_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestAppsList(t *testing.T) {
2929
var b bytes.Buffer
3030
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
3131

32-
server.Mux.HandleFunc("/v2/apps/", func(w http.ResponseWriter, r *http.Request) {
32+
server.Mux.HandleFunc("/v2/apps/", func(w http.ResponseWriter, _ *http.Request) {
3333
testutil.SetHeaders(w)
3434
fmt.Fprintf(w, `{
3535
"count": 2,
@@ -78,7 +78,7 @@ func TestAppsListLimit(t *testing.T) {
7878
var b bytes.Buffer
7979
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
8080

81-
server.Mux.HandleFunc("/v2/apps/", func(w http.ResponseWriter, r *http.Request) {
81+
server.Mux.HandleFunc("/v2/apps/", func(w http.ResponseWriter, _ *http.Request) {
8282
testutil.SetHeaders(w)
8383
fmt.Fprintf(w, `{
8484
"count": 2,
@@ -116,7 +116,7 @@ func TestAppsInfo(t *testing.T) {
116116
var b bytes.Buffer
117117
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
118118

119-
server.Mux.HandleFunc("/v2/apps/lorem-ipsum/", func(w http.ResponseWriter, r *http.Request) {
119+
server.Mux.HandleFunc("/v2/apps/lorem-ipsum/", func(w http.ResponseWriter, _ *http.Request) {
120120
testutil.SetHeaders(w)
121121
fmt.Fprintf(w, `{
122122
"uuid": "c4aed81c-d1ca-4ff1-ab89-d2151264e1a3",
@@ -130,7 +130,7 @@ func TestAppsInfo(t *testing.T) {
130130
}`)
131131
})
132132

133-
server.Mux.HandleFunc("/v2/apps/lorem-ipsum/pods/", func(w http.ResponseWriter, r *http.Request) {
133+
server.Mux.HandleFunc("/v2/apps/lorem-ipsum/pods/", func(w http.ResponseWriter, _ *http.Request) {
134134
testutil.SetHeaders(w)
135135
fmt.Fprintf(w, `{
136136
"count": 1,
@@ -146,7 +146,7 @@ func TestAppsInfo(t *testing.T) {
146146
}`)
147147
})
148148

149-
server.Mux.HandleFunc("/v2/apps/lorem-ipsum/domains/", func(w http.ResponseWriter, r *http.Request) {
149+
server.Mux.HandleFunc("/v2/apps/lorem-ipsum/domains/", func(w http.ResponseWriter, _ *http.Request) {
150150
testutil.SetHeaders(w)
151151
fmt.Fprintf(w, `{
152152
"count": 1,
@@ -164,7 +164,7 @@ func TestAppsInfo(t *testing.T) {
164164
}`)
165165
})
166166

167-
server.Mux.HandleFunc("/v2/apps/lorem-ipsum/settings/", func(w http.ResponseWriter, r *http.Request) {
167+
server.Mux.HandleFunc("/v2/apps/lorem-ipsum/settings/", func(w http.ResponseWriter, _ *http.Request) {
168168
testutil.SetHeaders(w)
169169
fmt.Fprintf(w, `{
170170
"owner": "elrond",
@@ -219,7 +219,7 @@ func TestAppDestroy(t *testing.T) {
219219
var b bytes.Buffer
220220
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
221221

222-
server.Mux.HandleFunc("/v2/apps/lorem-ipsum/", func(w http.ResponseWriter, r *http.Request) {
222+
server.Mux.HandleFunc("/v2/apps/lorem-ipsum/", func(w http.ResponseWriter, _ *http.Request) {
223223
testutil.SetHeaders(w)
224224
fmt.Fprintf(w, `{
225225
"uuid": "c4aed81c-d1ca-4ff1-ab89-d2151264e1a3",
@@ -252,7 +252,7 @@ func TestAppTransfer(t *testing.T) {
252252
var b bytes.Buffer
253253
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
254254

255-
server.Mux.HandleFunc("/v2/apps/lorem-ipsum/", func(w http.ResponseWriter, r *http.Request) {
255+
server.Mux.HandleFunc("/v2/apps/lorem-ipsum/", func(w http.ResponseWriter, _ *http.Request) {
256256
testutil.SetHeaders(w)
257257
fmt.Fprintf(w, `{
258258
"uuid": "c4aed81c-d1ca-4ff1-ab89-d2151264e1a3",
@@ -300,7 +300,7 @@ func TestRemoteExists(t *testing.T) {
300300
}
301301
defer server.Close()
302302

303-
server.Mux.HandleFunc("/v2/apps/", func(w http.ResponseWriter, r *http.Request) {
303+
server.Mux.HandleFunc("/v2/apps/", func(w http.ResponseWriter, _ *http.Request) {
304304
testutil.SetHeaders(w)
305305
fmt.Fprintf(w, `{
306306
"owner": "jkirk",

‎cmd/auth_test.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ func TestLogin(t *testing.T) {
2020
var b bytes.Buffer
2121
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
2222

23-
server.Mux.HandleFunc("/v2/", func(w http.ResponseWriter, r *http.Request) {
23+
server.Mux.HandleFunc("/v2/", func(w http.ResponseWriter, _ *http.Request) {
2424
testutil.SetHeaders(w)
2525
w.WriteHeader(http.StatusUnauthorized)
2626
fmt.Fprintf(w, `{}`)
2727
})
2828

29-
server.Mux.HandleFunc("/v2/auth/login/", func(w http.ResponseWriter, r *http.Request) {
29+
server.Mux.HandleFunc("/v2/auth/login/", func(w http.ResponseWriter, _ *http.Request) {
3030
testutil.SetHeaders(w)
3131
w.Header().Add("Location", "/v2/login/drycc/?key=fdbf3b34742e4ed2be4dfa848af13007/")
3232
w.WriteHeader(http.StatusOK)
3333
w.Write(nil)
3434
})
3535

36-
server.Mux.HandleFunc("/v2/auth/token/fdbf3b34742e4ed2be4dfa848af13007/", func(w http.ResponseWriter, r *http.Request) {
36+
server.Mux.HandleFunc("/v2/auth/token/fdbf3b34742e4ed2be4dfa848af13007/", func(w http.ResponseWriter, _ *http.Request) {
3737
testutil.SetHeaders(w)
3838
w.WriteHeader(http.StatusOK)
3939
w.Write([]byte(`{"username":"test-user","token":"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.SflKxwRJSMeKKF2QT4fwpMeJf36POk6yJV_adQssw5c"}`))
@@ -70,7 +70,7 @@ func TestWhoami(t *testing.T) {
7070
var b bytes.Buffer
7171
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
7272

73-
server.Mux.HandleFunc("/v2/auth/whoami/", func(w http.ResponseWriter, r *http.Request) {
73+
server.Mux.HandleFunc("/v2/auth/whoami/", func(w http.ResponseWriter, _ *http.Request) {
7474
testutil.SetHeaders(w)
7575
fmt.Fprintf(w, `{
7676
"email": "test@example.com",
@@ -104,7 +104,7 @@ func TestWhoamiAll(t *testing.T) {
104104
var b bytes.Buffer
105105
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
106106

107-
server.Mux.HandleFunc("/v2/auth/whoami/", func(w http.ResponseWriter, r *http.Request) {
107+
server.Mux.HandleFunc("/v2/auth/whoami/", func(w http.ResponseWriter, _ *http.Request) {
108108
testutil.SetHeaders(w)
109109
fmt.Fprintf(w, `{
110110
"email": "test@example.com",

‎cmd/autoscale.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func (d *DryccCmd) AutoscaleList(appID string) error {
2222
if appSettings.Autoscale == nil {
2323
d.Println("No autoscale rules found.")
2424
} else {
25-
table := d.getDefaultFormatTable([]string{"UUID", "TYPE", "PERCENT", "MIN", "MAX"})
25+
table := d.getDefaultFormatTable([]string{"UUID", "PTYPE", "PERCENT", "MIN", "MAX"})
2626
for process, kv := range appSettings.Autoscale {
2727
table.Append([]string{
2828
appSettings.UUID,

‎cmd/autoscale_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestAutoscaleList(t *testing.T) {
2121
var b bytes.Buffer
2222
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
2323

24-
server.Mux.HandleFunc("/v2/apps/rivendell/settings/", func(w http.ResponseWriter, r *http.Request) {
24+
server.Mux.HandleFunc("/v2/apps/rivendell/settings/", func(w http.ResponseWriter, _ *http.Request) {
2525
testutil.SetHeaders(w)
2626
fmt.Fprintf(w, `{
2727
"owner": "elrond",
@@ -35,11 +35,11 @@ func TestAutoscaleList(t *testing.T) {
3535

3636
err = cmdr.AutoscaleList("rivendell")
3737
assert.NoError(t, err)
38-
assert.Equal(t, b.String(), `UUID TYPE PERCENT MIN MAX
39-
de1bf5b5-4a72-4f94-a10c-d2a3741cdf75 cmd 40 3 8
38+
assert.Equal(t, b.String(), `UUID PTYPE PERCENT MIN MAX
39+
de1bf5b5-4a72-4f94-a10c-d2a3741cdf75 cmd 40 3 8
4040
`, "output")
4141

42-
server.Mux.HandleFunc("/v2/apps/mordor/settings/", func(w http.ResponseWriter, r *http.Request) {
42+
server.Mux.HandleFunc("/v2/apps/mordor/settings/", func(w http.ResponseWriter, _ *http.Request) {
4343
testutil.SetHeaders(w)
4444
fmt.Fprintf(w, `{
4545
"owner": "sauron",

‎cmd/builds_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestBuildsList(t *testing.T) {
3737
var b bytes.Buffer
3838
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
3939

40-
server.Mux.HandleFunc("/v2/apps/foo/builds/", func(w http.ResponseWriter, r *http.Request) {
40+
server.Mux.HandleFunc("/v2/apps/foo/builds/", func(w http.ResponseWriter, _ *http.Request) {
4141
testutil.SetHeaders(w)
4242
fmt.Fprintf(w, `{
4343
"count": 2,
@@ -88,7 +88,7 @@ func TestBuildsListLimit(t *testing.T) {
8888
var b bytes.Buffer
8989
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
9090

91-
server.Mux.HandleFunc("/v2/apps/foo/builds/", func(w http.ResponseWriter, r *http.Request) {
91+
server.Mux.HandleFunc("/v2/apps/foo/builds/", func(w http.ResponseWriter, _ *http.Request) {
9292
testutil.SetHeaders(w)
9393
fmt.Fprintf(w, `{
9494
"count": 2,

‎cmd/canary.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func (d *DryccCmd) CanaryInfo(appID string) error {
2121
return err
2222
}
2323
if len(appSettings.Canaries) > 0 {
24-
table := d.getDefaultFormatTable([]string{"UUID", "OWNER", "TYPE", "CREATED", "UPDATED"})
24+
table := d.getDefaultFormatTable([]string{"UUID", "OWNER", "PTYPE", "CREATED", "UPDATED"})
2525
for _, procType := range appSettings.Canaries {
2626
table.Append([]string{
2727
appSettings.UUID,

‎cmd/canary_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ func TestCanaryInfo(t *testing.T) {
2121
var b bytes.Buffer
2222
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
2323

24-
server.Mux.HandleFunc("/v2/apps/rivendell/settings/", func(w http.ResponseWriter, r *http.Request) {
24+
server.Mux.HandleFunc("/v2/apps/rivendell/settings/", func(w http.ResponseWriter, _ *http.Request) {
2525
testutil.SetHeaders(w)
2626
fmt.Fprintf(w, `{
2727
"owner": "elrond",
@@ -35,11 +35,11 @@ func TestCanaryInfo(t *testing.T) {
3535

3636
err = cmdr.CanaryInfo("rivendell")
3737
assert.NoError(t, err)
38-
assert.Equal(t, b.String(), `UUID OWNER TYPE CREATED UPDATED
39-
de1bf5b5-4a72-4f94-a10c-d2a3741cdf75 elrond cmd 2014-01-01T00:00:00UTC 2014-01-01T00:00:00UTC
38+
assert.Equal(t, b.String(), `UUID OWNER PTYPE CREATED UPDATED
39+
de1bf5b5-4a72-4f94-a10c-d2a3741cdf75 elrond cmd 2014-01-01T00:00:00UTC 2014-01-01T00:00:00UTC
4040
`, "output")
4141

42-
server.Mux.HandleFunc("/v2/apps/mordor/settings/", func(w http.ResponseWriter, r *http.Request) {
42+
server.Mux.HandleFunc("/v2/apps/mordor/settings/", func(w http.ResponseWriter, _ *http.Request) {
4343
testutil.SetHeaders(w)
4444
fmt.Fprintf(w, `{
4545
"owner": "sauron",
@@ -110,7 +110,7 @@ func TestCanaryRelease(t *testing.T) {
110110
var b bytes.Buffer
111111
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
112112

113-
server.Mux.HandleFunc("/v2/apps/bree/canary/release/", func(w http.ResponseWriter, r *http.Request) {
113+
server.Mux.HandleFunc("/v2/apps/bree/canary/release/", func(w http.ResponseWriter, _ *http.Request) {
114114
testutil.SetHeaders(w)
115115
w.WriteHeader(http.StatusNoContent)
116116
})
@@ -130,7 +130,7 @@ func TestCanaryRollback(t *testing.T) {
130130
var b bytes.Buffer
131131
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
132132

133-
server.Mux.HandleFunc("/v2/apps/bree/canary/rollback/", func(w http.ResponseWriter, r *http.Request) {
133+
server.Mux.HandleFunc("/v2/apps/bree/canary/rollback/", func(w http.ResponseWriter, _ *http.Request) {
134134
testutil.SetHeaders(w)
135135
w.WriteHeader(http.StatusNoContent)
136136
})

‎cmd/certs_test.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestCertsList(t *testing.T) {
2222
var b bytes.Buffer
2323
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
2424

25-
server.Mux.HandleFunc("/v2/certs/", func(w http.ResponseWriter, r *http.Request) {
25+
server.Mux.HandleFunc("/v2/certs/", func(w http.ResponseWriter, _ *http.Request) {
2626
testutil.SetHeaders(w)
2727
fmt.Fprintf(w, `{
2828
"count": 4,
@@ -86,7 +86,7 @@ test2 2.test.drycc.com 1 Jan 2018 <none> <
8686
cmdr.ConfigFile = cf
8787
b.Reset()
8888

89-
server.Mux.HandleFunc("/v2/certs/", func(w http.ResponseWriter, r *http.Request) {
89+
server.Mux.HandleFunc("/v2/certs/", func(w http.ResponseWriter, _ *http.Request) {
9090
testutil.SetHeaders(w)
9191
fmt.Fprintf(w, `{
9292
"count": 0,
@@ -112,7 +112,7 @@ func TestCertsListLimit(t *testing.T) {
112112
var b bytes.Buffer
113113
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
114114

115-
server.Mux.HandleFunc("/v2/certs/", func(w http.ResponseWriter, r *http.Request) {
115+
server.Mux.HandleFunc("/v2/certs/", func(w http.ResponseWriter, _ *http.Request) {
116116
testutil.SetHeaders(w)
117117
fmt.Fprintf(w, `{
118118
"count": 4,
@@ -160,7 +160,7 @@ func TestCertsInfo(t *testing.T) {
160160
var b bytes.Buffer
161161
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
162162

163-
server.Mux.HandleFunc("/v2/certs/test-example-com", func(w http.ResponseWriter, r *http.Request) {
163+
server.Mux.HandleFunc("/v2/certs/test-example-com", func(w http.ResponseWriter, _ *http.Request) {
164164
testutil.SetHeaders(w)
165165
fmt.Fprintf(w, `{
166166
"name": "test-example-com",
@@ -201,7 +201,7 @@ Created: 2016-06-09T00:00:00Z
201201
Updated: 2016-06-09T00:00:00Z
202202
`, "output")
203203

204-
server.Mux.HandleFunc("/v2/certs/test-drycc-com", func(w http.ResponseWriter, r *http.Request) {
204+
server.Mux.HandleFunc("/v2/certs/test-drycc-com", func(w http.ResponseWriter, _ *http.Request) {
205205
testutil.SetHeaders(w)
206206
fmt.Fprintf(w, `{
207207
"name": "test-drycc-com"
@@ -237,7 +237,7 @@ func TestCertsRemove(t *testing.T) {
237237
var b bytes.Buffer
238238
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
239239

240-
server.Mux.HandleFunc("/v2/certs/test-example-com", func(w http.ResponseWriter, r *http.Request) {
240+
server.Mux.HandleFunc("/v2/certs/test-example-com", func(w http.ResponseWriter, _ *http.Request) {
241241
testutil.SetHeaders(w)
242242
w.WriteHeader(http.StatusNoContent)
243243
})
@@ -280,7 +280,7 @@ func TestCertsDetach(t *testing.T) {
280280
var b bytes.Buffer
281281
cmdr := DryccCmd{WOut: &b, ConfigFile: cf}
282282

283-
server.Mux.HandleFunc("/v2/certs/test-example-com/domain/drycc.com", func(w http.ResponseWriter, r *http.Request) {
283+
server.Mux.HandleFunc("/v2/certs/test-example-com/domain/drycc.com", func(w http.ResponseWriter, _ *http.Request) {
284284
testutil.SetHeaders(w)
285285
w.WriteHeader(http.StatusNoContent)
286286
})

‎cmd/cmd.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,10 +110,11 @@ type Commander interface {
110110
PrintErr(...interface{}) (int, error)
111111
PrintErrf(string, ...interface{}) (int, error)
112112
Version(bool) error
113-
VolumesCreate(string, string, string) error
113+
VolumesCreate(string, string, string, string, map[string]interface{}) error
114114
VolumesExpand(string, string, string) error
115115
VolumesDelete(string, string) error
116116
VolumesList(string, int) error
117+
VolumesInfo(string, string) error
117118
VolumesMount(string, string, []string) error
118119
VolumesUnmount(string, string, []string) error
119120
ResourcesServices(int) error

‎cmd/config_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func TestConfigList(t *testing.T) {
9494
}
9595
defer server.Close()
9696

97-
server.Mux.HandleFunc("/v2/apps/foo/config/", func(w http.ResponseWriter, r *http.Request) {
97+
server.Mux.HandleFunc("/v2/apps/foo/config/", func(w http.ResponseWriter, _ *http.Request) {
9898
testutil.SetHeaders(w)
9999
fmt.Fprintf(w, `{
100100
"owner": "jkirk",

0 commit comments

Comments
 (0)