Skip to content

Commit 4077bb8

Browse files
authored
fix(api): default version is 1 for pipeline (#5036)
1 parent 8355c7f commit 4077bb8

File tree

2 files changed

+28
-1
lines changed

2 files changed

+28
-1
lines changed

engine/api/pipeline_import_test.go

+27
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,33 @@ jobs:
9999
assert.Equal(t, 400, rec.Code)
100100
}
101101

102+
func Test_putPipelineImportJSONWithoutVersionHandler(t *testing.T) {
103+
api, db, _, end := newTestAPI(t)
104+
defer end()
105+
106+
u, pass := assets.InsertAdminUser(t, db)
107+
proj := assets.InsertTestProject(t, db, api.Cache, sdk.RandomString(10), sdk.RandomString(10))
108+
test.NotNil(t, proj)
109+
110+
//Prepare request
111+
vars := map[string]string{
112+
"permProjectKey": proj.Key,
113+
"pipelineKey": "testest",
114+
}
115+
uri := api.Router.GetRoute("PUT", api.putImportPipelineHandler, vars)
116+
test.NotEmpty(t, uri)
117+
req := assets.NewAuthentifiedRequest(t, u, pass, "PUT", uri+"?format=json", nil)
118+
119+
bodyjson := `{"name":"testest","stages":["Stage 1"],"jobs":[{"job":"echo with default","stage":"Stage 1","steps":[{"script":["echo \"test\"","echo {{.limit | default \"\"}}"]}]}]}`
120+
req.Body = ioutil.NopCloser(strings.NewReader(bodyjson))
121+
req.Header.Set("Content-Type", "application/json")
122+
123+
//Do the request
124+
rec := httptest.NewRecorder()
125+
api.Router.Mux.ServeHTTP(rec, req)
126+
assert.Equal(t, 200, rec.Code)
127+
}
128+
102129
func Test_putPipelineImportDifferentStageHandler(t *testing.T) {
103130
api, db, _, end := newTestAPI(t)
104131
defer end()

sdk/exportentities/pipeline.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ func ParsePipeline(format string, data []byte) (Pipeliner, error) {
374374
return nil, sdk.NewError(sdk.ErrWrongRequest, err)
375375
}
376376

377-
var version PipelineVersion
377+
version := PipelineVersion1
378378
if v, ok := rawPayload["version"]; ok {
379379
switch v.(string) {
380380
case PipelineVersion1:

0 commit comments

Comments
 (0)