fix tags with tag-prefix (#549)

* fix tags with tag-prefix * new UT --------- Co-authored-by: ChanochShayner <[email protected]>
bridgecrewio · Jul 25, 2024 · f86cd7e · f86cd7e
1 parent 77cc55b
commit f86cd7e
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/common/tagging/tag_group.go b/src/common/tagging/tag_group.go
@@ -49,7 +49,7 @@ func (t *TagGroup) SetTags(tags []tags.ITag) {
 	for _, tag := range tags {
 		tag.Init()
 		tag.SetTagPrefix(t.Options.TagPrefix)
-		if !t.IsTagSkipped(tag) && (t.SpecifiedTags == nil || len(t.SpecifiedTags) == 0 || utils.InSlice(t.SpecifiedTags, tag.GetKey())) {
+		if !t.IsTagSkipped(tag) && (t.SpecifiedTags == nil || len(t.SpecifiedTags) == 0 || utils.InSlice(t.SpecifiedTags, strings.TrimPrefix(tag.GetKey(), t.Options.TagPrefix))) {
 			t.tags = append(t.tags, tag)
 		}
 	}

diff --git a/src/common/tagging/tag_group_test.go b/src/common/tagging/tag_group_test.go
@@ -52,4 +52,20 @@ func TestTagGroup(t *testing.T) {
 		tgs := tagGroup.GetTags()
 		assert.Equal(t, 0, len(tgs))
 	})
+
+	t.Run("Test tag prefix not broke tags", func(t *testing.T) {
+		tagGroup := TagGroup{Options: InitTagGroupOptions{
+			TagPrefix: "prefix_",
+		},
+			SpecifiedTags: []string{"yor_trace"},
+		}
+		tagGroup.SetTags([]tags.ITag{
+			&tags.Tag{Key: "yor_trace"},
+			&tags.Tag{Key: "git_modifiers"},
+		})
+		tgs := tagGroup.GetTags()
+		assert.Equal(t, 1, len(tgs))
+		assert.Equal(t, string("prefix_yor_trace"), tgs[0].GetKey())
+
+	})
 }