test: fix e2e imports

Author: fredericosilva

.github/workflows/javascript.yaml

@@ -36,7 +36,7 @@ jobs:
         HYPERONE_PASSWORD: ${{secrets.HYPERONE_PASSWORD}}
         AWS_SECRET_KEY: ${{secrets.AWS_SECRET_KEY}}
     - name: Run e2e tests
-      run: npm run test
+      run: yarn run test
       working-directory: ./packages/cli-device-node
       if: ${{ github.event_name == 'push' }}
     - name: Build NodeJS release files

extensions/cli-ext-container-helper/commands/setup.js

@@ -1,10 +1,11 @@
 import { Command } from '@hyperone/cli-framework';
-import fs from 'fs';
-import path from 'path';
+import path from 'node:path';
+import fs from 'node:fs';
+import os from 'node:os';
 import { openapi } from '@hyperone/cli-core';
 
 const get_config_path = () => {
-    const docker_config_dir = process.env.DOCKER_CONFIG || path.join(require('os').homedir(), '.docker');
+    const docker_config_dir = process.env.DOCKER_CONFIG || path.join(os.homedir(), '.docker');
     return path.join(docker_config_dir, 'config.json');
 };
 

extensions/cli-ext-root-openapi-generator/middlewares/uri-upload.js

@@ -36,9 +36,9 @@ export default {
             if (!value.startsWith('file://')) {
                 continue;
             }
-            const path = require('path');
+
             const filepath = new URL(value).pathname;
-            const filename = path.basename(filepath);
+            const filename = filepath.split('/').pop();
             const filestream = device.createReadStream(filepath);
             const filestat = await device.statFile(filepath);
             const filesize = filestat.size;

packages/cli-device-node/lib/tests.js

@@ -1,15 +1,17 @@
-const shlex = require('shlex');
-const child_process = require('child_process');
-const path = require('path');
-const fs = require('fs').promises;
-const { createWriteStream } = require('fs');
-const os = require('os');
-const util = require('util');
-const crypto = require('crypto');
-const randomBytes = util.promisify(crypto.randomBytes);
-const pty = require('node-pty');
-
-const randomToken = (len = 16) => randomBytes(len).then(x => x.toString('hex'));
+import shlex from 'shlex';
+import pty from 'node-pty';
+
+import { promises as fs, createWriteStream } from 'node:fs';
+import { randomBytes, createHash } from 'node:crypto';
+import { fileURLToPath } from 'node:url';
+
+import child_process from 'node:child_process';
+import path from 'node:path';
+import os from 'node:os';
+
+const __dirname = fileURLToPath(new URL('.', import.meta.url));
+
+const randomToken = async (len = 16) => randomBytes(len).toString('hex');
 
 const run = (cmd, options = {}) => new Promise((resolve, reject) => {
     if (process.argv.includes('--serial')) {
@@ -18,9 +20,16 @@ const run = (cmd, options = {}) => new Promise((resolve, reject) => {
     }
 
     const args = [
-        path.join(__dirname, '../dist/h1.js'),
+        path.join(__dirname, '../bin/h1.js'),
         ...shlex.split(cmd).slice(1),
     ];
+    options.env = {
+        ...options.env,
+        //TODO remove when it becomes stable
+        //  "Importing JSON modules is an experimental feature" - https://nodejs.org/api/esm.html#json-modules
+        //  "The Fetch API is an experimental feature"          - https://nodejs.org/api/globals.html#fetch
+        NODE_NO_WARNINGS: '1'
+    };
     const program = child_process.spawn(process.argv[0], args, options);
     const chunks = [];
 
@@ -57,7 +66,7 @@ const runJson = async (cmd, options = {}) => {
 
 const runPty = async (cmd, inputs, options = {}) => new Promise((resolve, reject) => {
     const ptyProcess = pty.spawn(process.argv[0], [
-        path.join(__dirname, '../dist/h1.js'),
+        path.join(__dirname, '../bin/h1.js'),
         ...shlex.split(cmd).slice(1),
     ], options);
     const chunks = [];
@@ -126,19 +135,18 @@ const getName = (...names) => [...names, Date.now().toString()]
     .replace(/[^a-zA-Z0-9]/g, '-');
 
 const downloadCachedFile = url => new Promise((resolve, reject) => {
-    const suffix = crypto.createHash('sha256').update(url).digest('hex');
+    const suffix = createHash('sha256').update(url).digest('hex');
     const filename = path.join(os.tmpdir(), `test-h1-cli-v2-${suffix}`);
-    const stream = createWriteStream(filename);
-    stream.on('finish', () => resolve(filename));
+    
     fetch(url)
-        .then(resp => resp.body
-            .pipe(stream)
-            .on('error', reject)
-        )
-        .catch(reject);
+        .then(response => response.blob())
+        .then(blob => fs.writeFile(filename, blob.stream()))
+        .catch(reject)
+        .then(() => resolve(filename))
+    ;
 });
 
-module.exports = {
+export {
     run,
     runJson,
     runPty,

packages/cli-device-node/scripts/validate-ext.js

@@ -1,10 +1,9 @@
 /* eslint-disable no-console */
+import info from '../package.json' assert { type: 'json' };
 
-import packageInfo from './../package.json';
-
-for (const pkg of Object.keys(packageInfo.dependencies).filter(x => x.startsWith('@hyperone/cli-ext'))) {
+for (const pkg of Object.keys(info.dependencies).filter(x => x.startsWith('@hyperone/cli-ext'))) {
     try {
-        require(pkg);
+        await import(pkg);
         console.log('Successfully loaded', pkg);
     } catch (err) {
         console.log('Failed to load', pkg);

packages/cli-device-node/tests/auth.js

@@ -1,28 +1,28 @@
-const ava = require('ava');
-const { run, runJson, runPty, withTemp, withVariable } = require('./../lib/tests');
+import test from 'ava';
+import { run, runJson, runPty, withTemp, withVariable } from '../lib/tests.js';
 
-ava('display user profile', async t => {
+test('display user profile', async t => {
     const output = await runJson('h1 auth me');
     t.true(output.aud.includes('https://api.hyperone.com/v2'));
 });
 
-ava('auth user', withTemp(withVariable(['username', 'password'], async (t, tmpDir, username, password) => {
+test('auth user', withTemp(withVariable(['username', 'password'], async (t, tmpDir, username, password) => {
     const options = { env: { HOME: tmpDir } };
     const output = await run(`h1 auth user --username ${username} --password ${password}`, options);
     t.true(output.includes('Token successfully updated.'));
     const me = await runJson('h1 auth me', options);
     t.true(me.sub.includes(username));
 })));
 
-ava('auth aws', withTemp(withVariable(['aws-access-key', 'aws-secret-key'], async (t, tmpDir, access_key, secret_key) => {
+test('auth aws', withTemp(withVariable(['aws-access-key', 'aws-secret-key'], async (t, tmpDir, access_key, secret_key) => {
     const options = { env: { HOME: tmpDir } };
     const output = await run(`h1 auth aws --access-key-id ${access_key} --secret-access-key ${secret_key}`, options);
     t.true(output.includes('Token successfully updated.'));
     const me = await runJson('h1 auth me', options);
     t.true(me.sub.includes('https://sts.amazonaws.com/'));
 })));
 
-ava('auth user interactive', withTemp(withVariable(['username', 'password'], async (t, tmpDir, username, password) => {
+test('auth user interactive', withTemp(withVariable(['username', 'password'], async (t, tmpDir, username, password) => {
     const options = { env: { HOME: tmpDir } };
     const output = await runPty('h1 auth user', [username, password].map(x => `${x}\r`), options);
     t.true(output.includes('Token successfully updated.'));

packages/cli-device-node/tests/config-autocomplete.js

@@ -1,12 +1,12 @@
-const ava = require('ava');
-const { run, withTemp } = require('../lib/tests');
+import test from 'ava';
+import { run, withTemp } from '../lib/tests.js';
 
 const comply = async (cmd) => {
     const output = await run(`h1 config autocomplete comply --cmd '${cmd}'`);
     return output.split('\n');
 };
 
-ava('autocomplete comply', async t => {
+test('autocomplete comply', async t => {
     const category = await comply('h1 i');
     t.true(category.includes('iam'));
 
@@ -18,7 +18,7 @@ ava('autocomplete comply', async t => {
     t.true(option.includes('--project'));
 });
 
-ava('autocomplete install', withTemp(async (t, tempDir) => {
+test('autocomplete install', withTemp(async (t, tempDir) => {
     const options = {env: {HOME: tempDir}};
     const output = await run('h1 config autocomplete install', options);
     t.true(output.includes(tempDir));

packages/cli-device-node/tests/config-settings.js

@@ -1,12 +1,12 @@
-const ava = require('ava');
-const { run, runJson, randomToken } = require('./../lib/tests');
+import test from 'ava';
+import { run, runJson, randomToken } from '../lib/tests.js';
 
-ava('config settings set', async t => {
+test('config settings set', async t => {
     const output = await run('h1 config settings set --key x --value x');
     t.true(output.includes('Configuration option set'));
 });
 
-ava('config settings lifecycle', async t => {
+test('config settings lifecycle', async t => {
     const token = await randomToken();
     const key = 'token-lifecycle';
     const output_set = await run(`h1 config settings set --key ${key} --value ${token}`);

packages/cli-device-node/tests/container-helper.js

@@ -1,10 +1,11 @@
-const ava = require('ava');
-const { run, runJson, withTemp, withVariable } = require('../lib/tests');
-const util = require('util');
-const exec = util.promisify(require('child_process').exec);
+import test from 'ava';
+import { run, runJson, withTemp, withVariable } from '../lib/tests.js';
+import { promisify } from 'node:util';
+import child_process from 'node:child_process';
+const exec = promisify(child_process.exec);
 
 // test have known isolation issue on CI
-const skipIfCi = process.env.CI ? ava.skip : ava;
+const skipIfCi = process.env.CI ? test.skip : test;
 
 skipIfCi('container helper lifecycle', withVariable(['project'], withTemp(async (t, project, tmpDir) => {
     const options = {

packages/cli-device-node/tests/core.js

@@ -1,22 +1,22 @@
-const ava = require('ava');
-const { run } = require('./../lib/tests');
+import test from 'ava';
+import { run } from '../lib/tests.js';
 
-ava('display version option output', async t => {
+test('display version option output', async t => {
     const output = await run('h1 -v');
     t.true(output.includes('h1 version 2'));
 });
 
-ava('display category', async t => {
+test('display category', async t => {
     const output = await run('h1 iam');
     t.true(output.includes('Management of project resource'));
 });
 
-ava('display command help', async t => {
+test('display command help', async t => {
     const output = await run('h1 iam project create --help');
     t.true(output.includes('Show help message and exit.'));
 });
 
-ava('display error for missing parameter', async t => {
+test('display error for missing parameter', async t => {
     const err = await t.throwsAsync(run('h1 config settings set'));
     t.true(err.output.includes('--key'));
     t.true(err.output.includes('--value'));