Skip to content

chore(parameters): refactor provider constructor to init client as needed #1757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 11 additions & 20 deletions packages/parameters/src/appconfig/AppConfigProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ import type {
AppConfigGetOptions,
AppConfigGetOutput,
} from '../types/AppConfigProvider';
import {
addUserAgentMiddleware,
isSdkClient,
} from '@aws-lambda-powertools/commons';

/**
* ## Intro
Expand Down Expand Up @@ -185,7 +181,7 @@ import {
* For more usage examples, see [our documentation](https://docs.powertools.aws.dev/lambda/typescript/latest/utilities/parameters/).
*/
class AppConfigProvider extends BaseProvider {
public client: AppConfigDataClient;
public client!: AppConfigDataClient;
protected configurationTokenStore = new Map<string, string>();
protected valueStore = new Map<string, Uint8Array>();
private application?: string;
Expand All @@ -197,27 +193,22 @@ class AppConfigProvider extends BaseProvider {
* @param {AppConfigProviderOptions} options - The configuration object.
*/
public constructor(options: AppConfigProviderOptions) {
super();
this.client = new AppConfigDataClient(options.clientConfig || {});
if (options?.awsSdkV3Client) {
if (isSdkClient(options.awsSdkV3Client)) {
this.client = options.awsSdkV3Client;
} else {
console.warn(
'awsSdkV3Client is not an AWS SDK v3 client, using default client'
);
}
}
addUserAgentMiddleware(this.client, 'parameters');
super({
proto: AppConfigDataClient as new (
config?: unknown
) => AppConfigDataClient,
clientConfig: options.clientConfig,
awsSdkV3Client: options.awsSdkV3Client,
});

this.application =
options?.application || this.envVarsService.getServiceName();
const { application, environment } = options;
this.application = application ?? this.envVarsService.getServiceName();
if (!this.application || this.application.trim().length === 0) {
throw new Error(
'Application name is not defined or POWERTOOLS_SERVICE_NAME is not set'
);
}
this.environment = options.environment;
this.environment = environment;
}

/**
Expand Down
26 changes: 25 additions & 1 deletion packages/parameters/src/base/BaseProvider.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import {
addUserAgentMiddleware,
isNullOrUndefined,
isRecord,
isSdkClient,
isString,
} from '@aws-lambda-powertools/commons';
import { GetOptions } from './GetOptions';
Expand Down Expand Up @@ -36,11 +38,33 @@ import type {
*/
abstract class BaseProvider implements BaseProviderInterface {
public envVarsService: EnvironmentVariablesService;
protected client: unknown;
protected store: Map<string, ExpirableValue>;

public constructor() {
public constructor({
awsSdkV3Client,
clientConfig,
proto,
}: {
awsSdkV3Client?: unknown;
clientConfig?: unknown;
proto: new (config?: unknown) => unknown;
}) {
this.store = new Map();
this.envVarsService = new EnvironmentVariablesService();
if (awsSdkV3Client) {
if (!isSdkClient(awsSdkV3Client)) {
console.warn(
'awsSdkV3Client is not an AWS SDK v3 client, using default client'
);
this.client = new proto(clientConfig ?? {});
} else {
this.client = awsSdkV3Client;
}
} else {
this.client = new proto(clientConfig ?? {});
}
addUserAgentMiddleware(this.client, 'parameters');
}

/**
Expand Down
33 changes: 11 additions & 22 deletions packages/parameters/src/dynamodb/DynamoDBProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ import type {
} from '@aws-sdk/client-dynamodb';
import type { PaginationConfiguration } from '@aws-sdk/types';
import type { JSONValue } from '@aws-lambda-powertools/commons';
import {
addUserAgentMiddleware,
isSdkClient,
} from '@aws-lambda-powertools/commons';

/**
* ## Intro
Expand Down Expand Up @@ -239,7 +235,7 @@ import {
* For more usage examples, see [our documentation](https://docs.powertools.aws.dev/lambda/typescript/latest/utilities/parameters/).
*/
class DynamoDBProvider extends BaseProvider {
public client: DynamoDBClient;
public client!: DynamoDBClient;
protected keyAttr = 'id';
protected sortAttr = 'sk';
protected tableName: string;
Expand All @@ -251,24 +247,17 @@ class DynamoDBProvider extends BaseProvider {
* @param {DynamoDBProviderOptions} config - The configuration object.
*/
public constructor(config: DynamoDBProviderOptions) {
super();

this.client = new DynamoDBClient(config?.clientConfig || {});
if (config?.awsSdkV3Client) {
if (isSdkClient(config.awsSdkV3Client)) {
this.client = config.awsSdkV3Client;
} else {
console.warn(
'awsSdkV3Client is not an AWS SDK v3 client, using default client'
);
}
}
addUserAgentMiddleware(this.client, 'parameters');
super({
awsSdkV3Client: config.awsSdkV3Client,
clientConfig: config.clientConfig,
proto: DynamoDBClient as new (config?: unknown) => DynamoDBClient,
});

this.tableName = config.tableName;
if (config.keyAttr) this.keyAttr = config.keyAttr;
if (config.sortAttr) this.sortAttr = config.sortAttr;
if (config.valueAttr) this.valueAttr = config.valueAttr;
const { tableName, keyAttr, sortAttr, valueAttr } = config;
this.tableName = tableName;
if (keyAttr) this.keyAttr = keyAttr;
if (sortAttr) this.sortAttr = sortAttr;
if (valueAttr) this.valueAttr = valueAttr;
}

/**
Expand Down
25 changes: 7 additions & 18 deletions packages/parameters/src/secrets/SecretsProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ import type {
SecretsGetOptions,
SecretsGetOutput,
} from '../types/SecretsProvider';
import {
addUserAgentMiddleware,
isSdkClient,
} from '@aws-lambda-powertools/commons';

/**
* ## Intro
Expand Down Expand Up @@ -149,27 +145,20 @@ import {
* @see https://docs.powertools.aws.dev/lambda/typescript/latest/utilities/parameters/
*/
class SecretsProvider extends BaseProvider {
public client: SecretsManagerClient;
public client!: SecretsManagerClient;

/**
* It initializes the SecretsProvider class.
*
* @param {SecretsProviderOptions} config - The configuration object.
*/
public constructor(config?: SecretsProviderOptions) {
super();

this.client = new SecretsManagerClient(config?.clientConfig || {});
if (config?.awsSdkV3Client) {
if (isSdkClient(config.awsSdkV3Client)) {
this.client = config.awsSdkV3Client;
} else {
console.warn(
'awsSdkV3Client is not an AWS SDK v3 client, using default client'
);
}
}
addUserAgentMiddleware(this.client, 'parameters');
super({
proto: SecretsManagerClient as new (
config?: unknown
) => SecretsManagerClient,
...(config ?? {}),
});
}

/**
Expand Down
23 changes: 5 additions & 18 deletions packages/parameters/src/ssm/SSMProvider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ import type {
SSMGetParametersByNameFromCacheOutputType,
} from '../types/SSMProvider';
import type { PaginationConfiguration } from '@aws-sdk/types';
import {
addUserAgentMiddleware,
isSdkClient,
} from '@aws-lambda-powertools/commons';

/**
* ## Intro
Expand Down Expand Up @@ -266,7 +262,7 @@ import {
* For more usage examples, see [our documentation](https://docs.powertools.aws.dev/lambda/typescript/latest/utilities/parameters/).
*/
class SSMProvider extends BaseProvider {
public client: SSMClient;
public client!: SSMClient;
protected errorsKey = '_errors';
protected maxGetParametersItems = 10;

Expand All @@ -276,19 +272,10 @@ class SSMProvider extends BaseProvider {
* @param {SSMProviderOptions} config - The configuration object.
*/
public constructor(config?: SSMProviderOptions) {
super();

this.client = new SSMClient(config?.clientConfig || {});
if (config?.awsSdkV3Client) {
if (isSdkClient(config.awsSdkV3Client)) {
this.client = config.awsSdkV3Client;
} else {
console.warn(
'awsSdkV3Client is not an AWS SDK v3 client, using default client'
);
}
}
addUserAgentMiddleware(this.client, 'parameters');
super({
proto: SSMClient as new (config?: unknown) => SSMClient,
...(config ?? {}),
});
}

/**
Expand Down
74 changes: 39 additions & 35 deletions packages/parameters/tests/unit/BaseProvider.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,51 @@ import { GetParameterError, TransformParameterError } from '../../src/errors';
import { toBase64 } from '@aws-sdk/util-base64-node';

const encoder = new TextEncoder();
jest.mock('@aws-lambda-powertools/commons', () => ({
...jest.requireActual('@aws-lambda-powertools/commons'),
addUserAgentMiddleware: jest.fn(),
}));

class TestProvider extends BaseProvider {
public constructor() {
super({
proto: class {
#name = 'TestProvider';

public hello(): string {
return this.#name;
}
},
});
}

describe('Class: BaseProvider', () => {
afterEach(() => {
jest.clearAllMocks();
});

class TestProvider extends BaseProvider {
public _add(key: string, value: ExpirableValue): void {
this.store.set(key, value);
}
public _add(key: string, value: ExpirableValue): void {
this.store.set(key, value);
}

public _get(_name: string): Promise<string> {
throw Error('Not implemented.');
}
public _get(_name: string): Promise<string> {
throw Error('Not implemented.');
}

public _getKeyTest(key: string): ExpirableValue | undefined {
return this.store.get(key);
}
public _getKeyTest(key: string): ExpirableValue | undefined {
return this.store.get(key);
}

public _getMultiple(
_path: string
): Promise<Record<string, string | undefined>> {
throw Error('Not implemented.');
}
public _getMultiple(
_path: string
): Promise<Record<string, string | undefined>> {
throw Error('Not implemented.');
}

public _getStoreSize(): number {
return this.store.size;
}
public _getStoreSize(): number {
return this.store.size;
}
}

describe('Class: BaseProvider', () => {
afterEach(() => {
jest.clearAllMocks();
});

describe('Method: addToCache', () => {
test('when called with a value and maxAge equal to 0, it skips the cache entirely', () => {
Expand Down Expand Up @@ -581,18 +597,6 @@ describe('Class: BaseProvider', () => {
});

describe('Function: clearCaches', () => {
class TestProvider extends BaseProvider {
public _get(_name: string): Promise<string> {
throw Error('Not implemented.');
}

public _getMultiple(
_path: string
): Promise<Record<string, string | undefined>> {
throw Error('Not implemented.');
}
}

test('when called, it clears all the caches', () => {
// Prepare
const provider1 = new TestProvider();
Expand Down