From a9d35cc598d6578d98adb3e843117858abcb20b3 Mon Sep 17 00:00:00 2001 From: Rhomel Chinsio Date: Wed, 22 Jan 2020 15:36:02 +0900 Subject: [PATCH] fix: add braces to image tag match --- api/builtins/ImageTagTransformer.go | 7 +++++-- plugin/builtin/imagetagtransformer/ImageTagTransformer.go | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/api/builtins/ImageTagTransformer.go b/api/builtins/ImageTagTransformer.go index 0ce7bd797..627a45768 100644 --- a/api/builtins/ImageTagTransformer.go +++ b/api/builtins/ImageTagTransformer.go @@ -1,6 +1,8 @@ // Code generated by pluginator on ImageTagTransformer; DO NOT EDIT. // pluginator {unknown 1970-01-01T00:00:00Z } + + package builtins import ( @@ -22,6 +24,7 @@ type ImageTagTransformerPlugin struct { FieldSpecs []types.FieldSpec `json:"fieldSpecs,omitempty" yaml:"fieldSpecs,omitempty"` } + func (p *ImageTagTransformerPlugin) Config( _ *resmap.PluginHelpers, c []byte) (err error) { p.ImageTag = types.Image{} @@ -145,7 +148,7 @@ func (p *ImageTagTransformerPlugin) findContainers(obj map[string]interface{}) e func isImageMatched(s, t string) bool { // Tag values are limited to [a-zA-Z0-9_.-]. - pattern, _ := regexp.Compile("^" + t + "(@sha256)?(:[a-zA-Z0-9_.-]*)?$") + pattern, _ := regexp.Compile("^" + t + "(@sha256)?(:[a-zA-Z0-9_.-{}]*)?$") return pattern.MatchString(s) } @@ -181,5 +184,5 @@ func split(imageName string) (name string, tag string) { } func NewImageTagTransformerPlugin() resmap.TransformerPlugin { - return &ImageTagTransformerPlugin{} + return &ImageTagTransformerPlugin{} } diff --git a/plugin/builtin/imagetagtransformer/ImageTagTransformer.go b/plugin/builtin/imagetagtransformer/ImageTagTransformer.go index 2b1b347b6..cbb0f3517 100644 --- a/plugin/builtin/imagetagtransformer/ImageTagTransformer.go +++ b/plugin/builtin/imagetagtransformer/ImageTagTransformer.go @@ -149,7 +149,7 @@ func (p *plugin) findContainers(obj map[string]interface{}) error { func isImageMatched(s, t string) bool { // Tag values are limited to [a-zA-Z0-9_.-]. - pattern, _ := regexp.Compile("^" + t + "(@sha256)?(:[a-zA-Z0-9_.-]*)?$") + pattern, _ := regexp.Compile("^" + t + "(@sha256)?(:[a-zA-Z0-9_.-{}]*)?$") return pattern.MatchString(s) }