[backend] Address dual package hazard issue on graphql dep in tests

Author: fellowseb

opencti-platform/opencti-graphql/script/script-generate-schema.js

@@ -3,7 +3,7 @@
 
 import fs from 'node:fs';
 import _ from '../src/modules/index';
-import { printSchema } from 'graphql/utilities';
+import { printSchema } from 'graphql';
 import createSchema from '../src/graphql/schema';
 
 const schema = createSchema();

opencti-platform/opencti-graphql/src/config/conf.js

@@ -10,7 +10,7 @@ import { HttpsProxyAgent } from 'https-proxy-agent';
 import { HttpProxyAgent } from 'http-proxy-agent';
 import { ProxyAgent } from 'undici';
 import { v4 as uuid } from 'uuid';
-import { GraphQLError } from 'graphql/index';
+import { GraphQLError } from 'graphql';
 import * as O from '../schema/internalObject';
 import * as M from '../schema/stixMetaObject';
 import {

opencti-platform/opencti-graphql/src/config/errors.js

@@ -1,4 +1,4 @@
-import { GraphQLError } from 'graphql/index';
+import { GraphQLError } from 'graphql';
 
 const CATEGORY_TECHNICAL = 'TECHNICAL';
 const CATEGORY_BUSINESS = 'BUSINESS';

opencti-platform/opencti-graphql/src/domain/stixCoreRelationship.js

@@ -1,5 +1,5 @@
 import * as R from 'ramda';
-import { GraphQLError } from 'graphql/index';
+import { GraphQLError } from 'graphql';
 import { ApolloServerErrorCode } from '@apollo/server/errors';
 import { delEditContext, notify, setEditContext } from '../database/redis';
 import { createRelation, deleteElementById, deleteRelationsByFromAndTo, timeSeriesRelations, updateAttribute } from '../database/middleware';

opencti-platform/opencti-graphql/src/domain/stixRelationship.js

@@ -1,5 +1,5 @@
 import * as R from 'ramda';
-import { GraphQLError } from 'graphql/index';
+import { GraphQLError } from 'graphql';
 import { ApolloServerErrorCode } from '@apollo/server/errors';
 import { deleteElementById, distributionRelations, timeSeriesRelations } from '../database/middleware';
 import { ABSTRACT_STIX_RELATIONSHIP } from '../schema/general';

opencti-platform/opencti-graphql/src/graphql/graphql.js

@@ -2,7 +2,7 @@ import { ApolloServer } from '@apollo/server';
 import { ApolloArmor } from '@escape.tech/graphql-armor';
 import { dissocPath } from 'ramda';
 import { createValidation as createAliasBatch } from 'graphql-no-alias';
-import { GraphQLError } from 'graphql/error';
+import { GraphQLError } from 'graphql';
 import { createApollo4QueryValidationPlugin } from 'graphql-constraint-directive/apollo4';
 import createSchema from './schema';
 import conf, { DEV_MODE, ENABLED_METRICS, ENABLED_TRACING, GRAPHQL_ARMOR_DISABLED, logApp, PLAYGROUND_ENABLED, PLAYGROUND_INTROSPECTION_DISABLED } from '../config/conf';

opencti-platform/opencti-graphql/src/graphql/loggerPlugin.js

@@ -1,5 +1,5 @@
 import { filter, head, isEmpty, isNil } from 'ramda';
-import { stripIgnoredCharacters } from 'graphql/utilities';
+import { stripIgnoredCharacters } from 'graphql';
 import { ApolloServerErrorCode } from '@apollo/server/errors';
 import conf, { appLogExtendedErrors, booleanConf, logApp } from '../config/conf';
 import { isNotEmptyField } from '../database/utils';

opencti-platform/opencti-graphql/src/graphql/telemetryPlugin.js

@@ -1,5 +1,5 @@
 import { head, includes } from 'ramda';
-import { stripIgnoredCharacters } from 'graphql/utilities';
+import { stripIgnoredCharacters } from 'graphql';
 import { meterManager } from '../config/tracing';
 import { AUTH_FAILURE, AUTH_REQUIRED, FORBIDDEN_ACCESS } from '../config/errors';
 import { isEmptyField } from '../database/utils';

opencti-platform/opencti-graphql/src/http/httpPlatform.js

@@ -13,7 +13,7 @@ import validator from 'validator';
 import archiverZipEncrypted from 'archiver-zip-encrypted';
 import rateLimit from 'express-rate-limit';
 import contentDisposition from 'content-disposition';
-import { printSchema } from 'graphql/utilities';
+import { printSchema } from 'graphql';
 import { basePath, DEV_MODE, ENABLED_UI, logApp, OPENCTI_SESSION, PLATFORM_VERSION, AUTH_PAYLOAD_BODY_SIZE, getBaseUrl } from '../config/conf';
 import { sessionAuthenticateUser, userWithOrigin } from '../domain/user';
 import { downloadFile, getFileContent, isStorageAlive } from '../database/raw-file-storage';

opencti-platform/opencti-graphql/tests/03-integration/01-database/middleware-organization-test.ts

@@ -1,6 +1,6 @@
 import { beforeAll, afterAll, describe, expect, it, vi } from 'vitest';
 import { now } from 'moment';
-import { GraphQLError } from 'graphql/index';
+import { GraphQLError } from 'graphql';
 import { unSetOrganization, setOrganization } from '../../utils/testQueryHelper';
 import { ADMIN_USER, PLATFORM_ORGANIZATION, testContext, TEST_ORGANIZATION, GREEN_GROUP, inPlatformContext } from '../../utils/testQuery';
 import type { ThreatActorIndividualAddInput } from '../../../src/generated/graphql';