Revert: restore label_selector (was incorrectly renamed to label_source)

rkoster · rkoster · commit 338b2e8bb5dd · 2026-04-21T12:55:03.000Z
During the selector→source rebrand for route policies, we accidentally
renamed 'label_selector' to 'label_source' across the test suite.

This was WRONG because:
- label_selector is a standard Cloud Controller query parameter for
  filtering resources by labels/annotations (e.g., ?label_selector=env=prod)
- It is used across many endpoints: apps, packages, orgs, buildpacks, etc.
- It has nothing to do with route policies or the terminology rebrand
- The overly broad sed command caught it by mistake

This commit restores label_selector to its correct name, fixing 13+ test
failures caused by the regression.
diff --git a/spec/request/apps_spec.rb b/spec/request/apps_spec.rb
@@ -607,7 +607,7 @@
             stacks: 'cf',
             include: 'space',
             lifecycle_type: 'buildpack',
-            label_source: 'foo,bar',
+            label_selector: 'foo,bar',
             created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
             updated_ats: { gt: Time.now.utc.iso8601 }
           }
diff --git a/spec/request/buildpacks_spec.rb b/spec/request/buildpacks_spec.rb
@@ -29,7 +29,7 @@
           names: 'foo',
           stacks: 'cf',
           lifecycle: 'buildpack',
-          label_source: 'foo,bar',
+          label_selector: 'foo,bar',
           guids: 'foo,bar',
           created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
           updated_ats: { gt: Time.now.utc.iso8601 }
diff --git a/spec/request/builds_spec.rb b/spec/request/builds_spec.rb
@@ -410,7 +410,7 @@
           guids: '123',
           app_guids: '123',
           package_guids: '123',
-          label_source: 'foo,bar',
+          label_selector: 'foo,bar',
           created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
           updated_ats: { gt: Time.now.utc.iso8601 }
         }
diff --git a/spec/request/deployments_spec.rb b/spec/request/deployments_spec.rb
@@ -2077,7 +2077,7 @@ def json_for_options(deployment)
             status_values: 'foo',
             status_reasons: 'foo',
             app_guids: '123',
-            label_source: 'bar',
+            label_selector: 'bar',
             guids: 'foo,bar',
             created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
             updated_ats: { gt: Time.now.utc.iso8601 }
diff --git a/spec/request/domains_spec.rb b/spec/request/domains_spec.rb
@@ -31,7 +31,7 @@
           names: 'foo,bar',
           guids: 'foo,bar',
           organization_guids: 'foo,bar',
-          label_source: 'foo,bar',
+          label_selector: 'foo,bar',
           created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
           updated_ats: { gt: Time.now.utc.iso8601 }
         }
diff --git a/spec/request/droplets_spec.rb b/spec/request/droplets_spec.rb
@@ -646,7 +646,7 @@
           space_guids: 'test',
           states: %w[test foo],
           organization_guids: 'foo,bar',
-          label_source: 'foo,bar',
+          label_selector: 'foo,bar',
           created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
           updated_ats: { gt: Time.now.utc.iso8601 }
         }
@@ -674,7 +674,7 @@
           current: true,
           package_guid: package_model.guid,
           states: %w[test foo],
-          label_source: 'foo,bar',
+          label_selector: 'foo,bar',
           created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
           updated_ats: { gt: Time.now.utc.iso8601 }
         }
diff --git a/spec/request/isolation_segments_spec.rb b/spec/request/isolation_segments_spec.rb
@@ -269,7 +269,7 @@
           page: '2',
           per_page: '10',
           order_by: 'updated_at',
-          label_source: 'foo,bar',
+          label_selector: 'foo,bar',
           created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
           updated_ats: { gt: Time.now.utc.iso8601 }
         }
diff --git a/spec/request/organizations_spec.rb b/spec/request/organizations_spec.rb
@@ -194,7 +194,7 @@ module VCAP::CloudController
                 page: '2',
                 per_page: '10',
                 order_by: 'updated_at',
-                label_source: 'foo,bar',
+                label_selector: 'foo,bar',
                 created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
                 updated_ats: { gt: Time.now.utc.iso8601 }
               }
@@ -1462,7 +1462,7 @@ module VCAP::CloudController
               page: '2',
               per_page: '10',
               order_by: 'updated_at',
