From 68accbf8e30db59d93ec894836aa0b0f78fc1ef4 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Thu, 6 May 2021 11:20:44 +0200
Subject: [PATCH] build: improve regex for iidfile
improve the regex to match only at the beginning of the line.
It prevents matching "Copying %s $CHECKSUM" messages returned by the
containers/image copy process.
Closes: https://github.com/containers/podman/issues/10233
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
---
pkg/bindings/images/build.go | 7 +++++--
pkg/bindings/images/build_test.go | 17 +++++++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
create mode 100644 pkg/bindings/images/build_test.go
diff --git a/pkg/bindings/images/build.go b/pkg/bindings/images/build.go
index c0e5706a5c..6acfcc1c88 100644
--- a/pkg/bindings/images/build.go
+++ b/pkg/bindings/images/build.go
@@ -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 != "":
diff --git a/pkg/bindings/images/build_test.go b/pkg/bindings/images/build_test.go
new file mode 100644
index 0000000000..e4035d5f86
--- /dev/null
+++ b/pkg/bindings/images/build_test.go
@@ -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"))
+}