From bbf3dae37f975b7b93b645d65b9d73a4a84907b0 Mon Sep 17 00:00:00 2001 From: Julien Fontanet Date: Mon, 25 Apr 2022 16:26:56 +0200 Subject: [PATCH] fix(xen-api): fix proxy support (#6204) Introduced by c99120bd2 --- CHANGELOG.unreleased.md | 3 +++ packages/xen-api/src/index.js | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.unreleased.md b/CHANGELOG.unreleased.md index 9c878db41..4c2becc36 100644 --- a/CHANGELOG.unreleased.md +++ b/CHANGELOG.unreleased.md @@ -15,6 +15,7 @@ > Users must be able to say: “I had this issue, happy to know it's fixed” - [VM/Host Console] Fix support of older versions of XCP-ng/XS, please not that HTTP proxies are note supported in that case [#6191](https://github.com/vatesfr/xen-orchestra/pull/6191) +- Fix HTTP proxy support to connect to pools (introduced in XO 5.69.0) [#6204](https://github.com/vatesfr/xen-orchestra/pull/6204) ### Packages to release @@ -35,6 +36,8 @@ - @vates/cached-dns.lookup major - @vates/event-listeners-manager major +- xen-api patch - xo-vmdk-to-vhd minor +- @xen-orchestra/proxy patch - xo-server minor - xo-web minor diff --git a/packages/xen-api/src/index.js b/packages/xen-api/src/index.js index c1210b680..f54af8f68 100644 --- a/packages/xen-api/src/index.js +++ b/packages/xen-api/src/index.js @@ -122,8 +122,9 @@ export class Xapi extends EventEmitter { } this._allowUnauthorized = opts.allowUnauthorized - if (opts.httpProxy !== undefined) { - this._httpAgent = new ProxyAgent(this._httpProxy) + const { httpProxy } = opts + if (httpProxy !== undefined) { + this._httpAgent = new ProxyAgent(httpProxy) } this._setUrl(url)