Fix cloud-foundry test failures from PR #5321

service-catalog-data.service.spec: serviceOffering's two strict-URL
expectOne matchers were broken by adding ?return=details to the
implementation. Switch to predicate matchers like the broker tests
already use.

csi-mode.service: narrow isOperationInProgressError so it matches
on the "operation in progress" detail string only, not on CF code
10008 (which is the generic CF-UnprocessableEntity covering many
unrelated 422 cases). Without this narrowing the bind-error spec
that exercises a different 10008 reject ("App is already bound")
trips into the polling+retry branch and never settles.

Author: nabramovitz

src/frontend/packages/cloud-foundry/src/services/endpoint-data/service-catalog-data.service.spec.ts

@@ -29,10 +29,10 @@ describe('ServiceCatalogDataService', () => {
 
   afterEach(() => httpMock.verify());
 
-  it('serviceOffering hits /cf/service_offerings/:cnsi/:offeringGuid', async () => {
+  it('serviceOffering hits /cf/service_offerings/:cnsi/:offeringGuid?return=details', async () => {
     const promise = new Promise<any>(resolve => service.serviceOffering('cnsi-1', 'off-1').subscribe(resolve));
 
-    const req = httpMock.expectOne('/pp/v1/cf/service_offerings/cnsi-1/off-1');
+    const req = httpMock.expectOne(r => r.url === '/pp/v1/cf/service_offerings/cnsi-1/off-1' && r.params.get('return') === 'details');
     expect(req.request.method).toBe('GET');
     req.flush({ guid: 'off-1', name: 'premium', description: 'd', broker: { guid: 'b-1', name: 'b1' }, tags: [], available: true, cnsiGuid: 'cnsi-1', createdAt: '', updatedAt: '' });
 
@@ -44,7 +44,7 @@ describe('ServiceCatalogDataService', () => {
   it('serviceOffering returns null on 404', async () => {
     const promise = new Promise<any>(resolve => service.serviceOffering('cnsi-1', 'missing').subscribe(resolve));
 
-    const req = httpMock.expectOne('/pp/v1/cf/service_offerings/cnsi-1/missing');
+    const req = httpMock.expectOne(r => r.url === '/pp/v1/cf/service_offerings/cnsi-1/missing' && r.params.get('return') === 'details');
     req.flush({ message: 'not found' }, { status: 404, statusText: 'Not Found' });
 
     const res = await promise;

src/frontend/packages/cloud-foundry/src/shared/components/add-service-instance/csi-mode.service.ts

@@ -319,20 +319,20 @@ export class CsiModeService {
 
 }
 
-// Detect CF's "operation in progress" reject — code 10008 with status 422.
-// CF returns this when a bind / update lands while the SI's last_operation
-// is still in progress. Treated as deferred, not failed: the caller polls
-// the SI and retries the bind once last_op = succeeded.
+// Detect CF's "operation in progress" reject. CF returns 422 with the
+// generic CF-UnprocessableEntity title (code 10008) when a bind/update
+// lands while the SI's last_operation is still in progress; the
+// distinguishing signal is the detail message itself, not the code
+// (10008 covers many other cases). Treated as deferred, not failed:
+// the caller polls the SI and retries the bind once last_op = succeeded.
 function isOperationInProgressError(err: unknown): boolean {
   if (!(err instanceof HttpErrorResponse)) return false;
   if (err.status !== 422) return false;
   const body = err.error;
   if (!body || typeof body !== 'object') return false;
-  const errors = (body as { errors?: Array<{ code?: number; detail?: string }> }).errors;
+  const errors = (body as { errors?: Array<{ detail?: string }> }).errors;
   const first = errors?.[0];
-  if (first?.code === 10008) return true;
-  if (typeof first?.detail === 'string' && first.detail.includes('operation in progress')) return true;
-  return false;
+  return typeof first?.detail === 'string' && first.detail.includes('operation in progress');
 }
 
 function extractErrorMessage(err: unknown): string {