@automattic/vip 2.16.0 → 2.18.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## Changelog
 
+### 2.18.0 (15 Sep 2022)
+- #1103	Force the preference for WebSocket in case we see an error during connection
+- #1102	Remove http proxy support
+- #1096	[dev-env] Supports extended information table
+- #1100	Add GitHub action to mark inactive issues and PRs as stale
+- #1099	Add @app.env to commands help
+- #1092	Improve login + logout
+- #1097	Don't pipe output through less
+
+### 2.17.0 (06 Sep 2022)
+- #1093 [dev-env] use latest proxy image
+- #1091 Extract http helper into standalone function
+- #1090 Add tracking to software update
+- #1083 Software Management: Update
+- #1089 [dev-env] Fix wording in wizard
+
 ### 2.16.0 (29 Aug 2022)
 
 - #1086	Add tracking to config software get

package/CONTRIBUTING.md

@@ -85,7 +85,7 @@ Prepare the release by making sure that:
 
 ```
 export LAST_RELEASE_DATE=2021-08-25T13:40:00+02
-gh pr list --search "is:merged sort:updated-desc closed:>$LAST_RELEASE_DATE" | sed -e 's/\s*\S\+\s*\S\+\s*$//' -e 's/^/- #/'
+gh pr list --search "is:merged sort:updated-desc closed:>$LAST_RELEASE_DATE" | sed -e 's/\s\+\S\+\tMERGED.*$//' -e 's/^/- #/'
 ```
 
 Then, let's publish:

package/dist/bin/vip-config-envvar-delete.js

