paulononato/backstage
1
0
Fork 0
Code Issues Pull Requests Actions 40 Packages Projects Releases Wiki Activity

Merge branch 'seant-splunk/awsS3_readTree_processor' of github.com:splunk/backstage into seant-splunk/awsS3_readTree_processor

Browse Source
This commit is contained in:
Sean Tan
2021-08-30 15:10:50 -07:00
parent d399742c15 bd119f21cc
commit 9aef36dfb4
2 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/backend-common/api-report.md
+35
View File
@@ -35,6 +35,8 @@ import * as winston from 'winston';
import { Writable } from 'stream';
// Warning: (ae-missing-release-tag) "AwsS3UrlReader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
<<<<<<< HEAD
=======
//
// @public (undocumented)
export class AwsS3UrlReader implements UrlReader {
@@ -64,6 +66,39 @@ export class AwsS3UrlReader implements UrlReader {
toString(): string;
}
// Warning: (ae-missing-release-tag) "AzureUrlReader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
>>>>>>> bd119f21cc075b9d09eb0470566eee996364fbb0
//
// @public (undocumented)
export class AwsS3UrlReader implements UrlReader {
constructor(
integration: AwsS3Integration,
deps: {
s3: S3;
treeResponseFactory: ReadTreeResponseFactory;
},
);
// (undocumented)
static factory: ReaderFactory;
// (undocumented)
read(url: string): Promise<Buffer>;
// (undocumented)
<<<<<<< HEAD
readTree(url: string): Promise<ReadTreeResponse>;
// Warning: (ae-forgotten-export) The symbol "ReadUrlOptions" needs to be exported by the entry point index.d.ts
// Warning: (ae-forgotten-export) The symbol "ReadUrlResponse" needs to be exported by the entry point index.d.ts
//
=======
readTree(url: string, options?: ReadTreeOptions): Promise<ReadTreeResponse>;
>>>>>>> bd119f21cc075b9d09eb0470566eee996364fbb0
// (undocumented)
readUrl(url: string, options?: ReadUrlOptions): Promise<ReadUrlResponse>;
// (undocumented)
search(): Promise<SearchResponse>;
// (undocumented)
toString(): string;
}
// Warning: (ae-missing-release-tag) "AzureUrlReader" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
//
// @public (undocumented)
plugins/catalog-backend/package.json
+2 -9
View File
@@ -64,22 +64,15 @@
"yup": "^0.29.3"
},
"devDependencies": {
<<<<<<< HEAD
<<<<<<< HEAD
"@backstage/backend-test-utils": "^0.1.6",
"@backstage/cli": "^0.7.9",
=======
"aws-sdk-mock": "^5.2.1",
<<<<<<< HEAD
"@backstage/backend-test-utils": "^0.1.5",
"@backstage/cli": "^0.7.8",
>>>>>>> Finish AwsS3ReadTreeProcessor tests
=======
=======
>>>>>>> Copy package.json from master and add 'aws-sdk-mock' to devDependencies
"@backstage/backend-test-utils": "^0.1.6",
"@backstage/cli": "^0.7.9",
>>>>>>> Resolve conflict with package.json
"@backstage/backend-test-utils": "^0.1.6",
"@backstage/cli": "^0.7.9",
"@backstage/test-utils": "^0.1.17",
"@types/core-js": "^2.5.4",
"@types/git-url-parse": "^9.0.0",