-              label_source: 'foo,bar',
+              label_selector: 'foo,bar',
               created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
               updated_ats: { gt: Time.now.utc.iso8601 }
             }
@@ -1488,7 +1488,7 @@ module VCAP::CloudController
                 page: '2',
                 per_page: '10',
                 order_by: 'updated_at',
-                label_source: 'foo,bar',
+                label_selector: 'foo,bar',
                 created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
                 updated_ats: { gt: Time.now.utc.iso8601 }
               }
diff --git a/spec/request/packages_spec.rb b/spec/request/packages_spec.rb
@@ -481,7 +481,7 @@
         page: '2',
         per_page: '10',
         order_by: 'updated_at',
-        label_source: 'foo,bar',
+        label_selector: 'foo,bar',
         created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
         updated_ats: { gt: Time.now.utc.iso8601 }
       }
diff --git a/spec/request/processes_spec.rb b/spec/request/processes_spec.rb
@@ -121,7 +121,7 @@
           page: '2',
           per_page: '10',
           order_by: 'updated_at',
-          label_source: 'foo,bar',
+          label_selector: 'foo,bar',
           created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
           updated_ats: { gt: Time.now.utc.iso8601 }
         }
diff --git a/spec/request/revisions_spec.rb b/spec/request/revisions_spec.rb
@@ -185,7 +185,7 @@
               order_by: 'updated_at',
               guids: app_model.guid.to_s,
               versions: '1,2',
-              label_source: 'foo,bar',
+              label_selector: 'foo,bar',
               created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
               updated_ats: { gt: Time.now.utc.iso8601 }
             }
diff --git a/spec/request/routes_spec.rb b/spec/request/routes_spec.rb
@@ -165,7 +165,7 @@
             hosts: 'foo',
             ports: 636,
             include: 'domain',
-            label_source: 'foo,bar',
+            label_selector: 'foo,bar',
             created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
             updated_ats: { gt: Time.now.utc.iso8601 }
           }
diff --git a/spec/request/service_brokers_spec.rb b/spec/request/service_brokers_spec.rb
@@ -113,7 +113,7 @@
           per_page: '10',
           page: 2,
           order_by: 'updated_at',
-          label_source: 'foo==bar',
+          label_selector: 'foo==bar',
           guids: 'foo,bar',
           created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
           updated_ats: { gt: Time.now.utc.iso8601 }
diff --git a/spec/request/service_credential_bindings_spec.rb b/spec/request/service_credential_bindings_spec.rb
@@ -53,7 +53,7 @@
           guids: 'foo,bar',
           created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
           updated_ats: { gt: Time.now.utc.iso8601 },
-          label_source: 'env'
+          label_selector: 'env'
         }
       end
     end
diff --git a/spec/request/service_instances_spec.rb b/spec/request/service_instances_spec.rb
@@ -170,7 +170,7 @@
           per_page: '10',
           page: 2,
           order_by: 'updated_at',
-          label_source: 'foo,bar',
+          label_selector: 'foo,bar',
           type: 'managed',
           service_plan_guids: %w[guid-1 guid-2],
           service_plan_names: %w[plan-1 plan-2],
diff --git a/spec/request/service_offerings_spec.rb b/spec/request/service_offerings_spec.rb
@@ -219,7 +219,7 @@
           per_page: '10',
           page: 2,
           order_by: 'updated_at',
-          label_source: 'foo==bar',
+          label_selector: 'foo==bar',
           fields: { 'service_broker' => 'name' },
           guids: 'foo,bar',
           created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
diff --git a/spec/request/service_plans_spec.rb b/spec/request/service_plans_spec.rb
@@ -197,7 +197,7 @@
           per_page: '10',
           page: 2,
           order_by: 'updated_at',
-          label_source: 'foo==bar',
+          label_selector: 'foo==bar',
           fields: { 'service_offering.service_broker' => 'name' },
           guids: 'foo,bar',
           created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
diff --git a/spec/request/service_route_bindings_spec.rb b/spec/request/service_route_bindings_spec.rb
@@ -71,7 +71,7 @@
           per_page: '10',
           page: 2,
           order_by: 'updated_at',
-          label_source: 'foo==bar',
+          label_selector: 'foo==bar',
           guids: 'foo,bar',
           created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
           updated_ats: { gt: Time.now.utc.iso8601 }
