Merge pull request #16519 from JosiahCraw/feature/add-proxy-support-for-techdocs-awsS3

feat: add support for HTTPS proxy for AWS S3 requests in Techdocs
This commit is contained in:
Morgan Bentell
2023-02-27 09:38:39 +01:00
committed by GitHub
9 changed files with 56 additions and 24 deletions
+2
View File
@@ -42,6 +42,7 @@
"@aws-sdk/client-s3": "^3.208.0",
"@aws-sdk/credential-providers": "^3.208.0",
"@aws-sdk/lib-storage": "^3.208.0",
"@aws-sdk/node-http-handler": "^3.208.0",
"@aws-sdk/types": "^3.208.0",
"@azure/identity": "^2.1.0",
"@azure/storage-blob": "^12.5.0",
@@ -58,6 +59,7 @@
"express": "^4.17.1",
"fs-extra": "10.1.0",
"git-url-parse": "^13.0.0",
"hpagent": "^1.2.0",
"js-yaml": "^4.0.0",
"json5": "^2.1.3",
"mime-types": "^2.1.27",
@@ -32,8 +32,10 @@ import {
S3Client,
} from '@aws-sdk/client-s3';
import { fromTemporaryCredentials } from '@aws-sdk/credential-providers';
import { NodeHttpHandler } from '@aws-sdk/node-http-handler';
import { Upload } from '@aws-sdk/lib-storage';
import { AwsCredentialIdentityProvider } from '@aws-sdk/types';
import { HttpsProxyAgent } from 'hpagent';
import express from 'express';
import fs from 'fs-extra';
import JSON5 from 'json5';
@@ -150,6 +152,11 @@ export class AwsS3Publish implements PublisherBase {
'techdocs.publisher.awsS3.endpoint',
);
// AWS HTTPS proxy is an optional config. If missing, no proxy is used
const httpsProxy = config.getOptionalString(
'techdocs.publisher.awsS3.httpsProxy',
);
// AWS forcePathStyle is an optional config. If missing, it defaults to false. Needs to be enabled for cases
// where endpoint url points to locally hosted S3 compatible storage like Localstack
const forcePathStyle = config.getOptionalBoolean(
@@ -162,6 +169,11 @@ export class AwsS3Publish implements PublisherBase {
...(region && { region }),
...(endpoint && { endpoint }),
...(forcePathStyle && { forcePathStyle }),
...(httpsProxy && {
requestHandler: new NodeHttpHandler({
httpsAgent: new HttpsProxyAgent({ proxy: httpsProxy }),
}),
}),
});
const legacyPathCasing =