Fixed a bug in the PR labelling logic (#9679)

Service labels start with service/ not services/
GoogleCloudPlatform · Dec 19, 2023 · dc714ec · dc714ec
1 parent f86454b
commit dc714ec
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/tools/diff-processor/cmd/add_labels.go b/tools/diff-processor/cmd/add_labels.go
@@ -65,7 +65,7 @@ func (o *addLabelsOptions) run(args []string) error {
 	oldLabels := make(map[string]struct{}, len(issue.Labels))
 	for _, label := range issue.Labels {
 		oldLabels[label.Name] = struct{}{}
-		if strings.HasPrefix(label.Name, "services/") {
+		if strings.HasPrefix(label.Name, "service/") {
 			hasServiceLabels = true
 		}
 	}

diff --git a/tools/diff-processor/cmd/add_labels_test.go b/tools/diff-processor/cmd/add_labels_test.go
@@ -12,7 +12,7 @@ import (
 )
 
 var enrolledTeamsYaml = []byte(`
-services/google-x:
+service/google-x:
   resources:
   - google_x_resource`)
 
@@ -112,7 +112,7 @@ func TestAddLabelsCmdRun(t *testing.T) {
 				Labels:      []labeler.Label{},
 				PullRequest: map[string]any{},
 			},
-			expectedLabels: []string{"services/google-x"},
+			expectedLabels: []string{"service/google-x"},
 		},
 		"service labels are deduped": {
 			args: []string{"12345"},
@@ -148,7 +148,7 @@ func TestAddLabelsCmdRun(t *testing.T) {
 				Labels:      []labeler.Label{},
 				PullRequest: map[string]any{},
 			},
-			expectedLabels: []string{"services/google-x"},
+			expectedLabels: []string{"service/google-x"},
 		},
 		"existing labels are preserved": {
 			args: []string{"12345"},
@@ -173,7 +173,7 @@ func TestAddLabelsCmdRun(t *testing.T) {
 				Labels:      []labeler.Label{{Name: "override-breaking-change"}},
 				PullRequest: map[string]any{},
 			},
-			expectedLabels: []string{"override-breaking-change", "services/google-x"},
+			expectedLabels: []string{"override-breaking-change", "service/google-x"},
 		},
 		"existing service label prevents new service labels": {
 			args: []string{"12345"},
@@ -195,7 +195,7 @@ func TestAddLabelsCmdRun(t *testing.T) {
 			githubIssue: &labeler.Issue{
 				Number:      12345,
 				Body:        "Unused",
-				Labels:      []labeler.Label{{Name: "services/google-z"}},
+				Labels:      []labeler.Label{{Name: "service/google-z"}},
 				PullRequest: map[string]any{},
 			},
 			// nil indicates that the issue won't be updated at all (preserving existing labels)
@@ -241,7 +241,7 @@ func TestAddLabelsCmdRun(t *testing.T) {
 			githubIssue: &labeler.Issue{
 				Number:      12345,
 				Body:        "Unused",
-				Labels:      []labeler.Label{{Name: "services/google-z"}},
+				Labels:      []labeler.Label{{Name: "service/google-z"}},
 				PullRequest: map[string]any{},
 			},
 			expectError: true,