diff --git a/spec/request/spaces_spec.rb b/spec/request/spaces_spec.rb
@@ -263,7 +263,7 @@
             page: '2',
             per_page: '10',
             order_by: 'updated_at',
-            label_source: 'foo,bar',
+            label_selector: 'foo,bar',
             created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
             updated_ats: { gt: Time.now.utc.iso8601 }
           }
@@ -1304,7 +1304,7 @@
             page: '2',
             per_page: '10',
             order_by: 'updated_at',
-            label_source: 'foo,bar',
+            label_selector: 'foo,bar',
             created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
             updated_ats: { gt: Time.now.utc.iso8601 }
           }
@@ -1330,7 +1330,7 @@
               page: '2',
               per_page: '10',
               order_by: 'updated_at',
-              label_source: 'foo,bar',
+              label_selector: 'foo,bar',
               created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
               updated_ats: { gt: Time.now.utc.iso8601 }
             }
diff --git a/spec/request/stacks_spec.rb b/spec/request/stacks_spec.rb
@@ -86,7 +86,7 @@
             page: '2',
             per_page: '10',
             order_by: 'updated_at',
-            label_source: 'foo,bar',
+            label_selector: 'foo,bar',
             guids: 'foo,bar',
             created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
             updated_ats: { gt: Time.now.utc.iso8601 }
diff --git a/spec/request/tasks_spec.rb b/spec/request/tasks_spec.rb
@@ -60,7 +60,7 @@
           names: %w[foo bar],
           states: %w[test foo],
           organization_guids: 'foo,bar',
-          label_source: 'foo,bar',
+          label_selector: 'foo,bar',
           created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
           updated_ats: { gt: Time.now.utc.iso8601 }
         }
@@ -89,7 +89,7 @@
           page: '2',
           per_page: '10',
           order_by: 'updated_at',
-          label_source: 'foo,bar',
+          label_selector: 'foo,bar',
           created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
           updated_ats: { gt: Time.now.utc.iso8601 }
         }
@@ -347,7 +347,7 @@
           organization_guids: app_model.organization.guid,
           space_guids: app_model.space.guid,
           states: 'SUCCEEDED',
-          label_source: 'boomerang'
+          label_selector: 'boomerang'
         }
 
         get "/v3/tasks?#{query.to_query}", nil, developer_headers
diff --git a/spec/request/users_spec.rb b/spec/request/users_spec.rb
@@ -116,7 +116,7 @@
             page: '2',
             per_page: '10',
             order_by: 'updated_at',
-            label_source: 'foo,bar',
+            label_selector: 'foo,bar',
             created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
             updated_ats: { gt: Time.now.utc.iso8601 }
           }
@@ -142,7 +142,7 @@
               page: '2',
               per_page: '10',
               order_by: 'updated_at',
-              label_source: 'foo,bar',
+              label_selector: 'foo,bar',
               created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",
               updated_ats: { gt: Time.now.utc.iso8601 }
             }
diff --git a/spec/unit/controllers/v3/apps_controller_spec.rb b/spec/unit/controllers/v3/apps_controller_spec.rb
@@ -135,7 +135,7 @@
 
     context 'label_selection' do
       it 'returns a 400 when the label_selector is invalid' do
-        get :index, params: { label_source: 'buncha nonsense' }
+        get :index, params: { label_selector: 'buncha nonsense' }
 
         expect(response).to have_http_status(:bad_request)
 
diff --git a/spec/unit/fetchers/service_broker_list_fetcher_spec.rb b/spec/unit/fetchers/service_broker_list_fetcher_spec.rb
@@ -160,7 +160,7 @@ module VCAP::CloudController
           let(:filters) do
             {
               space_guids: [space_2.guid],
-              label_source: 'dog in (poodle,scooby-doo)',
+              label_selector: 'dog in (poodle,scooby-doo)',
               names: [space_scoped_broker_1.name]
             }
           end
@@ -189,7 +189,7 @@ module VCAP::CloudController
           let(:filters) do
             {
               space_guids: [space_1.guid, space_2.guid],
-              label_source: 'dog in (poodle,scooby-doo)',
+              label_selector: 'dog in (poodle,scooby-doo)',
               names: [space_scoped_broker_1.name]
             }
           end
