Merge #148454 #148513

148454: changefeedccl: fix alter changefeed test for webhook sinks r=aerfrei a=asg0451

Opt a changefeed test out of the
metamorphic enriched envelope testing for webhook
sinks.

Fixes: #148254
Release note: None


148513: TEAMS: update admission control labels r=RaduBerinde a=RaduBerinde

Add support for multiple github issue labels in teams and update
admission-control team labels.

Epic: none
Release note: None

Co-authored-by: Miles Frankel <[email protected]>
Co-authored-by: Radu Berinde <[email protected]>

Author: 3 people

TEAMS.yaml

@@ -29,6 +29,8 @@ cockroachdb/kv:
     'cockroachdb/kv-triage ': unittest
     cockroachdb/kv-prs: other
   label: T-kv
+cockroachdb/admission-control:
+  label: T-kv,A-admission-control
 cockroachdb/spatial:
   label: T-spatial
 cockroachdb/dev-inf:
@@ -38,8 +40,6 @@ cockroachdb/drp-eng:
 cockroachdb/multiregion:
   label: T-multiregion
 cockroachdb/storage:
-  aliases:
-    cockroachdb/admission-control: other
   label: T-storage
 cockroachdb/test-eng:
   label: T-testeng

pkg/ccl/changefeedccl/alter_changefeed_test.go

@@ -1242,7 +1242,17 @@ func TestAlterChangefeedAlterTableName(t *testing.T) {
 		sqlDB.Exec(t,
 			`INSERT INTO movr.users VALUES (1, 'Alice')`,
 		)
-		testFeed := feed(t, f, `CREATE CHANGEFEED FOR movr.users WITH diff, resolved = '100ms'`)
+
+		// TODO(#145927): currently the metamorphic enriched envelope system for
+		// webhook uses source.table_name as the topic. This test expects the
+		// topic name to be durable across table renames, which is not expected
+		// to be true for source.table_name.
+		var args []any
+		if _, ok := f.(*webhookFeedFactory); ok {
+			args = append(args, optOutOfMetamorphicEnrichedEnvelope{reason: "see comment"})
+		}
+
+		testFeed := feed(t, f, `CREATE CHANGEFEED FOR movr.users WITH diff, resolved = '100ms'`, args...)
 		defer closeFeed(t, testFeed)
 
 		assertPayloads(t, testFeed, []string{

pkg/cmd/bazci/githubpost/githubpost.go

@@ -79,9 +79,7 @@ func DefaultFormatter(ctx context.Context, f Failure) (issues.IssueFormatter, is
 					mentions = append(mentions, "@"+string(tm.Name()))
 				}
 			}
-			if tm.Label != "" {
-				labels = append(labels, tm.Label)
-			}
+			labels = append(labels, tm.Labels()...)
 		}
 	}
 	return issues.UnitTestFormatter, issues.PostRequest{

pkg/cmd/roachtest/github.go

@@ -248,9 +248,7 @@ func (g *githubIssues) createPostRequest(
 			if mentionTeam {
 				mention = append(mention, "@"+string(alias))
 			}
-			if label := teams[alias].Label; label != "" {
-				labels = append(labels, label)
-			}
+			labels = append(labels, teams[alias].Labels()...)
 		}
 	}
 

pkg/internal/team/TEAMS.yaml

@@ -29,6 +29,8 @@ cockroachdb/kv:
     'cockroachdb/kv-triage ': unittest
     cockroachdb/kv-prs: other
   label: T-kv
+cockroachdb/admission-control:
+  label: T-kv,A-admission-control
 cockroachdb/spatial:
   label: T-spatial
 cockroachdb/dev-inf:
@@ -38,8 +40,6 @@ cockroachdb/drp-eng:
 cockroachdb/multiregion:
   label: T-multiregion
 cockroachdb/storage:
-  aliases:
-    cockroachdb/admission-control: other
   label: T-storage
 cockroachdb/test-eng:
   label: T-testeng

pkg/internal/team/team.go

@@ -31,8 +31,9 @@ type Team struct {
 	// does not contain TeamName.
 	Aliases map[Alias]Purpose `yaml:"aliases"`
 	// GitHub label will be added to issues posted for this team.
+	// Multiple labels can be specified, separated by commas.
 	Label string `yaml:"label"`
-	// SilenceMentions is true if @-mentions should be supressed for this team.
+	// SilenceMentions is true if @-mentions should be suppressed for this team.
 	SilenceMentions bool `yaml:"silence_mentions"`
 }
 
@@ -41,6 +42,14 @@ func (t Team) Name() Alias {
 	return t.TeamName
 }
 
+// Labels returns the list of labels (possibly empty).
+func (t Team) Labels() []string {
+	if t.Label == "" {
+		return nil
+	}
+	return strings.Split(t.Label, ",")
+}
+
 // Map contains the in-memory representation of TEAMS.yaml.
 type Map map[Alias]Team