Skip to content

Commit 88a7463

Browse files
[VAULT-39235]: pipeline(changed-files): don't group underscore prefixed changelogs as enterprise only files (hashicorp#8906) (hashicorp#8934)
Don't categorize changelog files that begin with an underscore as enterprise only, otherwise they'll be removed when backporting changes to CE. Since we want to include links to commit SHAs in the changelog we have to create the changelog in the context of CE and thus need to backport all of those changes. We also fix a few Go tests that hand not been updated to handle the updated default inactive CE groups. Signed-off-by: Ryan Cragun <[email protected]> Co-authored-by: Ryan Cragun <[email protected]>
1 parent 9f7449d commit 88a7463

File tree

3 files changed

+4
-8
lines changed

3 files changed

+4
-8
lines changed

tools/pipeline/internal/pkg/changed/checkers.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -182,10 +182,6 @@ func FileGroupCheckerEnterprise(ctx context.Context, file *File) FileGroups {
182182
strings.Contains(name, "_ent") && strings.HasSuffix(name, ".pb.go"):
183183
return FileGroups{FileGroupEnterprise}
184184
}
185-
case ".txt":
186-
if hasBaseDir(name, "changelog") && strings.HasPrefix(filepath.Base(name), "_") {
187-
return FileGroups{FileGroupEnterprise}
188-
}
189185
case
190186
".proto",
191187
".hcl",

tools/pipeline/internal/pkg/changed/checkers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestFileGroupDefaultCheckers(t *testing.T) {
2727
"builtin/logical/transit/something_ent.go": {FileGroupGoApp, FileGroupEnterprise},
2828
"buf.yml": {FileGroupProto},
2929
"changelog/1726.txt": {FileGroupChangelog},
30-
"changelog/_1726.txt": {FileGroupChangelog, FileGroupEnterprise},
30+
"changelog/_1726.txt": {FileGroupChangelog},
3131
"command/server/config.go": {FileGroupGoApp},
3232
"command/operator_raft_autopilot_state.go": {FileGroupGoApp, FileGroupAutopilot},
3333
"command/agent_ent_test.go": {FileGroupGoApp, FileGroupEnterprise},

tools/pipeline/internal/pkg/github/create_backport_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ func TestCreateBackportReq_shouldSkipRef(t *testing.T) {
447447
},
448448
},
449449

450-
skip: false,
450+
skip: true,
451451
},
452452
"inactive ce with with docs changes": {
453453
baseRefVersion: "1.17.x",
@@ -475,7 +475,7 @@ func TestCreateBackportReq_shouldSkipRef(t *testing.T) {
475475
},
476476
},
477477

478-
skip: false,
478+
skip: true,
479479
},
480480
"inactive ce with with changelog changes": {
481481
baseRefVersion: "1.17.x",
@@ -499,7 +499,7 @@ func TestCreateBackportReq_shouldSkipRef(t *testing.T) {
499499
},
500500
},
501501
Groups: changed.FileGroups{
502-
"app", "gotoolchain", "pipeline",
502+
"app", "changelog", "gotoolchain",
503503
},
504504
},
505505

0 commit comments

Comments
 (0)