Merge branches 'enewman/integration-test' and 'enewman/integration-test' of https://github.com/Azure/apiops-cli into enewman/integration-test

Author: EMaher

src/services/override-merger.ts

@@ -55,7 +55,7 @@ export function applyOverrides(
   const wrappedOverride = { properties: overrideValues };
 
   // Deep-merge the override into the resource JSON
-  const result = deepMerge(json, wrappedOverride as Record<string, unknown>);
+  const result = deepMerge(json, wrappedOverride);
 
   logger.debug(
     `Applied overrides to ${descriptor.type} '${descriptor.nameParts.join('/')}'`,

src/services/product-publisher.ts

@@ -125,7 +125,7 @@ async function publishProductAssociations(
       await client.putResource(context, assocDescriptor, {});
       logger.debug(`Created ${resourceType} association: ${productName}/${name}`);
     } catch (error) {
-      logger.warn(`Failed to create ${resourceType} association ${productName}/${name}: ${error}`);
+      logger.warn(`Failed to create ${resourceType} association ${productName}/${name}: ${String(error)}`);
     }
   }
 }
@@ -168,7 +168,7 @@ async function publishProductTags(
       await client.putResource(context, tagDescriptor, {});
       logger.debug(`Created ProductTag association: ${productName}/${tagName}`);
     } catch (error) {
-      logger.warn(`Failed to create ProductTag association ${productName}/${tagName}: ${error}`);
+      logger.warn(`Failed to create ProductTag association ${productName}/${tagName}: ${String(error)}`);
     }
   }
 

tests/unit/services/api-product-extractor.test.ts

@@ -502,6 +502,7 @@ describe('api-extractor', () => {
         if (type === ResourceType.GraphQLResolver) {
           throw new Error('Should not list resolvers for non-GraphQL API');
         }
+        yield* [];
       });
       client.listResources = listResourcesSpy;
 

tests/unit/services/extract-service.test.ts

@@ -299,7 +299,6 @@ describe('extract-service', () => {
       });
 
       // Handle GatewayApi requests for the gateway
-      const originalListResources = client.listResources;
       client.listResources = async function* (_ctx, type, parent?) {
         if (type === ResourceType.Gateway) {
           yield { name: 'gw-1', properties: {} };
@@ -318,7 +317,7 @@ describe('extract-service', () => {
         logLevel: LogLevel.INFO,
       };
 
-      const result = await runExtraction(client, store, config);
+      await runExtraction(client, store, config);
 
       expect(store.writeAssociation).toHaveBeenCalledWith(
         expect.anything(),
@@ -335,8 +334,7 @@ describe('extract-service', () => {
         ],
       });
 
-      // eslint-disable-next-line require-yield
-      client.listResources = async function* (_ctx, type, parent?) {
+      client.listResources = async function* (_ctx, type, _parent?) {
         if (type === ResourceType.Gateway) {
           yield { name: 'gw-1', properties: {} };
         }