Skip to content

Commit

Permalink
fix(imagePushToRegistry): image tag shouldn't contain plus sign (#4756)
Browse files Browse the repository at this point in the history
  • Loading branch information
vstarostin authored Jan 5, 2024
1 parent 014e8f0 commit 0688a05
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
4 changes: 4 additions & 0 deletions cmd/imagePushToRegistry.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"context"
"fmt"
"regexp"
"strings"

v1 "github.com/google/go-containerregistry/pkg/v1"
"github.com/pkg/errors"
Expand Down Expand Up @@ -90,6 +91,9 @@ func runImagePushToRegistry(config *imagePushToRegistryOptions, telemetryData *t
}
}

// Docker image tags don't allow plus signs in tags, thus replacing with dash
config.SourceImageTag = strings.ReplaceAll(config.SourceImageTag, "+", "-")
config.TargetImageTag = strings.ReplaceAll(config.TargetImageTag, "+", "-")
re := regexp.MustCompile(`^https?://`)
config.SourceRegistryURL = re.ReplaceAllString(config.SourceRegistryURL, "")
config.TargetRegistryURL = re.ReplaceAllString(config.TargetRegistryURL, "")
Expand Down
4 changes: 4 additions & 0 deletions cmd/imagePushToRegistry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,12 @@ func TestRunImagePushToRegistry(t *testing.T) {
config := imagePushToRegistryOptions{
SourceRegistryURL: "https://source.registry",
SourceImages: []string{"source-image"},
SourceImageTag: "1.0.0-123+456",
SourceRegistryUser: "sourceuser",
SourceRegistryPassword: "sourcepassword",
TargetRegistryURL: "https://target.registry",
TargetImages: map[string]any{"source-image": "target-image"},
TargetImageTag: "1.0.0-123+456",
TargetRegistryUser: "targetuser",
TargetRegistryPassword: "targetpassword",
}
Expand All @@ -65,6 +67,8 @@ func TestRunImagePushToRegistry(t *testing.T) {
createdConfig, err := utils.FileRead(targetDockerConfigPath)
assert.NoError(t, err)
assert.Equal(t, customDockerConfig, string(createdConfig))
assert.Equal(t, "1.0.0-123-456", config.SourceImageTag)
assert.Equal(t, "1.0.0-123-456", config.TargetImageTag)
})

t.Run("failed to copy image", func(t *testing.T) {
Expand Down

0 comments on commit 0688a05

Please sign in to comment.