refactor: stop using getVoidLogger in tests

Signed-off-by: Camila Belo <camilaibs@gmail.com>
This commit is contained in:
Camila Belo
2024-05-15 09:09:54 +02:00
parent 819754e57e
commit eb34b87d5a
118 changed files with 533 additions and 433 deletions
@@ -20,7 +20,7 @@ import { DatabaseKeyStore } from './DatabaseKeyStore';
import { FirestoreKeyStore } from './FirestoreKeyStore';
import { KeyStores } from './KeyStores';
import { MemoryKeyStore } from './MemoryKeyStore';
import { getVoidLogger } from '@backstage/backend-common';
import { mockServices } from '@backstage/backend-test-utils';
describe('KeyStores', () => {
const defaultConfigOptions = {
@@ -35,7 +35,7 @@ describe('KeyStores', () => {
it('reads auth section from config', async () => {
const configSpy = jest.spyOn(defaultConfig, 'getOptionalConfig');
const keyStore = await KeyStores.fromConfig(defaultConfig, {
logger: getVoidLogger(),
logger: mockServices.logger.mock(),
database: AuthDatabase.forTesting(),
});
@@ -50,7 +50,7 @@ describe('KeyStores', () => {
it('can handle without auth config', async () => {
const keyStore = await KeyStores.fromConfig(new ConfigReader({}), {
logger: getVoidLogger(),
logger: mockServices.logger.mock(),
database: AuthDatabase.forTesting(),
});
expect(keyStore).toBeInstanceOf(DatabaseKeyStore);
@@ -78,7 +78,7 @@ describe('KeyStores', () => {
};
const config = new ConfigReader(configOptions);
const keyStore = await KeyStores.fromConfig(config, {
logger: getVoidLogger(),
logger: mockServices.logger.mock(),
database: AuthDatabase.forTesting(),
});
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { getVoidLogger } from '@backstage/backend-common';
import { StaticTokenIssuer } from './StaticTokenIssuer';
import { createLocalJWKSet, jwtVerify } from 'jose';
import { stringifyEntityRef } from '@backstage/catalog-model';
import { StaticKeyStore } from './StaticKeyStore';
import { mockServices } from '@backstage/backend-test-utils';
const logger = getVoidLogger();
const logger = mockServices.logger.mock();
const entityRef = stringifyEntityRef({
kind: 'User',
namespace: 'default',
@@ -14,7 +14,6 @@
* limitations under the License.
*/
import { getVoidLogger } from '@backstage/backend-common';
import { stringifyEntityRef } from '@backstage/catalog-model';
import {
base64url,
@@ -25,8 +24,9 @@ import {
import { MemoryKeyStore } from './MemoryKeyStore';
import { TokenFactory } from './TokenFactory';
import { tokenTypes } from '@backstage/plugin-auth-node';
import { mockServices } from '@backstage/backend-test-utils';
const logger = getVoidLogger();
const logger = mockServices.logger.mock();
function jwtKid(jwt: string): string {
const header = decodeProtectedHeader(jwt);
@@ -15,7 +15,6 @@
*/
import { CatalogAuthResolverContext } from './CatalogAuthResolverContext';
import { getVoidLogger } from '@backstage/backend-common';
import { CatalogApi } from '@backstage/catalog-client';
import { mockServices } from '@backstage/backend-test-utils';
import { TokenIssuer } from '../../identity/types';
@@ -32,7 +31,7 @@ describe('CatalogAuthResolverContext', () => {
it('adds kind to filter when missing', async () => {
const context = CatalogAuthResolverContext.create({
logger: getVoidLogger(),
logger: mockServices.logger.mock(),
catalogApi: mockCatalogApi as CatalogApi,
tokenIssuer: {} as TokenIssuer,
tokenManager: mockServices.tokenManager(),
@@ -13,8 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { setupRequestMockHandlers } from '@backstage/backend-test-utils';
import { getVoidLogger } from '@backstage/backend-common';
import {
mockServices,
setupRequestMockHandlers,
} from '@backstage/backend-test-utils';
import { LoggerService } from '@backstage/backend-plugin-api';
import { Config, ConfigReader } from '@backstage/config';
import {
@@ -112,7 +114,7 @@ describe('oidc.create', () => {
clientSecret: 'clientSecret',
},
}),
logger: getVoidLogger(),
logger: mockServices.logger.mock(),
resolverContext: {
issueToken: jest.fn(),
findCatalogUser: jest.fn(),