containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10242 from giuseppe/fix-iidfile-remote-build 

build: improve regex for iidfile
This commit is contained in:
OpenShift Merge Robot 2021-05-06 07:48:03 -04:00 committed by GitHub
parent 0b05ba808d 68accbf8e3
commit b6405c1ae6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/bindings/images/build.go
View File

@ -28,6 +28,10 @@ import (
"github.com/sirupsen/logrus"
)
var (
iidRegex = regexp.MustCompile(`^[0-9a-f]{12}`)
)
// Build creates an image using a containerfile reference
func Build(ctx context.Context, containerFiles []string, options entities.BuildOptions) (*entities.BuildReport, error) {
params := url.Values{}
@ -337,7 +341,6 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
}
dec := json.NewDecoder(body)
re := regexp.MustCompile(`[0-9a-f]{12}`)
var id string
var mErr error
@ -366,7 +369,7 @@ func Build(ctx context.Context, containerFiles []string, options entities.BuildO
switch {
case s.Stream != "":
stdout.Write([]byte(s.Stream))
if re.Match([]byte(s.Stream)) {
if iidRegex.Match([]byte(s.Stream)) {
id = strings.TrimSuffix(s.Stream, "\n")
}
case s.Error != "":

17
pkg/bindings/images/build_test.go Normal file
View File

@ -0,0 +1,17 @@
package images
import (
"testing"
"github.com/stretchr/testify/assert"
)
func TestBuildMatchIID(t *testing.T) {
assert.True(t, iidRegex.MatchString("a883dafc480d466ee04e0d6da986bd78eb1fdd2178d04693723da3a8f95d42f4"))
assert.True(t, iidRegex.MatchString("3da3a8f95d42"))
assert.False(t, iidRegex.MatchString("3da3"))
}
func TestBuildNotMatchStatusMessage(t *testing.T) {
assert.False(t, iidRegex.MatchString("Copying config a883dafc480d466ee04e0d6da986bd78eb1fdd2178d04693723da3a8f95d42f4"))
}