opensourcemirror
/
concourse
mirror of https://github.com/concourse/concourse.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5054 from concourse/fix-put-step 

[#5053] Updated resource_put step to use ProcessSpec.Args instead of …
This commit is contained in:
Izabela Gomes 2020-01-22 16:22:43 -05:00 committed by GitHub
parent 3294b1f400 93b3fd96b4
commit fc56cf89ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
atc/resource/resource_put.go
View File

@ -3,6 +3,7 @@ package resource
import (
"context"
"fmt"
"strings"
"github.com/concourse/concourse/atc/runtime"
)
@ -22,7 +23,7 @@ func (resource *resource) Put(
err = runnable.RunScript(
ctx,
spec.Path,
[]string{spec.Dir},
spec.Args,
input,
&vr,
spec.StderrWriter,
@ -32,7 +33,7 @@ func (resource *resource) Put(
return runtime.VersionResult{}, err
}
if vr.Version == nil {
return runtime.VersionResult{}, fmt.Errorf("resource script (%s %s) output a null version", spec.Path, spec.Dir)
return runtime.VersionResult{}, fmt.Errorf("resource script (%s %s) output a null version", spec.Path, strings.Join(spec.Args, " "))
}
return vr, nil

7
atc/resource/resource_put_test.go
View File

@ -5,6 +5,7 @@ import (
"encoding/json"
"errors"
"io"
"strings"
"github.com/concourse/concourse/atc"
"github.com/concourse/concourse/atc/resource"
@ -41,7 +42,7 @@ var _ = Describe("Resource Put", func() {
params = atc.Params{"some": "params"}
someProcessSpec.Path = "some/fake/path"
someProcessSpec.Dir = "some/other-dir"
someProcessSpec.Args = []string{"some/foo-dir"}
someProcessSpec.StderrWriter = gbytes.NewBuffer()
resource = resourceFactory.NewResource(source, params, version)
@ -74,7 +75,7 @@ var _ = Describe("Resource Put", func() {
Expect(actualCtx).To(Equal(ctx))
Expect(actualSpecPath).To(Equal(someProcessSpec.Path))
Expect(actualArgs).To(Equal([]string{someProcessSpec.Dir}))
Expect(actualArgs).To(Equal(someProcessSpec.Args))
Expect(actualInput).To(Equal(signature))
Expect(actualVersionResultRef).To(Equal(&putVersionResult))
Expect(actualSpecStdErrWriter).To(Equal(someProcessSpec.StderrWriter))
@ -90,7 +91,7 @@ var _ = Describe("Resource Put", func() {
fakeRunnable.RunScriptReturns(nil)
})
It("returns a corresponding error", func() {
Expect(putErr).To(MatchError("resource script (" + someProcessSpec.Path + " " + someProcessSpec.Dir + ") output a null version"))
Expect(putErr).To(MatchError("resource script (" + someProcessSpec.Path + " " + strings.Join(someProcessSpec.Args, " ") + ") output a null version"))
})
})