From 550d3476b9720cfb4d0fa0db2d3448d92f71c56b Mon Sep 17 00:00:00 2001 From: Lucas Guarisco Date: Mon, 6 Mar 2023 14:49:39 -0300 Subject: [PATCH] Changes to method signatures and returns Signed-off-by: Lucas Guarisco --- packages/backend-common/api-report.md | 9 --------- packages/backend-common/src/reading/AwsS3UrlReader.ts | 8 ++++---- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/packages/backend-common/api-report.md b/packages/backend-common/api-report.md index 7a3b251510..ebafb3dda0 100644 --- a/packages/backend-common/api-report.md +++ b/packages/backend-common/api-report.md @@ -50,7 +50,6 @@ import { ReadUrlOptions } from '@backstage/backend-plugin-api'; import { ReadUrlResponse } from '@backstage/backend-plugin-api'; import { RequestHandler } from 'express'; import { Router } from 'express'; -import { S3Client } from '@aws-sdk/client-s3'; import { SchedulerService } from '@backstage/backend-plugin-api'; import { SearchOptions } from '@backstage/backend-plugin-api'; import { SearchResponse } from '@backstage/backend-plugin-api'; @@ -74,12 +73,6 @@ export class AwsS3UrlReader implements UrlReader { }, ); // (undocumented) - buildS3Client( - defaultConfig: Config, - region: string, - integration: AwsS3Integration, - ): Promise; - // (undocumented) static factory: ReaderFactory; // (undocumented) read(url: string): Promise; @@ -88,8 +81,6 @@ export class AwsS3UrlReader implements UrlReader { // (undocumented) readUrl(url: string, options?: ReadUrlOptions): Promise; // (undocumented) - retrieveS3ObjectData(stream: Readable): Promise; - // (undocumented) search(): Promise; // (undocumented) toString(): string; diff --git a/packages/backend-common/src/reading/AwsS3UrlReader.ts b/packages/backend-common/src/reading/AwsS3UrlReader.ts index b1183c510a..3c564e807a 100644 --- a/packages/backend-common/src/reading/AwsS3UrlReader.ts +++ b/packages/backend-common/src/reading/AwsS3UrlReader.ts @@ -162,10 +162,10 @@ export class AwsS3UrlReader implements UrlReader { secretAccessKey: string, ): AwsCredentialIdentityProvider { return async () => { - return Promise.resolve({ + return { accessKeyId, secretAccessKey, - }); + }; }; } @@ -210,7 +210,7 @@ export class AwsS3UrlReader implements UrlReader { return explicitCredentials; } - async buildS3Client( + private async buildS3Client( defaultConfig: Config, region: string, integration: AwsS3Integration, @@ -231,7 +231,7 @@ export class AwsS3UrlReader implements UrlReader { return s3; } - async retrieveS3ObjectData(stream: Readable): Promise { + private async retrieveS3ObjectData(stream: Readable): Promise { return new Promise((resolve, reject) => { try { const chunks: any[] = [];