Skip to content

Commit 3ebc65e

Browse files
authored
chore: revisit utility types (#1223)
1 parent 0d68f59 commit 3ebc65e

11 files changed

+30
-16
lines changed

Diff for: packages/parameters/src/BaseProvider.ts

-2
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ abstract class BaseProvider implements BaseProviderInterface {
6565
this.addToCache(key, value, configs.maxAge);
6666
}
6767

68-
// TODO: revisit return type once providers are implemented, it might be missing binary when not transformed
6968
return value;
7069
}
7170

@@ -94,7 +93,6 @@ abstract class BaseProvider implements BaseProviderInterface {
9493
this.addToCache(key, values, configs.maxAge);
9594
}
9695

97-
// TODO: revisit return type once providers are implemented, it might be missing something
9896
return values;
9997
}
10098

Diff for: packages/parameters/src/ssm/SSMProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import type {
2121
SSMGetParametersByNameOptionsInterface,
2222
SSMSplitBatchAndDecryptParametersOutputType,
2323
SSMGetParametersByNameFromCacheOutputType,
24-
} from 'types/SSMProvider';
24+
} from '../types/SSMProvider';
2525
import type { PaginationConfiguration } from '@aws-sdk/types';
2626

2727
class SSMProvider extends BaseProvider {

Diff for: packages/parameters/src/ssm/getParametersByName.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
import { SSMProvider, DEFAULT_PROVIDERS } from './SSMProvider';
2-
import type { SSMGetParametersByNameOptionsInterface } from '../types/SSMProvider';
2+
import type {
3+
SSMGetParametersByNameOptionsInterface
4+
} from '../types/SSMProvider';
35

46
const getParametersByName = (
57
parameters: Record<string, SSMGetParametersByNameOptionsInterface>,
68
options?: SSMGetParametersByNameOptionsInterface
7-
): Promise<Record<string, unknown>> => {
9+
): Promise<Record<string, unknown> & { _errors?: string[] }> => {
810
if (!DEFAULT_PROVIDERS.hasOwnProperty('ssm')) {
911
DEFAULT_PROVIDERS.ssm = new SSMProvider();
1012
}

Diff for: packages/parameters/src/ssm/index.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export * from './SSMProvider';
22
export * from './getParameter';
33
export * from './getParameters';
4-
export * from './getParametersByName';
4+
export * from './getParametersByName';
5+
export * from '../types/SSMProvider';

Diff for: packages/parameters/src/types/AppConfigProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ interface GetAppConfigCombinedInterface
4343
extends Omit<AppConfigProviderOptions, 'clientConfig'>,
4444
AppConfigGetOptionsInterface {}
4545

46-
export {
46+
export type {
4747
AppConfigProviderOptions,
4848
AppConfigGetOptionsInterface,
4949
GetAppConfigCombinedInterface,

Diff for: packages/parameters/src/types/BaseProvider.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ interface BaseProviderInterface {
2121
getMultiple(path: string, options?: GetMultipleOptionsInterface): Promise<void | Record<string, unknown>>
2222
}
2323

24-
export {
24+
export type {
2525
GetOptionsInterface,
2626
GetMultipleOptionsInterface,
2727
BaseProviderInterface,

Diff for: packages/parameters/src/types/SSMProvider.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ import type {
33
GetParameterCommandInput,
44
GetParametersByPathCommandInput
55
} from '@aws-sdk/client-ssm';
6-
import type { GetOptionsInterface, GetMultipleOptionsInterface, TransformOptions } from './BaseProvider';
6+
import type {
7+
GetOptionsInterface,
8+
GetMultipleOptionsInterface,
9+
TransformOptions
10+
} from './BaseProvider';
711

812
interface SSMProviderOptionsInterface {
913
clientConfig: SSMClientConfig
@@ -51,7 +55,7 @@ type SSMGetParametersByNameFromCacheOutputType = {
5155
toFetch: Record<string, SSMGetParametersByNameOptionsInterface>
5256
};
5357

54-
export {
58+
export type {
5559
SSMProviderOptionsInterface,
5660
SSMGetOptionsInterface,
5761
SSMGetMultipleOptionsInterface,

Diff for: packages/parameters/src/types/index.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,5 @@
1-
export * from './BaseProvider';
1+
export * from './BaseProvider';
2+
export * from './AppConfigProvider';
3+
export * from './SSMProvider';
4+
export * from './SecretsProvider';
5+
export * from './DynamoDBProvider';

Diff for: packages/parameters/tests/unit/AppConfigProvider.test.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,14 @@
44
* @group unit/parameters/AppConfigProvider/class
55
*/
66
import { AppConfigProvider } from '../../src/appconfig/index';
7-
7+
import { AppConfigProviderOptions } from '../../src/types/AppConfigProvider';
88
import {
99
AppConfigDataClient,
1010
StartConfigurationSessionCommand,
1111
GetLatestConfigurationCommand,
1212
} from '@aws-sdk/client-appconfigdata';
1313
import { mockClient } from 'aws-sdk-client-mock';
1414
import 'aws-sdk-client-mock-jest';
15-
import { AppConfigProviderOptions } from '../../src/types/AppConfigProvider';
1615

1716
describe('Class: AppConfigProvider', () => {
1817
const client = mockClient(AppConfigDataClient);

Diff for: packages/parameters/tests/unit/BaseProvider.test.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
*
44
* @group unit/parameters/baseProvider/class
55
*/
6-
7-
import { BaseProvider, ExpirableValue, GetParameterError, TransformParameterError } from '../../src';
6+
import {
7+
BaseProvider,
8+
ExpirableValue,
9+
GetParameterError,
10+
TransformParameterError
11+
} from '../../src';
812
import { toBase64 } from '@aws-sdk/util-base64';
913

1014
const encoder = new TextEncoder();

Diff for: packages/parameters/tests/unit/getParametersByName.test.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*/
66
import { DEFAULT_PROVIDERS } from '../../src/BaseProvider';
77
import { SSMProvider, getParametersByName } from '../../src/ssm';
8+
import type { SSMGetParametersByNameOptionsInterface } from '../../src/types/SSMProvider';
89

910
describe('Function: getParametersByName', () => {
1011

@@ -15,12 +16,13 @@ describe('Function: getParametersByName', () => {
1516
test('when called and a default provider doesn\'t exist, it instantiates one and returns the value', async () => {
1617

1718
// Prepare
18-
const parameters = {
19+
const parameters: Record<string, SSMGetParametersByNameOptionsInterface> = {
1920
'/foo/bar': {
2021
maxAge: 1000,
2122
},
2223
'/foo/baz': {
2324
maxAge: 2000,
25+
transform: 'json',
2426
}
2527
};
2628
const getParametersByNameSpy = jest.spyOn(SSMProvider.prototype, 'getParametersByName').mockImplementation();

0 commit comments

Comments
 (0)