fix: adjust stubs to use new paginator

Author: Hweinstock

packages/core/src/awsService/apprunner/explorer/apprunnerNode.ts

@@ -11,8 +11,7 @@ import * as nls from 'vscode-nls'
 import { AppRunnerClient, AppRunnerServiceSummary } from '../../../shared/clients/apprunner'
 import { AppRunner } from 'aws-sdk'
 import { PollingSet } from '../../../shared/utilities/pollingSet'
-import { ListServicesRequest, ServiceSummary } from '@aws-sdk/client-apprunner'
-import { hasProps } from '../../../shared/utilities/tsUtils'
+import { ListServicesRequest } from '@aws-sdk/client-apprunner'
 
 const localize = nls.loadMessageBundle()
 
@@ -22,7 +21,7 @@ export class AppRunnerNode extends AWSTreeNodeBase {
 
     public constructor(
         public override readonly regionCode: string,
-        public readonly client: AppRunnerClient
+        public client: AppRunnerClient
     ) {
         super('App Runner', vscode.TreeItemCollapsibleState.Collapsed)
         this.contextValue = 'awsAppRunnerNode'
@@ -46,11 +45,8 @@ export class AppRunnerNode extends AWSTreeNodeBase {
 
     private async getServiceSummaries(request: ListServicesRequest = {}): Promise<AppRunnerServiceSummary[]> {
         // TODO: avoid resolving all services at once.
-        return await this.client.paginateServices(request).flatten().filter(isService).promise()
-
-        function isService(s: ServiceSummary): s is AppRunnerServiceSummary {
-            return hasProps(s, 'ServiceName', 'ServiceArn', 'Status', 'ServiceId')
-        }
+        const serviceCollection = this.client.paginateServices(request)
+        return await serviceCollection.flatten().promise()
     }
 
     public async updateChildren(): Promise<void> {

packages/core/src/shared/clients/apprunner.ts

@@ -33,7 +33,8 @@ import {
     UpdateServiceResponse,
 } from '@aws-sdk/client-apprunner'
 import { ClientWrapper } from './clientWrapper'
-import { RequiredProps } from '../utilities/tsUtils'
+import { hasProps, RequiredProps } from '../utilities/tsUtils'
+import { AsyncCollection } from '../utilities/asyncCollection'
 
 export type AppRunnerService = RequiredProps<Service, 'ServiceName' | 'ServiceArn' | 'Status' | 'ServiceId'>
 export type AppRunnerServiceSummary = RequiredProps<
@@ -43,7 +44,6 @@ export type AppRunnerServiceSummary = RequiredProps<
 
 // Note: Many of the requests return a type of Service, but Service <: ServiceSummary.
 type WithServiceSummary<T> = Omit<T, 'Service'> & { Service: AppRunnerServiceSummary }
-
 export class AppRunnerClient extends ClientWrapper<AppRunnerClientSDK> {
     public constructor(regionCode: string) {
         super(regionCode, AppRunnerClientSDK)
@@ -57,8 +57,14 @@ export class AppRunnerClient extends ClientWrapper<AppRunnerClientSDK> {
         return await this.makeRequest(ListServicesCommand, request)
     }
 
-    public paginateServices(request: ListServicesRequest) {
-        return this.makePaginatedRequest(paginateListServices, request, (page) => page.ServiceSummaryList)
+    public paginateServices(request: ListServicesRequest): AsyncCollection<AppRunnerServiceSummary[]> {
+        return this.makePaginatedRequest(paginateListServices, request, (page) => page.ServiceSummaryList).map(
+            (summaries) => summaries.filter(isServiceSummary)
+        )
+
+        function isServiceSummary(s: ServiceSummary): s is AppRunnerServiceSummary {
+            return hasProps(s, 'ServiceName', 'ServiceArn', 'Status', 'ServiceId')
+        }
     }
 
     public async pauseService(request: PauseServiceRequest): Promise<WithServiceSummary<PauseServiceResponse>> {

packages/core/src/test/awsService/apprunner/explorer/apprunnerNode.test.ts

@@ -6,25 +6,26 @@
 import assert from 'assert'
 import * as FakeTimers from '@sinonjs/fake-timers'
 import * as sinon from 'sinon'
-import { AppRunner } from 'aws-sdk'
 import { AppRunnerNode } from '../../../../awsService/apprunner/explorer/apprunnerNode'
 import { AppRunnerServiceNode } from '../../../../awsService/apprunner/explorer/apprunnerServiceNode'
-import { AppRunnerClient } from '../../../../shared/clients/apprunner'
+import { AppRunnerClient, AppRunnerServiceSummary } from '../../../../shared/clients/apprunner'
 import { PlaceholderNode } from '../../../../shared/treeview/nodes/placeholderNode'
 import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
 import { installFakeClock } from '../../../testUtil'
+import { intoCollection } from '../../../../shared/utilities/collectionUtils'
 
 describe('AppRunnerNode', function () {
     let mockApprunnerClient: AppRunnerClient
     let node: AppRunnerNode
     let clock: FakeTimers.InstalledClock
     let refreshStub: sinon.SinonStub<[], void>
 
-    const exampleSummaries: AppRunner.ServiceSummaryList = [
+    const exampleSummaries: AppRunnerServiceSummary[] = [
         {
             ServiceName: 'test1',
             Status: 'RUNNING',
             ServiceArn: 'test-arn1',
+            ServiceId: 'Amazon',
         },
     ]
 
@@ -35,7 +36,7 @@ describe('AppRunnerNode', function () {
 
     beforeEach(function () {
         mockApprunnerClient = {
-            listServices: sinon.stub().resolves({ ServiceSummaryList: exampleSummaries }),
+            paginateServices: sinon.stub().returns(intoCollection([exampleSummaries])),
             listOperations: sinon.stub().resolves({ OperationSummaryList: [] }),
         } as any as AppRunnerClient
         node = new AppRunnerNode('', mockApprunnerClient)
@@ -56,17 +57,17 @@ describe('AppRunnerNode', function () {
         const childNode = (await node.getChildren())[0] as AppRunnerServiceNode
 
         const updatedSummary = { ...exampleSummaries[0], Status: 'PAUSED' }
-        const serviceStub = sinon.stub().resolves({ ServiceSummaryList: [updatedSummary] })
-        mockApprunnerClient.listServices = serviceStub
+        const serviceStub = sinon.stub().returns(intoCollection([[updatedSummary]]))
+        mockApprunnerClient.paginateServices = serviceStub
 
         await node.getChildren()
         assert.strictEqual(childNode.info.Status, 'PAUSED')
     })
 
     it('deletes AppRunnerServiceNodes', async function () {
         await node.getChildren()
-        const serviceStub = sinon.stub().resolves({ ServiceSummaryList: [] })
-        mockApprunnerClient.listServices = serviceStub
+        const serviceStub = sinon.stub().returns(intoCollection([[]]))
+        mockApprunnerClient.paginateServices = serviceStub
 
         assert.ok((await node.getChildren())[0] instanceof PlaceholderNode)
     })
@@ -77,10 +78,10 @@ describe('AppRunnerNode', function () {
         const serviceStub = sinon
             .stub()
             .onFirstCall()
-            .resolves({ ServiceSummaryList: [transientService] })
+            .returns(intoCollection([[transientService]]))
             .onSecondCall()
-            .resolves({ ServiceSummaryList: [pausedService] })
-        mockApprunnerClient.listServices = serviceStub
+            .returns(intoCollection([[pausedService]]))
+        mockApprunnerClient.paginateServices = serviceStub
         const opStub = sinon.stub().resolves({
             OperationSummaryList: [{ Id: 'test-id', Type: 'PAUSE_SERVICE' }],
         })