@@ -34,7 +34,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
-const baseUsage = 'vip config envvar delete'; // Command examples
+const baseUsage = 'vip @mysite.develop config envvar delete'; // Command examples
 
 const examples = [{
   usage: `${baseUsage} MY_VARIABLE`,

package/dist/bin/vip-config-envvar-get-all.js

@@ -34,7 +34,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
-const usage = 'vip config envvar get-all'; // Command examples
+const usage = 'vip @mysite.develop config envvar get-all'; // Command examples
 
 const examples = [{
   usage,

package/dist/bin/vip-config-envvar-get.js

@@ -32,7 +32,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
-const baseUsage = 'vip config envvar get'; // Command examples
+const baseUsage = 'vip @mysite.develop config envvar get'; // Command examples
 
 const examples = [{
   usage: `${baseUsage} MY_VARIABLE`,

package/dist/bin/vip-config-envvar-list.js

@@ -34,7 +34,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
-const usage = 'vip config envvar list'; // Command examples
+const usage = 'vip @mysite.develop config envvar list'; // Command examples
 
 const examples = [{
   usage,

package/dist/bin/vip-config-envvar-set.js

@@ -36,7 +36,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 /**
  * Internal dependencies
  */
-const baseUsage = 'vip config envvar set';
+const baseUsage = 'vip @mysite.develop config envvar set';
 const NEW_RELIC_ENVVAR_KEY = 'NEW_RELIC_LICENSE_KEY'; // Command examples
 
 const examples = [{

package/dist/bin/vip-config-software-get.js

@@ -22,16 +22,16 @@ var _format = require("../lib/cli/format");
 
 var _software = require("../lib/config/software");
 
-var _userError = _interopRequireDefault(require("../lib/cli/userError"));
+var _userError = _interopRequireDefault(require("../lib/user-error"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Command examples
 const examples = [{
-  usage: 'vip config software get wordpress --format json',
+  usage: 'vip @mysite.develop config software get wordpress --format json',
   description: 'Read current software settings for WordPress in JSON format'
 }, {
-  usage: 'vip config software get',
+  usage: 'vip @mysite.develop config software get',
   description: 'Read current software settings for all components'
 }];
 (0, _command.default)({
@@ -41,7 +41,7 @@ const examples = [{
   envContext: true,
   wildcardCommand: true,
   format: true,
-  usage: 'vip config software get <wordpress|php|nodejs|muplugins>'
+  usage: 'vip @mysite.develop config software get <wordpress|php|nodejs|muplugins>'
 }).examples(examples).argv(process.argv, async (arg, opt) => {
   var _opt$env;
 

package/dist/bin/vip-config-software-update.js

@@ -0,0 +1,147 @@
+#!/usr/bin/env node
+
+/**
+ * 
+ * @format
+ */
+
+/**
+ * External dependencies
+ */
+"use strict";
+
+var _chalk = _interopRequireDefault(require("chalk"));
+
+var _debug = _interopRequireDefault(require("debug"));
+
+var _command = _interopRequireDefault(require("../lib/cli/command"));
+
+var _software = require("../lib/config/software");
+
+var _progress = require("../lib/cli/progress");
+
+var _userError = _interopRequireDefault(require("../lib/user-error"));
+
+var _tracker = require("../lib/tracker");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * Internal dependencies
+ */
+const debug = (0, _debug.default)('@automattic/vip:bin:config-software');
+const UPDATE_SOFTWARE_PROGRESS_STEPS = [{
+  id: 'trigger',
+  name: 'Trigger software update'
+}, {
+  id: 'process',
+  name: 'Process software update'
+}];
+const cmd = (0, _command.default)({
+  appContext: true,
+  appQuery: _software.appQuery,
+  appQueryFragments: _software.appQueryFragments,
+  envContext: true,
+  wildcardCommand: true,
+  usage: 'vip @mysite.develop config software update <wordpress|php|nodejs|muplugins> <version>'
+}).examples([{
+  usage: 'vip @mysite.develop config software update wordpress 6.0',
+  description: 'Update WordPress to 6.0.x'
+}, {
+  usage: 'vip @mysite.develop config software update nodejs 16',
+  description: 'Update Node.js to v16'
+}]);
+cmd.option('force', 'Auto-confirm update');
+cmd.argv(process.argv, async (arg, opt) => {
+  const {
+    app,
+    env
+  } = opt;
+  const {
+    softwareSettings
+  } = env;
+  const baseTrackingInfo = {
+    environment_id: env === null || env === void 0 ? void 0 : env.id,
+    args: JSON.stringify(arg)
+  };
+  await (0, _tracker.trackEvent)('config_software_update_execute', baseTrackingInfo);
+  let updateData = {};
+
+  try {
+    if (softwareSettings === null) {
+      throw new _userError.default('Software settings are not supported for this environment.');
+    }
+
+    const updateOptions = {
+      force: !!opt.force
+    };
+
+    if (arg.length > 0) {
+      updateOptions.component = arg[0];
+    }
+
+    if (arg.length > 1) {
+      updateOptions.version = arg[1];
+    }
+
+    updateData = await (0, _software.promptForUpdate)(app.typeId, updateOptions, softwareSettings);
+    const hasProcessJob = updateData.component !== 'nodejs';
+    const steps = hasProcessJob ? UPDATE_SOFTWARE_PROGRESS_STEPS : [UPDATE_SOFTWARE_PROGRESS_STEPS[0]];
+    const progressTracker = new _progress.ProgressTracker(steps);
+    progressTracker.startPrinting();
+    progressTracker.stepRunning('trigger');
+    const triggerResult = await (0, _software.triggerUpdate)({
+      appId: app.id,
+      envId: env.id,
+      ...updateData
+    });
+    debug('Triggered update with result', triggerResult);
+    progressTracker.stepSuccess('trigger');
+
+    if (hasProcessJob) {
+      const {
+        ok,
+        errorMessage
+      } = await (0, _software.getUpdateResult)(app.id, env.id);
+
+      if (ok) {
+        progressTracker.stepSuccess('process');
+      } else {
+        progressTracker.stepFailed('process');
+      }
+
+      progressTracker.print();
+      progressTracker.stopPrinting();
+
+      if (ok) {
+        console.log(_chalk.default.green('✓') + ' Software update complete');
+      } else {
+        throw Error(errorMessage);
+      }
+    } else {
+      progressTracker.print();
+      progressTracker.stopPrinting();
+      const deploymentsLink = `https://dashboard.wpvip.com/apps/${app.id}/${env.uniqueLabel}/deploys`;
+      const message = ` A new build of the application code has been initiated and will be deployed using Node.js v${updateData.version} when the build is successful\n` + `View the deployments page in VIP Dashboard for progress updates. - ${deploymentsLink}`;
+      console.log(_chalk.default.green('✓') + message);
+    }
+
+    await (0, _tracker.trackEvent)('config_software_update_success', { ...baseTrackingInfo,
+      ...updateData
+    });
+  } catch (error) {
+    if (error instanceof _userError.default) {
+      await (0, _tracker.trackEvent)('config_software_update_success', { ...baseTrackingInfo,
+        ...updateData,
+        user_error: error === null || error === void 0 ? void 0 : error.message
+      });
+    } else {
+      await (0, _tracker.trackEvent)('config_software_update_error', { ...baseTrackingInfo,
+        ...updateData,
+        error: error === null || error === void 0 ? void 0 : error.message
+      });
+    }
+
+    throw error;
+  }
+});

package/dist/bin/vip-config-software.js

@@ -19,5 +19,6 @@ var _command = _interopRequireDefault(require("../lib/cli/command"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 (0, _command.default)({
-  requiredArgs: 1
-}).command('get', 'Read current software settings').argv(process.argv);
+  requiredArgs: 1,
+  usage: 'vip @mysite.develop config software <action>'
+}).command('get', 'Read current software settings').command('update', 'Update software settings').argv(process.argv);

package/dist/bin/vip-dev-env-create.js

@@ -97,7 +97,9 @@ cmd.argv(process.argv, async (arg, opt) => {
 
   try {
     await (0, _devEnvironmentCore.createEnvironment)(instanceData);
-    await (0, _devEnvironmentCore.printEnvironmentInfo)(slug);
+    await (0, _devEnvironmentCore.printEnvironmentInfo)(slug, {
+      extended: false
+    });
     const message = '\n' + _chalk.default.green('✓') + ` environment created.\n\nTo start it please run:\n\n${startCommand}\n`;
     console.log(message);
     await (0, _tracker.trackEvent)('dev_env_create_command_success', trackingInfo);

package/dist/bin/vip-dev-env-info.js

@@ -35,7 +35,7 @@ const examples = [{
   usage: `${_devEnvironment.DEV_ENVIRONMENT_FULL_COMMAND} info --slug=my_site`,
   description: 'Return information about a local dev environment named "my_site"'
 }];
-(0, _command.default)().option('slug', 'Custom name of the dev environment').option('all', 'Show Info for all local dev environments').examples(examples).argv(process.argv, async (arg, opt) => {
+(0, _command.default)().option('slug', 'Custom name of the dev environment').option('all', 'Show Info for all local dev environments').option('extended', 'Show extended information about the dev environment').examples(examples).argv(process.argv, async (arg, opt) => {
   await (0, _devEnvironmentCli.validateDependencies)();
   const slug = (0, _devEnvironmentCli.getEnvironmentName)(opt);
   const trackingInfo = opt.all ? {
@@ -45,10 +45,14 @@ const examples = [{
   debug('Args: ', arg, 'Options: ', opt);
 
   try {
+    const options = {
+      extended: !!opt.extended
+    };
+
     if (opt.all) {
-      await (0, _devEnvironmentCore.printAllEnvironmentsInfo)();
+      await (0, _devEnvironmentCore.printAllEnvironmentsInfo)(options);
     } else {
-      await (0, _devEnvironmentCore.printEnvironmentInfo)(slug);
+      await (0, _devEnvironmentCore.printEnvironmentInfo)(slug, options);
     }
 
     await (0, _tracker.trackEvent)('dev_env_info_command_success', trackingInfo);

package/dist/bin/vip-wp.js

@@ -229,6 +229,7 @@ const bindReconnectEvents = ({
   currentJob.socket.io.removeAllListeners('reconnect');
   currentJob.socket.io.removeAllListeners('reconnect_attempt');
   currentJob.socket.removeAllListeners('retry');
+  currentJob.socket.removeAllListeners('connect_error');
   currentJob.socket.io.on('reconnect', async () => {
     debug('socket.io: reconnect');
 
@@ -286,6 +287,20 @@ const bindReconnectEvents = ({
       currentJob.socket.io.engine.close();
     }, 5000);
   });
+  currentJob.socket.on('connect_error', () => {
+    debug('socket: connect_error; forcing the preference for websocket');
+
+    _rollbar.rollbar.info('WP-CLI socket.on( \'connect_error\' )', {
+      custom: {
+        code: 'wp-cli-on-connect_error',
+        commandGuid: cliCommand.guid
+      }
+    }); // Force the preference for WebSocket in case we see an error during connection
+    // https://socket.io/docs/v3/client-initialization/#low-level-engine-options
+
+
+    currentJob.socket.io.opts.transports = ['websocket', 'polling'];
+  });
   currentJob.socket.on('exit', async ({
     exitCode,
     message
@@ -479,12 +494,16 @@ const bindReconnectEvents = ({
     }
 
     const token = await _token.default.get();
+    const extraHeaders = {
+      Authorization: `Bearer ${token.raw}`
+    };
     const socket = (0, _socket.default)(`${_api.API_HOST}/wp-cli`, {
       transportOptions: {
         polling: {
-          extraHeaders: {
-            Authorization: `Bearer ${token.raw}`
-          }
+          extraHeaders
+        },
+        websocket: {
+          extraHeaders
         }
       },
       agent: (0, _proxyAgent.createProxyAgent)(_api.API_HOST)

package/dist/bin/vip.js

@@ -23,6 +23,8 @@ var _tracker = require("../lib/tracker");
 
 var _rollbar = require("../lib/rollbar");
 
+var _logout = _interopRequireDefault(require("../lib/logout"));
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -45,8 +47,7 @@ const tokenURL = 'https://dashboard.wpvip.com/me/cli/token';
 const runCmd = async function () {
   const cmd = (0, _command.default)();
   cmd.command('logout', 'Logout from your current session', async () => {
-    await _token.default.purge();
-    await (0, _tracker.trackEvent)('logout_command_execute');
+    await (0, _logout.default)();
     console.log('You are successfully logged out.');
   }).command('app', 'List and modify your VIP applications').command('cache', 'Manage page cache for your VIP applications').command('config', 'Set configuration for your VIP applications').command('dev-env', 'Use local dev-environment').command('import', 'Import media or SQL files into your VIP applications').command('logs', 'Get logs from your VIP applications').command('search-replace', 'Perform search and replace tasks on files').command('sync', 'Sync production to a development environment').command('whoami', 'Display details about the currently logged-in user').command('wp', 'Run WP CLI commands against an environment');
   cmd.argv(process.argv);
@@ -56,10 +57,11 @@ const rootCmd = async function () {
   let token = await _token.default.get();
   const isHelpCommand = process.argv.some(arg => arg === 'help' || arg === '-h' || arg === '--help');
   const isLogoutCommand = process.argv.some(arg => arg === 'logout');
+  const isLoginCommand = process.argv.some(arg => arg === 'login');
   const isDevEnvCommandWithoutEnv = process.argv.some(arg => arg === 'dev-env') && !(0, _command.containsAppEnvArgument)(process.argv);
   debug('Argv:', process.argv);
 
-  if (isLogoutCommand || isHelpCommand || isDevEnvCommandWithoutEnv || token && token.valid()) {
+  if (!isLoginCommand && (isLogoutCommand || isHelpCommand || isDevEnvCommandWithoutEnv || token && token.valid())) {
     runCmd();
   } else {
     console.log();
@@ -142,6 +144,12 @@ const rootCmd = async function () {
 
     await (0, _tracker.aliasUser)(token.id);
     await (0, _tracker.trackEvent)('login_command_token_submit_success');
+
+    if (isLoginCommand) {
+      console.log('You are now logged in - see `vip -h` for a list of available commands.');
+      process.exit();
+    }
+
     runCmd();
   }
 };

package/dist/lib/analytics/clients/pendo.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _api = _interopRequireDefault(require("../../api"));
+var _http = _interopRequireDefault(require("../../api/http"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -75,10 +75,7 @@ class Pendo {
       visitorId: `${this.context.userId}`
     };
     debug('send()', body);
-    const {
-      apiFetch
-    } = await (0, _api.default)();
-    const response = await apiFetch(Pendo.ENDPOINT, {
+    const response = await (0, _http.default)(Pendo.ENDPOINT, {
       method: 'POST',
       body
     });

package/dist/lib/api/http.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _nodeFetch = _interopRequireDefault(require("node-fetch"));
+
+var _token = _interopRequireDefault(require("../token"));
+
+var _env = _interopRequireDefault(require("../env"));
+
+var _proxyAgent = require("../http/proxy-agent");
+
+var _api = require("../api");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+/**
+ * External dependencies
+ */
+
+/**
+ * Internal dependencies
+ */
+const debug = require('debug')('@automattic/vip:http');
+/**
+ * Call the Public API with an arbitrary path (e.g. to connect to REST endpoints).
+ * This will include the token in an Authorization header so requests are "logged-in."
+ *
+ * This is simply a wrapper around node-fetch
+ *
+ * @param {string} path API path to pass to `fetch` -- will be prefixed by the API_HOST
+ * @param {object} options options to pass to `fetch`
+ * @returns {Promise} Return value of the `fetch` call
+ */
+
+
+var _default = async (path, options = {}) => {
+  let url = path; // For convenience, we support just passing in the path to this function...
+  // but some things (Apollo) always pass the full url
+
+  if (!path.startsWith(_api.API_HOST)) {
+    url = `${_api.API_HOST}${path}`;
+  }
+
+  const authToken = await _token.default.get();
+  const headers = {
+    'User-Agent': _env.default.userAgent,
+    Authorization: authToken ? `Bearer ${authToken.raw}` : null
+  };
+  const proxyAgent = (0, _proxyAgent.createProxyAgent)(url);
+  debug('running fetch', url);
+  return (0, _nodeFetch.default)(url, { ...options,
+    ...{
+      agent: proxyAgent,
+      headers: { ...headers,
+        ...{
+          'Content-Type': 'application/json'
+        },
+        ...options.headers
+      }
+    },
+    ...{
+      body: typeof options.body === 'object' ? JSON.stringify(options.body) : options.body
+    }
+  });
+};
+
+exports.default = _default;

package/dist/lib/api.js

@@ -97,10 +97,13 @@ async function API({
     return forward(operation);
   });
   const proxyAgent = (0, _proxyAgent.createProxyAgent)(API_URL);
+
+  const http = require("./api/http").default;
+
   const httpLink = new _core.HttpLink({
     uri: API_URL,
     headers,
-    fetch: _nodeFetch.default,
+    fetch: http,
     fetchOptions: {
       agent: proxyAgent
     }
@@ -109,28 +112,5 @@ async function API({
     link: _core2.ApolloLink.from([withToken, errorLink, authLink, httpLink]),
     cache: new _core.InMemoryCache()
   });
-  /**
-   * Call the Public API with an arbitrary path (e.g. to connect to REST endpoints).
-   * This will include the token in an Authorization header so requests are "logged-in."
-   * @param {string} path API path to pass to `fetch` -- will be prefixed by the API_HOST
-   * @param {object} options options to pass to `fetch`
-   * @returns {Promise} Return value of the `fetch` call
-   */
-
-  apiClient.apiFetch = (path, options = {}) => (0, _nodeFetch.default)(`${API_HOST}${path}`, { ...options,
-    ...{
-      agent: proxyAgent,
-      headers: { ...headers,
-        ...{
-          'Content-Type': 'application/json'
-        },
-        ...options.headers
-      }
-    },
-    ...{
-      body: typeof options.body === 'object' ? JSON.stringify(options.body) : options.body
-    }
-  });
-
   return apiClient;
 }

package/dist/lib/app.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isAppWordPress = isAppWordPress;
+exports.isAppNodejs = isAppNodejs;
+
+var _vipgo = require("./constants/vipgo");
+
+/**
+ * External dependencies
+ */
+
+/**
+ * Internal dependencies
+ */
+
+/**
+ * Is this a WordPress application?
+ * @param       {int} appTypeId application type ID
+ * @constructor
+ */
+function isAppWordPress(appTypeId) {
+  return _vipgo.WORDPRESS_SITE_TYPE_IDS.includes(appTypeId);
+}
+/**
+ * Is this a Nodejs application?
+ * @param       {int} appTypeId application type ID
+ * @constructor
+ */
+
+
+function isAppNodejs(appTypeId) {
+  return _vipgo.NODEJS_SITE_TYPE_IDS.includes(appTypeId);
+}

package/dist/lib/cli/command.js

@@ -29,8 +29,6 @@ var _package = _interopRequireDefault(require("../../../package.json"));
 
 var _tracker = require("../tracker");
 
-var _pager = _interopRequireDefault(require("./pager"));
-
 var _envAlias = require("./envAlias");
 
 var _rollbar = require("../rollbar");
@@ -39,7 +37,7 @@ var exit = _interopRequireWildcard(require("./exit"));
 
 var _debug = _interopRequireDefault(require("debug"));
 
-var _userError = _interopRequireDefault(require("./userError"));
+var _userError = _interopRequireDefault(require("../user-error"));
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -526,9 +524,7 @@ _args.default.argv = async function (argv, cb) {
         format: options.format
       });
       const formattedOut = (0, _format.formatData)(res, options.format);
-      const page = (0, _pager.default)();
-      page.write(formattedOut + '\n');
-      page.end();
+      console.log(formattedOut);
       return {};
     }
   }

package/dist/lib/client-file-uploader.js

@@ -39,7 +39,7 @@ var _xml2js = require("xml2js");
 
 var _debug = _interopRequireDefault(require("debug"));
 
-var _api = _interopRequireDefault(require("./api"));
+var _http = _interopRequireDefault(require("./api/http"));
 
 var _fileSize = require("./constants/file-size");
 
@@ -308,10 +308,7 @@ async function getSignedUploadRequestData({
   uploadId = undefined,
   partNumber = undefined
 }) {
-  const {
-    apiFetch
-  } = await (0, _api.default)();
-  const response = await apiFetch('/upload/site-import-presigned-url', {
+  const response = await (0, _http.default)('/upload/site-import-presigned-url', {
     method: 'POST',
     body: {
       action,