diff --git a/CHANGELOG.md b/CHANGELOG.md index dff2203b..3bf42f81 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,16 @@ # Changelog -## 3.10.0 - (Seafoam Vienna) +## 3.10.0 - (Seafoam Vienna) - November 2020 + +### Highlights 3.10.0 + +- Merged 2 more Hacktoberfest contributions. Thanks to coding4funrocks! Great job! +- Happy Halloween release! ### Bugfixes and Improvements 3.10.0 - CLI: support for uploading files to data lake (#221) +- SDK: upload files to data lake (#221) - SDK: signed Url generation for upload and download (#221) - CLI: added support for direct calculation of KPI states to CLI mc kpi-calculation command - SDK: feat: add support for direct interaction to TrendPrediction Client (#204) [#hacktoberfest, coding4funrocks] diff --git a/package-lock.json b/package-lock.json index 9f51e0ce..f611d8cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@mindconnect/mindconnect-nodejs", - "version": "3.10.0-3", + "version": "3.10.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 781b2879..ebd63803 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mindconnect/mindconnect-nodejs", - "version": "3.10.0-3", + "version": "3.10.0", "description": "MindConnect Library for NodeJS (community based)", "main": "./dist/src/index.js", "browser": "./dist/src/index.bundle.js", diff --git a/src/api/sdk/data-lake/data-lake.ts b/src/api/sdk/data-lake/data-lake.ts index f2009b45..a3e39633 100644 --- a/src/api/sdk/data-lake/data-lake.ts +++ b/src/api/sdk/data-lake/data-lake.ts @@ -3,6 +3,8 @@ import * as fs from "fs"; import { toQueryString } from "../../utils"; import { SdkClient } from "../common/sdk-client"; import { DataLakeModels } from "./data-lake.models"; +const HttpsProxyAgent = require("https-proxy-agent"); + export class DataLakeClient extends SdkClient { private _baseUrl: string = "/api/datalake/v3"; @@ -171,7 +173,10 @@ export class DataLakeClient extends SdkClient { public async PutFile(file: string | Buffer, signedUrl: string): Promise { const myBuffer = typeof file === "string" ? fs.readFileSync(file) : (file as Buffer); - const request: any = { method: "PUT", headers: {} }; + const proxy = process.env.http_proxy || process.env.HTTP_PROXY; + const proxyHttpAgent: any = proxy ? new HttpsProxyAgent(proxy) : null; + + const request: any = { method: "PUT", headers: {}, agent: proxyHttpAgent }; request.body = myBuffer; const response = await fetch(signedUrl, request); return response.headers;