refactor: clean up type disparities

Author: Hweinstock

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

@@ -4,7 +4,7 @@
  */
 
 import AsyncLock from 'async-lock'
-import { AppRunnerClient, AppRunnerService, AppRunnerServiceSummary } from '../../../shared/clients/apprunner'
+import { AppRunnerClient, AppRunnerServiceSummary } from '../../../shared/clients/apprunner'
 import { AppRunner } from 'aws-sdk'
 import { AppRunnerNode } from './apprunnerNode'
 
@@ -82,8 +82,7 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
         this.label = `${this._info.ServiceName} [${displayStatus}]`
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-duplicate-type-constituents
-    public update(info: AppRunnerServiceSummary | AppRunnerService): void {
+    public update(info: AppRunnerServiceSummary): void {
         // update can be called multiple times during an event loop
         // this would rarely cause the node's status to appear as 'Operation in progress'
         this.lock
@@ -174,7 +173,7 @@ export class AppRunnerServiceNode extends CloudWatchLogsBase implements AWSResou
     }
 
     // eslint-disable-next-line @typescript-eslint/no-duplicate-type-constituents
-    public setOperation(info: AppRunnerService | AppRunnerServiceSummary, id?: string, type?: ServiceOperation): void {
+    public setOperation(info: AppRunnerServiceSummary, id?: string, type?: ServiceOperation): void {
         this.currentOperation.Id = id
         this.currentOperation.Type = type
         this.update(info)

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

@@ -41,7 +41,8 @@ export type AppRunnerServiceSummary = RequiredProps<
     'ServiceName' | 'ServiceArn' | 'Status' | 'ServiceId'
 >
 
-type WithService<T> = T & { Service: AppRunnerService }
+// 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) {
@@ -60,15 +61,15 @@ export class AppRunnerClient extends ClientWrapper<AppRunnerClientSDK> {
         return this.makePaginatedRequest(paginateListServices, request, (page) => page.ServiceSummaryList)
     }
 
-    public async pauseService(request: PauseServiceRequest): Promise<WithService<PauseServiceResponse>> {
+    public async pauseService(request: PauseServiceRequest): Promise<WithServiceSummary<PauseServiceResponse>> {
         return await this.makeRequest(PauseServiceCommand, request)
     }
 
-    public async resumeService(request: ResumeServiceRequest): Promise<WithService<ResumeServiceResponse>> {
+    public async resumeService(request: ResumeServiceRequest): Promise<WithServiceSummary<ResumeServiceResponse>> {
         return await this.makeRequest(ResumeServiceCommand, request)
     }
 
-    public async updateService(request: UpdateServiceRequest): Promise<WithService<UpdateServiceResponse>> {
+    public async updateService(request: UpdateServiceRequest): Promise<WithServiceSummary<UpdateServiceResponse>> {
         return await this.makeRequest(UpdateServiceCommand, request)
     }
 
@@ -84,7 +85,9 @@ export class AppRunnerClient extends ClientWrapper<AppRunnerClientSDK> {
         return (await this.createSdkClient()).listConnections(request).promise()
     }
 
-    public async describeService(request: DescribeServiceRequest): Promise<WithService<DescribeServiceResponse>> {
+    public async describeService(
+        request: DescribeServiceRequest
+    ): Promise<WithServiceSummary<DescribeServiceResponse>> {
         return await this.makeRequest(DescribeServiceCommand, request)
     }
 
@@ -96,7 +99,7 @@ export class AppRunnerClient extends ClientWrapper<AppRunnerClientSDK> {
         return (await this.createSdkClient()).listOperations(request).promise()
     }
 
-    public async deleteService(request: DeleteServiceRequest): Promise<WithService<DeleteServiceResponse>> {
+    public async deleteService(request: DeleteServiceRequest): Promise<WithServiceSummary<DeleteServiceResponse>> {
         return this.makeRequest(DeleteServiceCommand, request)
     }
 

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

@@ -7,7 +7,7 @@ import assert from 'assert'
 import * as sinon from 'sinon'
 import { AppRunnerNode } from '../../../../awsService/apprunner/explorer/apprunnerNode'
 import { AppRunnerServiceNode } from '../../../../awsService/apprunner/explorer/apprunnerServiceNode'
-import { AppRunnerClient, AppRunnerService } from '../../../../shared/clients/apprunner'
+import { AppRunnerClient, AppRunnerServiceSummary } from '../../../../shared/clients/apprunner'
 import { DefaultCloudWatchLogsClient } from '../../../../shared/clients/cloudWatchLogsClient'
 import { asyncGenerator } from '../../../../shared/utilities/collectionUtils'
 import { AWSTreeNodeBase } from '../../../../shared/treeview/nodes/awsTreeNodeBase'
@@ -19,7 +19,7 @@ describe('AppRunnerServiceNode', function () {
     let mockParentNode: AppRunnerNode
     let node: AppRunnerServiceNode
 
-    const exampleInfo: AppRunnerService = {
+    const exampleInfo: AppRunnerServiceSummary = {
         ServiceName: 'test1',
         Status: 'RUNNING',
         ServiceArn: 'test-arn1',