From 3fc47084154b11254fd52a33996f67c10cb50a3f Mon Sep 17 00:00:00 2001 From: Lisbet Alvarez <107949262+lisbet-alvarez@users.noreply.github.com> Date: Tue, 1 Aug 2023 13:31:20 -0700 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20upgrade=20faker=20js=20?= =?UTF-8?q?from=20v7=20to=20v8=20(#1808)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: 🤖 upgrade faker js from v7 to v8 ✅ Closes: ICU-10373 * refactor: 💡 remove deprecated modules from factories * test: 💍 fix failing tests --------- Co-authored-by: Carlos Alcaide Corvo --- addons/api/mirage/factories/account.js | 21 +++++++++++-------- .../api/mirage/factories/channel-recording.js | 6 ++++-- .../mirage/factories/connection-recording.js | 6 ++++-- .../mirage/factories/credential-library.js | 7 +++---- .../api/mirage/factories/credential-store.js | 4 ++-- addons/api/mirage/factories/credential.js | 2 +- addons/api/mirage/factories/host-catalog.js | 20 ++++++++++-------- addons/api/mirage/factories/host-set.js | 8 +++---- addons/api/mirage/factories/host.js | 4 ++-- addons/api/mirage/factories/managed-group.js | 6 +++--- .../api/mirage/factories/session-recording.js | 6 +++--- addons/api/mirage/factories/session.js | 2 +- addons/api/mirage/factories/storage-bucket.js | 8 +++---- addons/api/mirage/factories/target.js | 18 +++++++++------- addons/api/mirage/factories/worker.js | 4 ++-- .../api/mirage/generated/factories/account.js | 6 +++--- .../mirage/generated/factories/auth-method.js | 14 ++++++------- .../generated/factories/channel-recording.js | 8 +++---- .../factories/connection-recording.js | 8 +++---- .../generated/factories/credential-library.js | 4 ++-- .../generated/factories/credential-store.js | 4 ++-- .../mirage/generated/factories/credential.js | 6 +++--- .../api/mirage/generated/factories/group.js | 4 ++-- .../generated/factories/host-catalog.js | 4 ++-- .../mirage/generated/factories/host-set.js | 8 +++---- addons/api/mirage/generated/factories/host.js | 4 ++-- .../generated/factories/managed-group.js | 6 +++--- addons/api/mirage/generated/factories/org.js | 4 ++-- .../api/mirage/generated/factories/project.js | 4 ++-- addons/api/mirage/generated/factories/role.js | 6 +++--- .../api/mirage/generated/factories/scope.js | 4 ++-- .../generated/factories/session-recording.js | 8 +++---- .../api/mirage/generated/factories/session.js | 2 +- .../generated/factories/storage-bucket.js | 9 ++++---- .../api/mirage/generated/factories/target.js | 12 +++++------ addons/api/mirage/generated/factories/user.js | 4 ++-- .../api/mirage/generated/factories/worker.js | 16 +++++++------- addons/api/mirage/scenarios/ipc.js | 2 +- addons/core/package.json | 2 +- ui/admin/package.json | 2 +- ui/admin/tests/e2e/tests/target.spec.js | 4 +++- ui/desktop/package.json | 2 +- yarn.lock | 8 +++---- 43 files changed, 147 insertions(+), 140 deletions(-) diff --git a/addons/api/mirage/factories/account.js b/addons/api/mirage/factories/account.js index 49f270975..5e27a5771 100644 --- a/addons/api/mirage/factories/account.js +++ b/addons/api/mirage/factories/account.js @@ -32,17 +32,20 @@ export default factory.extend({ case TYPE_AUTH_METHOD_PASSWORD: return { login_name: faker.internet.userName() }; case TYPE_AUTH_METHOD_LDAP: { - const groupsAmount = faker.datatype.number({ min: 3, max: 5 }); - let groups = []; - for (let i = 0; i < groupsAmount; i++) { - groups.push(faker.random.word()); + const randomNum = faker.number.int({ min: 3, max: 5 }); + let member_of_groups = []; + const login_name = faker.internet.userName(); + let dn = `uid=${login_name}`; + for (let i = 0; i < randomNum; i++) { + member_of_groups.push(faker.word.noun()); + dn += `,dc=${faker.internet.domainSuffix()}`; } return { - login_name: faker.internet.userName(), + login_name, + dn, + member_of_groups, email: faker.internet.email(), - full_name: faker.random.words(), - dn: faker.random.words(), - member_of_groups: groups, + full_name: faker.person.fullName(), }; } case TYPE_AUTH_METHOD_OIDC: @@ -50,7 +53,7 @@ export default factory.extend({ issuer: faker.internet.ip(), subject: 'sub', email: faker.internet.email(), - full_name: faker.random.words(), + full_name: faker.person.fullName(), }; } }, diff --git a/addons/api/mirage/factories/channel-recording.js b/addons/api/mirage/factories/channel-recording.js index 639e15448..a77fe5cff 100644 --- a/addons/api/mirage/factories/channel-recording.js +++ b/addons/api/mirage/factories/channel-recording.js @@ -11,9 +11,11 @@ import { MIME_TYPE_ASCIICAST } from 'api/models/channel-recording'; export default factory.extend({ id: () => generateId('chr_'), start_time(i) { - return i % 3 === 2 ? null : faker.date.recent(3, this.end_time); + return i % 3 === 2 + ? null + : faker.date.recent({ days: 3, refDate: this.end_time }); }, end_time: (i) => (i % 3 === 2 ? null : faker.date.recent()), - duration: (i) => (i % 3 === 2 ? null : `${faker.datatype.number()}s`), + duration: (i) => (i % 3 === 2 ? null : `${faker.number.int()}s`), mime_types: (i) => (i % 3 === 2 ? null : [MIME_TYPE_ASCIICAST]), }); diff --git a/addons/api/mirage/factories/connection-recording.js b/addons/api/mirage/factories/connection-recording.js index c8196a4b8..bd4164ec7 100644 --- a/addons/api/mirage/factories/connection-recording.js +++ b/addons/api/mirage/factories/connection-recording.js @@ -11,8 +11,10 @@ export default factory.extend({ id: () => generateId('cr_'), connection_id: () => generateId('sc_'), start_time(i) { - return i % 3 === 2 ? null : faker.date.recent(3, this.end_time); + return i % 3 === 2 + ? null + : faker.date.recent({ days: 3, refDate: this.end_time }); }, end_time: (i) => (i % 3 === 2 ? null : faker.date.recent()), - duration: (i) => (i % 3 === 2 ? null : `${faker.datatype.number()}s`), + duration: (i) => (i % 3 === 2 ? null : `${faker.number.int()}s`), }); diff --git a/addons/api/mirage/factories/credential-library.js b/addons/api/mirage/factories/credential-library.js index b2bd9c009..7e2439d2b 100644 --- a/addons/api/mirage/factories/credential-library.js +++ b/addons/api/mirage/factories/credential-library.js @@ -30,14 +30,13 @@ export default factory.extend({ case TYPE_CREDENTIAL_LIBRARY_VAULT_GENERIC: return { http_method: 'GET', - http_request_body: faker.random.word(), + http_request_body: faker.word.words(1), path: faker.system.directoryPath(), }; case TYPE_CREDENTIAL_LIBRARY_VAULT_SSH_CERTIFICATE: return { - username: faker.random.word(), - key_type: faker.random.word(), - key_bits: faker.datatype.number(999), + username: faker.internet.userName(), + key_bits: faker.number.int(999), path: faker.system.directoryPath(), }; } diff --git a/addons/api/mirage/factories/credential-store.js b/addons/api/mirage/factories/credential-store.js index bc6238f13..0cf8462e3 100644 --- a/addons/api/mirage/factories/credential-store.js +++ b/addons/api/mirage/factories/credential-store.js @@ -40,14 +40,14 @@ export default factory.extend({ case 'vault': return { address: faker.internet.ip(), - namespace: faker.random.word(), + namespace: faker.word.words(1), ca_cert: 'ca-cert-123', tls_server_name: faker.internet.domainName(), tls_skip_verify: faker.datatype.boolean(), token_hmac: 'token-hmac-abcde0987654321', client_certificate: 'client-cert-123', client_certificate_key_hmac: 'client-cert-key-hmac-abcde0987654321', - worker_filter: faker.random.words(), + worker_filter: faker.word.words(), }; } }, diff --git a/addons/api/mirage/factories/credential.js b/addons/api/mirage/factories/credential.js index 29deaf850..194e9b1a1 100644 --- a/addons/api/mirage/factories/credential.js +++ b/addons/api/mirage/factories/credential.js @@ -31,7 +31,7 @@ export default factory.extend({ ], attributes() { return { - username: faker.random.word(), + username: faker.internet.userName(), }; }, }); diff --git a/addons/api/mirage/factories/host-catalog.js b/addons/api/mirage/factories/host-catalog.js index 35eac0f4d..efb485446 100644 --- a/addons/api/mirage/factories/host-catalog.js +++ b/addons/api/mirage/factories/host-catalog.js @@ -43,7 +43,7 @@ export default factory.extend({ return { id: `plugin-id-${i}`, name: pluginTypes[pluginTypeCounter++ % pluginTypes.length], - description: faker.random.words(), + description: faker.word.words(), }; } }, @@ -53,14 +53,16 @@ export default factory.extend({ case 'aws': return { disable_credential_rotation: faker.datatype.boolean(), - region: faker.address.state(), + region: `us-${faker.location.cardinalDirection()}-${faker.number.int( + 9 + )}`, }; case 'azure': return { disable_credential_rotation: faker.datatype.boolean(), - tenant_id: faker.datatype.hexadecimal(6), - client_id: faker.datatype.hexadecimal(6), - subscription_id: faker.datatype.hexadecimal(8), + tenant_id: faker.string.uuid(), + client_id: faker.string.uuid(), + subscription_id: faker.string.uuid(), }; } }, @@ -69,13 +71,13 @@ export default factory.extend({ switch (this.plugin?.name) { case 'aws': return { - access_key_id: faker.datatype.hexadecimal(8), - secret_access_key: faker.datatype.string(12), + access_key_id: faker.string.nanoid(), + secret_access_key: faker.string.nanoid(), }; case 'azure': return { - secret_id: faker.datatype.hexadecimal(6), - secret_value: faker.datatype.string(12), + secret_id: faker.string.nanoid(), + secret_value: faker.string.nanoid(), }; } }, diff --git a/addons/api/mirage/factories/host-set.js b/addons/api/mirage/factories/host-set.js index d1cdc18f6..b6f0136ff 100644 --- a/addons/api/mirage/factories/host-set.js +++ b/addons/api/mirage/factories/host-set.js @@ -27,7 +27,7 @@ export default factory.extend({ }, preferred_endpoints() { if (this.type === 'plugin') { - const enpointsAmount = faker.datatype.number({ min: 1, max: 5 }); + const enpointsAmount = faker.number.int({ min: 1, max: 5 }); let result = []; for (let i = 0; i < enpointsAmount; ++i) { result.push(faker.internet.ip()); @@ -37,17 +37,17 @@ export default factory.extend({ }, sync_interval_seconds() { if (this.type === 'plugin') { - return faker.datatype.number(); + return faker.number.int(); } }, attributes() { // AWS specific if (this.plugin?.name === 'aws') { - const filtersAmount = faker.datatype.number({ min: 1, max: 5 }); + const filtersAmount = faker.number.int({ min: 1, max: 5 }); let filters = []; for (let i = 0; i < filtersAmount; ++i) { - filters.push(`${faker.datatype.string(3)}=${faker.datatype.string(8)}`); + filters.push(`${faker.word.words(1)}=${faker.word.words(1)}`); } return { filters, diff --git a/addons/api/mirage/factories/host.js b/addons/api/mirage/factories/host.js index c2abaa1cf..d0b0a8ff7 100644 --- a/addons/api/mirage/factories/host.js +++ b/addons/api/mirage/factories/host.js @@ -11,7 +11,7 @@ import generateId from '../helpers/id'; export default factory.extend({ id: () => generateId('h_'), name() { - if (this.type === 'static') return faker.random.words(); + if (this.type === 'static') return faker.word.words(); }, type() { return this.hostCatalog?.type || factory.attrs.type; @@ -39,7 +39,7 @@ export default factory.extend({ // Return external fields only for plugins external_id() { if (this.type === 'plugin') { - return faker.datatype.uuid(); + return faker.string.uuid(); } }, external_name(i) { diff --git a/addons/api/mirage/factories/managed-group.js b/addons/api/mirage/factories/managed-group.js index 90ccfd852..24e110c83 100644 --- a/addons/api/mirage/factories/managed-group.js +++ b/addons/api/mirage/factories/managed-group.js @@ -31,13 +31,13 @@ export default factory.extend({ switch (this.type) { case TYPE_AUTH_METHOD_OIDC: return { - filter: faker.random.words(), + filter: `"${faker.word.noun()}" in "${faker.system.directoryPath()}"`, }; case TYPE_AUTH_METHOD_LDAP: { - const num = faker.datatype.number({ min: 2, max: 4 }); + const num = faker.number.int({ min: 2, max: 4 }); const names = []; for (let i = 0; i < num; i++) { - names.push(faker.random.word()); + names.push(faker.word.noun()); } return { group_names: names, diff --git a/addons/api/mirage/factories/session-recording.js b/addons/api/mirage/factories/session-recording.js index 2612e9cc4..8a6c6b59f 100644 --- a/addons/api/mirage/factories/session-recording.js +++ b/addons/api/mirage/factories/session-recording.js @@ -29,17 +29,17 @@ export default factory.extend({ state: (i) => states[i % states.length], start_time() { return this.state === STATE_SESSION_RECORDING_AVAILABLE - ? faker.date.recent(3, this.end_time) + ? faker.date.recent({ days: 3, refDate: this.end_time }) : null; }, end_time() { return this.state === STATE_SESSION_RECORDING_AVAILABLE - ? faker.date.recent(1, this.updated_time) + ? faker.date.recent({ days: 1, refDate: this.updated_time }) : null; }, duration() { return this.state === STATE_SESSION_RECORDING_AVAILABLE - ? `${faker.datatype.number()}s` + ? `${faker.number.int()}s` : null; }, diff --git a/addons/api/mirage/factories/session.js b/addons/api/mirage/factories/session.js index 7c6115a80..48c681814 100644 --- a/addons/api/mirage/factories/session.js +++ b/addons/api/mirage/factories/session.js @@ -16,7 +16,7 @@ export const pickRandomStatusString = () => export default factory.extend({ id: () => generateId('ss_'), - status: pickRandomStatusString, + status: pickRandomStatusString(), /** * Sessions generated with this trait will automatically form diff --git a/addons/api/mirage/factories/storage-bucket.js b/addons/api/mirage/factories/storage-bucket.js index 3482d45d1..6a3d98d35 100644 --- a/addons/api/mirage/factories/storage-bucket.js +++ b/addons/api/mirage/factories/storage-bucket.js @@ -36,7 +36,7 @@ export default factory.extend({ return { id: `plugin-id-${i}`, name: pluginTypes[i % pluginTypes.length], - description: faker.random.words(), + description: faker.word.words(), }; } }, @@ -45,10 +45,8 @@ export default factory.extend({ switch (this.plugin?.name) { case TYPE_STORAGE_BUCKET_PLUGIN_AWS_S3: return { - region: `us-${faker.address.cardinalDirection()}-${faker.datatype.number( - { - max: 9, - } + region: `us-${faker.location.cardinalDirection()}-${faker.number.int( + 9 )}`, disable_credential_rotation: faker.datatype.boolean(), }; diff --git a/addons/api/mirage/factories/target.js b/addons/api/mirage/factories/target.js index 3d8ecb950..5dd731e65 100644 --- a/addons/api/mirage/factories/target.js +++ b/addons/api/mirage/factories/target.js @@ -11,6 +11,8 @@ import generateId from '../helpers/id'; import { TYPES_TARGET, TYPE_TARGET_SSH } from 'api/models/target'; const randomBoolean = (chance = 0.5) => Math.random() < chance; +const randomFilter = () => + `"${faker.word.noun()}" in "${faker.system.directoryPath()}"`; const hostSetChance = 0.3; const types = [...TYPES_TARGET]; @@ -33,10 +35,10 @@ export default factory.extend({ * -1 means "unlimited" and we want to generate these on occasion. */ session_connection_limit: () => - faker.helpers.arrayElement([-1, faker.datatype.number()]), - worker_filter: (i) => (i % 2 === 0 ? faker.random.words() : null), - egress_worker_filter: (i) => (i % 2 !== 0 ? faker.random.words() : null), - ingress_worker_filter: (i) => (i % 2 !== 0 ? faker.random.words() : null), + faker.helpers.arrayElement([-1, faker.number.int()]), + worker_filter: (i) => (i % 2 === 0 ? randomFilter() : null), + egress_worker_filter: (i) => (i % 2 !== 0 ? randomFilter() : null), + ingress_worker_filter: (i) => (i % 2 !== 0 ? randomFilter() : null), type: (i) => types[i % types.length], /** @@ -67,9 +69,11 @@ export default factory.extend({ .models.filter(() => randomBoolean()) .map((cred) => cred.id); - const randomlySelectedStorageBucket = faker.helpers.arrayElement( - server.schema.storageBuckets.all().models - ); + const storageBuckets = server.schema.storageBuckets.all().models; + const randomlySelectedStorageBucket = + storageBuckets.length === 0 + ? undefined + : faker.helpers.arrayElement(storageBuckets); if (randomlySelectedStorageBucket && target.type === TYPE_TARGET_SSH) { target.update({ diff --git a/addons/api/mirage/factories/worker.js b/addons/api/mirage/factories/worker.js index 6591d3b86..7b1460fe3 100644 --- a/addons/api/mirage/factories/worker.js +++ b/addons/api/mirage/factories/worker.js @@ -26,7 +26,7 @@ export default factory.extend({ } if (i % 2 === 0) { return { - type: [faker.random.word(), faker.random.word()], + type: [faker.word.words(1), faker.word.words(1)], os: ['ubuntu'], env: ['dev', 'local'], }; @@ -39,7 +39,7 @@ export default factory.extend({ } if (i % 2 === 0) { return { - type: [faker.random.word(), faker.random.word()], + type: [faker.word.words(1), faker.word.words(1)], os: ['ubuntu'], env: ['dev', 'local'], }; diff --git a/addons/api/mirage/generated/factories/account.js b/addons/api/mirage/generated/factories/account.js index ccca1efa8..60c09fa7a 100644 --- a/addons/api/mirage/generated/factories/account.js +++ b/addons/api/mirage/generated/factories/account.js @@ -10,9 +10,9 @@ import { faker } from '@faker-js/faker'; * GeneratedAccountFactory */ export default Factory.extend({ - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), - version: () => faker.datatype.number(), + version: () => faker.number.int(), }); diff --git a/addons/api/mirage/generated/factories/auth-method.js b/addons/api/mirage/generated/factories/auth-method.js index 72d7b758a..c4a12a194 100644 --- a/addons/api/mirage/generated/factories/auth-method.js +++ b/addons/api/mirage/generated/factories/auth-method.js @@ -17,8 +17,8 @@ import { */ export default Factory.extend({ type: TYPE_AUTH_METHOD_PASSWORD, - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), disabled: () => faker.datatype.boolean(), @@ -48,18 +48,18 @@ export default Factory.extend({ attrs = { state: 'active-public', urls: [`ldap://${faker.internet.domainName()}`], - certificates: [faker.random.alphaNumeric(50)], - client_certificate: faker.random.alphaNumeric(50), - client_certificate_key: `---Begin Certificate --- ${faker.random.alphaNumeric( + certificates: [faker.string.alphanumeric(50)], + client_certificate: faker.string.alphanumeric(50), + client_certificate_key: `---Begin Certificate --- ${faker.string.alphanumeric( 170 )} ---End Certificate ---`, - client_certificate_key_hmac: faker.random.alphaNumeric(50), + client_certificate_key_hmac: faker.string.alphanumeric(50), enable_groups: true, start_tls: false, insecure_tls: false, bind_dn: 'cn=read-only-admin,dc=example,dc=com', bind_password: 'password', - bind_password_hmac: faker.random.alphaNumeric(50), + bind_password_hmac: faker.string.alphanumeric(50), upn_domain: 'example.com', discover_dn: false, anon_group_search: false, diff --git a/addons/api/mirage/generated/factories/channel-recording.js b/addons/api/mirage/generated/factories/channel-recording.js index 4c6446150..cfd766832 100644 --- a/addons/api/mirage/generated/factories/channel-recording.js +++ b/addons/api/mirage/generated/factories/channel-recording.js @@ -10,9 +10,7 @@ import { faker } from '@faker-js/faker'; * GeneratedChannelRecordingModelFactory */ export default Factory.extend({ - bytes_up: () => - faker.random.numeric(faker.datatype.number({ min: 1, max: 12 })), - bytes_down: () => - faker.random.numeric(faker.datatype.number({ min: 1, max: 12 })), - errors: () => faker.datatype.number({ max: 10 }), + bytes_up: () => faker.string.numeric(faker.number.int({ min: 1, max: 12 })), + bytes_down: () => faker.string.numeric(faker.number.int({ min: 1, max: 12 })), + errors: () => faker.number.int({ max: 10 }), }); diff --git a/addons/api/mirage/generated/factories/connection-recording.js b/addons/api/mirage/generated/factories/connection-recording.js index f0b50e501..c83eb93bc 100644 --- a/addons/api/mirage/generated/factories/connection-recording.js +++ b/addons/api/mirage/generated/factories/connection-recording.js @@ -10,9 +10,7 @@ import { faker } from '@faker-js/faker'; * GeneratedConnectionRecordingModelFactory */ export default Factory.extend({ - bytes_up: () => - faker.random.numeric(faker.datatype.number({ min: 1, max: 12 })), - bytes_down: () => - faker.random.numeric(faker.datatype.number({ min: 1, max: 12 })), - errors: () => faker.datatype.number({ max: 10 }), + bytes_up: () => faker.string.numeric(faker.number.int({ min: 1, max: 12 })), + bytes_down: () => faker.string.numeric(faker.number.int({ min: 1, max: 12 })), + errors: () => faker.number.int({ max: 10 }), }); diff --git a/addons/api/mirage/generated/factories/credential-library.js b/addons/api/mirage/generated/factories/credential-library.js index f8820f8f0..b97f54477 100644 --- a/addons/api/mirage/generated/factories/credential-library.js +++ b/addons/api/mirage/generated/factories/credential-library.js @@ -10,8 +10,8 @@ import { faker } from '@faker-js/faker'; * GeneratedCredentialLibraryModelFactory */ export default Factory.extend({ - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), }); diff --git a/addons/api/mirage/generated/factories/credential-store.js b/addons/api/mirage/generated/factories/credential-store.js index 389596b92..8455cac2d 100644 --- a/addons/api/mirage/generated/factories/credential-store.js +++ b/addons/api/mirage/generated/factories/credential-store.js @@ -10,8 +10,8 @@ import { faker } from '@faker-js/faker'; * GeneratedCredentialStoreModelFactory */ export default Factory.extend({ - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), }); diff --git a/addons/api/mirage/generated/factories/credential.js b/addons/api/mirage/generated/factories/credential.js index 4b871c722..de61cf019 100644 --- a/addons/api/mirage/generated/factories/credential.js +++ b/addons/api/mirage/generated/factories/credential.js @@ -10,9 +10,9 @@ import { faker } from '@faker-js/faker'; * GeneratedCredentialModelFactory */ export default Factory.extend({ - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), - version: () => faker.datatype.number(), + version: () => faker.number.int(), }); diff --git a/addons/api/mirage/generated/factories/group.js b/addons/api/mirage/generated/factories/group.js index 6e9444d0e..9b8b2c23f 100644 --- a/addons/api/mirage/generated/factories/group.js +++ b/addons/api/mirage/generated/factories/group.js @@ -11,8 +11,8 @@ import { faker } from '@faker-js/faker'; * Group contains all fields related to a Group resource */ export default Factory.extend({ - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), disabled: () => faker.datatype.boolean(), diff --git a/addons/api/mirage/generated/factories/host-catalog.js b/addons/api/mirage/generated/factories/host-catalog.js index d01179d01..7c58a9cfc 100644 --- a/addons/api/mirage/generated/factories/host-catalog.js +++ b/addons/api/mirage/generated/factories/host-catalog.js @@ -11,8 +11,8 @@ import { faker } from '@faker-js/faker'; */ export default Factory.extend({ type: 'static', - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), disabled: () => faker.datatype.boolean(), diff --git a/addons/api/mirage/generated/factories/host-set.js b/addons/api/mirage/generated/factories/host-set.js index 7a8e41140..eee801a9d 100644 --- a/addons/api/mirage/generated/factories/host-set.js +++ b/addons/api/mirage/generated/factories/host-set.js @@ -11,10 +11,10 @@ import { faker } from '@faker-js/faker'; */ export default Factory.extend({ type: 'static', - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), - version: () => faker.datatype.number(), - size: () => faker.datatype.number(), + version: () => faker.number.int(), + size: () => faker.number.int(), }); diff --git a/addons/api/mirage/generated/factories/host.js b/addons/api/mirage/generated/factories/host.js index 4b3f64498..a26fc2146 100644 --- a/addons/api/mirage/generated/factories/host.js +++ b/addons/api/mirage/generated/factories/host.js @@ -11,10 +11,10 @@ import { faker } from '@faker-js/faker'; */ export default Factory.extend({ type: 'static', - description: () => faker.random.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), - version: () => faker.datatype.number(), + version: () => faker.number.int(), attributes: () => { return { address: faker.internet.ipv6() }; }, diff --git a/addons/api/mirage/generated/factories/managed-group.js b/addons/api/mirage/generated/factories/managed-group.js index 92890f9f9..c6d2fb04b 100644 --- a/addons/api/mirage/generated/factories/managed-group.js +++ b/addons/api/mirage/generated/factories/managed-group.js @@ -11,9 +11,9 @@ import { faker } from '@faker-js/faker'; * A managed group is a resource that represents a collection of accounts. */ export default Factory.extend({ - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), - version: () => faker.datatype.number(), + version: () => faker.number.int(), }); diff --git a/addons/api/mirage/generated/factories/org.js b/addons/api/mirage/generated/factories/org.js index d2ffc9878..962be0b84 100644 --- a/addons/api/mirage/generated/factories/org.js +++ b/addons/api/mirage/generated/factories/org.js @@ -11,8 +11,8 @@ import { faker } from '@faker-js/faker'; * */ export default Factory.extend({ - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), }); diff --git a/addons/api/mirage/generated/factories/project.js b/addons/api/mirage/generated/factories/project.js index ee1aa6505..d20712ee9 100644 --- a/addons/api/mirage/generated/factories/project.js +++ b/addons/api/mirage/generated/factories/project.js @@ -11,8 +11,8 @@ import { faker } from '@faker-js/faker'; * Project contains all fields related to a Project resource */ export default Factory.extend({ - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), disabled: () => faker.datatype.boolean(), diff --git a/addons/api/mirage/generated/factories/role.js b/addons/api/mirage/generated/factories/role.js index b7a3ba98b..aad8b9d74 100644 --- a/addons/api/mirage/generated/factories/role.js +++ b/addons/api/mirage/generated/factories/role.js @@ -11,10 +11,10 @@ import { faker } from '@faker-js/faker'; * Role contains all field related to a Role resource */ export default Factory.extend({ - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), disabled: () => faker.datatype.boolean(), - version: () => faker.datatype.number(), + version: () => faker.number.int(), }); diff --git a/addons/api/mirage/generated/factories/scope.js b/addons/api/mirage/generated/factories/scope.js index 10cbb37c8..27ad920e1 100644 --- a/addons/api/mirage/generated/factories/scope.js +++ b/addons/api/mirage/generated/factories/scope.js @@ -10,8 +10,8 @@ import { faker } from '@faker-js/faker'; * GeneratedScopeModelFactory */ export default Factory.extend({ - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), disabled: () => faker.datatype.boolean(), diff --git a/addons/api/mirage/generated/factories/session-recording.js b/addons/api/mirage/generated/factories/session-recording.js index 5fc563d94..8071f1dd1 100644 --- a/addons/api/mirage/generated/factories/session-recording.js +++ b/addons/api/mirage/generated/factories/session-recording.js @@ -10,11 +10,9 @@ import { faker } from '@faker-js/faker'; * GeneratedSessionRecordingModelFactory */ export default Factory.extend({ - bytes_up: () => - faker.random.numeric(faker.datatype.number({ min: 1, max: 12 })), - bytes_down: () => - faker.random.numeric(faker.datatype.number({ min: 1, max: 12 })), - errors: () => faker.datatype.number({ max: 10 }), + bytes_up: () => faker.string.numeric(faker.number.int({ min: 1, max: 12 })), + bytes_down: () => faker.string.numeric(faker.number.int({ min: 1, max: 12 })), + errors: () => faker.number.int(10), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), }); diff --git a/addons/api/mirage/generated/factories/session.js b/addons/api/mirage/generated/factories/session.js index 956b8f1ff..2e3897e35 100644 --- a/addons/api/mirage/generated/factories/session.js +++ b/addons/api/mirage/generated/factories/session.js @@ -13,5 +13,5 @@ export default Factory.extend({ type: 'tcp', created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), - version: () => faker.datatype.number(), + version: () => faker.number.int(), }); diff --git a/addons/api/mirage/generated/factories/storage-bucket.js b/addons/api/mirage/generated/factories/storage-bucket.js index 82be1797b..930b7cfcc 100644 --- a/addons/api/mirage/generated/factories/storage-bucket.js +++ b/addons/api/mirage/generated/factories/storage-bucket.js @@ -10,12 +10,13 @@ import { faker } from '@faker-js/faker'; * GeneratedStorageBucketModelFactory */ export default Factory.extend({ - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), - version: () => faker.datatype.number(), + version: () => faker.number.int(), bucket_name: () => faker.internet.domainWord(), bucket_prefix: () => faker.system.directoryPath(), - worker_filter: () => faker.random.words(), + worker_filter: () => + `"${faker.word.noun()}" in "${faker.system.directoryPath()}"`, }); diff --git a/addons/api/mirage/generated/factories/target.js b/addons/api/mirage/generated/factories/target.js index f551efda2..009e5c20e 100644 --- a/addons/api/mirage/generated/factories/target.js +++ b/addons/api/mirage/generated/factories/target.js @@ -10,13 +10,13 @@ import { faker } from '@faker-js/faker'; * GeneratedTargetModelFactory */ export default Factory.extend({ - name: () => faker.random.words(), - session_max_seconds: () => faker.datatype.number(), - description: () => faker.random.words(), + name: () => faker.word.words(), + session_max_seconds: () => faker.number.int(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), disabled: () => faker.datatype.boolean(), - default_port: () => faker.datatype.number(), - default_client_port: () => faker.datatype.number(), - version: () => faker.datatype.number(), + default_port: () => faker.internet.port(), + default_client_port: () => faker.internet.port(), + version: () => faker.number.int(), }); diff --git a/addons/api/mirage/generated/factories/user.js b/addons/api/mirage/generated/factories/user.js index 0fac511d0..03d07bb2f 100644 --- a/addons/api/mirage/generated/factories/user.js +++ b/addons/api/mirage/generated/factories/user.js @@ -11,8 +11,8 @@ import { faker } from '@faker-js/faker'; * User contains all fields related to a User resource */ export default Factory.extend({ - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), disabled: () => faker.datatype.boolean(), diff --git a/addons/api/mirage/generated/factories/worker.js b/addons/api/mirage/generated/factories/worker.js index 729f3f678..c0070ed11 100644 --- a/addons/api/mirage/generated/factories/worker.js +++ b/addons/api/mirage/generated/factories/worker.js @@ -11,17 +11,17 @@ import { faker } from '@faker-js/faker'; * Worker contains all fields related to a Worker resource */ export default Factory.extend({ - name: () => faker.random.words(), - description: () => faker.random.words(), + name: () => faker.word.words(), + description: () => faker.word.words(), created_time: () => faker.date.recent(), updated_time: () => faker.date.recent(), - version: () => faker.datatype.number({ max: 4 }), + version: () => faker.number.int(), address: () => - `${faker.datatype.uuid()}.proxy.boundary.hashicorp.cloud:${faker.internet.port()}`, + `${faker.string.uuid()}.proxy.boundary.hashicorp.cloud:${faker.internet.port()}`, last_status_time: () => faker.date.recent(), - active_connection_count: () => faker.datatype.number({ max: 10 }), + active_connection_count: () => faker.number.int(10), release_version: () => - `Boundary v${faker.datatype.number({ max: 11 })}.${faker.datatype.number({ - max: 50, - })}.${faker.datatype.number({ max: 12 })}`, + `Boundary v${faker.number.int(11)}.${faker.number.int( + 50 + )}.${faker.number.int(12)}`, }); diff --git a/addons/api/mirage/scenarios/ipc.js b/addons/api/mirage/scenarios/ipc.js index 64895210e..6e2cd299b 100644 --- a/addons/api/mirage/scenarios/ipc.js +++ b/addons/api/mirage/scenarios/ipc.js @@ -66,7 +66,7 @@ export default function initializeMockIPC(server, config) { const raw = btoa(JSON.stringify(decoded)); return { address: window.location.hostname, - port: faker.datatype.number(), + port: faker.internet.port(), protocol: type, session_id: newSession.id, credentials: [ diff --git a/addons/core/package.json b/addons/core/package.json index 8b75d3ba6..54bbc0ecc 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -50,7 +50,7 @@ "@ember/optional-features": "^2.0.0", "@ember/test-helpers": "^2.8.1", "@embroider/test-setup": "^2.1.1", - "@faker-js/faker": "^7.3.0", + "@faker-js/faker": "^8.0.2", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", "broccoli-asset-rev": "^3.0.0", diff --git a/ui/admin/package.json b/ui/admin/package.json index 900bf7c97..ff8808a27 100644 --- a/ui/admin/package.json +++ b/ui/admin/package.json @@ -49,7 +49,7 @@ "@ember/optional-features": "^2.0.0", "@ember/render-modifiers": "^2.0.4", "@ember/test-helpers": "^2.8.1", - "@faker-js/faker": "^7.3.0", + "@faker-js/faker": "^8.0.2", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", "@hashicorp/ember-asciinema-player": "https://github.com/hashicorp/ember-asciinema-player.git#e047a096039cff70234c232efe75dcad74c6358a", diff --git a/ui/admin/tests/e2e/tests/target.spec.js b/ui/admin/tests/e2e/tests/target.spec.js index da1f64c75..e64fb0c80 100644 --- a/ui/admin/tests/e2e/tests/target.spec.js +++ b/ui/admin/tests/e2e/tests/target.spec.js @@ -138,7 +138,9 @@ test('Verify TCP target is updated', async ({ page }) => { await page.getByLabel('Maximum Duration').fill('1000'); await page.getByLabel('Maximum Connections').fill('10'); await page.getByLabel('Egress worker filter').click(); - await page.getByRole('textbox', { name: 'Filter', exact: true }).fill('"dev" in "/tags/type"'); + await page + .getByRole('textbox', { name: 'Filter', exact: true }) + .fill('"dev" in "/tags/type"'); await page.getByRole('button', { name: 'Save' }).click(); await expect( diff --git a/ui/desktop/package.json b/ui/desktop/package.json index 8611db386..b88fa7a6e 100644 --- a/ui/desktop/package.json +++ b/ui/desktop/package.json @@ -53,7 +53,7 @@ "@ember/optional-features": "^2.0.0", "@ember/render-modifiers": "^2.0.4", "@ember/test-helpers": "^2.8.1", - "@faker-js/faker": "^7.3.0", + "@faker-js/faker": "^8.0.2", "@glimmer/component": "^1.1.2", "@glimmer/tracking": "^1.1.2", "@playwright/test": "^1.30.0", diff --git a/yarn.lock b/yarn.lock index 5678867cd..83474603e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4494,10 +4494,10 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" -"@faker-js/faker@^7.3.0": - version "7.3.0" - resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-7.3.0.tgz#a508df35ded585c4e071cb5d9d7c89623c837fae" - integrity sha512-1W0PZezq2rxlAssoWemi9gFRD8IQxvf0FPL5Km3TOmGHFG7ib0TbFBJ0yC7D/1NsxunjNTK6WjUXV8ao/mKZ5w== +"@faker-js/faker@^8.0.2": + version "8.0.2" + resolved "https://registry.yarnpkg.com/@faker-js/faker/-/faker-8.0.2.tgz#bab698c5d3da9c52744e966e0e3eedb6c8b05c37" + integrity sha512-Uo3pGspElQW91PCvKSIAXoEgAUlRnH29sX2/p89kg7sP1m2PzCufHINd0FhTXQf6DYGiUlVncdSPa2F9wxed2A== "@formatjs/ecma402-abstract@1.17.0": version "1.17.0"