diff --git a/spec/unit/fetchers/service_offering_list_fetcher_spec.rb b/spec/unit/fetchers/service_offering_list_fetcher_spec.rb
@@ -490,7 +490,7 @@ module VCAP::CloudController
           let!(:service_offering_1) { VCAP::CloudController::ServicePlan.make(public: true, active: true).service }
           let!(:service_offering_2) { VCAP::CloudController::ServicePlan.make(public: true, active: true).service }
           let!(:service_offering_3) { VCAP::CloudController::ServicePlan.make(public: true, active: true).service }
-          let(:message) { ServiceOfferingsListMessage.from_params({ label_source: 'flavor=orange' }.with_indifferent_access) }
+          let(:message) { ServiceOfferingsListMessage.from_params({ label_selector: 'flavor=orange' }.with_indifferent_access) }
 
           before do
             VCAP::CloudController::ServiceOfferingLabelModel.make(resource_guid: service_offering_1.guid, key_name: 'flavor', value: 'orange')
diff --git a/spec/unit/fetchers/service_plan_list_fetcher_spec.rb b/spec/unit/fetchers/service_plan_list_fetcher_spec.rb
@@ -491,7 +491,7 @@ module VCAP::CloudController
             let!(:service_plan_1) { VCAP::CloudController::ServicePlan.make(public: true, active: true) }
             let!(:service_plan_2) { VCAP::CloudController::ServicePlan.make(public: true, active: true) }
             let!(:service_plan_3) { VCAP::CloudController::ServicePlan.make(public: true, active: true) }
-            let(:message) { ServicePlansListMessage.from_params({ label_source: 'flavor=orange' }.with_indifferent_access) }
+            let(:message) { ServicePlansListMessage.from_params({ label_selector: 'flavor=orange' }.with_indifferent_access) }
 
             before do
               VCAP::CloudController::ServicePlanLabelModel.make(resource_guid: service_plan_1.guid, key_name: 'flavor', value: 'orange')
diff --git a/spec/unit/messages/app_revisions_list_message_spec.rb b/spec/unit/messages/app_revisions_list_message_spec.rb
@@ -40,7 +40,7 @@ module VCAP::CloudController
       let(:opts) do
         {
           versions: %w[1 3],
-          label_source: 'key=value',
+          label_selector: 'key=value',
           page: 1,
           per_page: 5,
           deployable: true
@@ -61,7 +61,7 @@ module VCAP::CloudController
                                                 per_page: 5,
                                                 versions: ['1'],
                                                 deployable: true,
-                                                label_source: 'key=value'
+                                                label_selector: 'key=value'
                                               })
         end.not_to raise_error
       end
diff --git a/spec/unit/messages/apps_list_message_spec.rb b/spec/unit/messages/apps_list_message_spec.rb
@@ -67,7 +67,7 @@ module VCAP::CloudController
           per_page: 5,
           order_by: 'created_at',
           include: ['space', 'space.organization'],
-          label_source: 'foo in (stuff,things)',
+          label_selector: 'foo in (stuff,things)',
           lifecycle_type: 'buildpack'
         }
       end
@@ -90,7 +90,7 @@ module VCAP::CloudController
                                         per_page: 5,
                                         order_by: 'created_at',
                                         include: ['space', 'space.organization'],
-                                        label_source: 'foo in (stuff,things)',
+                                        label_selector: 'foo in (stuff,things)',
                                         lifecycle_type: 'buildpack'
                                       })
         end.not_to raise_error
diff --git a/spec/unit/messages/buildpacks_list_message_spec.rb b/spec/unit/messages/buildpacks_list_message_spec.rb
@@ -47,7 +47,7 @@ module VCAP::CloudController
           names: %w[name1 name2],
           stacks: %w[stack1 stack2],
           lifecycle: 'buildpack',
-          label_source: 'foo=bar',
+          label_selector: 'foo=bar',
           page: 1,
           per_page: 5
         }
@@ -65,7 +65,7 @@ module VCAP::CloudController
           BuildpacksListMessage.from_params({
                                               names: [],
                                               stacks: [],
-                                              label_source: '',
+                                              label_selector: '',
                                               lifecycle: 'buildpack'
                                             })
         end.not_to raise_error
diff --git a/spec/unit/messages/isolation_segments_list_message_spec.rb b/spec/unit/messages/isolation_segments_list_message_spec.rb
@@ -52,7 +52,7 @@ module VCAP::CloudController
           names: %w[name1 name2],
           guids: %w[guid1 guid2],
           organization_guids: %w[o-guid1 o-guid2],
-          label_source: 'foo=bar',
+          label_selector: 'foo=bar',
           page: 1,
           per_page: 5,
           order_by: 'created_at',
@@ -81,7 +81,7 @@ module VCAP::CloudController
                                                      names: [],
                                                      guids: [],
                                                      organization_guids: [],
-                                                     label_source: '',
+                                                     label_selector: '',
                                                      page: 1,
                                                      per_page: 5,
                                                      order_by: 'created_at'
diff --git a/spec/unit/messages/list_message_spec.rb b/spec/unit/messages/list_message_spec.rb
@@ -289,7 +289,7 @@ def self.from_params(params)
         end
 
         it 'handles ruby symbols' do
-          message = list_message_klass.from_params(label_source: 'example.com/foo==bar')
+          message = list_message_klass.from_params(label_selector: 'example.com/foo==bar')
           expect(message.requirements.first.key).to eq('example.com/foo')
         end
       end
diff --git a/spec/unit/messages/packages_list_message_spec.rb b/spec/unit/messages/packages_list_message_spec.rb
diff --git a/spec/unit/messages/processes_list_message_spec.rb b/spec/unit/messages/processes_list_message_spec.rb
diff --git a/spec/unit/messages/tasks_list_message_spec.rb b/spec/unit/messages/tasks_list_message_spec.rb

Original file line number	Diff line number	Diff line change
`@@ -607,7 +607,7 @@`
`607`	`607`	`stacks: 'cf',`
`608`	`608`	`include: 'space',`
`609`	`609`	`lifecycle_type: 'buildpack',`
`610`		`- label_source: 'foo,bar',`
	`610`	`+ label_selector: 'foo,bar',`
`611`	`611`	`created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",`
`612`	`612`	`updated_ats: { gt: Time.now.utc.iso8601 }`
`613`	`613`	`}`
Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@`
`410`	`410`	`guids: '123',`
`411`	`411`	`app_guids: '123',`
`412`	`412`	`package_guids: '123',`
`413`		`- label_source: 'foo,bar',`
	`413`	`+ label_selector: 'foo,bar',`
`414`	`414`	`created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",`
`415`	`415`	`updated_ats: { gt: Time.now.utc.iso8601 }`
`416`	`416`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`names: 'foo,bar',`
`32`	`32`	`guids: 'foo,bar',`
`33`	`33`	`organization_guids: 'foo,bar',`
`34`		`- label_source: 'foo,bar',`
	`34`	`+ label_selector: 'foo,bar',`
`35`	`35`	`created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",`
`36`	`36`	`updated_ats: { gt: Time.now.utc.iso8601 }`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -269,7 +269,7 @@`
`269`	`269`	`page: '2',`
`270`	`270`	`per_page: '10',`
`271`	`271`	`order_by: 'updated_at',`
`272`		`- label_source: 'foo,bar',`
	`272`	`+ label_selector: 'foo,bar',`
`273`	`273`	`created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",`
`274`	`274`	`updated_ats: { gt: Time.now.utc.iso8601 }`
`275`	`275`	`}`
Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@`
`481`	`481`	`page: '2',`
`482`	`482`	`per_page: '10',`
`483`	`483`	`order_by: 'updated_at',`
`484`		`- label_source: 'foo,bar',`
	`484`	`+ label_selector: 'foo,bar',`
`485`	`485`	`created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",`
`486`	`486`	`updated_ats: { gt: Time.now.utc.iso8601 }`
`487`	`487`	`}`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@`
`121`	`121`	`page: '2',`
`122`	`122`	`per_page: '10',`
`123`	`123`	`order_by: 'updated_at',`
`124`		`- label_source: 'foo,bar',`
	`124`	`+ label_selector: 'foo,bar',`
`125`	`125`	`created_ats: "#{Time.now.utc.iso8601},#{Time.now.utc.iso8601}",`
`126`	`126`	`updated_ats: { gt: Time.now.utc.iso8601 }`
`127`	`127`	`}`